Codebase list osmosis / bc93083
Drop patches applied upstream, refresh remaining patches. Bas Couwenberg 8 years ago
37 changed file(s) with 17 addition(s) and 16993 deletion(s). Raw diff Collapse all Expand all
00 osmosis (0.44.1-1) UNRELEASED; urgency=medium
11
22 * New upstream release.
3 * Drop patches applied upstream, refresh remaining patches.
34
45 -- Bas Couwenberg <sebastic@debian.org> Thu, 04 Jun 2015 15:30:44 +0200
56
+0
-16
debian/patches/0001-Disable-synchronous_commit-for-pgsnapshot-loading.patch less more
0 From ed22ce623433c7ec9f6ac34c74529bc801527e44 Mon Sep 17 00:00:00 2001
1 From: Paul Norman <penorman@mac.com>
2 Date: Sat, 1 Jun 2013 21:40:37 -0700
3 Subject: Disable synchronous_commit for pgsnapshot loading
4 Origin: https://github.com/openstreetmap/osmosis/commit/ed22ce623433c7ec9f6ac34c74529bc801527e44
5
6
7 --- a/package/script/pgsnapshot_load_0.6.sql
8 +++ b/package/script/pgsnapshot_load_0.6.sql
9 @@ -1,3 +1,6 @@
10 +-- Allow data loss (but not corruption) in the case of a power outage. This is okay because we need to re-run the script anyways.
11 +SET synchronous_commit TO OFF;
12 +
13 -- Drop all primary keys and indexes to improve load speed.
14 ALTER TABLE nodes DROP CONSTRAINT pk_nodes;
15 ALTER TABLE ways DROP CONSTRAINT pk_ways;
+0
-36
debian/patches/0001-Fix-checkstyle-errors.patch less more
0 From acc7f55aff11893c0521787ad3206331b1cae8ec Mon Sep 17 00:00:00 2001
1 From: Jeffrey Erikson <jeffrey.erikson@digitalglobe.com>
2 Date: Thu, 9 Apr 2015 14:59:37 -0400
3 Subject: Fix checkstyle errors
4 Origin: https://github.com/openstreetmap/osmosis/commit/acc7f55aff11893c0521787ad3206331b1cae8ec
5
6 ---
7 .../openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java | 3 ++-
8 .../java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java | 3 +--
9 2 files changed, 3 insertions(+), 3 deletions(-)
10
11 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
12 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
13 @@ -51,8 +51,8 @@ public class EntityFeatureDao<Tef extend
14 * @return All instances of this feature type for the entity.
15 */
16 public Collection<Tdb> getAll(long entityId) {
17 - return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true), new Object[] {entityId},
18 - entityFeatureMapper.getRowMapper());
19 + return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true),
20 + new Object[] {entityId}, entityFeatureMapper.getRowMapper());
21 }
22
23
24 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
25 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
26 @@ -61,8 +61,7 @@ public class WayDao extends EntityDao<Wa
27
28
29 private void loadFeatures(long entityId, Way entity) {
30 - if ( entity.getWayNodes().size() == 0 )
31 - {
32 + if (entity.getWayNodes().size() == 0) {
33 entity.getWayNodes().addAll(wayNodeDao.getAllRaw(entityId));
34 }
35 }
+0
-147
debian/patches/0001-Fix-deprecation-warnings-resulting-from-dependency-u.patch less more
0 From c9782fe68b249a05530eee43e0ae75481f732832 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Tue, 30 Sep 2014 21:44:01 +1000
3 Subject: Fix deprecation warnings resulting from dependency upgrades
4 Origin: https://github.com/openstreetmap/osmosis/commit/c9782fe68b249a05530eee43e0ae75481f732832
5
6 ---
7 .../openstreetmap/osmosis/apidb/common/MysqlIdentityValueLoader2.java | 2 +-
8 .../osmosis/apidb/common/PostgresqlIdentityValueLoader2.java | 4 ++--
9 .../java/org/openstreetmap/osmosis/apidb/v0_6/impl/EntityDao.java | 4 ++--
10 .../org/openstreetmap/osmosis/core/bound/v0_6/BoundComputerTest.java | 3 +--
11 .../org/openstreetmap/osmosis/core/bound/v0_6/BoundSetterTest.java | 3 +--
12 .../osmosis/pgsnapshot/common/SchemaVersionValidator.java | 2 +-
13 .../org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityDao.java | 2 +-
14 .../java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java | 3 +--
15 .../java/org/openstreetmap/osmosis/set/v0_6/EntityMergerTest.java | 3 +--
16 .../java/org/openstreetmap/osmosis/xml/common/ElementWriterTest.java | 3 +--
17 10 files changed, 12 insertions(+), 17 deletions(-)
18
19 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/MysqlIdentityValueLoader2.java
20 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/MysqlIdentityValueLoader2.java
21 @@ -32,7 +32,7 @@ public class MysqlIdentityValueLoader2 i
22 * @return The newly inserted id.
23 */
24 public long getLastInsertId() {
25 - return dbCtx.getJdbcTemplate().queryForLong(SQL_SELECT_LAST_INSERT_ID);
26 + return dbCtx.getJdbcTemplate().queryForObject(SQL_SELECT_LAST_INSERT_ID, Long.class);
27 }
28
29
30 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/PostgresqlIdentityValueLoader2.java
31 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/PostgresqlIdentityValueLoader2.java
32 @@ -34,7 +34,7 @@ public class PostgresqlIdentityValueLoad
33 * @return The newly inserted id.
34 */
35 public long getLastInsertId() {
36 - return dbCtx.getJdbcTemplate().queryForLong(SQL_SELECT_LAST_INSERT_ID);
37 + return dbCtx.getJdbcTemplate().queryForObject(SQL_SELECT_LAST_INSERT_ID, Long.class);
38 }
39
40
41 @@ -43,7 +43,7 @@ public class PostgresqlIdentityValueLoad
42 */
43 @Override
44 public long getLastSequenceId(String sequenceName) {
45 - return dbCtx.getJdbcTemplate().queryForLong(SQL_SELECT_LAST_SEQUENCE_ID, sequenceName);
46 + return dbCtx.getJdbcTemplate().queryForObject(SQL_SELECT_LAST_SEQUENCE_ID, Long.class, sequenceName);
47 }
48
49
50 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/EntityDao.java
51 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/impl/EntityDao.java
52 @@ -460,8 +460,8 @@ public abstract class EntityDao<T extend
53
54 if (LOG.isLoggable(Level.FINER)) {
55 LOG.log(Level.FINER,
56 - jdbcTemplate.queryForInt("SELECT Count(" + entityName + "_id) FROM " + selectedEntityTableName)
57 - + " " + entityName + " records located.");
58 + jdbcTemplate.queryForObject("SELECT Count(" + entityName + "_id) FROM " + selectedEntityTableName,
59 + Integer.class) + " " + entityName + " records located.");
60 }
61
62 // Extract the data and obtain an iterator for the results.
63 --- a/osmosis-core/src/test/java/org/openstreetmap/osmosis/core/bound/v0_6/BoundComputerTest.java
64 +++ b/osmosis-core/src/test/java/org/openstreetmap/osmosis/core/bound/v0_6/BoundComputerTest.java
65 @@ -4,8 +4,7 @@ package org.openstreetmap.osmosis.core.b
66 import java.util.Date;
67 import java.util.Iterator;
68
69 -import junit.framework.Assert;
70 -
71 +import org.junit.Assert;
72 import org.junit.Test;
73 import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
74 import org.openstreetmap.osmosis.core.container.v0_6.EntityContainer;
75 --- a/osmosis-core/src/test/java/org/openstreetmap/osmosis/core/bound/v0_6/BoundSetterTest.java
76 +++ b/osmosis-core/src/test/java/org/openstreetmap/osmosis/core/bound/v0_6/BoundSetterTest.java
77 @@ -4,8 +4,7 @@ package org.openstreetmap.osmosis.core.b
78 import java.util.Date;
79 import java.util.Iterator;
80
81 -import junit.framework.Assert;
82 -
83 +import org.junit.Assert;
84 import org.junit.Test;
85 import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
86 import org.openstreetmap.osmosis.core.container.v0_6.EntityContainer;
87 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/SchemaVersionValidator.java
88 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/common/SchemaVersionValidator.java
89 @@ -61,7 +61,7 @@ public class SchemaVersionValidator {
90 if (preferences.getValidateSchemaVersion()) {
91 int dbVersion;
92
93 - dbVersion = jdbcTemplate.queryForInt(SELECT_SQL);
94 + dbVersion = jdbcTemplate.queryForObject(SELECT_SQL, Integer.class);
95
96 if (dbVersion != expectedVersion) {
97 throw new OsmosisRuntimeException(
98 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityDao.java
99 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityDao.java
100 @@ -73,7 +73,7 @@ public abstract class EntityDao<T extend
101 * @return True if the entity exists in the database.
102 */
103 public boolean exists(long entityId) {
104 - return jdbcTemplate.queryForInt(entityMapper.getSqlSelectCount(true), entityId) > 0;
105 + return jdbcTemplate.queryForObject(entityMapper.getSqlSelectCount(true), Integer.class, entityId) > 0;
106 }
107
108
109 --- a/osmosis-set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
110 +++ b/osmosis-set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
111 @@ -6,8 +6,7 @@ import java.io.IOException;
112 import java.util.Date;
113 import java.util.HashMap;
114
115 -import junit.framework.Assert;
116 -
117 +import org.junit.Assert;
118 import org.junit.Test;
119 import org.openstreetmap.osmosis.core.Osmosis;
120 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
121 --- a/osmosis-set/src/test/java/org/openstreetmap/osmosis/set/v0_6/EntityMergerTest.java
122 +++ b/osmosis-set/src/test/java/org/openstreetmap/osmosis/set/v0_6/EntityMergerTest.java
123 @@ -6,8 +6,7 @@ import java.util.ArrayList;
124 import java.util.Collections;
125 import java.util.List;
126
127 -import junit.framework.Assert;
128 -
129 +import org.junit.Assert;
130 import org.junit.Test;
131 import org.openstreetmap.osmosis.core.Osmosis;
132 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
133 --- a/osmosis-xml/src/test/java/org/openstreetmap/osmosis/xml/common/ElementWriterTest.java
134 +++ b/osmosis-xml/src/test/java/org/openstreetmap/osmosis/xml/common/ElementWriterTest.java
135 @@ -5,10 +5,9 @@ import java.io.BufferedWriter;
136 import java.io.IOException;
137 import java.io.StringWriter;
138
139 +import org.junit.Assert;
140 import org.junit.Test;
141
142 -import junit.framework.Assert;
143 -
144
145 /**
146 * Tests the element writer.
+0
-33
debian/patches/0001-Fix-query-for-retrieving-way-nodes-in-pgsnapshot-mod.patch less more
0 From 749487e585de103c41e93c9819a798ec916c641a Mon Sep 17 00:00:00 2001
1 From: Jeffrey Erikson <jeffrey.erikson@digitalglobe.com>
2 Date: Thu, 19 Mar 2015 10:33:46 -0400
3 Subject: Fix query for retrieving way-nodes in pgsnapshot module
4 Origin: https://github.com/openstreetmap/osmosis/commit/749487e585de103c41e93c9819a798ec916c641a
5
6 ---
7 .../openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java | 2 +-
8 .../org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayNodeMapper.java | 2 +-
9 2 files changed, 2 insertions(+), 2 deletions(-)
10
11 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
12 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
13 @@ -51,7 +51,7 @@ public class EntityFeatureDao<Tef extend
14 * @return All instances of this feature type for the entity.
15 */
16 public Collection<Tdb> getAll(long entityId) {
17 - return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true), entityFeatureMapper.getRowMapper());
18 + return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true), new Object[] { entityId }, entityFeatureMapper.getRowMapper());
19 }
20
21
22 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayNodeMapper.java
23 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayNodeMapper.java
24 @@ -48,7 +48,7 @@ public class WayNodeMapper extends Entit
25 .append("s e ON f.").append(getParentEntityName()).append("_id = e.id");
26 }
27 if (filterByEntityId) {
28 - resultSql.append(" WHERE entity_id = ?");
29 + resultSql.append(" WHERE way_id = ?");
30 }
31 if (orderBy) {
32 resultSql.append(getSqlDefaultOrderBy());
+0
-76
debian/patches/0001-Fix-remaining-64-bit-id-tracking-problems.patch less more
0 From 50d1ec7a49fa13332d6e9c9123f8b7d05f306c5d Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Sat, 20 Jul 2013 10:23:58 +1000
3 Subject: Fix remaining 64-bit id tracking problems
4 Origin: https://github.com/openstreetmap/osmosis/commit/50d1ec7a49fa13332d6e9c9123f8b7d05f306c5d
5
6 The BitSetIdTracker was still being used in a number of places. All
7 instances have now been replaced by the 64-bit capable DynamicIdTracker.
8
9 --- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/report/v0_6/IntegrityReporter.java
10 +++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/report/v0_6/IntegrityReporter.java
11 @@ -23,7 +23,7 @@ import org.openstreetmap.osmosis.core.do
12 import org.openstreetmap.osmosis.core.domain.v0_6.RelationMember;
13 import org.openstreetmap.osmosis.core.domain.v0_6.Way;
14 import org.openstreetmap.osmosis.core.domain.v0_6.WayNode;
15 -import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
16 +import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
17 import org.openstreetmap.osmosis.core.filter.common.IdTracker;
18 import org.openstreetmap.osmosis.core.task.v0_6.Sink;
19
20 @@ -55,8 +55,8 @@ public class IntegrityReporter implement
21 this.file = file;
22
23 initialized = false;
24 - nodeBitSet = new BitSetIdTracker();
25 - wayBitSet = new BitSetIdTracker();
26 + nodeBitSet = new DynamicIdTracker();
27 + wayBitSet = new DynamicIdTracker();
28 }
29
30
31 --- a/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/BoundingBoxContext.java
32 +++ b/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/BoundingBoxContext.java
33 @@ -4,7 +4,7 @@ package org.openstreetmap.osmosis.datase
34 import java.awt.geom.Rectangle2D;
35 import java.util.Comparator;
36
37 -import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
38 +import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
39 import org.openstreetmap.osmosis.core.filter.common.IdTracker;
40 import org.openstreetmap.osmosis.core.store.UnsignedIntegerComparator;
41 import org.openstreetmap.osmosis.core.util.TileCalculator;
42 @@ -117,9 +117,9 @@ public class BoundingBoxContext {
43 minimumTile = tmpMinimumTile;
44
45 // Create the id trackers.
46 - nodeIdTracker = new BitSetIdTracker();
47 - wayIdTracker = new BitSetIdTracker();
48 - relationIdTracker = new BitSetIdTracker();
49 - externalNodeIdTracker = new BitSetIdTracker();
50 + nodeIdTracker = new DynamicIdTracker();
51 + wayIdTracker = new DynamicIdTracker();
52 + relationIdTracker = new DynamicIdTracker();
53 + externalNodeIdTracker = new DynamicIdTracker();
54 }
55 }
56 --- a/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/DatasetStoreReader.java
57 +++ b/osmosis-dataset/src/main/java/org/openstreetmap/osmosis/dataset/v0_6/impl/DatasetStoreReader.java
58 @@ -22,7 +22,7 @@ import org.openstreetmap.osmosis.core.do
59 import org.openstreetmap.osmosis.core.domain.v0_6.Relation;
60 import org.openstreetmap.osmosis.core.domain.v0_6.Way;
61 import org.openstreetmap.osmosis.core.domain.v0_6.WayNode;
62 -import org.openstreetmap.osmosis.core.filter.common.BitSetIdTracker;
63 +import org.openstreetmap.osmosis.core.filter.common.DynamicIdTracker;
64 import org.openstreetmap.osmosis.core.filter.common.IdTracker;
65 import org.openstreetmap.osmosis.core.lifecycle.ReleasableIterator;
66 import org.openstreetmap.osmosis.core.store.EmptyIterator;
67 @@ -287,7 +287,7 @@ public class DatasetStoreReader implemen
68 ReleasableIterator<Long> nodeIdsForTileset;
69 IdTracker idTracker;
70
71 - idTracker = new BitSetIdTracker();
72 + idTracker = new DynamicIdTracker();
73
74 // Search through all nodes in the tile range and add them to a
75 // temporary id tracker. This temporary id tracker allows all node ids
+0
-40
debian/patches/0001-Increase-maximum-way-node-count-from-16-bit-to-32-bi.patch less more
0 From f786e62a549276cd1b0fce00d498a2210f8c4eec Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Sat, 20 Jul 2013 11:39:57 +1000
3 Subject: Increase maximum way node count from 16-bit to 32-bit
4 Origin: https://github.com/openstreetmap/osmosis/commit/f786e62a549276cd1b0fce00d498a2210f8c4eec
5
6 The Storeable implementation for Way was representing the number of way
7 nodes as a Character. This is sufficient for most purposes (ie. API
8 data) but some third-party tools can create very long ways. This size
9 increase adds a small overhead to persistence, but should be largely
10 unnoticeable.
11
12 --- a/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/domain/v0_6/Way.java
13 +++ b/osmosis-core/src/main/java/org/openstreetmap/osmosis/core/domain/v0_6/Way.java
14 @@ -13,7 +13,6 @@ import org.openstreetmap.osmosis.core.do
15 import org.openstreetmap.osmosis.core.store.StoreClassRegister;
16 import org.openstreetmap.osmosis.core.store.StoreReader;
17 import org.openstreetmap.osmosis.core.store.StoreWriter;
18 -import org.openstreetmap.osmosis.core.util.IntAsChar;
19
20
21 /**
22 @@ -181,7 +180,7 @@ public class Way extends Entity implemen
23
24 int featureCount;
25
26 - featureCount = sr.readCharacter();
27 + featureCount = sr.readInteger();
28
29 wayNodes = new ArrayList<WayNode>();
30 for (int i = 0; i < featureCount; i++) {
31 @@ -197,7 +196,7 @@ public class Way extends Entity implemen
32 public void store(StoreWriter sw, StoreClassRegister scr) {
33 super.store(sw, scr);
34
35 - sw.writeCharacter(IntAsChar.intToChar(wayNodes.size()));
36 + sw.writeInteger(wayNodes.size());
37 for (WayNode wayNode : wayNodes) {
38 wayNode.store(sw, scr);
39 }
+0
-48
debian/patches/0001-Manually-set-some-statistics-for-way_nodes-and-relat.patch less more
0 From 5542f816875e7a72382a3dc2c72ff53396603a8e Mon Sep 17 00:00:00 2001
1 From: Paul Norman <penorman@mac.com>
2 Date: Wed, 3 Jul 2013 00:04:53 -0700
3 Subject: Manually set some statistics for way_nodes and relation_members
4 Origin: https://github.com/openstreetmap/osmosis/commit/5542f816875e7a72382a3dc2c72ff53396603a8e
5
6 Postgresql gets counts of distinct values horribly wrong for these tables.
7 This sometimes leads to very bad query plans, particularly for antijoin patterns
8
9 Because we have access to taginfo and know more about the data, we can do better.
10
11 Values that are likely to scale with the size of the database are set to do so.
12
13 Other values, like the maximum number of nodes in a way, are fixed based on current
14 data.
15
16 --- a/package/script/pgsnapshot_schema_0.6.sql
17 +++ b/package/script/pgsnapshot_schema_0.6.sql
18 @@ -142,3 +142,29 @@ DECLARE
19 BEGIN
20 END;
21 $$ LANGUAGE plpgsql;
22 +
23 +-- Manually set statistics for the way_nodes and relation_members table
24 +-- Postgres gets horrible counts of distinct values by sampling random pages
25 +-- and can be off by an 1-2 orders of magnitude
26 +
27 +-- Size of the ways table / size of the way_nodes table
28 +ALTER TABLE way_nodes ALTER COLUMN way_id SET (n_distinct = -0.08);
29 +
30 +-- Size of the nodes table / size of the way_nodes table * 0.998
31 +-- 0.998 is a factor for nodes not in ways
32 +ALTER TABLE way_nodes ALTER COLUMN node_id SET (n_distinct = -0.83);
33 +
34 +-- API allows a maximum of 2000 nodes/way. Unlikely to impact query plans.
35 +ALTER TABLE way_nodes ALTER COLUMN sequence_id SET (n_distinct = 2000);
36 +
37 +-- Size of the relations table / size of the relation_members table
38 +ALTER TABLE relation_members ALTER COLUMN relation_id SET (n_distinct = -0.09);
39 +
40 +-- Based on June 2013 data
41 +ALTER TABLE relation_members ALTER COLUMN member_id SET (n_distinct = -0.62);
42 +
43 +-- Based on June 2013 data. Unlikely to impact query plans.
44 +ALTER TABLE relation_members ALTER COLUMN member_role SET (n_distinct = 6500);
45 +
46 +-- Based on June 2013 data. Unlikely to impact query plans.
47 +ALTER TABLE relation_members ALTER COLUMN sequence_id SET (n_distinct = 10000);
+0
-27
debian/patches/0001-MessageFormat-needs-an-array-not-a-bare-long.patch less more
0 From 39b350537d0c1f404ad7e8dfbf86658796141700 Mon Sep 17 00:00:00 2001
1 From: Rory McCann <rory@geofabrik.de>
2 Date: Tue, 21 Apr 2015 10:43:52 +0200
3 Subject: MessageFormat needs an array, not a bare long.
4 Origin: https://github.com/openstreetmap/osmosis/commit/39b350537d0c1f404ad7e8dfbf86658796141700
5
6 ---
7 .../openstreetmap/osmosis/replication/v0_6/ReplicationLagReader.java | 5 ++++-
8 1 file changed, 4 insertions(+), 1 deletion(-)
9
10 --- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationLagReader.java
11 +++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationLagReader.java
12 @@ -119,10 +119,13 @@ public class ReplicationLagReader implem
13 );
14
15 } else {
16 + Object[] args = {
17 + new Long(lag)
18 + };
19
20 // just some seconds
21 System.out.println(
22 - new MessageFormat("{0} second(s)").format(lag)
23 + new MessageFormat("{0} second(s)").format(args)
24 );
25
26 }
+0
-74
debian/patches/0001-Modify-the-pgsnapshot-load-script-to-more-sensible-d.patch less more
0 From 715768e50d6a35910745c10a224b3862f03dacf8 Mon Sep 17 00:00:00 2001
1 From: Paul Norman <penorman@mac.com>
2 Date: Tue, 28 May 2013 18:29:08 -0700
3 Subject: Modify the pgsnapshot load script to more sensible defaults.
4 Origin: https://github.com/openstreetmap/osmosis/commit/715768e50d6a35910745c10a224b3862f03dacf8
5
6 If you've got a large enough file to use --wpd you really should be using osmosis to build linestrings and bboxes if you require them.
7
8 --- a/package/script/pgsnapshot_load_0.6.sql
9 +++ b/package/script/pgsnapshot_load_0.6.sql
10 @@ -10,9 +10,13 @@ DROP INDEX idx_relation_members_member_i
11 DROP INDEX idx_ways_bbox;
12 DROP INDEX idx_ways_linestring;
13
14 --- Comment these out if the COPY files include bbox or linestring column values.
15 -SELECT DropGeometryColumn('ways', 'bbox');
16 -SELECT DropGeometryColumn('ways', 'linestring');
17 +-- Uncomment these out if bbox or linestring columns are needed and the COPY
18 +-- files do not include them. If you want these columns you should use the
19 +-- enableBboxBuilder or enableLinestringBuilder options to --write-pgsql-dump
20 +-- as they are faster than the following SQL.
21 +
22 +/*SELECT DropGeometryColumn('ways', 'bbox');
23 +SELECT DropGeometryColumn('ways', 'linestring');*/
24
25 -- Import the table data from the data files using the fast COPY method.
26 \copy users FROM 'users.txt'
27 @@ -32,33 +36,35 @@ CREATE INDEX idx_nodes_geom ON nodes USI
28 CREATE INDEX idx_way_nodes_node_id ON way_nodes USING btree (node_id);
29 CREATE INDEX idx_relation_members_member_id_and_type ON relation_members USING btree (member_id, member_type);
30
31 --- Comment these out if the COPY files include bbox or linestring column values.
32 -SELECT AddGeometryColumn('ways', 'bbox', 4326, 'GEOMETRY', 2);
33 -SELECT AddGeometryColumn('ways', 'linestring', 4326, 'GEOMETRY', 2);
34 +-- Uncomment these if bbox or linestring columns are needed and the COPY files do not include them.
35
36 --- Comment these out if the COPY files include bbox or linestring column values.
37 -- Update the bbox column of the way table.
38 +/*SELECT AddGeometryColumn('ways', 'bbox', 4326, 'GEOMETRY', 2);
39 UPDATE ways SET bbox = (
40 SELECT ST_Envelope(ST_Collect(geom))
41 FROM nodes JOIN way_nodes ON way_nodes.node_id = nodes.id
42 WHERE way_nodes.way_id = ways.id
43 -);
44 +);*/
45 +
46 -- Update the linestring column of the way table.
47 +/*SELECT AddGeometryColumn('ways', 'linestring', 4326, 'GEOMETRY', 2);
48 UPDATE ways w SET linestring = (
49 SELECT ST_MakeLine(c.geom) AS way_line FROM (
50 SELECT n.geom AS geom
51 FROM nodes n INNER JOIN way_nodes wn ON n.id = wn.node_id
52 WHERE (wn.way_id = w.id) ORDER BY wn.sequence_id
53 ) c
54 -);
55 +);*/
56
57 --- Index the way bounding box column.
58 +-- Index the way bounding box column. If you don't have one of these columns, comment out the index
59 CREATE INDEX idx_ways_bbox ON ways USING gist (bbox);
60 CREATE INDEX idx_ways_linestring ON ways USING gist (linestring);
61
62 --- Update all clustered tables because it doesn't happen implicitly.
63 -CLUSTER nodes USING idx_nodes_geom;
64 -CLUSTER ways USING idx_ways_linestring;
65 +-- Optional: CLUSTER imported tables. CLUSTER takes a significant amount of time to run and a
66 +-- significant amount of free disk space but speeds up some queries.
67 +
68 +--CLUSTER nodes USING idx_nodes_geom;
69 +--CLUSTER ways USING idx_ways_linestring;
70
71 -- Perform database maintenance due to large database changes.
72 -VACUUM ANALYZE;
73 +ANALYZE;
+0
-93
debian/patches/0001-Set-User-Agent-header-on-HTTP-connections.patch less more
0 From d18a254783158234d3fd2471ff23d427215f34dd Mon Sep 17 00:00:00 2001
1 From: Matt Amos <zerebubuth@gmail.com>
2 Date: Thu, 30 Jan 2014 18:17:41 +0000
3 Subject: Set 'User-Agent' header on HTTP connections.
4 Origin: https://github.com/openstreetmap/osmosis/commit/d18a254783158234d3fd2471ff23d427215f34dd
5
6 Setting the 'User-Agent' header helps server administrators
7 identify which traffic is coming from Osmosis, and helps avoid
8 some disadvantages of using the plain Java identifier such as
9 setting off poorly configured IDS warnings.
10
11 --- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/common/ServerStateReader.java
12 +++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/common/ServerStateReader.java
13 @@ -16,6 +16,7 @@ import java.util.logging.Level;
14 import java.util.logging.Logger;
15
16 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
17 +import org.openstreetmap.osmosis.core.OsmosisConstants;
18
19
20 /**
21 @@ -92,6 +93,7 @@ public class ServerStateReader {
22 URLConnection connection = stateUrl.openConnection();
23 connection.setReadTimeout(15 * 60 * 1000); // timeout 15 minutes
24 connection.setConnectTimeout(15 * 60 * 1000); // timeout 15 minutes
25 + connection.setRequestProperty("User-Agent", "Osmosis/" + OsmosisConstants.VERSION);
26 stateStream = connection.getInputStream();
27
28 reader = new BufferedReader(new InputStreamReader(stateStream));
29 --- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/BaseReplicationDownloader.java
30 +++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/BaseReplicationDownloader.java
31 @@ -18,6 +18,7 @@ import java.util.logging.Level;
32 import java.util.logging.Logger;
33
34 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
35 +import org.openstreetmap.osmosis.core.OsmosisConstants;
36 import org.openstreetmap.osmosis.core.task.common.RunnableTask;
37 import org.openstreetmap.osmosis.core.util.FileBasedLock;
38 import org.openstreetmap.osmosis.core.util.PropertiesPersister;
39 @@ -104,6 +105,7 @@ public abstract class BaseReplicationDow
40 URLConnection connection = changesetUrl.openConnection();
41 connection.setReadTimeout(15 * 60 * 1000); // timeout 15 minutes
42 connection.setConnectTimeout(15 * 60 * 1000); // timeout 15 minutes
43 + connection.setRequestProperty("User-Agent", "Osmosis/" + OsmosisConstants.VERSION);
44 inputStream = connection.getInputStream();
45 source = new BufferedInputStream(inputStream, 65536);
46
47 --- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/IntervalDownloader.java
48 +++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/IntervalDownloader.java
49 @@ -20,6 +20,7 @@ import java.util.logging.Level;
50 import java.util.logging.Logger;
51
52 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
53 +import org.openstreetmap.osmosis.core.OsmosisConstants;
54 import org.openstreetmap.osmosis.core.merge.common.ConflictResolutionMethod;
55 import org.openstreetmap.osmosis.core.pipeline.common.TaskRunner;
56 import org.openstreetmap.osmosis.core.task.v0_6.ChangeSink;
57 @@ -111,6 +112,7 @@ public class IntervalDownloader implemen
58 URLConnection connection = timestampUrl.openConnection();
59 connection.setReadTimeout(15 * 60 * 1000); // timeout 15 minutes
60 connection.setConnectTimeout(15 * 60 * 1000); // timeout 15 minutes
61 + connection.setRequestProperty("User-Agent", "Osmosis/" + OsmosisConstants.VERSION);
62 timestampStream = connection.getInputStream();
63
64 reader = new BufferedReader(new InputStreamReader(timestampStream));
65 --- a/osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeUploader.java
66 +++ b/osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeUploader.java
67 @@ -122,6 +122,7 @@ public class XmlChangeUploader implement
68 System.err.println("DEBUG: URL= " + url.toString());
69 HttpURLConnection httpCon = (HttpURLConnection)
70 url.openConnection();
71 + httpCon.setRequestProperty("User-Agent", "Osmosis/" + OsmosisConstants.VERSION);
72
73 // we do not use Authenticator.setDefault()
74 // here to stay thread-safe.
75 --- a/osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlDownloader.java
76 +++ b/osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlDownloader.java
77 @@ -19,6 +19,7 @@ import org.xml.sax.SAXException;
78 import org.xml.sax.SAXParseException;
79
80 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
81 +import org.openstreetmap.osmosis.core.OsmosisConstants;
82 import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
83 import org.openstreetmap.osmosis.core.domain.v0_6.Bound;
84 import org.openstreetmap.osmosis.core.task.v0_6.RunnableSource;
85 @@ -235,6 +236,7 @@ public class XmlDownloader implements Ru
86 url = new URL(pUrlStr);
87 myActiveConnection = (HttpURLConnection) url.openConnection();
88
89 + myActiveConnection.setRequestProperty("User-Agent", "Osmosis/" + OsmosisConstants.VERSION);
90 myActiveConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
91
92 responseCode = myActiveConnection.getResponseCode();
+0
-138
debian/patches/0001-Update-build-to-newest-versions-of-dependent-librari.patch less more
0 From 240d95b79cdea9faed9f919a1e2024c04199c1ba Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Tue, 30 Sep 2014 21:26:20 +1000
3 Subject: Update build to newest versions of dependent libraries
4 Origin: https://github.com/openstreetmap/osmosis/commit/240d95b79cdea9faed9f919a1e2024c04199c1ba
5
6 ---
7 gradle.properties | 23 +++++++++++-----------
8 osmosis-apidb/build.gradle | 2 +-
9 osmosis-hstore-jdbc/build.gradle | 2 +-
10 .../org/postgresql/driverconfig.properties | 1 -
11 osmosis-pgsimple/build.gradle | 2 +-
12 osmosis-pgsnapshot/build.gradle | 2 +-
13 .../osmosis/pgsnapshot/v0_6/impl/EntityMapper.java | 6 +++---
14 .../pgsnapshot/v0_6/impl/EntityRowMapper.java | 7 ++++---
15 8 files changed, 22 insertions(+), 23 deletions(-)
16 delete mode 100644 osmosis-hstore-jdbc/src/main/resources/org/postgresql/driverconfig.properties
17
18 --- a/osmosis-apidb/build.gradle
19 +++ b/osmosis-apidb/build.gradle
20 @@ -4,7 +4,7 @@ dependencies {
21 compile project(':osmosis-xml')
22 compile group: 'commons-dbcp', name: 'commons-dbcp', version: dependencyVersionCommonsDbcp
23 compile group: 'org.springframework', name: 'spring-jdbc', version: dependencyVersionSpring
24 - runtime group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
25 + runtime group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
26 runtime group: 'mysql', name: 'mysql-connector-java', version: dependencyVersionMySql
27 testCompile project(':osmosis-testutil')
28 }
29 --- a/osmosis-hstore-jdbc/build.gradle
30 +++ b/osmosis-hstore-jdbc/build.gradle
31 @@ -1,5 +1,5 @@
32 dependencies {
33 - compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
34 + compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
35 }
36
37 // Disable checkstyle because this is external code.
38 --- a/osmosis-hstore-jdbc/src/main/resources/org/postgresql/driverconfig.properties
39 +++ /dev/null
40 @@ -1 +0,0 @@
41 -datatype.hstore=org.openstreetmap.osmosis.hstore.PGHStore
42 \ No newline at end of file
43 --- a/osmosis-pgsimple/build.gradle
44 +++ b/osmosis-pgsimple/build.gradle
45 @@ -6,7 +6,7 @@ configurations {
46 dependencies {
47 compile project(':osmosis-core')
48 compile group: 'org.postgis', name: 'postgis-jdbc', version: dependencyVersionPostGis
49 - compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
50 + compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
51 testCompile project(':osmosis-dataset')
52 testCompile project(':osmosis-testutil')
53 testCompile project(':osmosis-xml')
54 --- a/osmosis-pgsnapshot/build.gradle
55 +++ b/osmosis-pgsnapshot/build.gradle
56 @@ -9,7 +9,7 @@ dependencies {
57 compile group: 'commons-dbcp', name: 'commons-dbcp', version: dependencyVersionCommonsDbcp
58 compile group: 'org.postgis', name: 'postgis-jdbc', version: dependencyVersionPostGis
59 compile group: 'org.springframework', name: 'spring-jdbc', version: dependencyVersionSpring
60 - compile group: 'postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
61 + compile group: 'org.postgresql', name: 'postgresql', version: dependencyVersionPostgreSql
62 testCompile project(':osmosis-dataset')
63 testCompile project(':osmosis-testutil')
64 testCompile project(':osmosis-xml')
65 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityMapper.java
66 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityMapper.java
67 @@ -3,12 +3,12 @@ package org.openstreetmap.osmosis.pgsnap
68
69 import java.sql.Timestamp;
70 import java.util.Arrays;
71 +import java.util.HashMap;
72 import java.util.Map;
73
74 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
75 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
76 import org.openstreetmap.osmosis.core.domain.v0_6.Tag;
77 -import org.openstreetmap.osmosis.hstore.PGHStore;
78 import org.springframework.jdbc.core.RowMapper;
79
80
81 @@ -226,7 +226,7 @@ public abstract class EntityMapper<T ext
82 * The entity containing the data to be inserted.
83 */
84 protected void populateCommonEntityParameters(Map<String, Object> args, Entity entity) {
85 - PGHStore tags;
86 + Map<String, String> tags;
87
88 // We can't write an entity with a null timestamp.
89 if (entity.getTimestamp() == null) {
90 @@ -234,7 +234,7 @@ public abstract class EntityMapper<T ext
91 "Entity(" + entity.getType() + ") " + entity.getId() + " does not have a timestamp set.");
92 }
93
94 - tags = new PGHStore();
95 + tags = new HashMap<String, String>(entity.getTags().size());
96 for (Tag tag : entity.getTags()) {
97 tags.put(tag.getKey(), tag.getValue());
98 }
99 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityRowMapper.java
100 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityRowMapper.java
101 @@ -5,6 +5,7 @@ import java.sql.ResultSet;
102 import java.sql.SQLException;
103 import java.util.Collection;
104 import java.util.Date;
105 +import java.util.Map;
106 import java.util.Map.Entry;
107
108 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
109 @@ -12,7 +13,6 @@ import org.openstreetmap.osmosis.core.do
110 import org.openstreetmap.osmosis.core.domain.v0_6.Entity;
111 import org.openstreetmap.osmosis.core.domain.v0_6.OsmUser;
112 import org.openstreetmap.osmosis.core.domain.v0_6.Tag;
113 -import org.openstreetmap.osmosis.hstore.PGHStore;
114 import org.springframework.jdbc.core.RowMapper;
115
116
117 @@ -64,9 +64,10 @@ public abstract class EntityRowMapper<T
118 * if a database error is encountered.
119 * @return The common entity data.
120 */
121 + @SuppressWarnings("unchecked")
122 protected CommonEntityData mapCommonEntityData(ResultSet rs) throws SQLException {
123 CommonEntityData entityData;
124 - PGHStore dbTags;
125 + Map<String, String> dbTags;
126 Collection<Tag> tags;
127
128 entityData = new CommonEntityData(
129 @@ -77,7 +78,7 @@ public abstract class EntityRowMapper<T
130 rs.getLong("changeset_id")
131 );
132
133 - dbTags = (PGHStore) rs.getObject("tags");
134 + dbTags = (Map<String, String>) rs.getObject("tags");
135 if (dbTags != null) {
136 tags = entityData.getTags();
137 for (Entry<String, String> tagEntry : dbTags.entrySet()) {
+0
-29
debian/patches/0001-Update-list-of-expected-schema-migrations.patch less more
0 From 8b00fac60a9e78dbdc43d156b3895111452b224b Mon Sep 17 00:00:00 2001
1 From: Tom Hughes <tom@compton.nu>
2 Date: Thu, 4 Jul 2013 09:47:15 +0100
3 Subject: Update list of expected schema migrations
4 Origin: https://github.com/openstreetmap/osmosis/commit/8b00fac60a9e78dbdc43d156b3895111452b224b
5
6
7 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbVersionConstants.java
8 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbVersionConstants.java
9 @@ -24,11 +24,14 @@ public final class ApidbVersionConstants
10 "21", "22", "23", "24", "25", "26", "27", "28", "29", "30",
11 "31", "32", "33", "34", "35", "36", "37", "38", "39", "40",
12 "41", "42", "43", "44", "45", "46", "47", "48", "49", "50",
13 - "51", "52", "20100513171259", "20100516124737",
14 - "20100910084426", "20101114011429", "20110322001319",
15 + "51", "52", "53", "54", "55", "56", "57", "20100513171259",
16 + "20100516124737", "20100910084426", "20101114011429",
17 + "20110322001319", "20110508145337", "20110521142405",
18 "20110925112722", "20111116184519", "20111212183945",
19 - "20120208122334", "20120208194454", "20120123184321",
20 - "20120219161649", "20120214210114", "20120328090602",
21 - "20120404205604", "20120318201948", "20120808231205"
22 + "20120123184321", "20120208122334", "20120208194454",
23 + "20120214210114", "20120219161649", "20120318201948",
24 + "20120328090602", "20120404205604", "20120808231205",
25 + "20121005195010", "20121012044047", "20121119165817",
26 + "20121202155309", "20121203124841", "20130328184137"
27 };
28 }
+0
-39
debian/patches/0001-Update-replication-urls-to-match-current-planet.osm..patch less more
0 From 8c7a71d8606ec70607cf6aafa7a029f040ea4486 Mon Sep 17 00:00:00 2001
1 From: Rory McCann <rory@geofabrik.de>
2 Date: Tue, 21 Apr 2015 11:15:39 +0200
3 Subject: Update replication urls to match current planet.osm.org layout
4 Origin: https://github.com/openstreetmap/osmosis/commit/8c7a71d8606ec70607cf6aafa7a029f040ea4486
5
6 ---
7 .../osmosis/replication/v0_6/impl/intervalConfiguration.txt | 2 +-
8 .../replication/v0_6/impl/replicationDownloaderConfiguration.txt | 2 +-
9 .../replication/v0_6/impl/replicationFileMergerConfiguration.txt | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12 --- a/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/intervalConfiguration.txt
13 +++ b/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/intervalConfiguration.txt
14 @@ -1,5 +1,5 @@
15 # The URL of the directory containing change files.
16 -baseUrl=http://planet.openstreetmap.org/hourly
17 +baseUrl=http://planet.openstreetmap.org/replication/hour
18
19 # The length of an extraction interval in seconds (3600 = 1 hour).
20 intervalLength=3600
21 --- a/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/replicationDownloaderConfiguration.txt
22 +++ b/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/replicationDownloaderConfiguration.txt
23 @@ -1,5 +1,5 @@
24 # The URL of the directory containing change files.
25 -baseUrl=http://planet.openstreetmap.org/minute-replicate
26 +baseUrl=http://planet.openstreetmap.org/replication/minute
27
28 # Defines the maximum time interval in seconds to download in a single invocation.
29 # Setting to 0 disables this feature.
30 --- a/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/replicationFileMergerConfiguration.txt
31 +++ b/osmosis-replication/src/main/resources/org/openstreetmap/osmosis/replication/v0_6/impl/replicationFileMergerConfiguration.txt
32 @@ -1,5 +1,5 @@
33 # The URL of the directory containing change files.
34 -baseUrl=http://planet.openstreetmap.org/minute-replicate
35 +baseUrl=http://planet.openstreetmap.org/replication/minute
36
37 # The length of an extraction interval in seconds (3600 = 1 hour).
38 intervalLength=60
+0
-63
debian/patches/0001-Use-ALTER-TABLE-.-CLUSTER-ON-statements-to-set-what-.patch less more
0 From 789dc316cefb6208390e4376f66740406860a20a Mon Sep 17 00:00:00 2001
1 From: Paul Norman <penorman@mac.com>
2 Date: Thu, 30 May 2013 14:56:44 -0700
3 Subject: Use ALTER TABLE ... CLUSTER ON statements to set what index to
4 CLUSTER on.
5 Origin: https://github.com/openstreetmap/osmosis/commit/789dc316cefb6208390e4376f66740406860a20a
6
7 This way it gets set even if the DB is not immediately CLUSTERed and the entire database can be re-CLUSTERed with just CLUSTER;
8
9 Note: CLUSTERing nodes on a full-planet database probably isn't practical.
10
11 --- a/package/script/pgsnapshot_load_0.6.sql
12 +++ b/package/script/pgsnapshot_load_0.6.sql
13 @@ -36,6 +36,10 @@ CREATE INDEX idx_nodes_geom ON nodes USI
14 CREATE INDEX idx_way_nodes_node_id ON way_nodes USING btree (node_id);
15 CREATE INDEX idx_relation_members_member_id_and_type ON relation_members USING btree (member_id, member_type);
16
17 +ALTER TABLE ONLY nodes CLUSTER ON idx_nodes_geom;
18 +ALTER TABLE ONLY way_nodes CLUSTER ON pk_way_nodes;
19 +ALTER TABLE ONLY relation_members CLUSTER ON pk_relation_members;
20 +
21 -- Uncomment these if bbox or linestring columns are needed and the COPY files do not include them.
22
23 -- Update the bbox column of the way table.
24 @@ -60,11 +64,16 @@ UPDATE ways w SET linestring = (
25 CREATE INDEX idx_ways_bbox ON ways USING gist (bbox);
26 CREATE INDEX idx_ways_linestring ON ways USING gist (linestring);
27
28 +ALTER TABLE ONLY ways CLUSTER ON idx_ways_bbox;
29 +ALTER TABLE ONLY ways CLUSTER ON idx_ways_linestring;
30 +
31 -- Optional: CLUSTER imported tables. CLUSTER takes a significant amount of time to run and a
32 -- significant amount of free disk space but speeds up some queries.
33
34 ---CLUSTER nodes USING idx_nodes_geom;
35 ---CLUSTER ways USING idx_ways_linestring;
36 +--CLUSTER nodes;
37 +--CLUSTER ways;
38 +
39 +-- It is not necessary to CLUSTER way_nodes or relation_members after the initial load but you might want to do so later on
40
41 -- Perform database maintenance due to large database changes.
42 ANALYZE;
43 --- a/package/script/pgsnapshot_schema_0.6.sql
44 +++ b/package/script/pgsnapshot_schema_0.6.sql
45 @@ -108,9 +108,15 @@ CREATE INDEX idx_way_nodes_node_id ON wa
46 CREATE INDEX idx_relation_members_member_id_and_type ON relation_members USING btree (member_id, member_type);
47
48
49 --- Cluster tables by geographical location.
50 -CLUSTER nodes USING idx_nodes_geom;
51 +-- Set to cluster nodes by geographical location.
52 +ALTER TABLE ONLY nodes CLUSTER ON idx_nodes_geom;
53
54 +-- Set to cluster the tables showing relationship by parent ID and sequence
55 +ALTER TABLE ONLY way_nodes CLUSTER ON pk_way_nodes;
56 +ALTER TABLE ONLY relation_members CLUSTER ON pk_relation_members;
57 +
58 +-- There are no sensible CLUSTER orders for users or relations.
59 +-- Depending on geometry columns different clustings of ways may be desired.
60
61 -- Create the function that provides "unnest" functionality while remaining compatible with 8.3.
62 CREATE OR REPLACE FUNCTION unnest_bbox_way_nodes() RETURNS void AS $$
+0
-30
debian/patches/0001-apidb-Fix-one-off-error-in-current-way-relation-load.patch less more
0 From 53880f0e0dfa330bc74c767a39726061fc71143a Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Tue, 23 Sep 2014 21:17:26 +1000
3 Subject: apidb: Fix one-off error in current way/relation loading
4 Origin: https://github.com/openstreetmap/osmosis/commit/53880f0e0dfa330bc74c767a39726061fc71143a
5
6 The previous patch had a minor bug where the minimum way and relation
7 ids being loaded into the current tables were one-off and therefore
8 missing the first id to be loaded.
9
10 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbWriter.java
11 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbWriter.java
12 @@ -1160,7 +1160,7 @@ public class ApidbWriter implements Sink
13 maxWayId = wayId + 1;
14 }
15 if (wayId < minWayId) {
16 - minWayId = wayId + 1;
17 + minWayId = wayId;
18 }
19 wayBuffer.add(way);
20
21 @@ -1215,7 +1215,7 @@ public class ApidbWriter implements Sink
22 maxRelationId = relationId + 1;
23 }
24 if (relationId < minRelationId) {
25 - minRelationId = relationId + 1;
26 + minRelationId = relationId;
27 }
28 relationBuffer.add(relation);
29
+0
-98
debian/patches/0001-apidb-Support-importing-negative-ids.patch less more
0 From 1b49b7e04aeca0a3c0c7752ba0be3eedf1b22e40 Mon Sep 17 00:00:00 2001
1 From: Greg Schmidt <gschmidtee@gmail.com>
2 Date: Tue, 23 Sep 2014 21:02:38 +1000
3 Subject: apidb: Support importing negative ids
4 Origin: https://github.com/openstreetmap/osmosis/commit/1b49b7e04aeca0a3c0c7752ba0be3eedf1b22e40
5
6 The existing codebase was assuming that all entity ids were positive.
7 This patch allows ids to be positive or negative (or zero).
8
9 --- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbWriter.java
10 +++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbWriter.java
11 @@ -216,8 +216,11 @@ public class ApidbWriter implements Sink
12 private final List<DbFeatureHistory<DbFeature<Tag>>> relationTagBuffer;
13 private final List<DbFeatureHistory<DbOrderedFeature<RelationMember>>> relationMemberBuffer;
14 private long maxNodeId;
15 + private long minNodeId;
16 private long maxWayId;
17 + private long minWayId;
18 private long maxRelationId;
19 + private long minRelationId;
20 private final TileCalculator tileCalculator;
21 private final MemberTypeRenderer memberTypeRenderer;
22 private boolean initialized;
23 @@ -276,9 +279,12 @@ public class ApidbWriter implements Sink
24 relationTagBuffer = new ArrayList<DbFeatureHistory<DbFeature<Tag>>>();
25 relationMemberBuffer = new ArrayList<DbFeatureHistory<DbOrderedFeature<RelationMember>>>();
26
27 - maxNodeId = 0;
28 - maxWayId = 0;
29 - maxRelationId = 0;
30 + maxNodeId = Long.MIN_VALUE;
31 + minNodeId = Long.MAX_VALUE;
32 + maxWayId = Long.MIN_VALUE;
33 + minWayId = Long.MAX_VALUE;
34 + maxRelationId = Long.MIN_VALUE;
35 + minRelationId = Long.MAX_VALUE;
36
37 tileCalculator = new TileCalculator();
38 memberTypeRenderer = new MemberTypeRenderer();
39 @@ -917,7 +923,7 @@ public class ApidbWriter implements Sink
40
41 private void populateCurrentNodes() {
42 // Copy data into the current node tables.
43 - for (long i = 0; i < maxNodeId; i += LOAD_CURRENT_NODE_ROW_COUNT) {
44 + for (long i = minNodeId; i < maxNodeId; i += LOAD_CURRENT_NODE_ROW_COUNT) {
45 // Node
46 try {
47 loadCurrentNodesStatement.setLong(1, i);
48 @@ -946,7 +952,7 @@ public class ApidbWriter implements Sink
49
50
51 private void populateCurrentWays() {
52 - for (long i = 0; i < maxWayId; i += LOAD_CURRENT_WAY_ROW_COUNT) {
53 + for (long i = minWayId; i < maxWayId; i += LOAD_CURRENT_WAY_ROW_COUNT) {
54 // Way
55 try {
56 loadCurrentWaysStatement.setLong(1, i);
57 @@ -986,7 +992,7 @@ public class ApidbWriter implements Sink
58
59
60 private void populateCurrentRelations() {
61 - for (long i = 0; i < maxRelationId; i += LOAD_CURRENT_RELATION_ROW_COUNT) {
62 + for (long i = minRelationId; i < maxRelationId; i += LOAD_CURRENT_RELATION_ROW_COUNT) {
63 // Way
64 try {
65 loadCurrentRelationsStatement.setLong(1, i);
66 @@ -1115,6 +1121,9 @@ public class ApidbWriter implements Sink
67 if (nodeId >= maxNodeId) {
68 maxNodeId = nodeId + 1;
69 }
70 + if (nodeId < minNodeId) {
71 + minNodeId = nodeId;
72 + }
73
74 nodeBuffer.add(node);
75
76 @@ -1150,7 +1159,9 @@ public class ApidbWriter implements Sink
77 if (wayId >= maxWayId) {
78 maxWayId = wayId + 1;
79 }
80 -
81 + if (wayId < minWayId) {
82 + minWayId = wayId + 1;
83 + }
84 wayBuffer.add(way);
85
86 flushWays(false);
87 @@ -1203,7 +1214,9 @@ public class ApidbWriter implements Sink
88 if (relationId >= maxRelationId) {
89 maxRelationId = relationId + 1;
90 }
91 -
92 + if (relationId < minRelationId) {
93 + minRelationId = relationId + 1;
94 + }
95 relationBuffer.add(relation);
96
97 flushRelations(false);
+0
-23
debian/patches/0001-build-Exclude-db-server-as-a-java-project.patch less more
0 From 3de2d67237e319ac3e28213c556775663db4e4fe Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 22:22:16 +1100
3 Subject: build: Exclude db-server as a java project
4 Origin: https://github.com/openstreetmap/osmosis/commit/3de2d67237e319ac3e28213c556775663db4e4fe
5
6 ---
7 build.gradle | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10 --- a/build.gradle
11 +++ b/build.gradle
12 @@ -8,8 +8,9 @@ task wrapper(type: Wrapper) {
13 */
14 def packageProjects = allprojects.findAll { project -> project.path.equals(':package') }
15 def buildProjects = allprojects.findAll { project -> project.path.equals(':build-support') }
16 +def dockerProjects = allprojects.findAll { project -> project.path.equals(':db-server') }
17 // Java projects are all those that aren't in the previous collections.
18 -def javaProjects = subprojects.findAll { project -> !packageProjects.contains(project) && !buildProjects.contains(project) }
19 +def javaProjects = subprojects.findAll { project -> !packageProjects.contains(project) && !buildProjects.contains(project) && !dockerProjects.contains(project) }
20
21 // Apply common project configuration
22 subprojects {
+0
-25
debian/patches/0001-db-server-Add-a-readme-explaining-basic-docker-usage.patch less more
0 From 28723d03c44fe106c09e410877008974085719ea Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 22:18:38 +1100
3 Subject: db-server: Add a readme explaining basic docker usage
4 Origin: https://github.com/openstreetmap/osmosis/commit/28723d03c44fe106c09e410877008974085719ea
5
6 ---
7 db-server/readme.txt | 11 +++++++++++
8 1 file changed, 11 insertions(+)
9 create mode 100644 db-server/readme.txt
10
11 --- /dev/null
12 +++ b/db-server/readme.txt
13 @@ -0,0 +1,11 @@
14 +This directory contains the scripts to create a docker-based database server to be used for unit testing.
15 +
16 +To build the docker image, run the following script.
17 + ./build.sh
18 +
19 +To run the docker image, run the following command. To stop the server, press Ctrl-C.
20 + docker run -ti --rm=true --name osmosis-build -p 5432:5432 bretth/osmosis-build
21 +
22 +If you wish to troubleshoot a running server, you may run the following command to get a bash prompt
23 +inside the docker container.
24 + docker exec -ti osmosis-build /bin/bash
+0
-26
debian/patches/0001-db-server-Add-docker-workaround-to-allow-use-of-syml.patch less more
0 From aaf690bfad64536f65b82bce8d879c366fc86f7f Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 21:44:46 +1100
3 Subject: db-server: Add docker workaround to allow use of symlinks
4 Origin: https://github.com/openstreetmap/osmosis/commit/aaf690bfad64536f65b82bce8d879c366fc86f7f
5
6 A Dockerfile cannot reference files outside the current directory and
7 won't follow symlinks. This means that scripts from the package project
8 cannot be referenced without copying them into the db-server directory.
9 To avoid this, we use docker's ability to read a directory in tar
10 format from standard input, and use tar to dereference the symlinks
11 first.
12 ---
13 db-server/build.sh | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 --- a/db-server/build.sh
17 +++ b/db-server/build.sh
18 @@ -1,3 +1,6 @@
19 #!/bin/sh
20
21 -docker build -t="bretth/osmosis-build" .
22 +# Build the docker image.
23 +# The use of tar is a workaround for the docker restriction of not following symlinks. This
24 +# tar command dereferences symlinks and then passes the resultant archive to the docker build.
25 +tar -czh . | docker build -t="bretth/osmosis-build" -
+0
-94
debian/patches/0001-db-server-Add-initial-db-server-docker-image-for-tes.patch less more
0 From aa4c67517afbc5b752ae34dbe95bb44c3d76b977 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 16:48:49 +1100
3 Subject: db-server: Add initial db server docker image for testing database
4 tasks
5 Origin: https://github.com/openstreetmap/osmosis/commit/aa4c67517afbc5b752ae34dbe95bb44c3d76b977
6
7 ---
8 db-server/Dockerfile | 13 ++++++++++++
9 db-server/build.sh | 3 +++
10 db-server/docker-start.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++
11 3 files changed, 69 insertions(+)
12 create mode 100644 db-server/Dockerfile
13 create mode 100755 db-server/build.sh
14 create mode 100755 db-server/docker-start.sh
15
16 --- /dev/null
17 +++ b/db-server/Dockerfile
18 @@ -0,0 +1,13 @@
19 +FROM fedora:21
20 +
21 +# Install PostgreSQL
22 +RUN yum install -y postgresql-server postgresql-contrib
23 +
24 +# Install PostGIS
25 +RUN yum install -y postgis
26 +
27 +EXPOSE 5432
28 +
29 +COPY docker-start.sh /start.sh
30 +
31 +CMD ["/start.sh"]
32 --- /dev/null
33 +++ b/db-server/build.sh
34 @@ -0,0 +1,3 @@
35 +#!/bin/sh
36 +
37 +docker build -t="bretth/osmosis-build" .
38 --- /dev/null
39 +++ b/db-server/docker-start.sh
40 @@ -0,0 +1,53 @@
41 +#!/bin/bash
42 +
43 +DATADIR="/var/lib/pgsql/data"
44 +
45 +# test if DATADIR has content
46 +if [ ! "$(ls -A $DATADIR)" ]; then
47 + # Create the en_US.UTF-8 locale. We need UTF-8 support in the database.
48 + localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
49 +
50 + echo "Initializing Postgres Database at $DATADIR"
51 + su postgres sh -lc "initdb --encoding=UTF-8 --locale=en_US.UTF-8"
52 +
53 + su postgres sh -lc "postgres --single -jE" <<-EOSQL
54 + CREATE USER osm WITH SUPERUSER PASSWORD 'password';
55 + EOSQL
56 +
57 + # Allow the osm user to connect remotely with a password.
58 + echo "host all osm 0.0.0.0/0 md5" >> "${DATADIR}/pg_hba.conf"
59 +
60 + # Create the pgsnapshot database owned by osm.
61 + su postgres sh -lc "postgres --single -jE" <<-EOSQL
62 + CREATE DATABASE pgosmsnap06_test OWNER osm;
63 + EOSQL
64 +
65 + # Start the database temporarily while we configure it.
66 + #su postgres sh -lc "postgres" &
67 + #PID=$!
68 + #echo "PID: ${PID}"
69 + #sleep 1
70 + su postgres sh -lc "pg_ctl -w start"
71 +
72 + # Configure the database as the OSM user.
73 + su postgres sh -lc "psql -U osm pgosmsnap06_test" <<-EOSQL
74 + CREATE EXTENSION hstore;
75 + EOSQL
76 +
77 + # Stop the database.
78 + su postgres sh -lc "pg_ctl -w stop"
79 +fi
80 +
81 +SHUTDOWN_COMMAND="echo \"Shutting down postgres\"; su postgres sh -lc \"pg_ctl -w stop\""
82 +trap "${SHUTDOWN_COMMAND}" SIGTERM
83 +trap "${SHUTDOWN_COMMAND}" SIGINT
84 +
85 +# Start the database server.
86 +su postgres sh -lc "pg_ctl -w start"
87 +
88 +echo "Docker container startup complete"
89 +
90 +# Wait for the server to exit.
91 +while test -e "/var/lib/pgsql/data/postmaster.pid"; do
92 + sleep 0.5
93 +done
+0
-20
debian/patches/0001-db-server-Allow-remote-connections-to-the-server.patch less more
0 From 0b5af4f1d92c8645d75274305a7b4458398da7a7 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 22:18:20 +1100
3 Subject: db-server: Allow remote connections to the server
4 Origin: https://github.com/openstreetmap/osmosis/commit/0b5af4f1d92c8645d75274305a7b4458398da7a7
5
6 ---
7 db-server/docker-start.sh | 1 +
8 1 file changed, 1 insertion(+)
9
10 --- a/db-server/docker-start.sh
11 +++ b/db-server/docker-start.sh
12 @@ -15,6 +15,7 @@ if [ ! "$(ls -A $DATADIR)" ]; then
13 EOSQL
14
15 # Allow the osm user to connect remotely with a password.
16 + echo "listen_addresses = '*'" >> "${DATADIR}/postgresql.conf"
17 echo "host all osm 0.0.0.0/0 md5" >> "${DATADIR}/pg_hba.conf"
18
19 # Create the pgsnapshot database owned by osm.
+0
-39
debian/patches/0001-db-server-Create-and-configure-the-api06_test-databa.patch less more
0 From 391014fbe3b4c28950c0655155c3195aa031433a Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 21:49:59 +1100
3 Subject: db-server: Create and configure the api06_test database
4 Origin: https://github.com/openstreetmap/osmosis/commit/391014fbe3b4c28950c0655155c3195aa031433a
5
6 ---
7 db-server/docker-start.sh | 11 +++++++++++
8 db-server/script | 1 +
9 2 files changed, 12 insertions(+)
10 create mode 120000 db-server/script
11
12 --- a/db-server/docker-start.sh
13 +++ b/db-server/docker-start.sh
14 @@ -22,6 +22,11 @@ if [ ! "$(ls -A $DATADIR)" ]; then
15 CREATE DATABASE pgosmsnap06_test OWNER osm;
16 EOSQL
17
18 + # Create the apidb database owned by osm.
19 + su postgres sh -lc "postgres --single -jE" <<-EOSQL
20 + CREATE DATABASE api06_test OWNER osm;
21 + EOSQL
22 +
23 # Start the database server temporarily while we configure the databases.
24 su postgres sh -lc "pg_ctl -w start"
25
26 @@ -35,6 +40,12 @@ if [ ! "$(ls -A $DATADIR)" ]; then
27 \i /install/script/pgsnapshot_schema_0.6_linestring.sql
28 EOSQL
29
30 + # Configure the api06_test database as the OSM user.
31 + su postgres sh -lc "psql -U osm api06_test" <<-EOSQL
32 + \i /install/script/contrib/apidb_0.6.sql
33 + \i /install/script/contrib/apidb_0.6_osmosis_xid_indexing.sql
34 + EOSQL
35 +
36 # Stop the database.
37 su postgres sh -lc "pg_ctl -w stop"
38 fi
+0
-41
debian/patches/0001-db-server-Eclipse-enable-the-new-project.patch less more
0 From 30d9bda3915c597184a560c34803c0c6854feb17 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 21:20:48 +1100
3 Subject: db-server: Eclipse enable the new project
4 Origin: https://github.com/openstreetmap/osmosis/commit/30d9bda3915c597184a560c34803c0c6854feb17
5
6 ---
7 db-server/.gitignore | 4 ++++
8 settings.gradle | 7 ++++---
9 2 files changed, 8 insertions(+), 3 deletions(-)
10 create mode 100644 db-server/.gitignore
11
12 --- /dev/null
13 +++ b/db-server/.gitignore
14 @@ -0,0 +1,4 @@
15 +.classpath
16 +.project
17 +.settings
18 +
19 --- a/settings.gradle
20 +++ b/settings.gradle
21 @@ -1,11 +1,11 @@
22 -include 'osmosis-apidb'
23 -include 'osmosis-areafilter'
24 include 'build-support'
25 +include 'db-server'
26 +include 'osmosis-areafilter'
27 +include 'osmosis-apidb'
28 include 'osmosis-core'
29 include 'osmosis-dataset'
30 include 'osmosis-extract'
31 include 'osmosis-hstore-jdbc'
32 -include 'package'
33 include 'osmosis-osm-binary'
34 include 'osmosis-pbf'
35 include 'osmosis-pbf2'
36 @@ -18,3 +18,4 @@ include 'osmosis-tagfilter'
37 include 'osmosis-tagtransform'
38 include 'osmosis-testutil'
39 include 'osmosis-xml'
40 +include 'package'
+0
-19
debian/patches/0001-db-server-Minor-tweaks-to-readme-to-explain-docker-d.patch less more
0 From bc2b2fa891f83a26e7c78ca002ba6faa255b2a74 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 22:23:56 +1100
3 Subject: db-server: Minor tweaks to readme to explain docker dependency
4 Origin: https://github.com/openstreetmap/osmosis/commit/bc2b2fa891f83a26e7c78ca002ba6faa255b2a74
5
6 ---
7 db-server/readme.txt | 2 ++
8 1 file changed, 2 insertions(+)
9
10 --- a/db-server/readme.txt
11 +++ b/db-server/readme.txt
12 @@ -1,4 +1,6 @@
13 This directory contains the scripts to create a docker-based database server to be used for unit testing.
14 +In order to use this server, docker must be installed on the local workstation. Beyond that, no additional
15 +configuration should be required.
16
17 To build the docker image, run the following script.
18 ./build.sh
+0
-47
debian/patches/0001-db-server-Perform-full-configuration-of-the-pgosmsna.patch less more
0 From e80b65214afd6e08ec529e50700af735af1f117b Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Wed, 7 Jan 2015 21:45:15 +1100
3 Subject: db-server: Perform full configuration of the pgosmsnap06_test
4 database
5 Origin: https://github.com/openstreetmap/osmosis/commit/e80b65214afd6e08ec529e50700af735af1f117b
6
7 ---
8 db-server/Dockerfile | 1 +
9 db-server/docker-start.sh | 13 +++++++------
10 2 files changed, 8 insertions(+), 6 deletions(-)
11
12 --- a/db-server/Dockerfile
13 +++ b/db-server/Dockerfile
14 @@ -9,5 +9,6 @@ RUN yum install -y postgis
15 EXPOSE 5432
16
17 COPY docker-start.sh /start.sh
18 +COPY script /install/script
19
20 CMD ["/start.sh"]
21 --- a/db-server/docker-start.sh
22 +++ b/db-server/docker-start.sh
23 @@ -22,16 +22,17 @@ if [ ! "$(ls -A $DATADIR)" ]; then
24 CREATE DATABASE pgosmsnap06_test OWNER osm;
25 EOSQL
26
27 - # Start the database temporarily while we configure it.
28 - #su postgres sh -lc "postgres" &
29 - #PID=$!
30 - #echo "PID: ${PID}"
31 - #sleep 1
32 + # Start the database server temporarily while we configure the databases.
33 su postgres sh -lc "pg_ctl -w start"
34
35 - # Configure the database as the OSM user.
36 + # Configure the pgosmsnap06_test database as the OSM user.
37 su postgres sh -lc "psql -U osm pgosmsnap06_test" <<-EOSQL
38 CREATE EXTENSION hstore;
39 + CREATE EXTENSION postgis;
40 + \i /install/script/pgsnapshot_schema_0.6.sql
41 + \i /install/script/pgsnapshot_schema_0.6_action.sql
42 + \i /install/script/pgsnapshot_schema_0.6_bbox.sql
43 + \i /install/script/pgsnapshot_schema_0.6_linestring.sql
44 EOSQL
45
46 # Stop the database.
+0
-23
debian/patches/0001-pgsnapshot-Fix-checkstyle-errors-introduced-by-previ.patch less more
0 From cd86c4434242da3afb2ee3b084673bfb9c7583b5 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Fri, 20 Mar 2015 20:27:31 +1100
3 Subject: pgsnapshot: Fix checkstyle errors introduced by previous way-node
4 retrieval fix
5 Origin: https://github.com/openstreetmap/osmosis/commit/cd86c4434242da3afb2ee3b084673bfb9c7583b5
6
7 ---
8 .../openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java | 3 ++-
9 1 file changed, 2 insertions(+), 1 deletion(-)
10
11 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
12 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/EntityFeatureDao.java
13 @@ -51,7 +51,8 @@ public class EntityFeatureDao<Tef extend
14 * @return All instances of this feature type for the entity.
15 */
16 public Collection<Tdb> getAll(long entityId) {
17 - return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true), new Object[] { entityId }, entityFeatureMapper.getRowMapper());
18 + return jdbcTemplate.query(entityFeatureMapper.getSqlSelect("", true, true), new Object[] {entityId},
19 + entityFeatureMapper.getRowMapper());
20 }
21
22
+0
-21
debian/patches/0001-pgsnapshot-Fix-query-for-retrieving-relation-members.patch less more
0 From 276f3277a37ec7d6d9eb12ac81aff2ec69951cfc Mon Sep 17 00:00:00 2001
1 From: Jeffrey Erikson <jeffrey.erikson@digitalglobe.com>
2 Date: Thu, 9 Apr 2015 14:48:40 -0400
3 Subject: pgsnapshot: Fix query for retrieving relation members
4 Origin: https://github.com/openstreetmap/osmosis/commit/276f3277a37ec7d6d9eb12ac81aff2ec69951cfc
5
6 ---
7 .../osmosis/pgsnapshot/v0_6/impl/RelationMemberMapper.java | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/RelationMemberMapper.java
11 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/RelationMemberMapper.java
12 @@ -59,7 +59,7 @@ public class RelationMemberMapper extend
13 .append("s e ON f.").append(getParentEntityName()).append("_id = e.id");
14 }
15 if (filterByEntityId) {
16 - resultSql.append(" WHERE entity_id = ?");
17 + resultSql.append(" WHERE relation_id = ?");
18 }
19 if (orderBy) {
20 resultSql.append(getSqlDefaultOrderBy());
+0
-28
debian/patches/0001-pgsnapshot-Handle-case-where-WayNodes-might-already-.patch less more
0 From df5a10bc8060e3bad2a3ba6edbc537173a245368 Mon Sep 17 00:00:00 2001
1 From: Jeffrey Erikson <jeffrey.erikson@digitalglobe.com>
2 Date: Thu, 9 Apr 2015 14:42:44 -0400
3 Subject: pgsnapshot: Handle case where WayNodes might already be loaded
4 Origin: https://github.com/openstreetmap/osmosis/commit/df5a10bc8060e3bad2a3ba6edbc537173a245368
5
6 The WayMapper might already be loading node IDs when a Way
7 is retrieved, so this commit adds a check to see if the Way
8 already has a list of WayNodes before adding them to the Way
9 in WayDao. Without this check, the WayNodes end up duplicated.
10 ---
11 .../java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
15 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
16 @@ -61,7 +61,10 @@ public class WayDao extends EntityDao<Wa
17
18
19 private void loadFeatures(long entityId, Way entity) {
20 - entity.getWayNodes().addAll(wayNodeDao.getAllRaw(entityId));
21 + if ( entity.getWayNodes().size() == 0 )
22 + {
23 + entity.getWayNodes().addAll(wayNodeDao.getAllRaw(entityId));
24 + }
25 }
26
27
+0
-45
debian/patches/0001-pgsnapshot-Remove-redundant-way-node-loading-logic.patch less more
0 From 38824af034e5fefaa9d710e10206662e15978c1a Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Thu, 7 May 2015 20:31:37 +1000
3 Subject: pgsnapshot: Remove redundant way node loading logic
4 Origin: https://github.com/openstreetmap/osmosis/commit/38824af034e5fefaa9d710e10206662e15978c1a
5
6 The way node loading logic no longer needs to hit the way_nodes table
7 because the ways table has the list of node ids embedded in the nodes
8 column. This logic was causing double loading until Jeffrey's recent
9 fix, but it is redundant and can be removed completely ... I hope.
10 ---
11 .../osmosis/pgsnapshot/v0_6/impl/WayDao.java | 22 ----------------------
12 1 file changed, 22 deletions(-)
13
14 --- a/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
15 +++ b/osmosis-pgsnapshot/src/main/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/impl/WayDao.java
16 @@ -58,28 +58,6 @@ public class WayDao extends EntityDao<Wa
17 wayNodeMapper = new WayNodeMapper();
18 wayNodeDao = new EntityFeatureDao<WayNode, DbOrderedFeature<WayNode>>(jdbcTemplate, wayNodeMapper);
19 }
20 -
21 -
22 - private void loadFeatures(long entityId, Way entity) {
23 - if (entity.getWayNodes().size() == 0) {
24 - entity.getWayNodes().addAll(wayNodeDao.getAllRaw(entityId));
25 - }
26 - }
27 -
28 -
29 - /**
30 - * {@inheritDoc}
31 - */
32 - @Override
33 - public Way getEntity(long entityId) {
34 - Way entity;
35 -
36 - entity = super.getEntity(entityId);
37 -
38 - loadFeatures(entityId, entity);
39 -
40 - return entity;
41 - }
42
43
44 /**
+0
-48
debian/patches/0001-replication-Fix-null-pointer-exception-in-merge-repl.patch less more
0 From 4210fad83a5a8fb828f30545b1fd7c1bef653146 Mon Sep 17 00:00:00 2001
1 From: Brett Henderson <brett@bretth.com>
2 Date: Thu, 25 Jul 2013 21:38:19 +1000
3 Subject: replication: Fix null pointer exception in --merge-replication-files
4 Origin: https://github.com/openstreetmap/osmosis/commit/4210fad83a5a8fb828f30545b1fd7c1bef653146
5
6 The --merge-replication-files task was failing to initialise its current
7 data state during startup. This breakage was introduced while
8 externalising code into the new ReplicationStore implementation. This
9 change fixes the initialisation code to use the replication store to
10 load state instead of directly loading it.
11
12 --- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationFileMerger.java
13 +++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationFileMerger.java
14 @@ -10,7 +10,6 @@ import org.openstreetmap.osmosis.core.co
15 import org.openstreetmap.osmosis.core.sort.v0_6.ChangeForStreamableApplierComparator;
16 import org.openstreetmap.osmosis.core.sort.v0_6.ChangeSorter;
17 import org.openstreetmap.osmosis.core.task.v0_6.ChangeSink;
18 -import org.openstreetmap.osmosis.core.util.PropertiesPersister;
19 import org.openstreetmap.osmosis.replication.common.FileReplicationStore;
20 import org.openstreetmap.osmosis.replication.common.ReplicationState;
21 import org.openstreetmap.osmosis.replication.common.ReplicationStore;
22 @@ -35,7 +34,6 @@ public class ReplicationFileMerger exten
23 private boolean sinkActive;
24 private ChangeSink changeSink;
25 private ReplicationState currentDataState;
26 - private PropertiesPersister dataStatePersister;
27 private ReplicationStore replicationStore;
28
29
30 @@ -47,7 +45,7 @@ public class ReplicationFileMerger exten
31 */
32 public ReplicationFileMerger(File workingDirectory) {
33 super(workingDirectory);
34 -
35 +
36 replicationStore = new FileReplicationStore(new File(getWorkingDirectory(), DATA_DIRECTORY), true);
37
38 sinkActive = false;
39 @@ -77,7 +75,7 @@ public class ReplicationFileMerger exten
40 long intervalLength;
41
42 // Read the current persisted state.
43 - currentDataState = new ReplicationState(dataStatePersister.loadMap());
44 + currentDataState = replicationStore.getCurrentState();
45
46 // Get the default maximum timestamp according to base calculations.
47 maximumTimestamp = super.calculateMaximumTimestamp(configuration, serverTimestamp, localTimestamp);
11 Author: Bas Couwenberg <sebastic@xs4all.nl>
22 --- a/build.gradle
33 +++ b/build.gradle
4 @@ -25,7 +25,13 @@ subprojects {
4 @@ -28,7 +28,13 @@ subprojects {
55 // Enable access to artefact dependency repositories.
66 repositories {
77 // Standard Maven repository.
1616 }
1717 }
1818
19 @@ -54,6 +60,9 @@ configure(javaProjects) {
19 @@ -57,6 +63,9 @@ configure(javaProjects) {
2020 }
2121
2222 dependencies {
2828
2929 --- a/gradle.properties
3030 +++ b/gradle.properties
31 @@ -4,26 +4,26 @@
31 @@ -4,25 +4,25 @@
3232 org.gradle.daemon=true
3333
3434 # 3rd Party Library Versions
35 -dependencyVersionClassworlds=2.4
36 -dependencyVersionCommonsCodec=1.7
37 -dependencyVersionCommonsCompress=1.4.1
35 -dependencyVersionClassworlds=2.5.2
36 -dependencyVersionCommonsCodec=1.10
37 -dependencyVersionCommonsCompress=1.9
3838 -dependencyVersionCommonsDbcp=1.4
3939 -dependencyVersionJpf=1.5
40 -dependencyVersionJunit=4.10
41 -dependencyVersionMySql=5.1.21
42 -dependencyVersionNetty=3.2.7.Final
43 -dependencyVersionOsmPbf=1.1.1-754a33af
40 -dependencyVersionJunit=4.12
41 -dependencyVersionMySql=5.1.35
42 -dependencyVersionNetty=3.2.10.Final
4443 -dependencyVersionPostGis=1.3.3
45 -dependencyVersionPostgreSql=9.1-901-1.jdbc4
46 -dependencyVersionProtobuf=2.4.1
47 -dependencyVersionSpring=3.1.2.RELEASE
48 -dependencyVersionWoodstoxCore=4.1.4
49 -dependencyVersionWoodstoxStax2=3.1.1
44 -dependencyVersionPostgreSql=9.4-1201-jdbc4
45 -dependencyVersionProtobuf=2.6.1
46 -dependencyVersionSpring=4.1.6.RELEASE
47 -dependencyVersionWoodstoxCore=4.4.1
48 -dependencyVersionWoodstoxStax2=3.1.4
5049 +dependencyVersionClassworlds=debian
5150 +dependencyVersionCommonsCodec=debian
5251 +dependencyVersionCommonsCompress=debian
5554 +dependencyVersionJunit=4.x
5655 +dependencyVersionMySql=debian
5756 +dependencyVersionNetty=debian
58 +dependencyVersionOsmPbf=debian
5957 +dependencyVersionPostGis=debian
6058 +dependencyVersionPostgreSql=debian
6159 +dependencyVersionProtobuf=debian
11 Author: Bas Couwenberg <sebastic@xs4all.nl>
22 --- a/build.gradle
33 +++ b/build.gradle
4 @@ -20,7 +20,7 @@ subprojects {
4 @@ -23,7 +23,7 @@ subprojects {
55
66 // Load the project version dynamically from Git. For release builds, don't add a suffix.
77 def versionSuffix = "RELEASE".equals(osmosisBuildType) ? '' : '-' + osmosisBuildType
+0
-15432
debian/patches/05-protobuf-2.6.0.patch less more
0 Description: Update generated source for protobuf 2.6.0 using osmosis-protoc.sh.
1 Author: Bas Couwenberg <sebastic@xs4all.nl>
2
3 --- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
4 +++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
5 @@ -8,98 +8,319 @@ public final class Fileformat {
6 public static void registerAllExtensions(
7 com.google.protobuf.ExtensionRegistryLite registry) {
8 }
9 - public interface BlobOrBuilder
10 - extends com.google.protobuf.MessageLiteOrBuilder {
11 -
12 - // optional bytes raw = 1;
13 + public interface BlobOrBuilder extends
14 + // @@protoc_insertion_point(interface_extends:OSMPBF.Blob)
15 + com.google.protobuf.MessageLiteOrBuilder {
16 +
17 + /**
18 + * <code>optional bytes raw = 1;</code>
19 + *
20 + * <pre>
21 + * No compression
22 + * </pre>
23 + */
24 boolean hasRaw();
25 + /**
26 + * <code>optional bytes raw = 1;</code>
27 + *
28 + * <pre>
29 + * No compression
30 + * </pre>
31 + */
32 com.google.protobuf.ByteString getRaw();
33 -
34 - // optional int32 raw_size = 2;
35 +
36 + /**
37 + * <code>optional int32 raw_size = 2;</code>
38 + *
39 + * <pre>
40 + * When compressed, the uncompressed size
41 + * </pre>
42 + */
43 boolean hasRawSize();
44 + /**
45 + * <code>optional int32 raw_size = 2;</code>
46 + *
47 + * <pre>
48 + * When compressed, the uncompressed size
49 + * </pre>
50 + */
51 int getRawSize();
52 -
53 - // optional bytes zlib_data = 3;
54 +
55 + /**
56 + * <code>optional bytes zlib_data = 3;</code>
57 + *
58 + * <pre>
59 + * Possible compressed versions of the data.
60 + * </pre>
61 + */
62 boolean hasZlibData();
63 + /**
64 + * <code>optional bytes zlib_data = 3;</code>
65 + *
66 + * <pre>
67 + * Possible compressed versions of the data.
68 + * </pre>
69 + */
70 com.google.protobuf.ByteString getZlibData();
71 -
72 - // optional bytes lzma_data = 4;
73 +
74 + /**
75 + * <code>optional bytes lzma_data = 4;</code>
76 + *
77 + * <pre>
78 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
79 + * </pre>
80 + */
81 boolean hasLzmaData();
82 + /**
83 + * <code>optional bytes lzma_data = 4;</code>
84 + *
85 + * <pre>
86 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
87 + * </pre>
88 + */
89 com.google.protobuf.ByteString getLzmaData();
90 -
91 - // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
92 +
93 + /**
94 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
95 + *
96 + * <pre>
97 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
98 + * </pre>
99 + */
100 @java.lang.Deprecated boolean hasOBSOLETEBzip2Data();
101 + /**
102 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
103 + *
104 + * <pre>
105 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
106 + * </pre>
107 + */
108 @java.lang.Deprecated com.google.protobuf.ByteString getOBSOLETEBzip2Data();
109 }
110 + /**
111 + * Protobuf type {@code OSMPBF.Blob}
112 + */
113 public static final class Blob extends
114 - com.google.protobuf.GeneratedMessageLite
115 - implements BlobOrBuilder {
116 + com.google.protobuf.GeneratedMessageLite implements
117 + // @@protoc_insertion_point(message_implements:OSMPBF.Blob)
118 + BlobOrBuilder {
119 // Use Blob.newBuilder() to construct.
120 - private Blob(Builder builder) {
121 + private Blob(com.google.protobuf.GeneratedMessageLite.Builder builder) {
122 super(builder);
123 + this.unknownFields = builder.getUnknownFields();
124 }
125 - private Blob(boolean noInit) {}
126 -
127 + private Blob(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
128 +
129 private static final Blob defaultInstance;
130 public static Blob getDefaultInstance() {
131 return defaultInstance;
132 }
133 -
134 +
135 public Blob getDefaultInstanceForType() {
136 return defaultInstance;
137 }
138 -
139 +
140 + private final com.google.protobuf.ByteString unknownFields;
141 + private Blob(
142 + com.google.protobuf.CodedInputStream input,
143 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
144 + throws com.google.protobuf.InvalidProtocolBufferException {
145 + initFields();
146 + int mutable_bitField0_ = 0;
147 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
148 + com.google.protobuf.ByteString.newOutput();
149 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
150 + com.google.protobuf.CodedOutputStream.newInstance(
151 + unknownFieldsOutput);
152 + try {
153 + boolean done = false;
154 + while (!done) {
155 + int tag = input.readTag();
156 + switch (tag) {
157 + case 0:
158 + done = true;
159 + break;
160 + default: {
161 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
162 + extensionRegistry, tag)) {
163 + done = true;
164 + }
165 + break;
166 + }
167 + case 10: {
168 + bitField0_ |= 0x00000001;
169 + raw_ = input.readBytes();
170 + break;
171 + }
172 + case 16: {
173 + bitField0_ |= 0x00000002;
174 + rawSize_ = input.readInt32();
175 + break;
176 + }
177 + case 26: {
178 + bitField0_ |= 0x00000004;
179 + zlibData_ = input.readBytes();
180 + break;
181 + }
182 + case 34: {
183 + bitField0_ |= 0x00000008;
184 + lzmaData_ = input.readBytes();
185 + break;
186 + }
187 + case 42: {
188 + bitField0_ |= 0x00000010;
189 + oBSOLETEBzip2Data_ = input.readBytes();
190 + break;
191 + }
192 + }
193 + }
194 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
195 + throw e.setUnfinishedMessage(this);
196 + } catch (java.io.IOException e) {
197 + throw new com.google.protobuf.InvalidProtocolBufferException(
198 + e.getMessage()).setUnfinishedMessage(this);
199 + } finally {
200 + try {
201 + unknownFieldsCodedOutput.flush();
202 + } catch (java.io.IOException e) {
203 + // Should not happen
204 + } finally {
205 + unknownFields = unknownFieldsOutput.toByteString();
206 + }
207 + makeExtensionsImmutable();
208 + }
209 + }
210 + public static com.google.protobuf.Parser<Blob> PARSER =
211 + new com.google.protobuf.AbstractParser<Blob>() {
212 + public Blob parsePartialFrom(
213 + com.google.protobuf.CodedInputStream input,
214 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
215 + throws com.google.protobuf.InvalidProtocolBufferException {
216 + return new Blob(input, extensionRegistry);
217 + }
218 + };
219 +
220 + @java.lang.Override
221 + public com.google.protobuf.Parser<Blob> getParserForType() {
222 + return PARSER;
223 + }
224 +
225 private int bitField0_;
226 - // optional bytes raw = 1;
227 public static final int RAW_FIELD_NUMBER = 1;
228 private com.google.protobuf.ByteString raw_;
229 + /**
230 + * <code>optional bytes raw = 1;</code>
231 + *
232 + * <pre>
233 + * No compression
234 + * </pre>
235 + */
236 public boolean hasRaw() {
237 return ((bitField0_ & 0x00000001) == 0x00000001);
238 }
239 + /**
240 + * <code>optional bytes raw = 1;</code>
241 + *
242 + * <pre>
243 + * No compression
244 + * </pre>
245 + */
246 public com.google.protobuf.ByteString getRaw() {
247 return raw_;
248 }
249 -
250 - // optional int32 raw_size = 2;
251 +
252 public static final int RAW_SIZE_FIELD_NUMBER = 2;
253 private int rawSize_;
254 + /**
255 + * <code>optional int32 raw_size = 2;</code>
256 + *
257 + * <pre>
258 + * When compressed, the uncompressed size
259 + * </pre>
260 + */
261 public boolean hasRawSize() {
262 return ((bitField0_ & 0x00000002) == 0x00000002);
263 }
264 + /**
265 + * <code>optional int32 raw_size = 2;</code>
266 + *
267 + * <pre>
268 + * When compressed, the uncompressed size
269 + * </pre>
270 + */
271 public int getRawSize() {
272 return rawSize_;
273 }
274 -
275 - // optional bytes zlib_data = 3;
276 +
277 public static final int ZLIB_DATA_FIELD_NUMBER = 3;
278 private com.google.protobuf.ByteString zlibData_;
279 + /**
280 + * <code>optional bytes zlib_data = 3;</code>
281 + *
282 + * <pre>
283 + * Possible compressed versions of the data.
284 + * </pre>
285 + */
286 public boolean hasZlibData() {
287 return ((bitField0_ & 0x00000004) == 0x00000004);
288 }
289 + /**
290 + * <code>optional bytes zlib_data = 3;</code>
291 + *
292 + * <pre>
293 + * Possible compressed versions of the data.
294 + * </pre>
295 + */
296 public com.google.protobuf.ByteString getZlibData() {
297 return zlibData_;
298 }
299 -
300 - // optional bytes lzma_data = 4;
301 +
302 public static final int LZMA_DATA_FIELD_NUMBER = 4;
303 private com.google.protobuf.ByteString lzmaData_;
304 + /**
305 + * <code>optional bytes lzma_data = 4;</code>
306 + *
307 + * <pre>
308 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
309 + * </pre>
310 + */
311 public boolean hasLzmaData() {
312 return ((bitField0_ & 0x00000008) == 0x00000008);
313 }
314 + /**
315 + * <code>optional bytes lzma_data = 4;</code>
316 + *
317 + * <pre>
318 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
319 + * </pre>
320 + */
321 public com.google.protobuf.ByteString getLzmaData() {
322 return lzmaData_;
323 }
324 -
325 - // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
326 +
327 public static final int OBSOLETE_BZIP2_DATA_FIELD_NUMBER = 5;
328 private com.google.protobuf.ByteString oBSOLETEBzip2Data_;
329 + /**
330 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
331 + *
332 + * <pre>
333 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
334 + * </pre>
335 + */
336 @java.lang.Deprecated public boolean hasOBSOLETEBzip2Data() {
337 return ((bitField0_ & 0x00000010) == 0x00000010);
338 }
339 + /**
340 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
341 + *
342 + * <pre>
343 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
344 + * </pre>
345 + */
346 @java.lang.Deprecated public com.google.protobuf.ByteString getOBSOLETEBzip2Data() {
347 return oBSOLETEBzip2Data_;
348 }
349 -
350 +
351 private void initFields() {
352 raw_ = com.google.protobuf.ByteString.EMPTY;
353 rawSize_ = 0;
354 @@ -110,12 +331,13 @@ public final class Fileformat {
355 private byte memoizedIsInitialized = -1;
356 public final boolean isInitialized() {
357 byte isInitialized = memoizedIsInitialized;
358 - if (isInitialized != -1) return isInitialized == 1;
359 -
360 + if (isInitialized == 1) return true;
361 + if (isInitialized == 0) return false;
362 +
363 memoizedIsInitialized = 1;
364 return true;
365 }
366 -
367 +
368 public void writeTo(com.google.protobuf.CodedOutputStream output)
369 throws java.io.IOException {
370 getSerializedSize();
371 @@ -134,13 +356,14 @@ public final class Fileformat {
372 if (((bitField0_ & 0x00000010) == 0x00000010)) {
373 output.writeBytes(5, oBSOLETEBzip2Data_);
374 }
375 + output.writeRawBytes(unknownFields);
376 }
377 -
378 +
379 private int memoizedSerializedSize = -1;
380 public int getSerializedSize() {
381 int size = memoizedSerializedSize;
382 if (size != -1) return size;
383 -
384 +
385 size = 0;
386 if (((bitField0_ & 0x00000001) == 0x00000001)) {
387 size += com.google.protobuf.CodedOutputStream
388 @@ -162,106 +385,98 @@ public final class Fileformat {
389 size += com.google.protobuf.CodedOutputStream
390 .computeBytesSize(5, oBSOLETEBzip2Data_);
391 }
392 + size += unknownFields.size();
393 memoizedSerializedSize = size;
394 return size;
395 }
396 -
397 +
398 private static final long serialVersionUID = 0L;
399 @java.lang.Override
400 protected java.lang.Object writeReplace()
401 throws java.io.ObjectStreamException {
402 return super.writeReplace();
403 }
404 -
405 +
406 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
407 com.google.protobuf.ByteString data)
408 throws com.google.protobuf.InvalidProtocolBufferException {
409 - return newBuilder().mergeFrom(data).buildParsed();
410 + return PARSER.parseFrom(data);
411 }
412 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
413 com.google.protobuf.ByteString data,
414 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
415 throws com.google.protobuf.InvalidProtocolBufferException {
416 - return newBuilder().mergeFrom(data, extensionRegistry)
417 - .buildParsed();
418 + return PARSER.parseFrom(data, extensionRegistry);
419 }
420 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(byte[] data)
421 throws com.google.protobuf.InvalidProtocolBufferException {
422 - return newBuilder().mergeFrom(data).buildParsed();
423 + return PARSER.parseFrom(data);
424 }
425 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
426 byte[] data,
427 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
428 throws com.google.protobuf.InvalidProtocolBufferException {
429 - return newBuilder().mergeFrom(data, extensionRegistry)
430 - .buildParsed();
431 + return PARSER.parseFrom(data, extensionRegistry);
432 }
433 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(java.io.InputStream input)
434 throws java.io.IOException {
435 - return newBuilder().mergeFrom(input).buildParsed();
436 + return PARSER.parseFrom(input);
437 }
438 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
439 java.io.InputStream input,
440 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
441 throws java.io.IOException {
442 - return newBuilder().mergeFrom(input, extensionRegistry)
443 - .buildParsed();
444 + return PARSER.parseFrom(input, extensionRegistry);
445 }
446 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseDelimitedFrom(java.io.InputStream input)
447 throws java.io.IOException {
448 - Builder builder = newBuilder();
449 - if (builder.mergeDelimitedFrom(input)) {
450 - return builder.buildParsed();
451 - } else {
452 - return null;
453 - }
454 + return PARSER.parseDelimitedFrom(input);
455 }
456 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseDelimitedFrom(
457 java.io.InputStream input,
458 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
459 throws java.io.IOException {
460 - Builder builder = newBuilder();
461 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
462 - return builder.buildParsed();
463 - } else {
464 - return null;
465 - }
466 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
467 }
468 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
469 com.google.protobuf.CodedInputStream input)
470 throws java.io.IOException {
471 - return newBuilder().mergeFrom(input).buildParsed();
472 + return PARSER.parseFrom(input);
473 }
474 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
475 com.google.protobuf.CodedInputStream input,
476 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
477 throws java.io.IOException {
478 - return newBuilder().mergeFrom(input, extensionRegistry)
479 - .buildParsed();
480 + return PARSER.parseFrom(input, extensionRegistry);
481 }
482 -
483 +
484 public static Builder newBuilder() { return Builder.create(); }
485 public Builder newBuilderForType() { return newBuilder(); }
486 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob prototype) {
487 return newBuilder().mergeFrom(prototype);
488 }
489 public Builder toBuilder() { return newBuilder(this); }
490 -
491 +
492 + /**
493 + * Protobuf type {@code OSMPBF.Blob}
494 + */
495 public static final class Builder extends
496 com.google.protobuf.GeneratedMessageLite.Builder<
497 org.openstreetmap.osmosis.osmbinary.Fileformat.Blob, Builder>
498 - implements org.openstreetmap.osmosis.osmbinary.Fileformat.BlobOrBuilder {
499 + implements
500 + // @@protoc_insertion_point(builder_implements:OSMPBF.Blob)
501 + org.openstreetmap.osmosis.osmbinary.Fileformat.BlobOrBuilder {
502 // Construct using org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.newBuilder()
503 private Builder() {
504 maybeForceBuilderInitialization();
505 }
506 -
507 +
508 private void maybeForceBuilderInitialization() {
509 }
510 private static Builder create() {
511 return new Builder();
512 }
513 -
514 +
515 public Builder clear() {
516 super.clear();
517 raw_ = com.google.protobuf.ByteString.EMPTY;
518 @@ -276,15 +491,15 @@ public final class Fileformat {
519 bitField0_ = (bitField0_ & ~0x00000010);
520 return this;
521 }
522 -
523 +
524 public Builder clone() {
525 return create().mergeFrom(buildPartial());
526 }
527 -
528 +
529 public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob getDefaultInstanceForType() {
530 return org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.getDefaultInstance();
531 }
532 -
533 +
534 public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob build() {
535 org.openstreetmap.osmosis.osmbinary.Fileformat.Blob result = buildPartial();
536 if (!result.isInitialized()) {
537 @@ -292,17 +507,7 @@ public final class Fileformat {
538 }
539 return result;
540 }
541 -
542 - private org.openstreetmap.osmosis.osmbinary.Fileformat.Blob buildParsed()
543 - throws com.google.protobuf.InvalidProtocolBufferException {
544 - org.openstreetmap.osmosis.osmbinary.Fileformat.Blob result = buildPartial();
545 - if (!result.isInitialized()) {
546 - throw newUninitializedMessageException(
547 - result).asInvalidProtocolBufferException();
548 - }
549 - return result;
550 - }
551 -
552 +
553 public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob buildPartial() {
554 org.openstreetmap.osmosis.osmbinary.Fileformat.Blob result = new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob(this);
555 int from_bitField0_ = bitField0_;
556 @@ -330,7 +535,7 @@ public final class Fileformat {
557 result.bitField0_ = to_bitField0_;
558 return result;
559 }
560 -
561 +
562 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob other) {
563 if (other == org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.getDefaultInstance()) return this;
564 if (other.hasRaw()) {
565 @@ -348,69 +553,62 @@ public final class Fileformat {
566 if (other.hasOBSOLETEBzip2Data()) {
567 setOBSOLETEBzip2Data(other.getOBSOLETEBzip2Data());
568 }
569 + setUnknownFields(
570 + getUnknownFields().concat(other.unknownFields));
571 return this;
572 }
573 -
574 +
575 public final boolean isInitialized() {
576 return true;
577 }
578 -
579 +
580 public Builder mergeFrom(
581 com.google.protobuf.CodedInputStream input,
582 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
583 throws java.io.IOException {
584 - while (true) {
585 - int tag = input.readTag();
586 - switch (tag) {
587 - case 0:
588 -
589 - return this;
590 - default: {
591 - if (!parseUnknownField(input, extensionRegistry, tag)) {
592 -
593 - return this;
594 - }
595 - break;
596 - }
597 - case 10: {
598 - bitField0_ |= 0x00000001;
599 - raw_ = input.readBytes();
600 - break;
601 - }
602 - case 16: {
603 - bitField0_ |= 0x00000002;
604 - rawSize_ = input.readInt32();
605 - break;
606 - }
607 - case 26: {
608 - bitField0_ |= 0x00000004;
609 - zlibData_ = input.readBytes();
610 - break;
611 - }
612 - case 34: {
613 - bitField0_ |= 0x00000008;
614 - lzmaData_ = input.readBytes();
615 - break;
616 - }
617 - case 42: {
618 - bitField0_ |= 0x00000010;
619 - oBSOLETEBzip2Data_ = input.readBytes();
620 - break;
621 - }
622 + org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parsedMessage = null;
623 + try {
624 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
625 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
626 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Fileformat.Blob) e.getUnfinishedMessage();
627 + throw e;
628 + } finally {
629 + if (parsedMessage != null) {
630 + mergeFrom(parsedMessage);
631 }
632 }
633 + return this;
634 }
635 -
636 private int bitField0_;
637 -
638 - // optional bytes raw = 1;
639 +
640 private com.google.protobuf.ByteString raw_ = com.google.protobuf.ByteString.EMPTY;
641 + /**
642 + * <code>optional bytes raw = 1;</code>
643 + *
644 + * <pre>
645 + * No compression
646 + * </pre>
647 + */
648 public boolean hasRaw() {
649 return ((bitField0_ & 0x00000001) == 0x00000001);
650 }
651 + /**
652 + * <code>optional bytes raw = 1;</code>
653 + *
654 + * <pre>
655 + * No compression
656 + * </pre>
657 + */
658 public com.google.protobuf.ByteString getRaw() {
659 return raw_;
660 }
661 + /**
662 + * <code>optional bytes raw = 1;</code>
663 + *
664 + * <pre>
665 + * No compression
666 + * </pre>
667 + */
668 public Builder setRaw(com.google.protobuf.ByteString value) {
669 if (value == null) {
670 throw new NullPointerException();
671 @@ -420,42 +618,96 @@ public final class Fileformat {
672
673 return this;
674 }
675 + /**
676 + * <code>optional bytes raw = 1;</code>
677 + *
678 + * <pre>
679 + * No compression
680 + * </pre>
681 + */
682 public Builder clearRaw() {
683 bitField0_ = (bitField0_ & ~0x00000001);
684 raw_ = getDefaultInstance().getRaw();
685
686 return this;
687 }
688 -
689 - // optional int32 raw_size = 2;
690 +
691 private int rawSize_ ;
692 + /**
693 + * <code>optional int32 raw_size = 2;</code>
694 + *
695 + * <pre>
696 + * When compressed, the uncompressed size
697 + * </pre>
698 + */
699 public boolean hasRawSize() {
700 return ((bitField0_ & 0x00000002) == 0x00000002);
701 }
702 + /**
703 + * <code>optional int32 raw_size = 2;</code>
704 + *
705 + * <pre>
706 + * When compressed, the uncompressed size
707 + * </pre>
708 + */
709 public int getRawSize() {
710 return rawSize_;
711 }
712 + /**
713 + * <code>optional int32 raw_size = 2;</code>
714 + *
715 + * <pre>
716 + * When compressed, the uncompressed size
717 + * </pre>
718 + */
719 public Builder setRawSize(int value) {
720 bitField0_ |= 0x00000002;
721 rawSize_ = value;
722
723 return this;
724 }
725 + /**
726 + * <code>optional int32 raw_size = 2;</code>
727 + *
728 + * <pre>
729 + * When compressed, the uncompressed size
730 + * </pre>
731 + */
732 public Builder clearRawSize() {
733 bitField0_ = (bitField0_ & ~0x00000002);
734 rawSize_ = 0;
735
736 return this;
737 }
738 -
739 - // optional bytes zlib_data = 3;
740 +
741 private com.google.protobuf.ByteString zlibData_ = com.google.protobuf.ByteString.EMPTY;
742 + /**
743 + * <code>optional bytes zlib_data = 3;</code>
744 + *
745 + * <pre>
746 + * Possible compressed versions of the data.
747 + * </pre>
748 + */
749 public boolean hasZlibData() {
750 return ((bitField0_ & 0x00000004) == 0x00000004);
751 }
752 + /**
753 + * <code>optional bytes zlib_data = 3;</code>
754 + *
755 + * <pre>
756 + * Possible compressed versions of the data.
757 + * </pre>
758 + */
759 public com.google.protobuf.ByteString getZlibData() {
760 return zlibData_;
761 }
762 + /**
763 + * <code>optional bytes zlib_data = 3;</code>
764 + *
765 + * <pre>
766 + * Possible compressed versions of the data.
767 + * </pre>
768 + */
769 public Builder setZlibData(com.google.protobuf.ByteString value) {
770 if (value == null) {
771 throw new NullPointerException();
772 @@ -465,21 +717,48 @@ public final class Fileformat {
773
774 return this;
775 }
776 + /**
777 + * <code>optional bytes zlib_data = 3;</code>
778 + *
779 + * <pre>
780 + * Possible compressed versions of the data.
781 + * </pre>
782 + */
783 public Builder clearZlibData() {
784 bitField0_ = (bitField0_ & ~0x00000004);
785 zlibData_ = getDefaultInstance().getZlibData();
786
787 return this;
788 }
789 -
790 - // optional bytes lzma_data = 4;
791 +
792 private com.google.protobuf.ByteString lzmaData_ = com.google.protobuf.ByteString.EMPTY;
793 + /**
794 + * <code>optional bytes lzma_data = 4;</code>
795 + *
796 + * <pre>
797 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
798 + * </pre>
799 + */
800 public boolean hasLzmaData() {
801 return ((bitField0_ & 0x00000008) == 0x00000008);
802 }
803 + /**
804 + * <code>optional bytes lzma_data = 4;</code>
805 + *
806 + * <pre>
807 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
808 + * </pre>
809 + */
810 public com.google.protobuf.ByteString getLzmaData() {
811 return lzmaData_;
812 }
813 + /**
814 + * <code>optional bytes lzma_data = 4;</code>
815 + *
816 + * <pre>
817 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
818 + * </pre>
819 + */
820 public Builder setLzmaData(com.google.protobuf.ByteString value) {
821 if (value == null) {
822 throw new NullPointerException();
823 @@ -489,21 +768,48 @@ public final class Fileformat {
824
825 return this;
826 }
827 + /**
828 + * <code>optional bytes lzma_data = 4;</code>
829 + *
830 + * <pre>
831 + * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
832 + * </pre>
833 + */
834 public Builder clearLzmaData() {
835 bitField0_ = (bitField0_ & ~0x00000008);
836 lzmaData_ = getDefaultInstance().getLzmaData();
837
838 return this;
839 }
840 -
841 - // optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];
842 +
843 private com.google.protobuf.ByteString oBSOLETEBzip2Data_ = com.google.protobuf.ByteString.EMPTY;
844 + /**
845 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
846 + *
847 + * <pre>
848 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
849 + * </pre>
850 + */
851 @java.lang.Deprecated public boolean hasOBSOLETEBzip2Data() {
852 return ((bitField0_ & 0x00000010) == 0x00000010);
853 }
854 + /**
855 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
856 + *
857 + * <pre>
858 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
859 + * </pre>
860 + */
861 @java.lang.Deprecated public com.google.protobuf.ByteString getOBSOLETEBzip2Data() {
862 return oBSOLETEBzip2Data_;
863 }
864 + /**
865 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
866 + *
867 + * <pre>
868 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
869 + * </pre>
870 + */
871 @java.lang.Deprecated public Builder setOBSOLETEBzip2Data(com.google.protobuf.ByteString value) {
872 if (value == null) {
873 throw new NullPointerException();
874 @@ -513,110 +819,239 @@ public final class Fileformat {
875
876 return this;
877 }
878 + /**
879 + * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
880 + *
881 + * <pre>
882 + * Formerly used for bzip2 compressed data. Depreciated in 2010.
883 + * </pre>
884 + */
885 @java.lang.Deprecated public Builder clearOBSOLETEBzip2Data() {
886 bitField0_ = (bitField0_ & ~0x00000010);
887 oBSOLETEBzip2Data_ = getDefaultInstance().getOBSOLETEBzip2Data();
888
889 return this;
890 }
891 -
892 +
893 // @@protoc_insertion_point(builder_scope:OSMPBF.Blob)
894 }
895 -
896 +
897 static {
898 defaultInstance = new Blob(true);
899 defaultInstance.initFields();
900 }
901 -
902 +
903 // @@protoc_insertion_point(class_scope:OSMPBF.Blob)
904 }
905 -
906 - public interface BlobHeaderOrBuilder
907 - extends com.google.protobuf.MessageLiteOrBuilder {
908 -
909 - // required string type = 1;
910 +
911 + public interface BlobHeaderOrBuilder extends
912 + // @@protoc_insertion_point(interface_extends:OSMPBF.BlobHeader)
913 + com.google.protobuf.MessageLiteOrBuilder {
914 +
915 + /**
916 + * <code>required string type = 1;</code>
917 + */
918 boolean hasType();
919 - String getType();
920 -
921 - // optional bytes indexdata = 2;
922 + /**
923 + * <code>required string type = 1;</code>
924 + */
925 + java.lang.String getType();
926 + /**
927 + * <code>required string type = 1;</code>
928 + */
929 + com.google.protobuf.ByteString
930 + getTypeBytes();
931 +
932 + /**
933 + * <code>optional bytes indexdata = 2;</code>
934 + */
935 boolean hasIndexdata();
936 + /**
937 + * <code>optional bytes indexdata = 2;</code>
938 + */
939 com.google.protobuf.ByteString getIndexdata();
940 -
941 - // required int32 datasize = 3;
942 +
943 + /**
944 + * <code>required int32 datasize = 3;</code>
945 + */
946 boolean hasDatasize();
947 + /**
948 + * <code>required int32 datasize = 3;</code>
949 + */
950 int getDatasize();
951 }
952 + /**
953 + * Protobuf type {@code OSMPBF.BlobHeader}
954 + */
955 public static final class BlobHeader extends
956 - com.google.protobuf.GeneratedMessageLite
957 - implements BlobHeaderOrBuilder {
958 + com.google.protobuf.GeneratedMessageLite implements
959 + // @@protoc_insertion_point(message_implements:OSMPBF.BlobHeader)
960 + BlobHeaderOrBuilder {
961 // Use BlobHeader.newBuilder() to construct.
962 - private BlobHeader(Builder builder) {
963 + private BlobHeader(com.google.protobuf.GeneratedMessageLite.Builder builder) {
964 super(builder);
965 + this.unknownFields = builder.getUnknownFields();
966 }
967 - private BlobHeader(boolean noInit) {}
968 -
969 + private BlobHeader(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
970 +
971 private static final BlobHeader defaultInstance;
972 public static BlobHeader getDefaultInstance() {
973 return defaultInstance;
974 }
975 -
976 +
977 public BlobHeader getDefaultInstanceForType() {
978 return defaultInstance;
979 }
980 -
981 +
982 + private final com.google.protobuf.ByteString unknownFields;
983 + private BlobHeader(
984 + com.google.protobuf.CodedInputStream input,
985 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
986 + throws com.google.protobuf.InvalidProtocolBufferException {
987 + initFields();
988 + int mutable_bitField0_ = 0;
989 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
990 + com.google.protobuf.ByteString.newOutput();
991 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
992 + com.google.protobuf.CodedOutputStream.newInstance(
993 + unknownFieldsOutput);
994 + try {
995 + boolean done = false;
996 + while (!done) {
997 + int tag = input.readTag();
998 + switch (tag) {
999 + case 0:
1000 + done = true;
1001 + break;
1002 + default: {
1003 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
1004 + extensionRegistry, tag)) {
1005 + done = true;
1006 + }
1007 + break;
1008 + }
1009 + case 10: {
1010 + com.google.protobuf.ByteString bs = input.readBytes();
1011 + bitField0_ |= 0x00000001;
1012 + type_ = bs;
1013 + break;
1014 + }
1015 + case 18: {
1016 + bitField0_ |= 0x00000002;
1017 + indexdata_ = input.readBytes();
1018 + break;
1019 + }
1020 + case 24: {
1021 + bitField0_ |= 0x00000004;
1022 + datasize_ = input.readInt32();
1023 + break;
1024 + }
1025 + }
1026 + }
1027 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
1028 + throw e.setUnfinishedMessage(this);
1029 + } catch (java.io.IOException e) {
1030 + throw new com.google.protobuf.InvalidProtocolBufferException(
1031 + e.getMessage()).setUnfinishedMessage(this);
1032 + } finally {
1033 + try {
1034 + unknownFieldsCodedOutput.flush();
1035 + } catch (java.io.IOException e) {
1036 + // Should not happen
1037 + } finally {
1038 + unknownFields = unknownFieldsOutput.toByteString();
1039 + }
1040 + makeExtensionsImmutable();
1041 + }
1042 + }
1043 + public static com.google.protobuf.Parser<BlobHeader> PARSER =
1044 + new com.google.protobuf.AbstractParser<BlobHeader>() {
1045 + public BlobHeader parsePartialFrom(
1046 + com.google.protobuf.CodedInputStream input,
1047 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1048 + throws com.google.protobuf.InvalidProtocolBufferException {
1049 + return new BlobHeader(input, extensionRegistry);
1050 + }
1051 + };
1052 +
1053 + @java.lang.Override
1054 + public com.google.protobuf.Parser<BlobHeader> getParserForType() {
1055 + return PARSER;
1056 + }
1057 +
1058 private int bitField0_;
1059 - // required string type = 1;
1060 public static final int TYPE_FIELD_NUMBER = 1;
1061 private java.lang.Object type_;
1062 + /**
1063 + * <code>required string type = 1;</code>
1064 + */
1065 public boolean hasType() {
1066 return ((bitField0_ & 0x00000001) == 0x00000001);
1067 }
1068 - public String getType() {
1069 + /**
1070 + * <code>required string type = 1;</code>
1071 + */
1072 + public java.lang.String getType() {
1073 java.lang.Object ref = type_;
1074 - if (ref instanceof String) {
1075 - return (String) ref;
1076 + if (ref instanceof java.lang.String) {
1077 + return (java.lang.String) ref;
1078 } else {
1079 com.google.protobuf.ByteString bs =
1080 (com.google.protobuf.ByteString) ref;
1081 - String s = bs.toStringUtf8();
1082 - if (com.google.protobuf.Internal.isValidUtf8(bs)) {
1083 + java.lang.String s = bs.toStringUtf8();
1084 + if (bs.isValidUtf8()) {
1085 type_ = s;
1086 }
1087 return s;
1088 }
1089 }
1090 - private com.google.protobuf.ByteString getTypeBytes() {
1091 + /**
1092 + * <code>required string type = 1;</code>
1093 + */
1094 + public com.google.protobuf.ByteString
1095 + getTypeBytes() {
1096 java.lang.Object ref = type_;
1097 - if (ref instanceof String) {
1098 + if (ref instanceof java.lang.String) {
1099 com.google.protobuf.ByteString b =
1100 - com.google.protobuf.ByteString.copyFromUtf8((String) ref);
1101 + com.google.protobuf.ByteString.copyFromUtf8(
1102 + (java.lang.String) ref);
1103 type_ = b;
1104 return b;
1105 } else {
1106 return (com.google.protobuf.ByteString) ref;
1107 }
1108 }
1109 -
1110 - // optional bytes indexdata = 2;
1111 +
1112 public static final int INDEXDATA_FIELD_NUMBER = 2;
1113 private com.google.protobuf.ByteString indexdata_;
1114 + /**
1115 + * <code>optional bytes indexdata = 2;</code>
1116 + */
1117 public boolean hasIndexdata() {
1118 return ((bitField0_ & 0x00000002) == 0x00000002);
1119 }
1120 + /**
1121 + * <code>optional bytes indexdata = 2;</code>
1122 + */
1123 public com.google.protobuf.ByteString getIndexdata() {
1124 return indexdata_;
1125 }
1126 -
1127 - // required int32 datasize = 3;
1128 +
1129 public static final int DATASIZE_FIELD_NUMBER = 3;
1130 private int datasize_;
1131 + /**
1132 + * <code>required int32 datasize = 3;</code>
1133 + */
1134 public boolean hasDatasize() {
1135 return ((bitField0_ & 0x00000004) == 0x00000004);
1136 }
1137 + /**
1138 + * <code>required int32 datasize = 3;</code>
1139 + */
1140 public int getDatasize() {
1141 return datasize_;
1142 }
1143 -
1144 +
1145 private void initFields() {
1146 type_ = "";
1147 indexdata_ = com.google.protobuf.ByteString.EMPTY;
1148 @@ -625,8 +1060,9 @@ public final class Fileformat {
1149 private byte memoizedIsInitialized = -1;
1150 public final boolean isInitialized() {
1151 byte isInitialized = memoizedIsInitialized;
1152 - if (isInitialized != -1) return isInitialized == 1;
1153 -
1154 + if (isInitialized == 1) return true;
1155 + if (isInitialized == 0) return false;
1156 +
1157 if (!hasType()) {
1158 memoizedIsInitialized = 0;
1159 return false;
1160 @@ -638,7 +1074,7 @@ public final class Fileformat {
1161 memoizedIsInitialized = 1;
1162 return true;
1163 }
1164 -
1165 +
1166 public void writeTo(com.google.protobuf.CodedOutputStream output)
1167 throws java.io.IOException {
1168 getSerializedSize();
1169 @@ -651,13 +1087,14 @@ public final class Fileformat {
1170 if (((bitField0_ & 0x00000004) == 0x00000004)) {
1171 output.writeInt32(3, datasize_);
1172 }
1173 + output.writeRawBytes(unknownFields);
1174 }
1175 -
1176 +
1177 private int memoizedSerializedSize = -1;
1178 public int getSerializedSize() {
1179 int size = memoizedSerializedSize;
1180 if (size != -1) return size;
1181 -
1182 +
1183 size = 0;
1184 if (((bitField0_ & 0x00000001) == 0x00000001)) {
1185 size += com.google.protobuf.CodedOutputStream
1186 @@ -671,106 +1108,98 @@ public final class Fileformat {
1187 size += com.google.protobuf.CodedOutputStream
1188 .computeInt32Size(3, datasize_);
1189 }
1190 + size += unknownFields.size();
1191 memoizedSerializedSize = size;
1192 return size;
1193 }
1194 -
1195 +
1196 private static final long serialVersionUID = 0L;
1197 @java.lang.Override
1198 protected java.lang.Object writeReplace()
1199 throws java.io.ObjectStreamException {
1200 return super.writeReplace();
1201 }
1202 -
1203 +
1204 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1205 com.google.protobuf.ByteString data)
1206 throws com.google.protobuf.InvalidProtocolBufferException {
1207 - return newBuilder().mergeFrom(data).buildParsed();
1208 + return PARSER.parseFrom(data);
1209 }
1210 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1211 com.google.protobuf.ByteString data,
1212 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1213 throws com.google.protobuf.InvalidProtocolBufferException {
1214 - return newBuilder().mergeFrom(data, extensionRegistry)
1215 - .buildParsed();
1216 + return PARSER.parseFrom(data, extensionRegistry);
1217 }
1218 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(byte[] data)
1219 throws com.google.protobuf.InvalidProtocolBufferException {
1220 - return newBuilder().mergeFrom(data).buildParsed();
1221 + return PARSER.parseFrom(data);
1222 }
1223 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1224 byte[] data,
1225 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1226 throws com.google.protobuf.InvalidProtocolBufferException {
1227 - return newBuilder().mergeFrom(data, extensionRegistry)
1228 - .buildParsed();
1229 + return PARSER.parseFrom(data, extensionRegistry);
1230 }
1231 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(java.io.InputStream input)
1232 throws java.io.IOException {
1233 - return newBuilder().mergeFrom(input).buildParsed();
1234 + return PARSER.parseFrom(input);
1235 }
1236 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1237 java.io.InputStream input,
1238 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1239 throws java.io.IOException {
1240 - return newBuilder().mergeFrom(input, extensionRegistry)
1241 - .buildParsed();
1242 + return PARSER.parseFrom(input, extensionRegistry);
1243 }
1244 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseDelimitedFrom(java.io.InputStream input)
1245 throws java.io.IOException {
1246 - Builder builder = newBuilder();
1247 - if (builder.mergeDelimitedFrom(input)) {
1248 - return builder.buildParsed();
1249 - } else {
1250 - return null;
1251 - }
1252 + return PARSER.parseDelimitedFrom(input);
1253 }
1254 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseDelimitedFrom(
1255 java.io.InputStream input,
1256 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1257 throws java.io.IOException {
1258 - Builder builder = newBuilder();
1259 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
1260 - return builder.buildParsed();
1261 - } else {
1262 - return null;
1263 - }
1264 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
1265 }
1266 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1267 com.google.protobuf.CodedInputStream input)
1268 throws java.io.IOException {
1269 - return newBuilder().mergeFrom(input).buildParsed();
1270 + return PARSER.parseFrom(input);
1271 }
1272 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
1273 com.google.protobuf.CodedInputStream input,
1274 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1275 throws java.io.IOException {
1276 - return newBuilder().mergeFrom(input, extensionRegistry)
1277 - .buildParsed();
1278 + return PARSER.parseFrom(input, extensionRegistry);
1279 }
1280 -
1281 +
1282 public static Builder newBuilder() { return Builder.create(); }
1283 public Builder newBuilderForType() { return newBuilder(); }
1284 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader prototype) {
1285 return newBuilder().mergeFrom(prototype);
1286 }
1287 public Builder toBuilder() { return newBuilder(this); }
1288 -
1289 +
1290 + /**
1291 + * Protobuf type {@code OSMPBF.BlobHeader}
1292 + */
1293 public static final class Builder extends
1294 com.google.protobuf.GeneratedMessageLite.Builder<
1295 org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader, Builder>
1296 - implements org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeaderOrBuilder {
1297 + implements
1298 + // @@protoc_insertion_point(builder_implements:OSMPBF.BlobHeader)
1299 + org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeaderOrBuilder {
1300 // Construct using org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.newBuilder()
1301 private Builder() {
1302 maybeForceBuilderInitialization();
1303 }
1304 -
1305 +
1306 private void maybeForceBuilderInitialization() {
1307 }
1308 private static Builder create() {
1309 return new Builder();
1310 }
1311 -
1312 +
1313 public Builder clear() {
1314 super.clear();
1315 type_ = "";
1316 @@ -781,15 +1210,15 @@ public final class Fileformat {
1317 bitField0_ = (bitField0_ & ~0x00000004);
1318 return this;
1319 }
1320 -
1321 +
1322 public Builder clone() {
1323 return create().mergeFrom(buildPartial());
1324 }
1325 -
1326 +
1327 public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader getDefaultInstanceForType() {
1328 return org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.getDefaultInstance();
1329 }
1330 -
1331 +
1332 public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader build() {
1333 org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader result = buildPartial();
1334 if (!result.isInitialized()) {
1335 @@ -797,17 +1226,7 @@ public final class Fileformat {
1336 }
1337 return result;
1338 }
1339 -
1340 - private org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader buildParsed()
1341 - throws com.google.protobuf.InvalidProtocolBufferException {
1342 - org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader result = buildPartial();
1343 - if (!result.isInitialized()) {
1344 - throw newUninitializedMessageException(
1345 - result).asInvalidProtocolBufferException();
1346 - }
1347 - return result;
1348 - }
1349 -
1350 +
1351 public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader buildPartial() {
1352 org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader result = new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader(this);
1353 int from_bitField0_ = bitField0_;
1354 @@ -827,11 +1246,13 @@ public final class Fileformat {
1355 result.bitField0_ = to_bitField0_;
1356 return result;
1357 }
1358 -
1359 +
1360 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader other) {
1361 if (other == org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.getDefaultInstance()) return this;
1362 if (other.hasType()) {
1363 - setType(other.getType());
1364 + bitField0_ |= 0x00000001;
1365 + type_ = other.type_;
1366 +
1367 }
1368 if (other.hasIndexdata()) {
1369 setIndexdata(other.getIndexdata());
1370 @@ -839,9 +1260,11 @@ public final class Fileformat {
1371 if (other.hasDatasize()) {
1372 setDatasize(other.getDatasize());
1373 }
1374 + setUnknownFields(
1375 + getUnknownFields().concat(other.unknownFields));
1376 return this;
1377 }
1378 -
1379 +
1380 public final boolean isInitialized() {
1381 if (!hasType()) {
1382
1383 @@ -853,61 +1276,71 @@ public final class Fileformat {
1384 }
1385 return true;
1386 }
1387 -
1388 +
1389 public Builder mergeFrom(
1390 com.google.protobuf.CodedInputStream input,
1391 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1392 throws java.io.IOException {
1393 - while (true) {
1394 - int tag = input.readTag();
1395 - switch (tag) {
1396 - case 0:
1397 -
1398 - return this;
1399 - default: {
1400 - if (!parseUnknownField(input, extensionRegistry, tag)) {
1401 -
1402 - return this;
1403 - }
1404 - break;
1405 - }
1406 - case 10: {
1407 - bitField0_ |= 0x00000001;
1408 - type_ = input.readBytes();
1409 - break;
1410 - }
1411 - case 18: {
1412 - bitField0_ |= 0x00000002;
1413 - indexdata_ = input.readBytes();
1414 - break;
1415 - }
1416 - case 24: {
1417 - bitField0_ |= 0x00000004;
1418 - datasize_ = input.readInt32();
1419 - break;
1420 - }
1421 + org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parsedMessage = null;
1422 + try {
1423 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
1424 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
1425 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader) e.getUnfinishedMessage();
1426 + throw e;
1427 + } finally {
1428 + if (parsedMessage != null) {
1429 + mergeFrom(parsedMessage);
1430 }
1431 }
1432 + return this;
1433 }
1434 -
1435 private int bitField0_;
1436 -
1437 - // required string type = 1;
1438 +
1439 private java.lang.Object type_ = "";
1440 + /**
1441 + * <code>required string type = 1;</code>
1442 + */
1443 public boolean hasType() {
1444 return ((bitField0_ & 0x00000001) == 0x00000001);
1445 }
1446 - public String getType() {
1447 + /**
1448 + * <code>required string type = 1;</code>
1449 + */
1450 + public java.lang.String getType() {
1451 java.lang.Object ref = type_;
1452 - if (!(ref instanceof String)) {
1453 - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
1454 - type_ = s;
1455 + if (!(ref instanceof java.lang.String)) {
1456 + com.google.protobuf.ByteString bs =
1457 + (com.google.protobuf.ByteString) ref;
1458 + java.lang.String s = bs.toStringUtf8();
1459 + if (bs.isValidUtf8()) {
1460 + type_ = s;
1461 + }
1462 return s;
1463 } else {
1464 - return (String) ref;
1465 + return (java.lang.String) ref;
1466 + }
1467 + }
1468 + /**
1469 + * <code>required string type = 1;</code>
1470 + */
1471 + public com.google.protobuf.ByteString
1472 + getTypeBytes() {
1473 + java.lang.Object ref = type_;
1474 + if (ref instanceof String) {
1475 + com.google.protobuf.ByteString b =
1476 + com.google.protobuf.ByteString.copyFromUtf8(
1477 + (java.lang.String) ref);
1478 + type_ = b;
1479 + return b;
1480 + } else {
1481 + return (com.google.protobuf.ByteString) ref;
1482 }
1483 }
1484 - public Builder setType(String value) {
1485 + /**
1486 + * <code>required string type = 1;</code>
1487 + */
1488 + public Builder setType(
1489 + java.lang.String value) {
1490 if (value == null) {
1491 throw new NullPointerException();
1492 }
1493 @@ -916,26 +1349,45 @@ public final class Fileformat {
1494
1495 return this;
1496 }
1497 + /**
1498 + * <code>required string type = 1;</code>
1499 + */
1500 public Builder clearType() {
1501 bitField0_ = (bitField0_ & ~0x00000001);
1502 type_ = getDefaultInstance().getType();
1503
1504 return this;
1505 }
1506 - void setType(com.google.protobuf.ByteString value) {
1507 - bitField0_ |= 0x00000001;
1508 + /**
1509 + * <code>required string type = 1;</code>
1510 + */
1511 + public Builder setTypeBytes(
1512 + com.google.protobuf.ByteString value) {
1513 + if (value == null) {
1514 + throw new NullPointerException();
1515 + }
1516 + bitField0_ |= 0x00000001;
1517 type_ = value;
1518
1519 + return this;
1520 }
1521 -
1522 - // optional bytes indexdata = 2;
1523 +
1524 private com.google.protobuf.ByteString indexdata_ = com.google.protobuf.ByteString.EMPTY;
1525 + /**
1526 + * <code>optional bytes indexdata = 2;</code>
1527 + */
1528 public boolean hasIndexdata() {
1529 return ((bitField0_ & 0x00000002) == 0x00000002);
1530 }
1531 + /**
1532 + * <code>optional bytes indexdata = 2;</code>
1533 + */
1534 public com.google.protobuf.ByteString getIndexdata() {
1535 return indexdata_;
1536 }
1537 + /**
1538 + * <code>optional bytes indexdata = 2;</code>
1539 + */
1540 public Builder setIndexdata(com.google.protobuf.ByteString value) {
1541 if (value == null) {
1542 throw new NullPointerException();
1543 @@ -945,48 +1397,62 @@ public final class Fileformat {
1544
1545 return this;
1546 }
1547 + /**
1548 + * <code>optional bytes indexdata = 2;</code>
1549 + */
1550 public Builder clearIndexdata() {
1551 bitField0_ = (bitField0_ & ~0x00000002);
1552 indexdata_ = getDefaultInstance().getIndexdata();
1553
1554 return this;
1555 }
1556 -
1557 - // required int32 datasize = 3;
1558 +
1559 private int datasize_ ;
1560 + /**
1561 + * <code>required int32 datasize = 3;</code>
1562 + */
1563 public boolean hasDatasize() {
1564 return ((bitField0_ & 0x00000004) == 0x00000004);
1565 }
1566 + /**
1567 + * <code>required int32 datasize = 3;</code>
1568 + */
1569 public int getDatasize() {
1570 return datasize_;
1571 }
1572 + /**
1573 + * <code>required int32 datasize = 3;</code>
1574 + */
1575 public Builder setDatasize(int value) {
1576 bitField0_ |= 0x00000004;
1577 datasize_ = value;
1578
1579 return this;
1580 }
1581 + /**
1582 + * <code>required int32 datasize = 3;</code>
1583 + */
1584 public Builder clearDatasize() {
1585 bitField0_ = (bitField0_ & ~0x00000004);
1586 datasize_ = 0;
1587
1588 return this;
1589 }
1590 -
1591 +
1592 // @@protoc_insertion_point(builder_scope:OSMPBF.BlobHeader)
1593 }
1594 -
1595 +
1596 static {
1597 defaultInstance = new BlobHeader(true);
1598 defaultInstance.initFields();
1599 }
1600 -
1601 +
1602 // @@protoc_insertion_point(class_scope:OSMPBF.BlobHeader)
1603 }
1604 -
1605 -
1606 +
1607 +
1608 static {
1609 }
1610 -
1611 +
1612 // @@protoc_insertion_point(outer_class_scope)
1613 }
1614 --- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
1615 +++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
1616 @@ -8,216 +8,615 @@ public final class Osmformat {
1617 public static void registerAllExtensions(
1618 com.google.protobuf.ExtensionRegistryLite registry) {
1619 }
1620 - public interface HeaderBlockOrBuilder
1621 - extends com.google.protobuf.MessageLiteOrBuilder {
1622 -
1623 - // optional .OSMPBF.HeaderBBox bbox = 1;
1624 + public interface HeaderBlockOrBuilder extends
1625 + // @@protoc_insertion_point(interface_extends:OSMPBF.HeaderBlock)
1626 + com.google.protobuf.MessageLiteOrBuilder {
1627 +
1628 + /**
1629 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
1630 + */
1631 boolean hasBbox();
1632 + /**
1633 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
1634 + */
1635 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getBbox();
1636 -
1637 - // repeated string required_features = 4;
1638 - java.util.List<String> getRequiredFeaturesList();
1639 +
1640 + /**
1641 + * <code>repeated string required_features = 4;</code>
1642 + *
1643 + * <pre>
1644 + * Additional tags to aid in parsing this dataset
1645 + * </pre>
1646 + */
1647 + com.google.protobuf.ProtocolStringList
1648 + getRequiredFeaturesList();
1649 + /**
1650 + * <code>repeated string required_features = 4;</code>
1651 + *
1652 + * <pre>
1653 + * Additional tags to aid in parsing this dataset
1654 + * </pre>
1655 + */
1656 int getRequiredFeaturesCount();
1657 - String getRequiredFeatures(int index);
1658 -
1659 - // repeated string optional_features = 5;
1660 - java.util.List<String> getOptionalFeaturesList();
1661 + /**
1662 + * <code>repeated string required_features = 4;</code>
1663 + *
1664 + * <pre>
1665 + * Additional tags to aid in parsing this dataset
1666 + * </pre>
1667 + */
1668 + java.lang.String getRequiredFeatures(int index);
1669 + /**
1670 + * <code>repeated string required_features = 4;</code>
1671 + *
1672 + * <pre>
1673 + * Additional tags to aid in parsing this dataset
1674 + * </pre>
1675 + */
1676 + com.google.protobuf.ByteString
1677 + getRequiredFeaturesBytes(int index);
1678 +
1679 + /**
1680 + * <code>repeated string optional_features = 5;</code>
1681 + */
1682 + com.google.protobuf.ProtocolStringList
1683 + getOptionalFeaturesList();
1684 + /**
1685 + * <code>repeated string optional_features = 5;</code>
1686 + */
1687 int getOptionalFeaturesCount();
1688 - String getOptionalFeatures(int index);
1689 -
1690 - // optional string writingprogram = 16;
1691 + /**
1692 + * <code>repeated string optional_features = 5;</code>
1693 + */
1694 + java.lang.String getOptionalFeatures(int index);
1695 + /**
1696 + * <code>repeated string optional_features = 5;</code>
1697 + */
1698 + com.google.protobuf.ByteString
1699 + getOptionalFeaturesBytes(int index);
1700 +
1701 + /**
1702 + * <code>optional string writingprogram = 16;</code>
1703 + */
1704 boolean hasWritingprogram();
1705 - String getWritingprogram();
1706 -
1707 - // optional string source = 17;
1708 + /**
1709 + * <code>optional string writingprogram = 16;</code>
1710 + */
1711 + java.lang.String getWritingprogram();
1712 + /**
1713 + * <code>optional string writingprogram = 16;</code>
1714 + */
1715 + com.google.protobuf.ByteString
1716 + getWritingprogramBytes();
1717 +
1718 + /**
1719 + * <code>optional string source = 17;</code>
1720 + *
1721 + * <pre>
1722 + * From the bbox field.
1723 + * </pre>
1724 + */
1725 boolean hasSource();
1726 - String getSource();
1727 -
1728 - // optional int64 osmosis_replication_timestamp = 32;
1729 + /**
1730 + * <code>optional string source = 17;</code>
1731 + *
1732 + * <pre>
1733 + * From the bbox field.
1734 + * </pre>
1735 + */
1736 + java.lang.String getSource();
1737 + /**
1738 + * <code>optional string source = 17;</code>
1739 + *
1740 + * <pre>
1741 + * From the bbox field.
1742 + * </pre>
1743 + */
1744 + com.google.protobuf.ByteString
1745 + getSourceBytes();
1746 +
1747 + /**
1748 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
1749 + *
1750 + * <pre>
1751 + * replication timestamp, expressed in seconds since the epoch,
1752 + * otherwise the same value as in the "timestamp=..." field
1753 + * in the state.txt file used by Osmosis
1754 + * </pre>
1755 + */
1756 boolean hasOsmosisReplicationTimestamp();
1757 + /**
1758 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
1759 + *
1760 + * <pre>
1761 + * replication timestamp, expressed in seconds since the epoch,
1762 + * otherwise the same value as in the "timestamp=..." field
1763 + * in the state.txt file used by Osmosis
1764 + * </pre>
1765 + */
1766 long getOsmosisReplicationTimestamp();
1767 -
1768 - // optional int64 osmosis_replication_sequence_number = 33;
1769 +
1770 + /**
1771 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
1772 + *
1773 + * <pre>
1774 + * replication sequence number (sequenceNumber in state.txt)
1775 + * </pre>
1776 + */
1777 boolean hasOsmosisReplicationSequenceNumber();
1778 + /**
1779 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
1780 + *
1781 + * <pre>
1782 + * replication sequence number (sequenceNumber in state.txt)
1783 + * </pre>
1784 + */
1785 long getOsmosisReplicationSequenceNumber();
1786 -
1787 - // optional string osmosis_replication_base_url = 34;
1788 +
1789 + /**
1790 + * <code>optional string osmosis_replication_base_url = 34;</code>
1791 + *
1792 + * <pre>
1793 + * replication base URL (from Osmosis' configuration.txt file)
1794 + * </pre>
1795 + */
1796 boolean hasOsmosisReplicationBaseUrl();
1797 - String getOsmosisReplicationBaseUrl();
1798 + /**
1799 + * <code>optional string osmosis_replication_base_url = 34;</code>
1800 + *
1801 + * <pre>
1802 + * replication base URL (from Osmosis' configuration.txt file)
1803 + * </pre>
1804 + */
1805 + java.lang.String getOsmosisReplicationBaseUrl();
1806 + /**
1807 + * <code>optional string osmosis_replication_base_url = 34;</code>
1808 + *
1809 + * <pre>
1810 + * replication base URL (from Osmosis' configuration.txt file)
1811 + * </pre>
1812 + */
1813 + com.google.protobuf.ByteString
1814 + getOsmosisReplicationBaseUrlBytes();
1815 }
1816 + /**
1817 + * Protobuf type {@code OSMPBF.HeaderBlock}
1818 + */
1819 public static final class HeaderBlock extends
1820 - com.google.protobuf.GeneratedMessageLite
1821 - implements HeaderBlockOrBuilder {
1822 + com.google.protobuf.GeneratedMessageLite implements
1823 + // @@protoc_insertion_point(message_implements:OSMPBF.HeaderBlock)
1824 + HeaderBlockOrBuilder {
1825 // Use HeaderBlock.newBuilder() to construct.
1826 - private HeaderBlock(Builder builder) {
1827 + private HeaderBlock(com.google.protobuf.GeneratedMessageLite.Builder builder) {
1828 super(builder);
1829 + this.unknownFields = builder.getUnknownFields();
1830 }
1831 - private HeaderBlock(boolean noInit) {}
1832 -
1833 + private HeaderBlock(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
1834 +
1835 private static final HeaderBlock defaultInstance;
1836 public static HeaderBlock getDefaultInstance() {
1837 return defaultInstance;
1838 }
1839 -
1840 +
1841 public HeaderBlock getDefaultInstanceForType() {
1842 return defaultInstance;
1843 }
1844 -
1845 +
1846 + private final com.google.protobuf.ByteString unknownFields;
1847 + private HeaderBlock(
1848 + com.google.protobuf.CodedInputStream input,
1849 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1850 + throws com.google.protobuf.InvalidProtocolBufferException {
1851 + initFields();
1852 + int mutable_bitField0_ = 0;
1853 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
1854 + com.google.protobuf.ByteString.newOutput();
1855 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
1856 + com.google.protobuf.CodedOutputStream.newInstance(
1857 + unknownFieldsOutput);
1858 + try {
1859 + boolean done = false;
1860 + while (!done) {
1861 + int tag = input.readTag();
1862 + switch (tag) {
1863 + case 0:
1864 + done = true;
1865 + break;
1866 + default: {
1867 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
1868 + extensionRegistry, tag)) {
1869 + done = true;
1870 + }
1871 + break;
1872 + }
1873 + case 10: {
1874 + org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder subBuilder = null;
1875 + if (((bitField0_ & 0x00000001) == 0x00000001)) {
1876 + subBuilder = bbox_.toBuilder();
1877 + }
1878 + bbox_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.PARSER, extensionRegistry);
1879 + if (subBuilder != null) {
1880 + subBuilder.mergeFrom(bbox_);
1881 + bbox_ = subBuilder.buildPartial();
1882 + }
1883 + bitField0_ |= 0x00000001;
1884 + break;
1885 + }
1886 + case 34: {
1887 + com.google.protobuf.ByteString bs = input.readBytes();
1888 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
1889 + requiredFeatures_ = new com.google.protobuf.LazyStringArrayList();
1890 + mutable_bitField0_ |= 0x00000002;
1891 + }
1892 + requiredFeatures_.add(bs);
1893 + break;
1894 + }
1895 + case 42: {
1896 + com.google.protobuf.ByteString bs = input.readBytes();
1897 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
1898 + optionalFeatures_ = new com.google.protobuf.LazyStringArrayList();
1899 + mutable_bitField0_ |= 0x00000004;
1900 + }
1901 + optionalFeatures_.add(bs);
1902 + break;
1903 + }
1904 + case 130: {
1905 + com.google.protobuf.ByteString bs = input.readBytes();
1906 + bitField0_ |= 0x00000002;
1907 + writingprogram_ = bs;
1908 + break;
1909 + }
1910 + case 138: {
1911 + com.google.protobuf.ByteString bs = input.readBytes();
1912 + bitField0_ |= 0x00000004;
1913 + source_ = bs;
1914 + break;
1915 + }
1916 + case 256: {
1917 + bitField0_ |= 0x00000008;
1918 + osmosisReplicationTimestamp_ = input.readInt64();
1919 + break;
1920 + }
1921 + case 264: {
1922 + bitField0_ |= 0x00000010;
1923 + osmosisReplicationSequenceNumber_ = input.readInt64();
1924 + break;
1925 + }
1926 + case 274: {
1927 + com.google.protobuf.ByteString bs = input.readBytes();
1928 + bitField0_ |= 0x00000020;
1929 + osmosisReplicationBaseUrl_ = bs;
1930 + break;
1931 + }
1932 + }
1933 + }
1934 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
1935 + throw e.setUnfinishedMessage(this);
1936 + } catch (java.io.IOException e) {
1937 + throw new com.google.protobuf.InvalidProtocolBufferException(
1938 + e.getMessage()).setUnfinishedMessage(this);
1939 + } finally {
1940 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
1941 + requiredFeatures_ = requiredFeatures_.getUnmodifiableView();
1942 + }
1943 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
1944 + optionalFeatures_ = optionalFeatures_.getUnmodifiableView();
1945 + }
1946 + try {
1947 + unknownFieldsCodedOutput.flush();
1948 + } catch (java.io.IOException e) {
1949 + // Should not happen
1950 + } finally {
1951 + unknownFields = unknownFieldsOutput.toByteString();
1952 + }
1953 + makeExtensionsImmutable();
1954 + }
1955 + }
1956 + public static com.google.protobuf.Parser<HeaderBlock> PARSER =
1957 + new com.google.protobuf.AbstractParser<HeaderBlock>() {
1958 + public HeaderBlock parsePartialFrom(
1959 + com.google.protobuf.CodedInputStream input,
1960 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1961 + throws com.google.protobuf.InvalidProtocolBufferException {
1962 + return new HeaderBlock(input, extensionRegistry);
1963 + }
1964 + };
1965 +
1966 + @java.lang.Override
1967 + public com.google.protobuf.Parser<HeaderBlock> getParserForType() {
1968 + return PARSER;
1969 + }
1970 +
1971 private int bitField0_;
1972 - // optional .OSMPBF.HeaderBBox bbox = 1;
1973 public static final int BBOX_FIELD_NUMBER = 1;
1974 private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox bbox_;
1975 + /**
1976 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
1977 + */
1978 public boolean hasBbox() {
1979 return ((bitField0_ & 0x00000001) == 0x00000001);
1980 }
1981 + /**
1982 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
1983 + */
1984 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getBbox() {
1985 return bbox_;
1986 }
1987 -
1988 - // repeated string required_features = 4;
1989 +
1990 public static final int REQUIRED_FEATURES_FIELD_NUMBER = 4;
1991 private com.google.protobuf.LazyStringList requiredFeatures_;
1992 - public java.util.List<String>
1993 + /**
1994 + * <code>repeated string required_features = 4;</code>
1995 + *
1996 + * <pre>
1997 + * Additional tags to aid in parsing this dataset
1998 + * </pre>
1999 + */
2000 + public com.google.protobuf.ProtocolStringList
2001 getRequiredFeaturesList() {
2002 return requiredFeatures_;
2003 }
2004 + /**
2005 + * <code>repeated string required_features = 4;</code>
2006 + *
2007 + * <pre>
2008 + * Additional tags to aid in parsing this dataset
2009 + * </pre>
2010 + */
2011 public int getRequiredFeaturesCount() {
2012 return requiredFeatures_.size();
2013 }
2014 - public String getRequiredFeatures(int index) {
2015 + /**
2016 + * <code>repeated string required_features = 4;</code>
2017 + *
2018 + * <pre>
2019 + * Additional tags to aid in parsing this dataset
2020 + * </pre>
2021 + */
2022 + public java.lang.String getRequiredFeatures(int index) {
2023 return requiredFeatures_.get(index);
2024 }
2025 -
2026 - // repeated string optional_features = 5;
2027 + /**
2028 + * <code>repeated string required_features = 4;</code>
2029 + *
2030 + * <pre>
2031 + * Additional tags to aid in parsing this dataset
2032 + * </pre>
2033 + */
2034 + public com.google.protobuf.ByteString
2035 + getRequiredFeaturesBytes(int index) {
2036 + return requiredFeatures_.getByteString(index);
2037 + }
2038 +
2039 public static final int OPTIONAL_FEATURES_FIELD_NUMBER = 5;
2040 private com.google.protobuf.LazyStringList optionalFeatures_;
2041 - public java.util.List<String>
2042 + /**
2043 + * <code>repeated string optional_features = 5;</code>
2044 + */
2045 + public com.google.protobuf.ProtocolStringList
2046 getOptionalFeaturesList() {
2047 return optionalFeatures_;
2048 }
2049 + /**
2050 + * <code>repeated string optional_features = 5;</code>
2051 + */
2052 public int getOptionalFeaturesCount() {
2053 return optionalFeatures_.size();
2054 }
2055 - public String getOptionalFeatures(int index) {
2056 + /**
2057 + * <code>repeated string optional_features = 5;</code>
2058 + */
2059 + public java.lang.String getOptionalFeatures(int index) {
2060 return optionalFeatures_.get(index);
2061 }
2062 -
2063 - // optional string writingprogram = 16;
2064 + /**
2065 + * <code>repeated string optional_features = 5;</code>
2066 + */
2067 + public com.google.protobuf.ByteString
2068 + getOptionalFeaturesBytes(int index) {
2069 + return optionalFeatures_.getByteString(index);
2070 + }
2071 +
2072 public static final int WRITINGPROGRAM_FIELD_NUMBER = 16;
2073 private java.lang.Object writingprogram_;
2074 + /**
2075 + * <code>optional string writingprogram = 16;</code>
2076 + */
2077 public boolean hasWritingprogram() {
2078 return ((bitField0_ & 0x00000002) == 0x00000002);
2079 }
2080 - public String getWritingprogram() {
2081 + /**
2082 + * <code>optional string writingprogram = 16;</code>
2083 + */
2084 + public java.lang.String getWritingprogram() {
2085 java.lang.Object ref = writingprogram_;
2086 - if (ref instanceof String) {
2087 - return (String) ref;
2088 + if (ref instanceof java.lang.String) {
2089 + return (java.lang.String) ref;
2090 } else {
2091 com.google.protobuf.ByteString bs =
2092 (com.google.protobuf.ByteString) ref;
2093 - String s = bs.toStringUtf8();
2094 - if (com.google.protobuf.Internal.isValidUtf8(bs)) {
2095 + java.lang.String s = bs.toStringUtf8();
2096 + if (bs.isValidUtf8()) {
2097 writingprogram_ = s;
2098 }
2099 return s;
2100 }
2101 }
2102 - private com.google.protobuf.ByteString getWritingprogramBytes() {
2103 + /**
2104 + * <code>optional string writingprogram = 16;</code>
2105 + */
2106 + public com.google.protobuf.ByteString
2107 + getWritingprogramBytes() {
2108 java.lang.Object ref = writingprogram_;
2109 - if (ref instanceof String) {
2110 + if (ref instanceof java.lang.String) {
2111 com.google.protobuf.ByteString b =
2112 - com.google.protobuf.ByteString.copyFromUtf8((String) ref);
2113 + com.google.protobuf.ByteString.copyFromUtf8(
2114 + (java.lang.String) ref);
2115 writingprogram_ = b;
2116 return b;
2117 } else {
2118 return (com.google.protobuf.ByteString) ref;
2119 }
2120 }
2121 -
2122 - // optional string source = 17;
2123 +
2124 public static final int SOURCE_FIELD_NUMBER = 17;
2125 private java.lang.Object source_;
2126 + /**
2127 + * <code>optional string source = 17;</code>
2128 + *
2129 + * <pre>
2130 + * From the bbox field.
2131 + * </pre>
2132 + */
2133 public boolean hasSource() {
2134 return ((bitField0_ & 0x00000004) == 0x00000004);
2135 }
2136 - public String getSource() {
2137 + /**
2138 + * <code>optional string source = 17;</code>
2139 + *
2140 + * <pre>
2141 + * From the bbox field.
2142 + * </pre>
2143 + */
2144 + public java.lang.String getSource() {
2145 java.lang.Object ref = source_;
2146 - if (ref instanceof String) {
2147 - return (String) ref;
2148 + if (ref instanceof java.lang.String) {
2149 + return (java.lang.String) ref;
2150 } else {
2151 com.google.protobuf.ByteString bs =
2152 (com.google.protobuf.ByteString) ref;
2153 - String s = bs.toStringUtf8();
2154 - if (com.google.protobuf.Internal.isValidUtf8(bs)) {
2155 + java.lang.String s = bs.toStringUtf8();
2156 + if (bs.isValidUtf8()) {
2157 source_ = s;
2158 }
2159 return s;
2160 }
2161 }
2162 - private com.google.protobuf.ByteString getSourceBytes() {
2163 + /**
2164 + * <code>optional string source = 17;</code>
2165 + *
2166 + * <pre>
2167 + * From the bbox field.
2168 + * </pre>
2169 + */
2170 + public com.google.protobuf.ByteString
2171 + getSourceBytes() {
2172 java.lang.Object ref = source_;
2173 - if (ref instanceof String) {
2174 + if (ref instanceof java.lang.String) {
2175 com.google.protobuf.ByteString b =
2176 - com.google.protobuf.ByteString.copyFromUtf8((String) ref);
2177 + com.google.protobuf.ByteString.copyFromUtf8(
2178 + (java.lang.String) ref);
2179 source_ = b;
2180 return b;
2181 } else {
2182 return (com.google.protobuf.ByteString) ref;
2183 }
2184 }
2185 -
2186 - // optional int64 osmosis_replication_timestamp = 32;
2187 +
2188 public static final int OSMOSIS_REPLICATION_TIMESTAMP_FIELD_NUMBER = 32;
2189 private long osmosisReplicationTimestamp_;
2190 + /**
2191 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
2192 + *
2193 + * <pre>
2194 + * replication timestamp, expressed in seconds since the epoch,
2195 + * otherwise the same value as in the "timestamp=..." field
2196 + * in the state.txt file used by Osmosis
2197 + * </pre>
2198 + */
2199 public boolean hasOsmosisReplicationTimestamp() {
2200 return ((bitField0_ & 0x00000008) == 0x00000008);
2201 }
2202 + /**
2203 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
2204 + *
2205 + * <pre>
2206 + * replication timestamp, expressed in seconds since the epoch,
2207 + * otherwise the same value as in the "timestamp=..." field
2208 + * in the state.txt file used by Osmosis
2209 + * </pre>
2210 + */
2211 public long getOsmosisReplicationTimestamp() {
2212 return osmosisReplicationTimestamp_;
2213 }
2214 -
2215 - // optional int64 osmosis_replication_sequence_number = 33;
2216 +
2217 public static final int OSMOSIS_REPLICATION_SEQUENCE_NUMBER_FIELD_NUMBER = 33;
2218 private long osmosisReplicationSequenceNumber_;
2219 + /**
2220 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
2221 + *
2222 + * <pre>
2223 + * replication sequence number (sequenceNumber in state.txt)
2224 + * </pre>
2225 + */
2226 public boolean hasOsmosisReplicationSequenceNumber() {
2227 return ((bitField0_ & 0x00000010) == 0x00000010);
2228 }
2229 + /**
2230 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
2231 + *
2232 + * <pre>
2233 + * replication sequence number (sequenceNumber in state.txt)
2234 + * </pre>
2235 + */
2236 public long getOsmosisReplicationSequenceNumber() {
2237 return osmosisReplicationSequenceNumber_;
2238 }
2239 -
2240 - // optional string osmosis_replication_base_url = 34;
2241 +
2242 public static final int OSMOSIS_REPLICATION_BASE_URL_FIELD_NUMBER = 34;
2243 private java.lang.Object osmosisReplicationBaseUrl_;
2244 + /**
2245 + * <code>optional string osmosis_replication_base_url = 34;</code>
2246 + *
2247 + * <pre>
2248 + * replication base URL (from Osmosis' configuration.txt file)
2249 + * </pre>
2250 + */
2251 public boolean hasOsmosisReplicationBaseUrl() {
2252 return ((bitField0_ & 0x00000020) == 0x00000020);
2253 }
2254 - public String getOsmosisReplicationBaseUrl() {
2255 + /**
2256 + * <code>optional string osmosis_replication_base_url = 34;</code>
2257 + *
2258 + * <pre>
2259 + * replication base URL (from Osmosis' configuration.txt file)
2260 + * </pre>
2261 + */
2262 + public java.lang.String getOsmosisReplicationBaseUrl() {
2263 java.lang.Object ref = osmosisReplicationBaseUrl_;
2264 - if (ref instanceof String) {
2265 - return (String) ref;
2266 + if (ref instanceof java.lang.String) {
2267 + return (java.lang.String) ref;
2268 } else {
2269 com.google.protobuf.ByteString bs =
2270 (com.google.protobuf.ByteString) ref;
2271 - String s = bs.toStringUtf8();
2272 - if (com.google.protobuf.Internal.isValidUtf8(bs)) {
2273 + java.lang.String s = bs.toStringUtf8();
2274 + if (bs.isValidUtf8()) {
2275 osmosisReplicationBaseUrl_ = s;
2276 }
2277 return s;
2278 }
2279 }
2280 - private com.google.protobuf.ByteString getOsmosisReplicationBaseUrlBytes() {
2281 + /**
2282 + * <code>optional string osmosis_replication_base_url = 34;</code>
2283 + *
2284 + * <pre>
2285 + * replication base URL (from Osmosis' configuration.txt file)
2286 + * </pre>
2287 + */
2288 + public com.google.protobuf.ByteString
2289 + getOsmosisReplicationBaseUrlBytes() {
2290 java.lang.Object ref = osmosisReplicationBaseUrl_;
2291 - if (ref instanceof String) {
2292 + if (ref instanceof java.lang.String) {
2293 com.google.protobuf.ByteString b =
2294 - com.google.protobuf.ByteString.copyFromUtf8((String) ref);
2295 + com.google.protobuf.ByteString.copyFromUtf8(
2296 + (java.lang.String) ref);
2297 osmosisReplicationBaseUrl_ = b;
2298 return b;
2299 } else {
2300 return (com.google.protobuf.ByteString) ref;
2301 }
2302 }
2303 -
2304 +
2305 private void initFields() {
2306 bbox_ = org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
2307 requiredFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
2308 @@ -231,8 +630,9 @@ public final class Osmformat {
2309 private byte memoizedIsInitialized = -1;
2310 public final boolean isInitialized() {
2311 byte isInitialized = memoizedIsInitialized;
2312 - if (isInitialized != -1) return isInitialized == 1;
2313 -
2314 + if (isInitialized == 1) return true;
2315 + if (isInitialized == 0) return false;
2316 +
2317 if (hasBbox()) {
2318 if (!getBbox().isInitialized()) {
2319 memoizedIsInitialized = 0;
2320 @@ -242,7 +642,7 @@ public final class Osmformat {
2321 memoizedIsInitialized = 1;
2322 return true;
2323 }
2324 -
2325 +
2326 public void writeTo(com.google.protobuf.CodedOutputStream output)
2327 throws java.io.IOException {
2328 getSerializedSize();
2329 @@ -270,13 +670,14 @@ public final class Osmformat {
2330 if (((bitField0_ & 0x00000020) == 0x00000020)) {
2331 output.writeBytes(34, getOsmosisReplicationBaseUrlBytes());
2332 }
2333 + output.writeRawBytes(unknownFields);
2334 }
2335 -
2336 +
2337 private int memoizedSerializedSize = -1;
2338 public int getSerializedSize() {
2339 int size = memoizedSerializedSize;
2340 if (size != -1) return size;
2341 -
2342 +
2343 size = 0;
2344 if (((bitField0_ & 0x00000001) == 0x00000001)) {
2345 size += com.google.protobuf.CodedOutputStream
2346 @@ -320,106 +721,98 @@ public final class Osmformat {
2347 size += com.google.protobuf.CodedOutputStream
2348 .computeBytesSize(34, getOsmosisReplicationBaseUrlBytes());
2349 }
2350 + size += unknownFields.size();
2351 memoizedSerializedSize = size;
2352 return size;
2353 }
2354 -
2355 +
2356 private static final long serialVersionUID = 0L;
2357 @java.lang.Override
2358 protected java.lang.Object writeReplace()
2359 throws java.io.ObjectStreamException {
2360 return super.writeReplace();
2361 }
2362 -
2363 +
2364 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2365 com.google.protobuf.ByteString data)
2366 throws com.google.protobuf.InvalidProtocolBufferException {
2367 - return newBuilder().mergeFrom(data).buildParsed();
2368 + return PARSER.parseFrom(data);
2369 }
2370 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2371 com.google.protobuf.ByteString data,
2372 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2373 throws com.google.protobuf.InvalidProtocolBufferException {
2374 - return newBuilder().mergeFrom(data, extensionRegistry)
2375 - .buildParsed();
2376 + return PARSER.parseFrom(data, extensionRegistry);
2377 }
2378 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(byte[] data)
2379 throws com.google.protobuf.InvalidProtocolBufferException {
2380 - return newBuilder().mergeFrom(data).buildParsed();
2381 + return PARSER.parseFrom(data);
2382 }
2383 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2384 byte[] data,
2385 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2386 throws com.google.protobuf.InvalidProtocolBufferException {
2387 - return newBuilder().mergeFrom(data, extensionRegistry)
2388 - .buildParsed();
2389 + return PARSER.parseFrom(data, extensionRegistry);
2390 }
2391 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(java.io.InputStream input)
2392 throws java.io.IOException {
2393 - return newBuilder().mergeFrom(input).buildParsed();
2394 + return PARSER.parseFrom(input);
2395 }
2396 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2397 java.io.InputStream input,
2398 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2399 throws java.io.IOException {
2400 - return newBuilder().mergeFrom(input, extensionRegistry)
2401 - .buildParsed();
2402 + return PARSER.parseFrom(input, extensionRegistry);
2403 }
2404 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseDelimitedFrom(java.io.InputStream input)
2405 throws java.io.IOException {
2406 - Builder builder = newBuilder();
2407 - if (builder.mergeDelimitedFrom(input)) {
2408 - return builder.buildParsed();
2409 - } else {
2410 - return null;
2411 - }
2412 + return PARSER.parseDelimitedFrom(input);
2413 }
2414 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseDelimitedFrom(
2415 java.io.InputStream input,
2416 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2417 throws java.io.IOException {
2418 - Builder builder = newBuilder();
2419 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
2420 - return builder.buildParsed();
2421 - } else {
2422 - return null;
2423 - }
2424 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
2425 }
2426 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2427 com.google.protobuf.CodedInputStream input)
2428 throws java.io.IOException {
2429 - return newBuilder().mergeFrom(input).buildParsed();
2430 + return PARSER.parseFrom(input);
2431 }
2432 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
2433 com.google.protobuf.CodedInputStream input,
2434 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2435 throws java.io.IOException {
2436 - return newBuilder().mergeFrom(input, extensionRegistry)
2437 - .buildParsed();
2438 + return PARSER.parseFrom(input, extensionRegistry);
2439 }
2440 -
2441 +
2442 public static Builder newBuilder() { return Builder.create(); }
2443 public Builder newBuilderForType() { return newBuilder(); }
2444 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock prototype) {
2445 return newBuilder().mergeFrom(prototype);
2446 }
2447 public Builder toBuilder() { return newBuilder(this); }
2448 -
2449 +
2450 + /**
2451 + * Protobuf type {@code OSMPBF.HeaderBlock}
2452 + */
2453 public static final class Builder extends
2454 com.google.protobuf.GeneratedMessageLite.Builder<
2455 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock, Builder>
2456 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlockOrBuilder {
2457 + implements
2458 + // @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBlock)
2459 + org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlockOrBuilder {
2460 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.newBuilder()
2461 private Builder() {
2462 maybeForceBuilderInitialization();
2463 }
2464 -
2465 +
2466 private void maybeForceBuilderInitialization() {
2467 }
2468 private static Builder create() {
2469 return new Builder();
2470 }
2471 -
2472 +
2473 public Builder clear() {
2474 super.clear();
2475 bbox_ = org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
2476 @@ -440,15 +833,15 @@ public final class Osmformat {
2477 bitField0_ = (bitField0_ & ~0x00000080);
2478 return this;
2479 }
2480 -
2481 +
2482 public Builder clone() {
2483 return create().mergeFrom(buildPartial());
2484 }
2485 -
2486 +
2487 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock getDefaultInstanceForType() {
2488 return org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.getDefaultInstance();
2489 }
2490 -
2491 +
2492 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock build() {
2493 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock result = buildPartial();
2494 if (!result.isInitialized()) {
2495 @@ -456,17 +849,7 @@ public final class Osmformat {
2496 }
2497 return result;
2498 }
2499 -
2500 - private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock buildParsed()
2501 - throws com.google.protobuf.InvalidProtocolBufferException {
2502 - org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock result = buildPartial();
2503 - if (!result.isInitialized()) {
2504 - throw newUninitializedMessageException(
2505 - result).asInvalidProtocolBufferException();
2506 - }
2507 - return result;
2508 - }
2509 -
2510 +
2511 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock buildPartial() {
2512 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock result = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock(this);
2513 int from_bitField0_ = bitField0_;
2514 @@ -476,14 +859,12 @@ public final class Osmformat {
2515 }
2516 result.bbox_ = bbox_;
2517 if (((bitField0_ & 0x00000002) == 0x00000002)) {
2518 - requiredFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(
2519 - requiredFeatures_);
2520 + requiredFeatures_ = requiredFeatures_.getUnmodifiableView();
2521 bitField0_ = (bitField0_ & ~0x00000002);
2522 }
2523 result.requiredFeatures_ = requiredFeatures_;
2524 if (((bitField0_ & 0x00000004) == 0x00000004)) {
2525 - optionalFeatures_ = new com.google.protobuf.UnmodifiableLazyStringList(
2526 - optionalFeatures_);
2527 + optionalFeatures_ = optionalFeatures_.getUnmodifiableView();
2528 bitField0_ = (bitField0_ & ~0x00000004);
2529 }
2530 result.optionalFeatures_ = optionalFeatures_;
2531 @@ -510,7 +891,7 @@ public final class Osmformat {
2532 result.bitField0_ = to_bitField0_;
2533 return result;
2534 }
2535 -
2536 +
2537 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock other) {
2538 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.getDefaultInstance()) return this;
2539 if (other.hasBbox()) {
2540 @@ -537,10 +918,14 @@ public final class Osmformat {
2541
2542 }
2543 if (other.hasWritingprogram()) {
2544 - setWritingprogram(other.getWritingprogram());
2545 + bitField0_ |= 0x00000008;
2546 + writingprogram_ = other.writingprogram_;
2547 +
2548 }
2549 if (other.hasSource()) {
2550 - setSource(other.getSource());
2551 + bitField0_ |= 0x00000010;
2552 + source_ = other.source_;
2553 +
2554 }
2555 if (other.hasOsmosisReplicationTimestamp()) {
2556 setOsmosisReplicationTimestamp(other.getOsmosisReplicationTimestamp());
2557 @@ -549,11 +934,15 @@ public final class Osmformat {
2558 setOsmosisReplicationSequenceNumber(other.getOsmosisReplicationSequenceNumber());
2559 }
2560 if (other.hasOsmosisReplicationBaseUrl()) {
2561 - setOsmosisReplicationBaseUrl(other.getOsmosisReplicationBaseUrl());
2562 + bitField0_ |= 0x00000080;
2563 + osmosisReplicationBaseUrl_ = other.osmosisReplicationBaseUrl_;
2564 +
2565 }
2566 + setUnknownFields(
2567 + getUnknownFields().concat(other.unknownFields));
2568 return this;
2569 }
2570 -
2571 +
2572 public final boolean isInitialized() {
2573 if (hasBbox()) {
2574 if (!getBbox().isInitialized()) {
2575 @@ -563,98 +952,64 @@ public final class Osmformat {
2576 }
2577 return true;
2578 }
2579 -
2580 +
2581 public Builder mergeFrom(
2582 com.google.protobuf.CodedInputStream input,
2583 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
2584 throws java.io.IOException {
2585 - while (true) {
2586 - int tag = input.readTag();
2587 - switch (tag) {
2588 - case 0:
2589 -
2590 - return this;
2591 - default: {
2592 - if (!parseUnknownField(input, extensionRegistry, tag)) {
2593 -
2594 - return this;
2595 - }
2596 - break;
2597 - }
2598 - case 10: {
2599 - org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.newBuilder();
2600 - if (hasBbox()) {
2601 - subBuilder.mergeFrom(getBbox());
2602 - }
2603 - input.readMessage(subBuilder, extensionRegistry);
2604 - setBbox(subBuilder.buildPartial());
2605 - break;
2606 - }
2607 - case 34: {
2608 - ensureRequiredFeaturesIsMutable();
2609 - requiredFeatures_.add(input.readBytes());
2610 - break;
2611 - }
2612 - case 42: {
2613 - ensureOptionalFeaturesIsMutable();
2614 - optionalFeatures_.add(input.readBytes());
2615 - break;
2616 - }
2617 - case 130: {
2618 - bitField0_ |= 0x00000008;
2619 - writingprogram_ = input.readBytes();
2620 - break;
2621 - }
2622 - case 138: {
2623 - bitField0_ |= 0x00000010;
2624 - source_ = input.readBytes();
2625 - break;
2626 - }
2627 - case 256: {
2628 - bitField0_ |= 0x00000020;
2629 - osmosisReplicationTimestamp_ = input.readInt64();
2630 - break;
2631 - }
2632 - case 264: {
2633 - bitField0_ |= 0x00000040;
2634 - osmosisReplicationSequenceNumber_ = input.readInt64();
2635 - break;
2636 - }
2637 - case 274: {
2638 - bitField0_ |= 0x00000080;
2639 - osmosisReplicationBaseUrl_ = input.readBytes();
2640 - break;
2641 - }
2642 + org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parsedMessage = null;
2643 + try {
2644 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
2645 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
2646 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock) e.getUnfinishedMessage();
2647 + throw e;
2648 + } finally {
2649 + if (parsedMessage != null) {
2650 + mergeFrom(parsedMessage);
2651 }
2652 }
2653 + return this;
2654 }
2655 -
2656 private int bitField0_;
2657 -
2658 - // optional .OSMPBF.HeaderBBox bbox = 1;
2659 +
2660 private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox bbox_ = org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
2661 + /**
2662 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2663 + */
2664 public boolean hasBbox() {
2665 return ((bitField0_ & 0x00000001) == 0x00000001);
2666 }
2667 + /**
2668 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2669 + */
2670 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getBbox() {
2671 return bbox_;
2672 }
2673 + /**
2674 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2675 + */
2676 public Builder setBbox(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox value) {
2677 if (value == null) {
2678 throw new NullPointerException();
2679 }
2680 bbox_ = value;
2681 -
2682 +
2683 bitField0_ |= 0x00000001;
2684 return this;
2685 }
2686 + /**
2687 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2688 + */
2689 public Builder setBbox(
2690 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder builderForValue) {
2691 bbox_ = builderForValue.build();
2692 -
2693 +
2694 bitField0_ |= 0x00000001;
2695 return this;
2696 }
2697 + /**
2698 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2699 + */
2700 public Builder mergeBbox(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox value) {
2701 if (((bitField0_ & 0x00000001) == 0x00000001) &&
2702 bbox_ != org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance()) {
2703 @@ -663,18 +1018,20 @@ public final class Osmformat {
2704 } else {
2705 bbox_ = value;
2706 }
2707 -
2708 +
2709 bitField0_ |= 0x00000001;
2710 return this;
2711 }
2712 + /**
2713 + * <code>optional .OSMPBF.HeaderBBox bbox = 1;</code>
2714 + */
2715 public Builder clearBbox() {
2716 bbox_ = org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
2717 -
2718 +
2719 bitField0_ = (bitField0_ & ~0x00000001);
2720 return this;
2721 }
2722 -
2723 - // repeated string required_features = 4;
2724 +
2725 private com.google.protobuf.LazyStringList requiredFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
2726 private void ensureRequiredFeaturesIsMutable() {
2727 if (!((bitField0_ & 0x00000002) == 0x00000002)) {
2728 @@ -682,18 +1039,57 @@ public final class Osmformat {
2729 bitField0_ |= 0x00000002;
2730 }
2731 }
2732 - public java.util.List<String>
2733 + /**
2734 + * <code>repeated string required_features = 4;</code>
2735 + *
2736 + * <pre>
2737 + * Additional tags to aid in parsing this dataset
2738 + * </pre>
2739 + */
2740 + public com.google.protobuf.ProtocolStringList
2741 getRequiredFeaturesList() {
2742 - return java.util.Collections.unmodifiableList(requiredFeatures_);
2743 + return requiredFeatures_.getUnmodifiableView();
2744 }
2745 + /**
2746 + * <code>repeated string required_features = 4;</code>
2747 + *
2748 + * <pre>
2749 + * Additional tags to aid in parsing this dataset
2750 + * </pre>
2751 + */
2752 public int getRequiredFeaturesCount() {
2753 return requiredFeatures_.size();
2754 }
2755 - public String getRequiredFeatures(int index) {
2756 + /**
2757 + * <code>repeated string required_features = 4;</code>
2758 + *
2759 + * <pre>
2760 + * Additional tags to aid in parsing this dataset
2761 + * </pre>
2762 + */
2763 + public java.lang.String getRequiredFeatures(int index) {
2764 return requiredFeatures_.get(index);
2765 }
2766 + /**
2767 + * <code>repeated string required_features = 4;</code>
2768 + *
2769 + * <pre>
2770 + * Additional tags to aid in parsing this dataset
2771 + * </pre>
2772 + */
2773 + public com.google.protobuf.ByteString
2774 + getRequiredFeaturesBytes(int index) {
2775 + return requiredFeatures_.getByteString(index);
2776 + }
2777 + /**
2778 + * <code>repeated string required_features = 4;</code>
2779 + *
2780 + * <pre>
2781 + * Additional tags to aid in parsing this dataset
2782 + * </pre>
2783 + */
2784 public Builder setRequiredFeatures(
2785 - int index, String value) {
2786 + int index, java.lang.String value) {
2787 if (value == null) {
2788 throw new NullPointerException();
2789 }
2790 @@ -702,7 +1098,15 @@ public final class Osmformat {
2791
2792 return this;
2793 }
2794 - public Builder addRequiredFeatures(String value) {
2795 + /**
2796 + * <code>repeated string required_features = 4;</code>
2797 + *
2798 + * <pre>
2799 + * Additional tags to aid in parsing this dataset
2800 + * </pre>
2801 + */
2802 + public Builder addRequiredFeatures(
2803 + java.lang.String value) {
2804 if (value == null) {
2805 throw new NullPointerException();
2806 }
2807 @@ -711,26 +1115,52 @@ public final class Osmformat {
2808
2809 return this;
2810 }
2811 + /**
2812 + * <code>repeated string required_features = 4;</code>
2813 + *
2814 + * <pre>
2815 + * Additional tags to aid in parsing this dataset
2816 + * </pre>
2817 + */
2818 public Builder addAllRequiredFeatures(
2819 - java.lang.Iterable<String> values) {
2820 + java.lang.Iterable<java.lang.String> values) {
2821 ensureRequiredFeaturesIsMutable();
2822 - super.addAll(values, requiredFeatures_);
2823 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
2824 + values, requiredFeatures_);
2825
2826 return this;
2827 }
2828 + /**
2829 + * <code>repeated string required_features = 4;</code>
2830 + *
2831 + * <pre>
2832 + * Additional tags to aid in parsing this dataset
2833 + * </pre>
2834 + */
2835 public Builder clearRequiredFeatures() {
2836 requiredFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
2837 bitField0_ = (bitField0_ & ~0x00000002);
2838
2839 return this;
2840 }
2841 - void addRequiredFeatures(com.google.protobuf.ByteString value) {
2842 - ensureRequiredFeaturesIsMutable();
2843 + /**
2844 + * <code>repeated string required_features = 4;</code>
2845 + *
2846 + * <pre>
2847 + * Additional tags to aid in parsing this dataset
2848 + * </pre>
2849 + */
2850 + public Builder addRequiredFeaturesBytes(
2851 + com.google.protobuf.ByteString value) {
2852 + if (value == null) {
2853 + throw new NullPointerException();
2854 + }
2855 + ensureRequiredFeaturesIsMutable();
2856 requiredFeatures_.add(value);
2857
2858 + return this;
2859 }
2860 -
2861 - // repeated string optional_features = 5;
2862 +
2863 private com.google.protobuf.LazyStringList optionalFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
2864 private void ensureOptionalFeaturesIsMutable() {
2865 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
2866 @@ -738,18 +1168,37 @@ public final class Osmformat {
2867 bitField0_ |= 0x00000004;
2868 }
2869 }
2870 - public java.util.List<String>
2871 + /**
2872 + * <code>repeated string optional_features = 5;</code>
2873 + */
2874 + public com.google.protobuf.ProtocolStringList
2875 getOptionalFeaturesList() {
2876 - return java.util.Collections.unmodifiableList(optionalFeatures_);
2877 + return optionalFeatures_.getUnmodifiableView();
2878 }
2879 + /**
2880 + * <code>repeated string optional_features = 5;</code>
2881 + */
2882 public int getOptionalFeaturesCount() {
2883 return optionalFeatures_.size();
2884 }
2885 - public String getOptionalFeatures(int index) {
2886 + /**
2887 + * <code>repeated string optional_features = 5;</code>
2888 + */
2889 + public java.lang.String getOptionalFeatures(int index) {
2890 return optionalFeatures_.get(index);
2891 }
2892 + /**
2893 + * <code>repeated string optional_features = 5;</code>
2894 + */
2895 + public com.google.protobuf.ByteString
2896 + getOptionalFeaturesBytes(int index) {
2897 + return optionalFeatures_.getByteString(index);
2898 + }
2899 + /**
2900 + * <code>repeated string optional_features = 5;</code>
2901 + */
2902 public Builder setOptionalFeatures(
2903 - int index, String value) {
2904 + int index, java.lang.String value) {
2905 if (value == null) {
2906 throw new NullPointerException();
2907 }
2908 @@ -758,7 +1207,11 @@ public final class Osmformat {
2909
2910 return this;
2911 }
2912 - public Builder addOptionalFeatures(String value) {
2913 + /**
2914 + * <code>repeated string optional_features = 5;</code>
2915 + */
2916 + public Builder addOptionalFeatures(
2917 + java.lang.String value) {
2918 if (value == null) {
2919 throw new NullPointerException();
2920 }
2921 @@ -767,41 +1220,85 @@ public final class Osmformat {
2922
2923 return this;
2924 }
2925 + /**
2926 + * <code>repeated string optional_features = 5;</code>
2927 + */
2928 public Builder addAllOptionalFeatures(
2929 - java.lang.Iterable<String> values) {
2930 + java.lang.Iterable<java.lang.String> values) {
2931 ensureOptionalFeaturesIsMutable();
2932 - super.addAll(values, optionalFeatures_);
2933 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
2934 + values, optionalFeatures_);
2935
2936 return this;
2937 }
2938 + /**
2939 + * <code>repeated string optional_features = 5;</code>
2940 + */
2941 public Builder clearOptionalFeatures() {
2942 optionalFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
2943 bitField0_ = (bitField0_ & ~0x00000004);
2944
2945 return this;
2946 }
2947 - void addOptionalFeatures(com.google.protobuf.ByteString value) {
2948 - ensureOptionalFeaturesIsMutable();
2949 + /**
2950 + * <code>repeated string optional_features = 5;</code>
2951 + */
2952 + public Builder addOptionalFeaturesBytes(
2953 + com.google.protobuf.ByteString value) {
2954 + if (value == null) {
2955 + throw new NullPointerException();
2956 + }
2957 + ensureOptionalFeaturesIsMutable();
2958 optionalFeatures_.add(value);
2959
2960 + return this;
2961 }
2962 -
2963 - // optional string writingprogram = 16;
2964 +
2965 private java.lang.Object writingprogram_ = "";
2966 + /**
2967 + * <code>optional string writingprogram = 16;</code>
2968 + */
2969 public boolean hasWritingprogram() {
2970 return ((bitField0_ & 0x00000008) == 0x00000008);
2971 }
2972 - public String getWritingprogram() {
2973 + /**
2974 + * <code>optional string writingprogram = 16;</code>
2975 + */
2976 + public java.lang.String getWritingprogram() {
2977 java.lang.Object ref = writingprogram_;
2978 - if (!(ref instanceof String)) {
2979 - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
2980 - writingprogram_ = s;
2981 + if (!(ref instanceof java.lang.String)) {
2982 + com.google.protobuf.ByteString bs =
2983 + (com.google.protobuf.ByteString) ref;
2984 + java.lang.String s = bs.toStringUtf8();
2985 + if (bs.isValidUtf8()) {
2986 + writingprogram_ = s;
2987 + }
2988 return s;
2989 } else {
2990 - return (String) ref;
2991 + return (java.lang.String) ref;
2992 + }
2993 + }
2994 + /**
2995 + * <code>optional string writingprogram = 16;</code>
2996 + */
2997 + public com.google.protobuf.ByteString
2998 + getWritingprogramBytes() {
2999 + java.lang.Object ref = writingprogram_;
3000 + if (ref instanceof String) {
3001 + com.google.protobuf.ByteString b =
3002 + com.google.protobuf.ByteString.copyFromUtf8(
3003 + (java.lang.String) ref);
3004 + writingprogram_ = b;
3005 + return b;
3006 + } else {
3007 + return (com.google.protobuf.ByteString) ref;
3008 }
3009 }
3010 - public Builder setWritingprogram(String value) {
3011 + /**
3012 + * <code>optional string writingprogram = 16;</code>
3013 + */
3014 + public Builder setWritingprogram(
3015 + java.lang.String value) {
3016 if (value == null) {
3017 throw new NullPointerException();
3018 }
3019 @@ -810,34 +1307,90 @@ public final class Osmformat {
3020
3021 return this;
3022 }
3023 + /**
3024 + * <code>optional string writingprogram = 16;</code>
3025 + */
3026 public Builder clearWritingprogram() {
3027 bitField0_ = (bitField0_ & ~0x00000008);
3028 writingprogram_ = getDefaultInstance().getWritingprogram();
3029
3030 return this;
3031 }
3032 - void setWritingprogram(com.google.protobuf.ByteString value) {
3033 - bitField0_ |= 0x00000008;
3034 + /**
3035 + * <code>optional string writingprogram = 16;</code>
3036 + */
3037 + public Builder setWritingprogramBytes(
3038 + com.google.protobuf.ByteString value) {
3039 + if (value == null) {
3040 + throw new NullPointerException();
3041 + }
3042 + bitField0_ |= 0x00000008;
3043 writingprogram_ = value;
3044
3045 + return this;
3046 }
3047 -
3048 - // optional string source = 17;
3049 +
3050 private java.lang.Object source_ = "";
3051 + /**
3052 + * <code>optional string source = 17;</code>
3053 + *
3054 + * <pre>
3055 + * From the bbox field.
3056 + * </pre>
3057 + */
3058 public boolean hasSource() {
3059 return ((bitField0_ & 0x00000010) == 0x00000010);
3060 }
3061 - public String getSource() {
3062 + /**
3063 + * <code>optional string source = 17;</code>
3064 + *
3065 + * <pre>
3066 + * From the bbox field.
3067 + * </pre>
3068 + */
3069 + public java.lang.String getSource() {
3070 java.lang.Object ref = source_;
3071 - if (!(ref instanceof String)) {
3072 - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
3073 - source_ = s;
3074 + if (!(ref instanceof java.lang.String)) {
3075 + com.google.protobuf.ByteString bs =
3076 + (com.google.protobuf.ByteString) ref;
3077 + java.lang.String s = bs.toStringUtf8();
3078 + if (bs.isValidUtf8()) {
3079 + source_ = s;
3080 + }
3081 return s;
3082 } else {
3083 - return (String) ref;
3084 + return (java.lang.String) ref;
3085 }
3086 }
3087 - public Builder setSource(String value) {
3088 + /**
3089 + * <code>optional string source = 17;</code>
3090 + *
3091 + * <pre>
3092 + * From the bbox field.
3093 + * </pre>
3094 + */
3095 + public com.google.protobuf.ByteString
3096 + getSourceBytes() {
3097 + java.lang.Object ref = source_;
3098 + if (ref instanceof String) {
3099 + com.google.protobuf.ByteString b =
3100 + com.google.protobuf.ByteString.copyFromUtf8(
3101 + (java.lang.String) ref);
3102 + source_ = b;
3103 + return b;
3104 + } else {
3105 + return (com.google.protobuf.ByteString) ref;
3106 + }
3107 + }
3108 + /**
3109 + * <code>optional string source = 17;</code>
3110 + *
3111 + * <pre>
3112 + * From the bbox field.
3113 + * </pre>
3114 + */
3115 + public Builder setSource(
3116 + java.lang.String value) {
3117 if (value == null) {
3118 throw new NullPointerException();
3119 }
3120 @@ -846,76 +1399,202 @@ public final class Osmformat {
3121
3122 return this;
3123 }
3124 + /**
3125 + * <code>optional string source = 17;</code>
3126 + *
3127 + * <pre>
3128 + * From the bbox field.
3129 + * </pre>
3130 + */
3131 public Builder clearSource() {
3132 bitField0_ = (bitField0_ & ~0x00000010);
3133 source_ = getDefaultInstance().getSource();
3134
3135 return this;
3136 }
3137 - void setSource(com.google.protobuf.ByteString value) {
3138 - bitField0_ |= 0x00000010;
3139 + /**
3140 + * <code>optional string source = 17;</code>
3141 + *
3142 + * <pre>
3143 + * From the bbox field.
3144 + * </pre>
3145 + */
3146 + public Builder setSourceBytes(
3147 + com.google.protobuf.ByteString value) {
3148 + if (value == null) {
3149 + throw new NullPointerException();
3150 + }
3151 + bitField0_ |= 0x00000010;
3152 source_ = value;
3153
3154 + return this;
3155 }
3156 -
3157 - // optional int64 osmosis_replication_timestamp = 32;
3158 +
3159 private long osmosisReplicationTimestamp_ ;
3160 + /**
3161 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
3162 + *
3163 + * <pre>
3164 + * replication timestamp, expressed in seconds since the epoch,
3165 + * otherwise the same value as in the "timestamp=..." field
3166 + * in the state.txt file used by Osmosis
3167 + * </pre>
3168 + */
3169 public boolean hasOsmosisReplicationTimestamp() {
3170 return ((bitField0_ & 0x00000020) == 0x00000020);
3171 }
3172 + /**
3173 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
3174 + *
3175 + * <pre>
3176 + * replication timestamp, expressed in seconds since the epoch,
3177 + * otherwise the same value as in the "timestamp=..." field
3178 + * in the state.txt file used by Osmosis
3179 + * </pre>
3180 + */
3181 public long getOsmosisReplicationTimestamp() {
3182 return osmosisReplicationTimestamp_;
3183 }
3184 + /**
3185 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
3186 + *
3187 + * <pre>
3188 + * replication timestamp, expressed in seconds since the epoch,
3189 + * otherwise the same value as in the "timestamp=..." field
3190 + * in the state.txt file used by Osmosis
3191 + * </pre>
3192 + */
3193 public Builder setOsmosisReplicationTimestamp(long value) {
3194 bitField0_ |= 0x00000020;
3195 osmosisReplicationTimestamp_ = value;
3196
3197 return this;
3198 }
3199 + /**
3200 + * <code>optional int64 osmosis_replication_timestamp = 32;</code>
3201 + *
3202 + * <pre>
3203 + * replication timestamp, expressed in seconds since the epoch,
3204 + * otherwise the same value as in the "timestamp=..." field
3205 + * in the state.txt file used by Osmosis
3206 + * </pre>
3207 + */
3208 public Builder clearOsmosisReplicationTimestamp() {
3209 bitField0_ = (bitField0_ & ~0x00000020);
3210 osmosisReplicationTimestamp_ = 0L;
3211
3212 return this;
3213 }
3214 -
3215 - // optional int64 osmosis_replication_sequence_number = 33;
3216 +
3217 private long osmosisReplicationSequenceNumber_ ;
3218 + /**
3219 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
3220 + *
3221 + * <pre>
3222 + * replication sequence number (sequenceNumber in state.txt)
3223 + * </pre>
3224 + */
3225 public boolean hasOsmosisReplicationSequenceNumber() {
3226 return ((bitField0_ & 0x00000040) == 0x00000040);
3227 }
3228 + /**
3229 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
3230 + *
3231 + * <pre>
3232 + * replication sequence number (sequenceNumber in state.txt)
3233 + * </pre>
3234 + */
3235 public long getOsmosisReplicationSequenceNumber() {
3236 return osmosisReplicationSequenceNumber_;
3237 }
3238 + /**
3239 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
3240 + *
3241 + * <pre>
3242 + * replication sequence number (sequenceNumber in state.txt)
3243 + * </pre>
3244 + */
3245 public Builder setOsmosisReplicationSequenceNumber(long value) {
3246 bitField0_ |= 0x00000040;
3247 osmosisReplicationSequenceNumber_ = value;
3248
3249 return this;
3250 }
3251 + /**
3252 + * <code>optional int64 osmosis_replication_sequence_number = 33;</code>
3253 + *
3254 + * <pre>
3255 + * replication sequence number (sequenceNumber in state.txt)
3256 + * </pre>
3257 + */
3258 public Builder clearOsmosisReplicationSequenceNumber() {
3259 bitField0_ = (bitField0_ & ~0x00000040);
3260 osmosisReplicationSequenceNumber_ = 0L;
3261
3262 return this;
3263 }
3264 -
3265 - // optional string osmosis_replication_base_url = 34;
3266 +
3267 private java.lang.Object osmosisReplicationBaseUrl_ = "";
3268 + /**
3269 + * <code>optional string osmosis_replication_base_url = 34;</code>
3270 + *
3271 + * <pre>
3272 + * replication base URL (from Osmosis' configuration.txt file)
3273 + * </pre>
3274 + */
3275 public boolean hasOsmosisReplicationBaseUrl() {
3276 return ((bitField0_ & 0x00000080) == 0x00000080);
3277 }
3278 - public String getOsmosisReplicationBaseUrl() {
3279 + /**
3280 + * <code>optional string osmosis_replication_base_url = 34;</code>
3281 + *
3282 + * <pre>
3283 + * replication base URL (from Osmosis' configuration.txt file)
3284 + * </pre>
3285 + */
3286 + public java.lang.String getOsmosisReplicationBaseUrl() {
3287 java.lang.Object ref = osmosisReplicationBaseUrl_;
3288 - if (!(ref instanceof String)) {
3289 - String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
3290 - osmosisReplicationBaseUrl_ = s;
3291 + if (!(ref instanceof java.lang.String)) {
3292 + com.google.protobuf.ByteString bs =
3293 + (com.google.protobuf.ByteString) ref;
3294 + java.lang.String s = bs.toStringUtf8();
3295 + if (bs.isValidUtf8()) {
3296 + osmosisReplicationBaseUrl_ = s;
3297 + }
3298 return s;
3299 } else {
3300 - return (String) ref;
3301 + return (java.lang.String) ref;
3302 + }
3303 + }
3304 + /**
3305 + * <code>optional string osmosis_replication_base_url = 34;</code>
3306 + *
3307 + * <pre>
3308 + * replication base URL (from Osmosis' configuration.txt file)
3309 + * </pre>
3310 + */
3311 + public com.google.protobuf.ByteString
3312 + getOsmosisReplicationBaseUrlBytes() {
3313 + java.lang.Object ref = osmosisReplicationBaseUrl_;
3314 + if (ref instanceof String) {
3315 + com.google.protobuf.ByteString b =
3316 + com.google.protobuf.ByteString.copyFromUtf8(
3317 + (java.lang.String) ref);
3318 + osmosisReplicationBaseUrl_ = b;
3319 + return b;
3320 + } else {
3321 + return (com.google.protobuf.ByteString) ref;
3322 }
3323 }
3324 - public Builder setOsmosisReplicationBaseUrl(String value) {
3325 + /**
3326 + * <code>optional string osmosis_replication_base_url = 34;</code>
3327 + *
3328 + * <pre>
3329 + * replication base URL (from Osmosis' configuration.txt file)
3330 + * </pre>
3331 + */
3332 + public Builder setOsmosisReplicationBaseUrl(
3333 + java.lang.String value) {
3334 if (value == null) {
3335 throw new NullPointerException();
3336 }
3337 @@ -924,107 +1603,252 @@ public final class Osmformat {
3338
3339 return this;
3340 }
3341 + /**
3342 + * <code>optional string osmosis_replication_base_url = 34;</code>
3343 + *
3344 + * <pre>
3345 + * replication base URL (from Osmosis' configuration.txt file)
3346 + * </pre>
3347 + */
3348 public Builder clearOsmosisReplicationBaseUrl() {
3349 bitField0_ = (bitField0_ & ~0x00000080);
3350 osmosisReplicationBaseUrl_ = getDefaultInstance().getOsmosisReplicationBaseUrl();
3351
3352 return this;
3353 }
3354 - void setOsmosisReplicationBaseUrl(com.google.protobuf.ByteString value) {
3355 - bitField0_ |= 0x00000080;
3356 + /**
3357 + * <code>optional string osmosis_replication_base_url = 34;</code>
3358 + *
3359 + * <pre>
3360 + * replication base URL (from Osmosis' configuration.txt file)
3361 + * </pre>
3362 + */
3363 + public Builder setOsmosisReplicationBaseUrlBytes(
3364 + com.google.protobuf.ByteString value) {
3365 + if (value == null) {
3366 + throw new NullPointerException();
3367 + }
3368 + bitField0_ |= 0x00000080;
3369 osmosisReplicationBaseUrl_ = value;
3370
3371 + return this;
3372 }
3373 -
3374 +
3375 // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBlock)
3376 }
3377 -
3378 +
3379 static {
3380 defaultInstance = new HeaderBlock(true);
3381 defaultInstance.initFields();
3382 }
3383 -
3384 +
3385 // @@protoc_insertion_point(class_scope:OSMPBF.HeaderBlock)
3386 }
3387 -
3388 - public interface HeaderBBoxOrBuilder
3389 - extends com.google.protobuf.MessageLiteOrBuilder {
3390 -
3391 - // required sint64 left = 1;
3392 +
3393 + public interface HeaderBBoxOrBuilder extends
3394 + // @@protoc_insertion_point(interface_extends:OSMPBF.HeaderBBox)
3395 + com.google.protobuf.MessageLiteOrBuilder {
3396 +
3397 + /**
3398 + * <code>required sint64 left = 1;</code>
3399 + */
3400 boolean hasLeft();
3401 + /**
3402 + * <code>required sint64 left = 1;</code>
3403 + */
3404 long getLeft();
3405 -
3406 - // required sint64 right = 2;
3407 +
3408 + /**
3409 + * <code>required sint64 right = 2;</code>
3410 + */
3411 boolean hasRight();
3412 + /**
3413 + * <code>required sint64 right = 2;</code>
3414 + */
3415 long getRight();
3416 -
3417 - // required sint64 top = 3;
3418 +
3419 + /**
3420 + * <code>required sint64 top = 3;</code>
3421 + */
3422 boolean hasTop();
3423 + /**
3424 + * <code>required sint64 top = 3;</code>
3425 + */
3426 long getTop();
3427 -
3428 - // required sint64 bottom = 4;
3429 +
3430 + /**
3431 + * <code>required sint64 bottom = 4;</code>
3432 + */
3433 boolean hasBottom();
3434 + /**
3435 + * <code>required sint64 bottom = 4;</code>
3436 + */
3437 long getBottom();
3438 }
3439 + /**
3440 + * Protobuf type {@code OSMPBF.HeaderBBox}
3441 + */
3442 public static final class HeaderBBox extends
3443 - com.google.protobuf.GeneratedMessageLite
3444 - implements HeaderBBoxOrBuilder {
3445 + com.google.protobuf.GeneratedMessageLite implements
3446 + // @@protoc_insertion_point(message_implements:OSMPBF.HeaderBBox)
3447 + HeaderBBoxOrBuilder {
3448 // Use HeaderBBox.newBuilder() to construct.
3449 - private HeaderBBox(Builder builder) {
3450 + private HeaderBBox(com.google.protobuf.GeneratedMessageLite.Builder builder) {
3451 super(builder);
3452 + this.unknownFields = builder.getUnknownFields();
3453 }
3454 - private HeaderBBox(boolean noInit) {}
3455 -
3456 + private HeaderBBox(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
3457 +
3458 private static final HeaderBBox defaultInstance;
3459 public static HeaderBBox getDefaultInstance() {
3460 return defaultInstance;
3461 }
3462 -
3463 +
3464 public HeaderBBox getDefaultInstanceForType() {
3465 return defaultInstance;
3466 }
3467 -
3468 +
3469 + private final com.google.protobuf.ByteString unknownFields;
3470 + private HeaderBBox(
3471 + com.google.protobuf.CodedInputStream input,
3472 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3473 + throws com.google.protobuf.InvalidProtocolBufferException {
3474 + initFields();
3475 + int mutable_bitField0_ = 0;
3476 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
3477 + com.google.protobuf.ByteString.newOutput();
3478 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
3479 + com.google.protobuf.CodedOutputStream.newInstance(
3480 + unknownFieldsOutput);
3481 + try {
3482 + boolean done = false;
3483 + while (!done) {
3484 + int tag = input.readTag();
3485 + switch (tag) {
3486 + case 0:
3487 + done = true;
3488 + break;
3489 + default: {
3490 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
3491 + extensionRegistry, tag)) {
3492 + done = true;
3493 + }
3494 + break;
3495 + }
3496 + case 8: {
3497 + bitField0_ |= 0x00000001;
3498 + left_ = input.readSInt64();
3499 + break;
3500 + }
3501 + case 16: {
3502 + bitField0_ |= 0x00000002;
3503 + right_ = input.readSInt64();
3504 + break;
3505 + }
3506 + case 24: {
3507 + bitField0_ |= 0x00000004;
3508 + top_ = input.readSInt64();
3509 + break;
3510 + }
3511 + case 32: {
3512 + bitField0_ |= 0x00000008;
3513 + bottom_ = input.readSInt64();
3514 + break;
3515 + }
3516 + }
3517 + }
3518 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
3519 + throw e.setUnfinishedMessage(this);
3520 + } catch (java.io.IOException e) {
3521 + throw new com.google.protobuf.InvalidProtocolBufferException(
3522 + e.getMessage()).setUnfinishedMessage(this);
3523 + } finally {
3524 + try {
3525 + unknownFieldsCodedOutput.flush();
3526 + } catch (java.io.IOException e) {
3527 + // Should not happen
3528 + } finally {
3529 + unknownFields = unknownFieldsOutput.toByteString();
3530 + }
3531 + makeExtensionsImmutable();
3532 + }
3533 + }
3534 + public static com.google.protobuf.Parser<HeaderBBox> PARSER =
3535 + new com.google.protobuf.AbstractParser<HeaderBBox>() {
3536 + public HeaderBBox parsePartialFrom(
3537 + com.google.protobuf.CodedInputStream input,
3538 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3539 + throws com.google.protobuf.InvalidProtocolBufferException {
3540 + return new HeaderBBox(input, extensionRegistry);
3541 + }
3542 + };
3543 +
3544 + @java.lang.Override
3545 + public com.google.protobuf.Parser<HeaderBBox> getParserForType() {
3546 + return PARSER;
3547 + }
3548 +
3549 private int bitField0_;
3550 - // required sint64 left = 1;
3551 public static final int LEFT_FIELD_NUMBER = 1;
3552 private long left_;
3553 + /**
3554 + * <code>required sint64 left = 1;</code>
3555 + */
3556 public boolean hasLeft() {
3557 return ((bitField0_ & 0x00000001) == 0x00000001);
3558 }
3559 + /**
3560 + * <code>required sint64 left = 1;</code>
3561 + */
3562 public long getLeft() {
3563 return left_;
3564 }
3565 -
3566 - // required sint64 right = 2;
3567 +
3568 public static final int RIGHT_FIELD_NUMBER = 2;
3569 private long right_;
3570 + /**
3571 + * <code>required sint64 right = 2;</code>
3572 + */
3573 public boolean hasRight() {
3574 return ((bitField0_ & 0x00000002) == 0x00000002);
3575 }
3576 + /**
3577 + * <code>required sint64 right = 2;</code>
3578 + */
3579 public long getRight() {
3580 return right_;
3581 }
3582 -
3583 - // required sint64 top = 3;
3584 +
3585 public static final int TOP_FIELD_NUMBER = 3;
3586 private long top_;
3587 + /**
3588 + * <code>required sint64 top = 3;</code>
3589 + */
3590 public boolean hasTop() {
3591 return ((bitField0_ & 0x00000004) == 0x00000004);
3592 }
3593 + /**
3594 + * <code>required sint64 top = 3;</code>
3595 + */
3596 public long getTop() {
3597 return top_;
3598 }
3599 -
3600 - // required sint64 bottom = 4;
3601 +
3602 public static final int BOTTOM_FIELD_NUMBER = 4;
3603 private long bottom_;
3604 + /**
3605 + * <code>required sint64 bottom = 4;</code>
3606 + */
3607 public boolean hasBottom() {
3608 return ((bitField0_ & 0x00000008) == 0x00000008);
3609 }
3610 + /**
3611 + * <code>required sint64 bottom = 4;</code>
3612 + */
3613 public long getBottom() {
3614 return bottom_;
3615 }
3616 -
3617 +
3618 private void initFields() {
3619 left_ = 0L;
3620 right_ = 0L;
3621 @@ -1034,8 +1858,9 @@ public final class Osmformat {
3622 private byte memoizedIsInitialized = -1;
3623 public final boolean isInitialized() {
3624 byte isInitialized = memoizedIsInitialized;
3625 - if (isInitialized != -1) return isInitialized == 1;
3626 -
3627 + if (isInitialized == 1) return true;
3628 + if (isInitialized == 0) return false;
3629 +
3630 if (!hasLeft()) {
3631 memoizedIsInitialized = 0;
3632 return false;
3633 @@ -1055,7 +1880,7 @@ public final class Osmformat {
3634 memoizedIsInitialized = 1;
3635 return true;
3636 }
3637 -
3638 +
3639 public void writeTo(com.google.protobuf.CodedOutputStream output)
3640 throws java.io.IOException {
3641 getSerializedSize();
3642 @@ -1071,13 +1896,14 @@ public final class Osmformat {
3643 if (((bitField0_ & 0x00000008) == 0x00000008)) {
3644 output.writeSInt64(4, bottom_);
3645 }
3646 + output.writeRawBytes(unknownFields);
3647 }
3648 -
3649 +
3650 private int memoizedSerializedSize = -1;
3651 public int getSerializedSize() {
3652 int size = memoizedSerializedSize;
3653 if (size != -1) return size;
3654 -
3655 +
3656 size = 0;
3657 if (((bitField0_ & 0x00000001) == 0x00000001)) {
3658 size += com.google.protobuf.CodedOutputStream
3659 @@ -1095,106 +1921,98 @@ public final class Osmformat {
3660 size += com.google.protobuf.CodedOutputStream
3661 .computeSInt64Size(4, bottom_);
3662 }
3663 + size += unknownFields.size();
3664 memoizedSerializedSize = size;
3665 return size;
3666 }
3667 -
3668 +
3669 private static final long serialVersionUID = 0L;
3670 @java.lang.Override
3671 protected java.lang.Object writeReplace()
3672 throws java.io.ObjectStreamException {
3673 return super.writeReplace();
3674 }
3675 -
3676 +
3677 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3678 com.google.protobuf.ByteString data)
3679 throws com.google.protobuf.InvalidProtocolBufferException {
3680 - return newBuilder().mergeFrom(data).buildParsed();
3681 + return PARSER.parseFrom(data);
3682 }
3683 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3684 com.google.protobuf.ByteString data,
3685 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3686 throws com.google.protobuf.InvalidProtocolBufferException {
3687 - return newBuilder().mergeFrom(data, extensionRegistry)
3688 - .buildParsed();
3689 + return PARSER.parseFrom(data, extensionRegistry);
3690 }
3691 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(byte[] data)
3692 throws com.google.protobuf.InvalidProtocolBufferException {
3693 - return newBuilder().mergeFrom(data).buildParsed();
3694 + return PARSER.parseFrom(data);
3695 }
3696 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3697 byte[] data,
3698 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3699 throws com.google.protobuf.InvalidProtocolBufferException {
3700 - return newBuilder().mergeFrom(data, extensionRegistry)
3701 - .buildParsed();
3702 + return PARSER.parseFrom(data, extensionRegistry);
3703 }
3704 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(java.io.InputStream input)
3705 throws java.io.IOException {
3706 - return newBuilder().mergeFrom(input).buildParsed();
3707 + return PARSER.parseFrom(input);
3708 }
3709 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3710 java.io.InputStream input,
3711 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3712 throws java.io.IOException {
3713 - return newBuilder().mergeFrom(input, extensionRegistry)
3714 - .buildParsed();
3715 + return PARSER.parseFrom(input, extensionRegistry);
3716 }
3717 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseDelimitedFrom(java.io.InputStream input)
3718 throws java.io.IOException {
3719 - Builder builder = newBuilder();
3720 - if (builder.mergeDelimitedFrom(input)) {
3721 - return builder.buildParsed();
3722 - } else {
3723 - return null;
3724 - }
3725 + return PARSER.parseDelimitedFrom(input);
3726 }
3727 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseDelimitedFrom(
3728 java.io.InputStream input,
3729 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3730 throws java.io.IOException {
3731 - Builder builder = newBuilder();
3732 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
3733 - return builder.buildParsed();
3734 - } else {
3735 - return null;
3736 - }
3737 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
3738 }
3739 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3740 com.google.protobuf.CodedInputStream input)
3741 throws java.io.IOException {
3742 - return newBuilder().mergeFrom(input).buildParsed();
3743 + return PARSER.parseFrom(input);
3744 }
3745 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
3746 com.google.protobuf.CodedInputStream input,
3747 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3748 throws java.io.IOException {
3749 - return newBuilder().mergeFrom(input, extensionRegistry)
3750 - .buildParsed();
3751 + return PARSER.parseFrom(input, extensionRegistry);
3752 }
3753 -
3754 +
3755 public static Builder newBuilder() { return Builder.create(); }
3756 public Builder newBuilderForType() { return newBuilder(); }
3757 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox prototype) {
3758 return newBuilder().mergeFrom(prototype);
3759 }
3760 public Builder toBuilder() { return newBuilder(this); }
3761 -
3762 +
3763 + /**
3764 + * Protobuf type {@code OSMPBF.HeaderBBox}
3765 + */
3766 public static final class Builder extends
3767 com.google.protobuf.GeneratedMessageLite.Builder<
3768 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox, Builder>
3769 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder {
3770 + implements
3771 + // @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBBox)
3772 + org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder {
3773 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.newBuilder()
3774 private Builder() {
3775 maybeForceBuilderInitialization();
3776 }
3777 -
3778 +
3779 private void maybeForceBuilderInitialization() {
3780 }
3781 private static Builder create() {
3782 return new Builder();
3783 }
3784 -
3785 +
3786 public Builder clear() {
3787 super.clear();
3788 left_ = 0L;
3789 @@ -1207,15 +2025,15 @@ public final class Osmformat {
3790 bitField0_ = (bitField0_ & ~0x00000008);
3791 return this;
3792 }
3793 -
3794 +
3795 public Builder clone() {
3796 return create().mergeFrom(buildPartial());
3797 }
3798 -
3799 +
3800 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getDefaultInstanceForType() {
3801 return org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
3802 }
3803 -
3804 +
3805 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox build() {
3806 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox result = buildPartial();
3807 if (!result.isInitialized()) {
3808 @@ -1223,17 +2041,7 @@ public final class Osmformat {
3809 }
3810 return result;
3811 }
3812 -
3813 - private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox buildParsed()
3814 - throws com.google.protobuf.InvalidProtocolBufferException {
3815 - org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox result = buildPartial();
3816 - if (!result.isInitialized()) {
3817 - throw newUninitializedMessageException(
3818 - result).asInvalidProtocolBufferException();
3819 - }
3820 - return result;
3821 - }
3822 -
3823 +
3824 public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox buildPartial() {
3825 org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox result = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox(this);
3826 int from_bitField0_ = bitField0_;
3827 @@ -1257,7 +2065,7 @@ public final class Osmformat {
3828 result.bitField0_ = to_bitField0_;
3829 return result;
3830 }
3831 -
3832 +
3833 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox other) {
3834 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance()) return this;
3835 if (other.hasLeft()) {
3836 @@ -1272,9 +2080,11 @@ public final class Osmformat {
3837 if (other.hasBottom()) {
3838 setBottom(other.getBottom());
3839 }
3840 + setUnknownFields(
3841 + getUnknownFields().concat(other.unknownFields));
3842 return this;
3843 }
3844 -
3845 +
3846 public final boolean isInitialized() {
3847 if (!hasLeft()) {
3848
3849 @@ -1294,264 +2104,514 @@ public final class Osmformat {
3850 }
3851 return true;
3852 }
3853 -
3854 +
3855 public Builder mergeFrom(
3856 com.google.protobuf.CodedInputStream input,
3857 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
3858 throws java.io.IOException {
3859 - while (true) {
3860 - int tag = input.readTag();
3861 - switch (tag) {
3862 - case 0:
3863 -
3864 - return this;
3865 - default: {
3866 - if (!parseUnknownField(input, extensionRegistry, tag)) {
3867 -
3868 - return this;
3869 - }
3870 - break;
3871 - }
3872 - case 8: {
3873 - bitField0_ |= 0x00000001;
3874 - left_ = input.readSInt64();
3875 - break;
3876 - }
3877 - case 16: {
3878 - bitField0_ |= 0x00000002;
3879 - right_ = input.readSInt64();
3880 - break;
3881 - }
3882 - case 24: {
3883 - bitField0_ |= 0x00000004;
3884 - top_ = input.readSInt64();
3885 - break;
3886 - }
3887 - case 32: {
3888 - bitField0_ |= 0x00000008;
3889 - bottom_ = input.readSInt64();
3890 - break;
3891 - }
3892 + org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parsedMessage = null;
3893 + try {
3894 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
3895 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
3896 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox) e.getUnfinishedMessage();
3897 + throw e;
3898 + } finally {
3899 + if (parsedMessage != null) {
3900 + mergeFrom(parsedMessage);
3901 }
3902 }
3903 + return this;
3904 }
3905 -
3906 private int bitField0_;
3907 -
3908 - // required sint64 left = 1;
3909 +
3910 private long left_ ;
3911 + /**
3912 + * <code>required sint64 left = 1;</code>
3913 + */
3914 public boolean hasLeft() {
3915 return ((bitField0_ & 0x00000001) == 0x00000001);
3916 }
3917 + /**
3918 + * <code>required sint64 left = 1;</code>
3919 + */
3920 public long getLeft() {
3921 return left_;
3922 }
3923 + /**
3924 + * <code>required sint64 left = 1;</code>
3925 + */
3926 public Builder setLeft(long value) {
3927 bitField0_ |= 0x00000001;
3928 left_ = value;
3929
3930 return this;
3931 }
3932 + /**
3933 + * <code>required sint64 left = 1;</code>
3934 + */
3935 public Builder clearLeft() {
3936 bitField0_ = (bitField0_ & ~0x00000001);
3937 left_ = 0L;
3938
3939 return this;
3940 }
3941 -
3942 - // required sint64 right = 2;
3943 +
3944 private long right_ ;
3945 + /**
3946 + * <code>required sint64 right = 2;</code>
3947 + */
3948 public boolean hasRight() {
3949 return ((bitField0_ & 0x00000002) == 0x00000002);
3950 }
3951 + /**
3952 + * <code>required sint64 right = 2;</code>
3953 + */
3954 public long getRight() {
3955 return right_;
3956 }
3957 + /**
3958 + * <code>required sint64 right = 2;</code>
3959 + */
3960 public Builder setRight(long value) {
3961 bitField0_ |= 0x00000002;
3962 right_ = value;
3963
3964 return this;
3965 }
3966 + /**
3967 + * <code>required sint64 right = 2;</code>
3968 + */
3969 public Builder clearRight() {
3970 bitField0_ = (bitField0_ & ~0x00000002);
3971 right_ = 0L;
3972
3973 return this;
3974 }
3975 -
3976 - // required sint64 top = 3;
3977 +
3978 private long top_ ;
3979 + /**
3980 + * <code>required sint64 top = 3;</code>
3981 + */
3982 public boolean hasTop() {
3983 return ((bitField0_ & 0x00000004) == 0x00000004);
3984 }
3985 + /**
3986 + * <code>required sint64 top = 3;</code>
3987 + */
3988 public long getTop() {
3989 return top_;
3990 }
3991 + /**
3992 + * <code>required sint64 top = 3;</code>
3993 + */
3994 public Builder setTop(long value) {
3995 bitField0_ |= 0x00000004;
3996 top_ = value;
3997
3998 return this;
3999 }
4000 + /**
4001 + * <code>required sint64 top = 3;</code>
4002 + */
4003 public Builder clearTop() {
4004 bitField0_ = (bitField0_ & ~0x00000004);
4005 top_ = 0L;
4006
4007 return this;
4008 }
4009 -
4010 - // required sint64 bottom = 4;
4011 +
4012 private long bottom_ ;
4013 + /**
4014 + * <code>required sint64 bottom = 4;</code>
4015 + */
4016 public boolean hasBottom() {
4017 return ((bitField0_ & 0x00000008) == 0x00000008);
4018 }
4019 + /**
4020 + * <code>required sint64 bottom = 4;</code>
4021 + */
4022 public long getBottom() {
4023 return bottom_;
4024 }
4025 + /**
4026 + * <code>required sint64 bottom = 4;</code>
4027 + */
4028 public Builder setBottom(long value) {
4029 bitField0_ |= 0x00000008;
4030 bottom_ = value;
4031
4032 return this;
4033 }
4034 + /**
4035 + * <code>required sint64 bottom = 4;</code>
4036 + */
4037 public Builder clearBottom() {
4038 bitField0_ = (bitField0_ & ~0x00000008);
4039 bottom_ = 0L;
4040
4041 return this;
4042 }
4043 -
4044 +
4045 // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBBox)
4046 }
4047 -
4048 +
4049 static {
4050 defaultInstance = new HeaderBBox(true);
4051 defaultInstance.initFields();
4052 }
4053 -
4054 +
4055 // @@protoc_insertion_point(class_scope:OSMPBF.HeaderBBox)
4056 }
4057 -
4058 - public interface PrimitiveBlockOrBuilder
4059 - extends com.google.protobuf.MessageLiteOrBuilder {
4060 -
4061 - // required .OSMPBF.StringTable stringtable = 1;
4062 +
4063 + public interface PrimitiveBlockOrBuilder extends
4064 + // @@protoc_insertion_point(interface_extends:OSMPBF.PrimitiveBlock)
4065 + com.google.protobuf.MessageLiteOrBuilder {
4066 +
4067 + /**
4068 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4069 + */
4070 boolean hasStringtable();
4071 + /**
4072 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4073 + */
4074 org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable();
4075 -
4076 - // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
4077 +
4078 + /**
4079 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4080 + */
4081 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup>
4082 getPrimitivegroupList();
4083 + /**
4084 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4085 + */
4086 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index);
4087 + /**
4088 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4089 + */
4090 int getPrimitivegroupCount();
4091 -
4092 - // optional int32 granularity = 17 [default = 100];
4093 +
4094 + /**
4095 + * <code>optional int32 granularity = 17 [default = 100];</code>
4096 + *
4097 + * <pre>
4098 + * Granularity, units of nanodegrees, used to store coordinates in this block
4099 + * </pre>
4100 + */
4101 boolean hasGranularity();
4102 + /**
4103 + * <code>optional int32 granularity = 17 [default = 100];</code>
4104 + *
4105 + * <pre>
4106 + * Granularity, units of nanodegrees, used to store coordinates in this block
4107 + * </pre>
4108 + */
4109 int getGranularity();
4110 -
4111 - // optional int64 lat_offset = 19 [default = 0];
4112 +
4113 + /**
4114 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
4115 + *
4116 + * <pre>
4117 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
4118 + * </pre>
4119 + */
4120 boolean hasLatOffset();
4121 + /**
4122 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
4123 + *
4124 + * <pre>
4125 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
4126 + * </pre>
4127 + */
4128 long getLatOffset();
4129 -
4130 - // optional int64 lon_offset = 20 [default = 0];
4131 +
4132 + /**
4133 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
4134 + */
4135 boolean hasLonOffset();
4136 + /**
4137 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
4138 + */
4139 long getLonOffset();
4140 -
4141 - // optional int32 date_granularity = 18 [default = 1000];
4142 +
4143 + /**
4144 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
4145 + *
4146 + * <pre>
4147 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
4148 + * </pre>
4149 + */
4150 boolean hasDateGranularity();
4151 + /**
4152 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
4153 + *
4154 + * <pre>
4155 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
4156 + * </pre>
4157 + */
4158 int getDateGranularity();
4159 }
4160 + /**
4161 + * Protobuf type {@code OSMPBF.PrimitiveBlock}
4162 + */
4163 public static final class PrimitiveBlock extends
4164 - com.google.protobuf.GeneratedMessageLite
4165 - implements PrimitiveBlockOrBuilder {
4166 + com.google.protobuf.GeneratedMessageLite implements
4167 + // @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveBlock)
4168 + PrimitiveBlockOrBuilder {
4169 // Use PrimitiveBlock.newBuilder() to construct.
4170 - private PrimitiveBlock(Builder builder) {
4171 + private PrimitiveBlock(com.google.protobuf.GeneratedMessageLite.Builder builder) {
4172 super(builder);
4173 + this.unknownFields = builder.getUnknownFields();
4174 }
4175 - private PrimitiveBlock(boolean noInit) {}
4176 -
4177 + private PrimitiveBlock(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
4178 +
4179 private static final PrimitiveBlock defaultInstance;
4180 public static PrimitiveBlock getDefaultInstance() {
4181 return defaultInstance;
4182 }
4183 -
4184 +
4185 public PrimitiveBlock getDefaultInstanceForType() {
4186 return defaultInstance;
4187 }
4188 -
4189 - private int bitField0_;
4190 - // required .OSMPBF.StringTable stringtable = 1;
4191 - public static final int STRINGTABLE_FIELD_NUMBER = 1;
4192 - private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable stringtable_;
4193 - public boolean hasStringtable() {
4194 - return ((bitField0_ & 0x00000001) == 0x00000001);
4195 - }
4196 - public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable() {
4197 - return stringtable_;
4198 - }
4199 -
4200 - // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
4201 - public static final int PRIMITIVEGROUP_FIELD_NUMBER = 2;
4202 - private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> primitivegroup_;
4203 - public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> getPrimitivegroupList() {
4204 - return primitivegroup_;
4205 - }
4206 +
4207 + private final com.google.protobuf.ByteString unknownFields;
4208 + private PrimitiveBlock(
4209 + com.google.protobuf.CodedInputStream input,
4210 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4211 + throws com.google.protobuf.InvalidProtocolBufferException {
4212 + initFields();
4213 + int mutable_bitField0_ = 0;
4214 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
4215 + com.google.protobuf.ByteString.newOutput();
4216 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
4217 + com.google.protobuf.CodedOutputStream.newInstance(
4218 + unknownFieldsOutput);
4219 + try {
4220 + boolean done = false;
4221 + while (!done) {
4222 + int tag = input.readTag();
4223 + switch (tag) {
4224 + case 0:
4225 + done = true;
4226 + break;
4227 + default: {
4228 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
4229 + extensionRegistry, tag)) {
4230 + done = true;
4231 + }
4232 + break;
4233 + }
4234 + case 10: {
4235 + org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder subBuilder = null;
4236 + if (((bitField0_ & 0x00000001) == 0x00000001)) {
4237 + subBuilder = stringtable_.toBuilder();
4238 + }
4239 + stringtable_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.PARSER, extensionRegistry);
4240 + if (subBuilder != null) {
4241 + subBuilder.mergeFrom(stringtable_);
4242 + stringtable_ = subBuilder.buildPartial();
4243 + }
4244 + bitField0_ |= 0x00000001;
4245 + break;
4246 + }
4247 + case 18: {
4248 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
4249 + primitivegroup_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup>();
4250 + mutable_bitField0_ |= 0x00000002;
4251 + }
4252 + primitivegroup_.add(input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.PARSER, extensionRegistry));
4253 + break;
4254 + }
4255 + case 136: {
4256 + bitField0_ |= 0x00000002;
4257 + granularity_ = input.readInt32();
4258 + break;
4259 + }
4260 + case 144: {
4261 + bitField0_ |= 0x00000010;
4262 + dateGranularity_ = input.readInt32();
4263 + break;
4264 + }
4265 + case 152: {
4266 + bitField0_ |= 0x00000004;
4267 + latOffset_ = input.readInt64();
4268 + break;
4269 + }
4270 + case 160: {
4271 + bitField0_ |= 0x00000008;
4272 + lonOffset_ = input.readInt64();
4273 + break;
4274 + }
4275 + }
4276 + }
4277 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
4278 + throw e.setUnfinishedMessage(this);
4279 + } catch (java.io.IOException e) {
4280 + throw new com.google.protobuf.InvalidProtocolBufferException(
4281 + e.getMessage()).setUnfinishedMessage(this);
4282 + } finally {
4283 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
4284 + primitivegroup_ = java.util.Collections.unmodifiableList(primitivegroup_);
4285 + }
4286 + try {
4287 + unknownFieldsCodedOutput.flush();
4288 + } catch (java.io.IOException e) {
4289 + // Should not happen
4290 + } finally {
4291 + unknownFields = unknownFieldsOutput.toByteString();
4292 + }
4293 + makeExtensionsImmutable();
4294 + }
4295 + }
4296 + public static com.google.protobuf.Parser<PrimitiveBlock> PARSER =
4297 + new com.google.protobuf.AbstractParser<PrimitiveBlock>() {
4298 + public PrimitiveBlock parsePartialFrom(
4299 + com.google.protobuf.CodedInputStream input,
4300 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4301 + throws com.google.protobuf.InvalidProtocolBufferException {
4302 + return new PrimitiveBlock(input, extensionRegistry);
4303 + }
4304 + };
4305 +
4306 + @java.lang.Override
4307 + public com.google.protobuf.Parser<PrimitiveBlock> getParserForType() {
4308 + return PARSER;
4309 + }
4310 +
4311 + private int bitField0_;
4312 + public static final int STRINGTABLE_FIELD_NUMBER = 1;
4313 + private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable stringtable_;
4314 + /**
4315 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4316 + */
4317 + public boolean hasStringtable() {
4318 + return ((bitField0_ & 0x00000001) == 0x00000001);
4319 + }
4320 + /**
4321 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4322 + */
4323 + public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable() {
4324 + return stringtable_;
4325 + }
4326 +
4327 + public static final int PRIMITIVEGROUP_FIELD_NUMBER = 2;
4328 + private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> primitivegroup_;
4329 + /**
4330 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4331 + */
4332 + public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> getPrimitivegroupList() {
4333 + return primitivegroup_;
4334 + }
4335 + /**
4336 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4337 + */
4338 public java.util.List<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder>
4339 getPrimitivegroupOrBuilderList() {
4340 return primitivegroup_;
4341 }
4342 + /**
4343 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4344 + */
4345 public int getPrimitivegroupCount() {
4346 return primitivegroup_.size();
4347 }
4348 + /**
4349 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4350 + */
4351 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index) {
4352 return primitivegroup_.get(index);
4353 }
4354 + /**
4355 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4356 + */
4357 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
4358 int index) {
4359 return primitivegroup_.get(index);
4360 }
4361 -
4362 - // optional int32 granularity = 17 [default = 100];
4363 +
4364 public static final int GRANULARITY_FIELD_NUMBER = 17;
4365 private int granularity_;
4366 + /**
4367 + * <code>optional int32 granularity = 17 [default = 100];</code>
4368 + *
4369 + * <pre>
4370 + * Granularity, units of nanodegrees, used to store coordinates in this block
4371 + * </pre>
4372 + */
4373 public boolean hasGranularity() {
4374 return ((bitField0_ & 0x00000002) == 0x00000002);
4375 }
4376 + /**
4377 + * <code>optional int32 granularity = 17 [default = 100];</code>
4378 + *
4379 + * <pre>
4380 + * Granularity, units of nanodegrees, used to store coordinates in this block
4381 + * </pre>
4382 + */
4383 public int getGranularity() {
4384 return granularity_;
4385 }
4386 -
4387 - // optional int64 lat_offset = 19 [default = 0];
4388 +
4389 public static final int LAT_OFFSET_FIELD_NUMBER = 19;
4390 private long latOffset_;
4391 + /**
4392 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
4393 + *
4394 + * <pre>
4395 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
4396 + * </pre>
4397 + */
4398 public boolean hasLatOffset() {
4399 return ((bitField0_ & 0x00000004) == 0x00000004);
4400 }
4401 + /**
4402 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
4403 + *
4404 + * <pre>
4405 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
4406 + * </pre>
4407 + */
4408 public long getLatOffset() {
4409 return latOffset_;
4410 }
4411 -
4412 - // optional int64 lon_offset = 20 [default = 0];
4413 +
4414 public static final int LON_OFFSET_FIELD_NUMBER = 20;
4415 private long lonOffset_;
4416 + /**
4417 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
4418 + */
4419 public boolean hasLonOffset() {
4420 return ((bitField0_ & 0x00000008) == 0x00000008);
4421 }
4422 + /**
4423 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
4424 + */
4425 public long getLonOffset() {
4426 return lonOffset_;
4427 }
4428 -
4429 - // optional int32 date_granularity = 18 [default = 1000];
4430 +
4431 public static final int DATE_GRANULARITY_FIELD_NUMBER = 18;
4432 private int dateGranularity_;
4433 + /**
4434 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
4435 + *
4436 + * <pre>
4437 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
4438 + * </pre>
4439 + */
4440 public boolean hasDateGranularity() {
4441 return ((bitField0_ & 0x00000010) == 0x00000010);
4442 }
4443 + /**
4444 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
4445 + *
4446 + * <pre>
4447 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
4448 + * </pre>
4449 + */
4450 public int getDateGranularity() {
4451 return dateGranularity_;
4452 }
4453 -
4454 +
4455 private void initFields() {
4456 stringtable_ = org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance();
4457 primitivegroup_ = java.util.Collections.emptyList();
4458 @@ -1563,8 +2623,9 @@ public final class Osmformat {
4459 private byte memoizedIsInitialized = -1;
4460 public final boolean isInitialized() {
4461 byte isInitialized = memoizedIsInitialized;
4462 - if (isInitialized != -1) return isInitialized == 1;
4463 -
4464 + if (isInitialized == 1) return true;
4465 + if (isInitialized == 0) return false;
4466 +
4467 if (!hasStringtable()) {
4468 memoizedIsInitialized = 0;
4469 return false;
4470 @@ -1578,7 +2639,7 @@ public final class Osmformat {
4471 memoizedIsInitialized = 1;
4472 return true;
4473 }
4474 -
4475 +
4476 public void writeTo(com.google.protobuf.CodedOutputStream output)
4477 throws java.io.IOException {
4478 getSerializedSize();
4479 @@ -1600,13 +2661,14 @@ public final class Osmformat {
4480 if (((bitField0_ & 0x00000008) == 0x00000008)) {
4481 output.writeInt64(20, lonOffset_);
4482 }
4483 + output.writeRawBytes(unknownFields);
4484 }
4485 -
4486 +
4487 private int memoizedSerializedSize = -1;
4488 public int getSerializedSize() {
4489 int size = memoizedSerializedSize;
4490 if (size != -1) return size;
4491 -
4492 +
4493 size = 0;
4494 if (((bitField0_ & 0x00000001) == 0x00000001)) {
4495 size += com.google.protobuf.CodedOutputStream
4496 @@ -1632,106 +2694,98 @@ public final class Osmformat {
4497 size += com.google.protobuf.CodedOutputStream
4498 .computeInt64Size(20, lonOffset_);
4499 }
4500 + size += unknownFields.size();
4501 memoizedSerializedSize = size;
4502 return size;
4503 }
4504 -
4505 +
4506 private static final long serialVersionUID = 0L;
4507 @java.lang.Override
4508 protected java.lang.Object writeReplace()
4509 throws java.io.ObjectStreamException {
4510 return super.writeReplace();
4511 }
4512 -
4513 +
4514 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4515 com.google.protobuf.ByteString data)
4516 throws com.google.protobuf.InvalidProtocolBufferException {
4517 - return newBuilder().mergeFrom(data).buildParsed();
4518 + return PARSER.parseFrom(data);
4519 }
4520 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4521 com.google.protobuf.ByteString data,
4522 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4523 throws com.google.protobuf.InvalidProtocolBufferException {
4524 - return newBuilder().mergeFrom(data, extensionRegistry)
4525 - .buildParsed();
4526 + return PARSER.parseFrom(data, extensionRegistry);
4527 }
4528 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(byte[] data)
4529 throws com.google.protobuf.InvalidProtocolBufferException {
4530 - return newBuilder().mergeFrom(data).buildParsed();
4531 + return PARSER.parseFrom(data);
4532 }
4533 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4534 byte[] data,
4535 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4536 throws com.google.protobuf.InvalidProtocolBufferException {
4537 - return newBuilder().mergeFrom(data, extensionRegistry)
4538 - .buildParsed();
4539 + return PARSER.parseFrom(data, extensionRegistry);
4540 }
4541 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(java.io.InputStream input)
4542 throws java.io.IOException {
4543 - return newBuilder().mergeFrom(input).buildParsed();
4544 + return PARSER.parseFrom(input);
4545 }
4546 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4547 java.io.InputStream input,
4548 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4549 throws java.io.IOException {
4550 - return newBuilder().mergeFrom(input, extensionRegistry)
4551 - .buildParsed();
4552 + return PARSER.parseFrom(input, extensionRegistry);
4553 }
4554 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseDelimitedFrom(java.io.InputStream input)
4555 throws java.io.IOException {
4556 - Builder builder = newBuilder();
4557 - if (builder.mergeDelimitedFrom(input)) {
4558 - return builder.buildParsed();
4559 - } else {
4560 - return null;
4561 - }
4562 + return PARSER.parseDelimitedFrom(input);
4563 }
4564 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseDelimitedFrom(
4565 java.io.InputStream input,
4566 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4567 throws java.io.IOException {
4568 - Builder builder = newBuilder();
4569 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
4570 - return builder.buildParsed();
4571 - } else {
4572 - return null;
4573 - }
4574 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
4575 }
4576 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4577 com.google.protobuf.CodedInputStream input)
4578 throws java.io.IOException {
4579 - return newBuilder().mergeFrom(input).buildParsed();
4580 + return PARSER.parseFrom(input);
4581 }
4582 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
4583 com.google.protobuf.CodedInputStream input,
4584 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4585 throws java.io.IOException {
4586 - return newBuilder().mergeFrom(input, extensionRegistry)
4587 - .buildParsed();
4588 + return PARSER.parseFrom(input, extensionRegistry);
4589 }
4590 -
4591 +
4592 public static Builder newBuilder() { return Builder.create(); }
4593 public Builder newBuilderForType() { return newBuilder(); }
4594 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock prototype) {
4595 return newBuilder().mergeFrom(prototype);
4596 }
4597 public Builder toBuilder() { return newBuilder(this); }
4598 -
4599 +
4600 + /**
4601 + * Protobuf type {@code OSMPBF.PrimitiveBlock}
4602 + */
4603 public static final class Builder extends
4604 com.google.protobuf.GeneratedMessageLite.Builder<
4605 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock, Builder>
4606 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlockOrBuilder {
4607 + implements
4608 + // @@protoc_insertion_point(builder_implements:OSMPBF.PrimitiveBlock)
4609 + org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlockOrBuilder {
4610 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.newBuilder()
4611 private Builder() {
4612 maybeForceBuilderInitialization();
4613 }
4614 -
4615 +
4616 private void maybeForceBuilderInitialization() {
4617 }
4618 private static Builder create() {
4619 return new Builder();
4620 }
4621 -
4622 +
4623 public Builder clear() {
4624 super.clear();
4625 stringtable_ = org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance();
4626 @@ -1748,15 +2802,15 @@ public final class Osmformat {
4627 bitField0_ = (bitField0_ & ~0x00000020);
4628 return this;
4629 }
4630 -
4631 +
4632 public Builder clone() {
4633 return create().mergeFrom(buildPartial());
4634 }
4635 -
4636 +
4637 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock getDefaultInstanceForType() {
4638 return org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.getDefaultInstance();
4639 }
4640 -
4641 +
4642 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock build() {
4643 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock result = buildPartial();
4644 if (!result.isInitialized()) {
4645 @@ -1764,17 +2818,7 @@ public final class Osmformat {
4646 }
4647 return result;
4648 }
4649 -
4650 - private org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock buildParsed()
4651 - throws com.google.protobuf.InvalidProtocolBufferException {
4652 - org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock result = buildPartial();
4653 - if (!result.isInitialized()) {
4654 - throw newUninitializedMessageException(
4655 - result).asInvalidProtocolBufferException();
4656 - }
4657 - return result;
4658 - }
4659 -
4660 +
4661 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock buildPartial() {
4662 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock result = new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock(this);
4663 int from_bitField0_ = bitField0_;
4664 @@ -1807,7 +2851,7 @@ public final class Osmformat {
4665 result.bitField0_ = to_bitField0_;
4666 return result;
4667 }
4668 -
4669 +
4670 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock other) {
4671 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.getDefaultInstance()) return this;
4672 if (other.hasStringtable()) {
4673 @@ -1835,9 +2879,11 @@ public final class Osmformat {
4674 if (other.hasDateGranularity()) {
4675 setDateGranularity(other.getDateGranularity());
4676 }
4677 + setUnknownFields(
4678 + getUnknownFields().concat(other.unknownFields));
4679 return this;
4680 }
4681 -
4682 +
4683 public final boolean isInitialized() {
4684 if (!hasStringtable()) {
4685
4686 @@ -1851,89 +2897,64 @@ public final class Osmformat {
4687 }
4688 return true;
4689 }
4690 -
4691 +
4692 public Builder mergeFrom(
4693 com.google.protobuf.CodedInputStream input,
4694 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
4695 throws java.io.IOException {
4696 - while (true) {
4697 - int tag = input.readTag();
4698 - switch (tag) {
4699 - case 0:
4700 -
4701 - return this;
4702 - default: {
4703 - if (!parseUnknownField(input, extensionRegistry, tag)) {
4704 -
4705 - return this;
4706 - }
4707 - break;
4708 - }
4709 - case 10: {
4710 - org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.newBuilder();
4711 - if (hasStringtable()) {
4712 - subBuilder.mergeFrom(getStringtable());
4713 - }
4714 - input.readMessage(subBuilder, extensionRegistry);
4715 - setStringtable(subBuilder.buildPartial());
4716 - break;
4717 - }
4718 - case 18: {
4719 - org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.newBuilder();
4720 - input.readMessage(subBuilder, extensionRegistry);
4721 - addPrimitivegroup(subBuilder.buildPartial());
4722 - break;
4723 - }
4724 - case 136: {
4725 - bitField0_ |= 0x00000004;
4726 - granularity_ = input.readInt32();
4727 - break;
4728 - }
4729 - case 144: {
4730 - bitField0_ |= 0x00000020;
4731 - dateGranularity_ = input.readInt32();
4732 - break;
4733 - }
4734 - case 152: {
4735 - bitField0_ |= 0x00000008;
4736 - latOffset_ = input.readInt64();
4737 - break;
4738 - }
4739 - case 160: {
4740 - bitField0_ |= 0x00000010;
4741 - lonOffset_ = input.readInt64();
4742 - break;
4743 - }
4744 + org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parsedMessage = null;
4745 + try {
4746 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
4747 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
4748 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock) e.getUnfinishedMessage();
4749 + throw e;
4750 + } finally {
4751 + if (parsedMessage != null) {
4752 + mergeFrom(parsedMessage);
4753 }
4754 }
4755 + return this;
4756 }
4757 -
4758 private int bitField0_;
4759 -
4760 - // required .OSMPBF.StringTable stringtable = 1;
4761 +
4762 private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable stringtable_ = org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance();
4763 + /**
4764 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4765 + */
4766 public boolean hasStringtable() {
4767 return ((bitField0_ & 0x00000001) == 0x00000001);
4768 }
4769 + /**
4770 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4771 + */
4772 public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable() {
4773 return stringtable_;
4774 }
4775 + /**
4776 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4777 + */
4778 public Builder setStringtable(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable value) {
4779 if (value == null) {
4780 throw new NullPointerException();
4781 }
4782 stringtable_ = value;
4783 -
4784 +
4785 bitField0_ |= 0x00000001;
4786 return this;
4787 }
4788 + /**
4789 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4790 + */
4791 public Builder setStringtable(
4792 org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder builderForValue) {
4793 stringtable_ = builderForValue.build();
4794 -
4795 +
4796 bitField0_ |= 0x00000001;
4797 return this;
4798 }
4799 + /**
4800 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4801 + */
4802 public Builder mergeStringtable(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable value) {
4803 if (((bitField0_ & 0x00000001) == 0x00000001) &&
4804 stringtable_ != org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance()) {
4805 @@ -1942,18 +2963,20 @@ public final class Osmformat {
4806 } else {
4807 stringtable_ = value;
4808 }
4809 -
4810 +
4811 bitField0_ |= 0x00000001;
4812 return this;
4813 }
4814 + /**
4815 + * <code>required .OSMPBF.StringTable stringtable = 1;</code>
4816 + */
4817 public Builder clearStringtable() {
4818 stringtable_ = org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance();
4819 -
4820 +
4821 bitField0_ = (bitField0_ & ~0x00000001);
4822 return this;
4823 }
4824 -
4825 - // repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
4826 +
4827 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> primitivegroup_ =
4828 java.util.Collections.emptyList();
4829 private void ensurePrimitivegroupIsMutable() {
4830 @@ -1962,16 +2985,28 @@ public final class Osmformat {
4831 bitField0_ |= 0x00000002;
4832 }
4833 }
4834 -
4835 +
4836 + /**
4837 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4838 + */
4839 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> getPrimitivegroupList() {
4840 return java.util.Collections.unmodifiableList(primitivegroup_);
4841 }
4842 + /**
4843 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4844 + */
4845 public int getPrimitivegroupCount() {
4846 return primitivegroup_.size();
4847 }
4848 + /**
4849 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4850 + */
4851 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index) {
4852 return primitivegroup_.get(index);
4853 }
4854 + /**
4855 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4856 + */
4857 public Builder setPrimitivegroup(
4858 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
4859 if (value == null) {
4860 @@ -1979,25 +3014,34 @@ public final class Osmformat {
4861 }
4862 ensurePrimitivegroupIsMutable();
4863 primitivegroup_.set(index, value);
4864 -
4865 +
4866 return this;
4867 }
4868 + /**
4869 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4870 + */
4871 public Builder setPrimitivegroup(
4872 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
4873 ensurePrimitivegroupIsMutable();
4874 primitivegroup_.set(index, builderForValue.build());
4875 -
4876 +
4877 return this;
4878 }
4879 + /**
4880 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4881 + */
4882 public Builder addPrimitivegroup(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
4883 if (value == null) {
4884 throw new NullPointerException();
4885 }
4886 ensurePrimitivegroupIsMutable();
4887 primitivegroup_.add(value);
4888 -
4889 +
4890 return this;
4891 }
4892 + /**
4893 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4894 + */
4895 public Builder addPrimitivegroup(
4896 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
4897 if (value == null) {
4898 @@ -2005,282 +3049,615 @@ public final class Osmformat {
4899 }
4900 ensurePrimitivegroupIsMutable();
4901 primitivegroup_.add(index, value);
4902 -
4903 +
4904 return this;
4905 }
4906 + /**
4907 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4908 + */
4909 public Builder addPrimitivegroup(
4910 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
4911 ensurePrimitivegroupIsMutable();
4912 primitivegroup_.add(builderForValue.build());
4913 -
4914 +
4915 return this;
4916 }
4917 + /**
4918 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4919 + */
4920 public Builder addPrimitivegroup(
4921 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
4922 ensurePrimitivegroupIsMutable();
4923 primitivegroup_.add(index, builderForValue.build());
4924 -
4925 +
4926 return this;
4927 }
4928 + /**
4929 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4930 + */
4931 public Builder addAllPrimitivegroup(
4932 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup> values) {
4933 ensurePrimitivegroupIsMutable();
4934 - super.addAll(values, primitivegroup_);
4935 -
4936 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
4937 + values, primitivegroup_);
4938 +
4939 return this;
4940 }
4941 + /**
4942 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4943 + */
4944 public Builder clearPrimitivegroup() {
4945 primitivegroup_ = java.util.Collections.emptyList();
4946 bitField0_ = (bitField0_ & ~0x00000002);
4947 -
4948 +
4949 return this;
4950 }
4951 + /**
4952 + * <code>repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;</code>
4953 + */
4954 public Builder removePrimitivegroup(int index) {
4955 ensurePrimitivegroupIsMutable();
4956 primitivegroup_.remove(index);
4957 -
4958 +
4959 return this;
4960 }
4961 -
4962 - // optional int32 granularity = 17 [default = 100];
4963 +
4964 private int granularity_ = 100;
4965 + /**
4966 + * <code>optional int32 granularity = 17 [default = 100];</code>
4967 + *
4968 + * <pre>
4969 + * Granularity, units of nanodegrees, used to store coordinates in this block
4970 + * </pre>
4971 + */
4972 public boolean hasGranularity() {
4973 return ((bitField0_ & 0x00000004) == 0x00000004);
4974 }
4975 + /**
4976 + * <code>optional int32 granularity = 17 [default = 100];</code>
4977 + *
4978 + * <pre>
4979 + * Granularity, units of nanodegrees, used to store coordinates in this block
4980 + * </pre>
4981 + */
4982 public int getGranularity() {
4983 return granularity_;
4984 }
4985 + /**
4986 + * <code>optional int32 granularity = 17 [default = 100];</code>
4987 + *
4988 + * <pre>
4989 + * Granularity, units of nanodegrees, used to store coordinates in this block
4990 + * </pre>
4991 + */
4992 public Builder setGranularity(int value) {
4993 bitField0_ |= 0x00000004;
4994 granularity_ = value;
4995
4996 return this;
4997 }
4998 + /**
4999 + * <code>optional int32 granularity = 17 [default = 100];</code>
5000 + *
5001 + * <pre>
5002 + * Granularity, units of nanodegrees, used to store coordinates in this block
5003 + * </pre>
5004 + */
5005 public Builder clearGranularity() {
5006 bitField0_ = (bitField0_ & ~0x00000004);
5007 granularity_ = 100;
5008
5009 return this;
5010 }
5011 -
5012 - // optional int64 lat_offset = 19 [default = 0];
5013 +
5014 private long latOffset_ ;
5015 + /**
5016 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
5017 + *
5018 + * <pre>
5019 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
5020 + * </pre>
5021 + */
5022 public boolean hasLatOffset() {
5023 return ((bitField0_ & 0x00000008) == 0x00000008);
5024 }
5025 + /**
5026 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
5027 + *
5028 + * <pre>
5029 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
5030 + * </pre>
5031 + */
5032 public long getLatOffset() {
5033 return latOffset_;
5034 }
5035 + /**
5036 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
5037 + *
5038 + * <pre>
5039 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
5040 + * </pre>
5041 + */
5042 public Builder setLatOffset(long value) {
5043 bitField0_ |= 0x00000008;
5044 latOffset_ = value;
5045
5046 return this;
5047 }
5048 + /**
5049 + * <code>optional int64 lat_offset = 19 [default = 0];</code>
5050 + *
5051 + * <pre>
5052 + * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
5053 + * </pre>
5054 + */
5055 public Builder clearLatOffset() {
5056 bitField0_ = (bitField0_ & ~0x00000008);
5057 latOffset_ = 0L;
5058
5059 return this;
5060 }
5061 -
5062 - // optional int64 lon_offset = 20 [default = 0];
5063 +
5064 private long lonOffset_ ;
5065 + /**
5066 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
5067 + */
5068 public boolean hasLonOffset() {
5069 return ((bitField0_ & 0x00000010) == 0x00000010);
5070 }
5071 + /**
5072 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
5073 + */
5074 public long getLonOffset() {
5075 return lonOffset_;
5076 }
5077 + /**
5078 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
5079 + */
5080 public Builder setLonOffset(long value) {
5081 bitField0_ |= 0x00000010;
5082 lonOffset_ = value;
5083
5084 return this;
5085 }
5086 + /**
5087 + * <code>optional int64 lon_offset = 20 [default = 0];</code>
5088 + */
5089 public Builder clearLonOffset() {
5090 bitField0_ = (bitField0_ & ~0x00000010);
5091 lonOffset_ = 0L;
5092
5093 return this;
5094 }
5095 -
5096 - // optional int32 date_granularity = 18 [default = 1000];
5097 +
5098 private int dateGranularity_ = 1000;
5099 + /**
5100 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
5101 + *
5102 + * <pre>
5103 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
5104 + * </pre>
5105 + */
5106 public boolean hasDateGranularity() {
5107 return ((bitField0_ & 0x00000020) == 0x00000020);
5108 }
5109 + /**
5110 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
5111 + *
5112 + * <pre>
5113 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
5114 + * </pre>
5115 + */
5116 public int getDateGranularity() {
5117 return dateGranularity_;
5118 }
5119 + /**
5120 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
5121 + *
5122 + * <pre>
5123 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
5124 + * </pre>
5125 + */
5126 public Builder setDateGranularity(int value) {
5127 bitField0_ |= 0x00000020;
5128 dateGranularity_ = value;
5129
5130 return this;
5131 }
5132 + /**
5133 + * <code>optional int32 date_granularity = 18 [default = 1000];</code>
5134 + *
5135 + * <pre>
5136 + * Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
5137 + * </pre>
5138 + */
5139 public Builder clearDateGranularity() {
5140 bitField0_ = (bitField0_ & ~0x00000020);
5141 dateGranularity_ = 1000;
5142
5143 return this;
5144 }
5145 -
5146 +
5147 // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveBlock)
5148 }
5149 -
5150 +
5151 static {
5152 defaultInstance = new PrimitiveBlock(true);
5153 defaultInstance.initFields();
5154 }
5155 -
5156 +
5157 // @@protoc_insertion_point(class_scope:OSMPBF.PrimitiveBlock)
5158 }
5159 -
5160 - public interface PrimitiveGroupOrBuilder
5161 - extends com.google.protobuf.MessageLiteOrBuilder {
5162 -
5163 - // repeated .OSMPBF.Node nodes = 1;
5164 +
5165 + public interface PrimitiveGroupOrBuilder extends
5166 + // @@protoc_insertion_point(interface_extends:OSMPBF.PrimitiveGroup)
5167 + com.google.protobuf.MessageLiteOrBuilder {
5168 +
5169 + /**
5170 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5171 + */
5172 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Node>
5173 getNodesList();
5174 + /**
5175 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5176 + */
5177 org.openstreetmap.osmosis.osmbinary.Osmformat.Node getNodes(int index);
5178 + /**
5179 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5180 + */
5181 int getNodesCount();
5182 -
5183 - // optional .OSMPBF.DenseNodes dense = 2;
5184 +
5185 + /**
5186 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
5187 + */
5188 boolean hasDense();
5189 + /**
5190 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
5191 + */
5192 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes getDense();
5193 -
5194 - // repeated .OSMPBF.Way ways = 3;
5195 +
5196 + /**
5197 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5198 + */
5199 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Way>
5200 getWaysList();
5201 + /**
5202 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5203 + */
5204 org.openstreetmap.osmosis.osmbinary.Osmformat.Way getWays(int index);
5205 + /**
5206 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5207 + */
5208 int getWaysCount();
5209 -
5210 - // repeated .OSMPBF.Relation relations = 4;
5211 +
5212 + /**
5213 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5214 + */
5215 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation>
5216 getRelationsList();
5217 + /**
5218 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5219 + */
5220 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation getRelations(int index);
5221 + /**
5222 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5223 + */
5224 int getRelationsCount();
5225 -
5226 - // repeated .OSMPBF.ChangeSet changesets = 5;
5227 +
5228 + /**
5229 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5230 + */
5231 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet>
5232 getChangesetsList();
5233 + /**
5234 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5235 + */
5236 org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet getChangesets(int index);
5237 + /**
5238 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5239 + */
5240 int getChangesetsCount();
5241 }
5242 + /**
5243 + * Protobuf type {@code OSMPBF.PrimitiveGroup}
5244 + *
5245 + * <pre>
5246 + * Group of OSMPrimitives. All primitives in a group must be the same type.
5247 + * </pre>
5248 + */
5249 public static final class PrimitiveGroup extends
5250 - com.google.protobuf.GeneratedMessageLite
5251 - implements PrimitiveGroupOrBuilder {
5252 + com.google.protobuf.GeneratedMessageLite implements
5253 + // @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveGroup)
5254 + PrimitiveGroupOrBuilder {
5255 // Use PrimitiveGroup.newBuilder() to construct.
5256 - private PrimitiveGroup(Builder builder) {
5257 + private PrimitiveGroup(com.google.protobuf.GeneratedMessageLite.Builder builder) {
5258 super(builder);
5259 + this.unknownFields = builder.getUnknownFields();
5260 }
5261 - private PrimitiveGroup(boolean noInit) {}
5262 -
5263 + private PrimitiveGroup(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
5264 +
5265 private static final PrimitiveGroup defaultInstance;
5266 public static PrimitiveGroup getDefaultInstance() {
5267 return defaultInstance;
5268 }
5269 -
5270 +
5271 public PrimitiveGroup getDefaultInstanceForType() {
5272 return defaultInstance;
5273 }
5274 -
5275 +
5276 + private final com.google.protobuf.ByteString unknownFields;
5277 + private PrimitiveGroup(
5278 + com.google.protobuf.CodedInputStream input,
5279 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5280 + throws com.google.protobuf.InvalidProtocolBufferException {
5281 + initFields();
5282 + int mutable_bitField0_ = 0;
5283 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
5284 + com.google.protobuf.ByteString.newOutput();
5285 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
5286 + com.google.protobuf.CodedOutputStream.newInstance(
5287 + unknownFieldsOutput);
5288 + try {
5289 + boolean done = false;
5290 + while (!done) {
5291 + int tag = input.readTag();
5292 + switch (tag) {
5293 + case 0:
5294 + done = true;
5295 + break;
5296 + default: {
5297 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
5298 + extensionRegistry, tag)) {
5299 + done = true;
5300 + }
5301 + break;
5302 + }
5303 + case 10: {
5304 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
5305 + nodes_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.Node>();
5306 + mutable_bitField0_ |= 0x00000001;
5307 + }
5308 + nodes_.add(input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Node.PARSER, extensionRegistry));
5309 + break;
5310 + }
5311 + case 18: {
5312 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.Builder subBuilder = null;
5313 + if (((bitField0_ & 0x00000001) == 0x00000001)) {
5314 + subBuilder = dense_.toBuilder();
5315 + }
5316 + dense_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.PARSER, extensionRegistry);
5317 + if (subBuilder != null) {
5318 + subBuilder.mergeFrom(dense_);
5319 + dense_ = subBuilder.buildPartial();
5320 + }
5321 + bitField0_ |= 0x00000001;
5322 + break;
5323 + }
5324 + case 26: {
5325 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
5326 + ways_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.Way>();
5327 + mutable_bitField0_ |= 0x00000004;
5328 + }
5329 + ways_.add(input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Way.PARSER, extensionRegistry));
5330 + break;
5331 + }
5332 + case 34: {
5333 + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
5334 + relations_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation>();
5335 + mutable_bitField0_ |= 0x00000008;
5336 + }
5337 + relations_.add(input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.PARSER, extensionRegistry));
5338 + break;
5339 + }
5340 + case 42: {
5341 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
5342 + changesets_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet>();
5343 + mutable_bitField0_ |= 0x00000010;
5344 + }
5345 + changesets_.add(input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.PARSER, extensionRegistry));
5346 + break;
5347 + }
5348 + }
5349 + }
5350 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
5351 + throw e.setUnfinishedMessage(this);
5352 + } catch (java.io.IOException e) {
5353 + throw new com.google.protobuf.InvalidProtocolBufferException(
5354 + e.getMessage()).setUnfinishedMessage(this);
5355 + } finally {
5356 + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
5357 + nodes_ = java.util.Collections.unmodifiableList(nodes_);
5358 + }
5359 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
5360 + ways_ = java.util.Collections.unmodifiableList(ways_);
5361 + }
5362 + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
5363 + relations_ = java.util.Collections.unmodifiableList(relations_);
5364 + }
5365 + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
5366 + changesets_ = java.util.Collections.unmodifiableList(changesets_);
5367 + }
5368 + try {
5369 + unknownFieldsCodedOutput.flush();
5370 + } catch (java.io.IOException e) {
5371 + // Should not happen
5372 + } finally {
5373 + unknownFields = unknownFieldsOutput.toByteString();
5374 + }
5375 + makeExtensionsImmutable();
5376 + }
5377 + }
5378 + public static com.google.protobuf.Parser<PrimitiveGroup> PARSER =
5379 + new com.google.protobuf.AbstractParser<PrimitiveGroup>() {
5380 + public PrimitiveGroup parsePartialFrom(
5381 + com.google.protobuf.CodedInputStream input,
5382 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5383 + throws com.google.protobuf.InvalidProtocolBufferException {
5384 + return new PrimitiveGroup(input, extensionRegistry);
5385 + }
5386 + };
5387 +
5388 + @java.lang.Override
5389 + public com.google.protobuf.Parser<PrimitiveGroup> getParserForType() {
5390 + return PARSER;
5391 + }
5392 +
5393 private int bitField0_;
5394 - // repeated .OSMPBF.Node nodes = 1;
5395 public static final int NODES_FIELD_NUMBER = 1;
5396 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Node> nodes_;
5397 + /**
5398 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5399 + */
5400 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Node> getNodesList() {
5401 return nodes_;
5402 }
5403 + /**
5404 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5405 + */
5406 public java.util.List<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.NodeOrBuilder>
5407 getNodesOrBuilderList() {
5408 return nodes_;
5409 }
5410 + /**
5411 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5412 + */
5413 public int getNodesCount() {
5414 return nodes_.size();
5415 }
5416 + /**
5417 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5418 + */
5419 public org.openstreetmap.osmosis.osmbinary.Osmformat.Node getNodes(int index) {
5420 return nodes_.get(index);
5421 }
5422 + /**
5423 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5424 + */
5425 public org.openstreetmap.osmosis.osmbinary.Osmformat.NodeOrBuilder getNodesOrBuilder(
5426 int index) {
5427 return nodes_.get(index);
5428 }
5429 -
5430 - // optional .OSMPBF.DenseNodes dense = 2;
5431 +
5432 public static final int DENSE_FIELD_NUMBER = 2;
5433 private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes dense_;
5434 + /**
5435 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
5436 + */
5437 public boolean hasDense() {
5438 return ((bitField0_ & 0x00000001) == 0x00000001);
5439 }
5440 + /**
5441 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
5442 + */
5443 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes getDense() {
5444 return dense_;
5445 }
5446 -
5447 - // repeated .OSMPBF.Way ways = 3;
5448 +
5449 public static final int WAYS_FIELD_NUMBER = 3;
5450 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Way> ways_;
5451 + /**
5452 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5453 + */
5454 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Way> getWaysList() {
5455 return ways_;
5456 }
5457 + /**
5458 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5459 + */
5460 public java.util.List<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.WayOrBuilder>
5461 getWaysOrBuilderList() {
5462 return ways_;
5463 }
5464 + /**
5465 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5466 + */
5467 public int getWaysCount() {
5468 return ways_.size();
5469 }
5470 + /**
5471 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5472 + */
5473 public org.openstreetmap.osmosis.osmbinary.Osmformat.Way getWays(int index) {
5474 return ways_.get(index);
5475 }
5476 + /**
5477 + * <code>repeated .OSMPBF.Way ways = 3;</code>
5478 + */
5479 public org.openstreetmap.osmosis.osmbinary.Osmformat.WayOrBuilder getWaysOrBuilder(
5480 int index) {
5481 return ways_.get(index);
5482 }
5483 -
5484 - // repeated .OSMPBF.Relation relations = 4;
5485 +
5486 public static final int RELATIONS_FIELD_NUMBER = 4;
5487 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation> relations_;
5488 + /**
5489 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5490 + */
5491 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation> getRelationsList() {
5492 return relations_;
5493 }
5494 + /**
5495 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5496 + */
5497 public java.util.List<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.RelationOrBuilder>
5498 getRelationsOrBuilderList() {
5499 return relations_;
5500 }
5501 + /**
5502 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5503 + */
5504 public int getRelationsCount() {
5505 return relations_.size();
5506 }
5507 + /**
5508 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5509 + */
5510 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation getRelations(int index) {
5511 return relations_.get(index);
5512 }
5513 + /**
5514 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
5515 + */
5516 public org.openstreetmap.osmosis.osmbinary.Osmformat.RelationOrBuilder getRelationsOrBuilder(
5517 int index) {
5518 return relations_.get(index);
5519 }
5520 -
5521 - // repeated .OSMPBF.ChangeSet changesets = 5;
5522 +
5523 public static final int CHANGESETS_FIELD_NUMBER = 5;
5524 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet> changesets_;
5525 + /**
5526 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5527 + */
5528 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet> getChangesetsList() {
5529 return changesets_;
5530 }
5531 + /**
5532 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5533 + */
5534 public java.util.List<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSetOrBuilder>
5535 getChangesetsOrBuilderList() {
5536 return changesets_;
5537 }
5538 + /**
5539 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5540 + */
5541 public int getChangesetsCount() {
5542 return changesets_.size();
5543 }
5544 + /**
5545 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5546 + */
5547 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet getChangesets(int index) {
5548 return changesets_.get(index);
5549 }
5550 + /**
5551 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
5552 + */
5553 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSetOrBuilder getChangesetsOrBuilder(
5554 int index) {
5555 return changesets_.get(index);
5556 }
5557 -
5558 +
5559 private void initFields() {
5560 nodes_ = java.util.Collections.emptyList();
5561 dense_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance();
5562 @@ -2291,8 +3668,9 @@ public final class Osmformat {
5563 private byte memoizedIsInitialized = -1;
5564 public final boolean isInitialized() {
5565 byte isInitialized = memoizedIsInitialized;
5566 - if (isInitialized != -1) return isInitialized == 1;
5567 -
5568 + if (isInitialized == 1) return true;
5569 + if (isInitialized == 0) return false;
5570 +
5571 for (int i = 0; i < getNodesCount(); i++) {
5572 if (!getNodes(i).isInitialized()) {
5573 memoizedIsInitialized = 0;
5574 @@ -2320,7 +3698,7 @@ public final class Osmformat {
5575 memoizedIsInitialized = 1;
5576 return true;
5577 }
5578 -
5579 +
5580 public void writeTo(com.google.protobuf.CodedOutputStream output)
5581 throws java.io.IOException {
5582 getSerializedSize();
5583 @@ -2339,13 +3717,14 @@ public final class Osmformat {
5584 for (int i = 0; i < changesets_.size(); i++) {
5585 output.writeMessage(5, changesets_.get(i));
5586 }
5587 + output.writeRawBytes(unknownFields);
5588 }
5589 -
5590 +
5591 private int memoizedSerializedSize = -1;
5592 public int getSerializedSize() {
5593 int size = memoizedSerializedSize;
5594 if (size != -1) return size;
5595 -
5596 +
5597 size = 0;
5598 for (int i = 0; i < nodes_.size(); i++) {
5599 size += com.google.protobuf.CodedOutputStream
5600 @@ -2367,106 +3746,102 @@ public final class Osmformat {
5601 size += com.google.protobuf.CodedOutputStream
5602 .computeMessageSize(5, changesets_.get(i));
5603 }
5604 + size += unknownFields.size();
5605 memoizedSerializedSize = size;
5606 return size;
5607 }
5608 -
5609 +
5610 private static final long serialVersionUID = 0L;
5611 @java.lang.Override
5612 protected java.lang.Object writeReplace()
5613 throws java.io.ObjectStreamException {
5614 return super.writeReplace();
5615 }
5616 -
5617 +
5618 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5619 com.google.protobuf.ByteString data)
5620 throws com.google.protobuf.InvalidProtocolBufferException {
5621 - return newBuilder().mergeFrom(data).buildParsed();
5622 + return PARSER.parseFrom(data);
5623 }
5624 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5625 com.google.protobuf.ByteString data,
5626 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5627 throws com.google.protobuf.InvalidProtocolBufferException {
5628 - return newBuilder().mergeFrom(data, extensionRegistry)
5629 - .buildParsed();
5630 + return PARSER.parseFrom(data, extensionRegistry);
5631 }
5632 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(byte[] data)
5633 throws com.google.protobuf.InvalidProtocolBufferException {
5634 - return newBuilder().mergeFrom(data).buildParsed();
5635 + return PARSER.parseFrom(data);
5636 }
5637 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5638 byte[] data,
5639 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5640 throws com.google.protobuf.InvalidProtocolBufferException {
5641 - return newBuilder().mergeFrom(data, extensionRegistry)
5642 - .buildParsed();
5643 + return PARSER.parseFrom(data, extensionRegistry);
5644 }
5645 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(java.io.InputStream input)
5646 throws java.io.IOException {
5647 - return newBuilder().mergeFrom(input).buildParsed();
5648 + return PARSER.parseFrom(input);
5649 }
5650 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5651 java.io.InputStream input,
5652 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5653 throws java.io.IOException {
5654 - return newBuilder().mergeFrom(input, extensionRegistry)
5655 - .buildParsed();
5656 + return PARSER.parseFrom(input, extensionRegistry);
5657 }
5658 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseDelimitedFrom(java.io.InputStream input)
5659 throws java.io.IOException {
5660 - Builder builder = newBuilder();
5661 - if (builder.mergeDelimitedFrom(input)) {
5662 - return builder.buildParsed();
5663 - } else {
5664 - return null;
5665 - }
5666 + return PARSER.parseDelimitedFrom(input);
5667 }
5668 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseDelimitedFrom(
5669 java.io.InputStream input,
5670 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5671 throws java.io.IOException {
5672 - Builder builder = newBuilder();
5673 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
5674 - return builder.buildParsed();
5675 - } else {
5676 - return null;
5677 - }
5678 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
5679 }
5680 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5681 com.google.protobuf.CodedInputStream input)
5682 throws java.io.IOException {
5683 - return newBuilder().mergeFrom(input).buildParsed();
5684 + return PARSER.parseFrom(input);
5685 }
5686 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
5687 com.google.protobuf.CodedInputStream input,
5688 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5689 throws java.io.IOException {
5690 - return newBuilder().mergeFrom(input, extensionRegistry)
5691 - .buildParsed();
5692 + return PARSER.parseFrom(input, extensionRegistry);
5693 }
5694 -
5695 +
5696 public static Builder newBuilder() { return Builder.create(); }
5697 public Builder newBuilderForType() { return newBuilder(); }
5698 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup prototype) {
5699 return newBuilder().mergeFrom(prototype);
5700 }
5701 public Builder toBuilder() { return newBuilder(this); }
5702 -
5703 +
5704 + /**
5705 + * Protobuf type {@code OSMPBF.PrimitiveGroup}
5706 + *
5707 + * <pre>
5708 + * Group of OSMPrimitives. All primitives in a group must be the same type.
5709 + * </pre>
5710 + */
5711 public static final class Builder extends
5712 com.google.protobuf.GeneratedMessageLite.Builder<
5713 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup, Builder>
5714 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder {
5715 + implements
5716 + // @@protoc_insertion_point(builder_implements:OSMPBF.PrimitiveGroup)
5717 + org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder {
5718 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.newBuilder()
5719 private Builder() {
5720 maybeForceBuilderInitialization();
5721 }
5722 -
5723 +
5724 private void maybeForceBuilderInitialization() {
5725 }
5726 private static Builder create() {
5727 return new Builder();
5728 }
5729 -
5730 +
5731 public Builder clear() {
5732 super.clear();
5733 nodes_ = java.util.Collections.emptyList();
5734 @@ -2481,15 +3856,15 @@ public final class Osmformat {
5735 bitField0_ = (bitField0_ & ~0x00000010);
5736 return this;
5737 }
5738 -
5739 +
5740 public Builder clone() {
5741 return create().mergeFrom(buildPartial());
5742 }
5743 -
5744 +
5745 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getDefaultInstanceForType() {
5746 return org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.getDefaultInstance();
5747 }
5748 -
5749 +
5750 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup build() {
5751 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup result = buildPartial();
5752 if (!result.isInitialized()) {
5753 @@ -2497,17 +3872,7 @@ public final class Osmformat {
5754 }
5755 return result;
5756 }
5757 -
5758 - private org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup buildParsed()
5759 - throws com.google.protobuf.InvalidProtocolBufferException {
5760 - org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup result = buildPartial();
5761 - if (!result.isInitialized()) {
5762 - throw newUninitializedMessageException(
5763 - result).asInvalidProtocolBufferException();
5764 - }
5765 - return result;
5766 - }
5767 -
5768 +
5769 public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup buildPartial() {
5770 org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup result = new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup(this);
5771 int from_bitField0_ = bitField0_;
5772 @@ -2539,7 +3904,7 @@ public final class Osmformat {
5773 result.bitField0_ = to_bitField0_;
5774 return result;
5775 }
5776 -
5777 +
5778 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup other) {
5779 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.getDefaultInstance()) return this;
5780 if (!other.nodes_.isEmpty()) {
5781 @@ -2585,9 +3950,11 @@ public final class Osmformat {
5782 }
5783
5784 }
5785 + setUnknownFields(
5786 + getUnknownFields().concat(other.unknownFields));
5787 return this;
5788 }
5789 -
5790 +
5791 public final boolean isInitialized() {
5792 for (int i = 0; i < getNodesCount(); i++) {
5793 if (!getNodes(i).isInitialized()) {
5794 @@ -2615,64 +3982,26 @@ public final class Osmformat {
5795 }
5796 return true;
5797 }
5798 -
5799 +
5800 public Builder mergeFrom(
5801 com.google.protobuf.CodedInputStream input,
5802 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
5803 throws java.io.IOException {
5804 - while (true) {
5805 - int tag = input.readTag();
5806 - switch (tag) {
5807 - case 0:
5808 -
5809 - return this;
5810 - default: {
5811 - if (!parseUnknownField(input, extensionRegistry, tag)) {
5812 -
5813 - return this;
5814 - }
5815 - break;
5816 - }
5817 - case 10: {
5818 - org.openstreetmap.osmosis.osmbinary.Osmformat.Node.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Node.newBuilder();
5819 - input.readMessage(subBuilder, extensionRegistry);
5820 - addNodes(subBuilder.buildPartial());
5821 - break;
5822 - }
5823 - case 18: {
5824 - org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.newBuilder();
5825 - if (hasDense()) {
5826 - subBuilder.mergeFrom(getDense());
5827 - }
5828 - input.readMessage(subBuilder, extensionRegistry);
5829 - setDense(subBuilder.buildPartial());
5830 - break;
5831 - }
5832 - case 26: {
5833 - org.openstreetmap.osmosis.osmbinary.Osmformat.Way.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Way.newBuilder();
5834 - input.readMessage(subBuilder, extensionRegistry);
5835 - addWays(subBuilder.buildPartial());
5836 - break;
5837 - }
5838 - case 34: {
5839 - org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.newBuilder();
5840 - input.readMessage(subBuilder, extensionRegistry);
5841 - addRelations(subBuilder.buildPartial());
5842 - break;
5843 - }
5844 - case 42: {
5845 - org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.newBuilder();
5846 - input.readMessage(subBuilder, extensionRegistry);
5847 - addChangesets(subBuilder.buildPartial());
5848 - break;
5849 - }
5850 + org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parsedMessage = null;
5851 + try {
5852 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
5853 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
5854 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup) e.getUnfinishedMessage();
5855 + throw e;
5856 + } finally {
5857 + if (parsedMessage != null) {
5858 + mergeFrom(parsedMessage);
5859 }
5860 }
5861 + return this;
5862 }
5863 -
5864 private int bitField0_;
5865 -
5866 - // repeated .OSMPBF.Node nodes = 1;
5867 +
5868 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Node> nodes_ =
5869 java.util.Collections.emptyList();
5870 private void ensureNodesIsMutable() {
5871 @@ -2681,16 +4010,28 @@ public final class Osmformat {
5872 bitField0_ |= 0x00000001;
5873 }
5874 }
5875 -
5876 +
5877 + /**
5878 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5879 + */
5880 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Node> getNodesList() {
5881 return java.util.Collections.unmodifiableList(nodes_);
5882 }
5883 + /**
5884 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5885 + */
5886 public int getNodesCount() {
5887 return nodes_.size();
5888 }
5889 + /**
5890 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5891 + */
5892 public org.openstreetmap.osmosis.osmbinary.Osmformat.Node getNodes(int index) {
5893 return nodes_.get(index);
5894 }
5895 + /**
5896 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5897 + */
5898 public Builder setNodes(
5899 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Node value) {
5900 if (value == null) {
5901 @@ -2698,25 +4039,34 @@ public final class Osmformat {
5902 }
5903 ensureNodesIsMutable();
5904 nodes_.set(index, value);
5905 -
5906 +
5907 return this;
5908 }
5909 + /**
5910 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5911 + */
5912 public Builder setNodes(
5913 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Node.Builder builderForValue) {
5914 ensureNodesIsMutable();
5915 nodes_.set(index, builderForValue.build());
5916 -
5917 +
5918 return this;
5919 }
5920 + /**
5921 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5922 + */
5923 public Builder addNodes(org.openstreetmap.osmosis.osmbinary.Osmformat.Node value) {
5924 if (value == null) {
5925 throw new NullPointerException();
5926 }
5927 ensureNodesIsMutable();
5928 nodes_.add(value);
5929 -
5930 +
5931 return this;
5932 }
5933 + /**
5934 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5935 + */
5936 public Builder addNodes(
5937 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Node value) {
5938 if (value == null) {
5939 @@ -2724,67 +4074,97 @@ public final class Osmformat {
5940 }
5941 ensureNodesIsMutable();
5942 nodes_.add(index, value);
5943 -
5944 +
5945 return this;
5946 }
5947 + /**
5948 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5949 + */
5950 public Builder addNodes(
5951 org.openstreetmap.osmosis.osmbinary.Osmformat.Node.Builder builderForValue) {
5952 ensureNodesIsMutable();
5953 nodes_.add(builderForValue.build());
5954 -
5955 +
5956 return this;
5957 }
5958 + /**
5959 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5960 + */
5961 public Builder addNodes(
5962 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Node.Builder builderForValue) {
5963 ensureNodesIsMutable();
5964 nodes_.add(index, builderForValue.build());
5965 -
5966 +
5967 return this;
5968 }
5969 + /**
5970 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5971 + */
5972 public Builder addAllNodes(
5973 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.Node> values) {
5974 ensureNodesIsMutable();
5975 - super.addAll(values, nodes_);
5976 -
5977 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
5978 + values, nodes_);
5979 +
5980 return this;
5981 }
5982 + /**
5983 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5984 + */
5985 public Builder clearNodes() {
5986 nodes_ = java.util.Collections.emptyList();
5987 bitField0_ = (bitField0_ & ~0x00000001);
5988 -
5989 +
5990 return this;
5991 }
5992 + /**
5993 + * <code>repeated .OSMPBF.Node nodes = 1;</code>
5994 + */
5995 public Builder removeNodes(int index) {
5996 ensureNodesIsMutable();
5997 nodes_.remove(index);
5998 -
5999 +
6000 return this;
6001 }
6002 -
6003 - // optional .OSMPBF.DenseNodes dense = 2;
6004 +
6005 private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes dense_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance();
6006 + /**
6007 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6008 + */
6009 public boolean hasDense() {
6010 return ((bitField0_ & 0x00000002) == 0x00000002);
6011 }
6012 + /**
6013 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6014 + */
6015 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes getDense() {
6016 return dense_;
6017 }
6018 + /**
6019 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6020 + */
6021 public Builder setDense(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes value) {
6022 if (value == null) {
6023 throw new NullPointerException();
6024 }
6025 dense_ = value;
6026 -
6027 +
6028 bitField0_ |= 0x00000002;
6029 return this;
6030 }
6031 + /**
6032 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6033 + */
6034 public Builder setDense(
6035 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.Builder builderForValue) {
6036 dense_ = builderForValue.build();
6037 -
6038 +
6039 bitField0_ |= 0x00000002;
6040 return this;
6041 }
6042 + /**
6043 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6044 + */
6045 public Builder mergeDense(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes value) {
6046 if (((bitField0_ & 0x00000002) == 0x00000002) &&
6047 dense_ != org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance()) {
6048 @@ -2793,18 +4173,20 @@ public final class Osmformat {
6049 } else {
6050 dense_ = value;
6051 }
6052 -
6053 +
6054 bitField0_ |= 0x00000002;
6055 return this;
6056 }
6057 + /**
6058 + * <code>optional .OSMPBF.DenseNodes dense = 2;</code>
6059 + */
6060 public Builder clearDense() {
6061 dense_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance();
6062 -
6063 +
6064 bitField0_ = (bitField0_ & ~0x00000002);
6065 return this;
6066 }
6067 -
6068 - // repeated .OSMPBF.Way ways = 3;
6069 +
6070 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Way> ways_ =
6071 java.util.Collections.emptyList();
6072 private void ensureWaysIsMutable() {
6073 @@ -2813,16 +4195,28 @@ public final class Osmformat {
6074 bitField0_ |= 0x00000004;
6075 }
6076 }
6077 -
6078 +
6079 + /**
6080 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6081 + */
6082 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Way> getWaysList() {
6083 return java.util.Collections.unmodifiableList(ways_);
6084 }
6085 + /**
6086 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6087 + */
6088 public int getWaysCount() {
6089 return ways_.size();
6090 }
6091 + /**
6092 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6093 + */
6094 public org.openstreetmap.osmosis.osmbinary.Osmformat.Way getWays(int index) {
6095 return ways_.get(index);
6096 }
6097 + /**
6098 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6099 + */
6100 public Builder setWays(
6101 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Way value) {
6102 if (value == null) {
6103 @@ -2830,25 +4224,34 @@ public final class Osmformat {
6104 }
6105 ensureWaysIsMutable();
6106 ways_.set(index, value);
6107 -
6108 +
6109 return this;
6110 }
6111 + /**
6112 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6113 + */
6114 public Builder setWays(
6115 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Way.Builder builderForValue) {
6116 ensureWaysIsMutable();
6117 ways_.set(index, builderForValue.build());
6118 -
6119 +
6120 return this;
6121 }
6122 + /**
6123 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6124 + */
6125 public Builder addWays(org.openstreetmap.osmosis.osmbinary.Osmformat.Way value) {
6126 if (value == null) {
6127 throw new NullPointerException();
6128 }
6129 ensureWaysIsMutable();
6130 ways_.add(value);
6131 -
6132 +
6133 return this;
6134 }
6135 + /**
6136 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6137 + */
6138 public Builder addWays(
6139 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Way value) {
6140 if (value == null) {
6141 @@ -2856,44 +4259,59 @@ public final class Osmformat {
6142 }
6143 ensureWaysIsMutable();
6144 ways_.add(index, value);
6145 -
6146 +
6147 return this;
6148 }
6149 + /**
6150 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6151 + */
6152 public Builder addWays(
6153 org.openstreetmap.osmosis.osmbinary.Osmformat.Way.Builder builderForValue) {
6154 ensureWaysIsMutable();
6155 ways_.add(builderForValue.build());
6156 -
6157 +
6158 return this;
6159 }
6160 + /**
6161 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6162 + */
6163 public Builder addWays(
6164 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Way.Builder builderForValue) {
6165 ensureWaysIsMutable();
6166 ways_.add(index, builderForValue.build());
6167 -
6168 +
6169 return this;
6170 }
6171 + /**
6172 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6173 + */
6174 public Builder addAllWays(
6175 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.Way> values) {
6176 ensureWaysIsMutable();
6177 - super.addAll(values, ways_);
6178 -
6179 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
6180 + values, ways_);
6181 +
6182 return this;
6183 }
6184 + /**
6185 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6186 + */
6187 public Builder clearWays() {
6188 ways_ = java.util.Collections.emptyList();
6189 bitField0_ = (bitField0_ & ~0x00000004);
6190 -
6191 +
6192 return this;
6193 }
6194 + /**
6195 + * <code>repeated .OSMPBF.Way ways = 3;</code>
6196 + */
6197 public Builder removeWays(int index) {
6198 ensureWaysIsMutable();
6199 ways_.remove(index);
6200 -
6201 +
6202 return this;
6203 }
6204 -
6205 - // repeated .OSMPBF.Relation relations = 4;
6206 +
6207 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation> relations_ =
6208 java.util.Collections.emptyList();
6209 private void ensureRelationsIsMutable() {
6210 @@ -2902,16 +4320,28 @@ public final class Osmformat {
6211 bitField0_ |= 0x00000008;
6212 }
6213 }
6214 -
6215 +
6216 + /**
6217 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6218 + */
6219 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation> getRelationsList() {
6220 return java.util.Collections.unmodifiableList(relations_);
6221 }
6222 + /**
6223 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6224 + */
6225 public int getRelationsCount() {
6226 return relations_.size();
6227 }
6228 + /**
6229 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6230 + */
6231 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation getRelations(int index) {
6232 return relations_.get(index);
6233 }
6234 + /**
6235 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6236 + */
6237 public Builder setRelations(
6238 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Relation value) {
6239 if (value == null) {
6240 @@ -2919,25 +4349,34 @@ public final class Osmformat {
6241 }
6242 ensureRelationsIsMutable();
6243 relations_.set(index, value);
6244 -
6245 +
6246 return this;
6247 }
6248 + /**
6249 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6250 + */
6251 public Builder setRelations(
6252 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.Builder builderForValue) {
6253 ensureRelationsIsMutable();
6254 relations_.set(index, builderForValue.build());
6255 -
6256 +
6257 return this;
6258 }
6259 + /**
6260 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6261 + */
6262 public Builder addRelations(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation value) {
6263 if (value == null) {
6264 throw new NullPointerException();
6265 }
6266 ensureRelationsIsMutable();
6267 relations_.add(value);
6268 -
6269 +
6270 return this;
6271 }
6272 + /**
6273 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6274 + */
6275 public Builder addRelations(
6276 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Relation value) {
6277 if (value == null) {
6278 @@ -2945,44 +4384,59 @@ public final class Osmformat {
6279 }
6280 ensureRelationsIsMutable();
6281 relations_.add(index, value);
6282 -
6283 +
6284 return this;
6285 }
6286 + /**
6287 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6288 + */
6289 public Builder addRelations(
6290 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.Builder builderForValue) {
6291 ensureRelationsIsMutable();
6292 relations_.add(builderForValue.build());
6293 -
6294 +
6295 return this;
6296 }
6297 + /**
6298 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6299 + */
6300 public Builder addRelations(
6301 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.Builder builderForValue) {
6302 ensureRelationsIsMutable();
6303 relations_.add(index, builderForValue.build());
6304 -
6305 +
6306 return this;
6307 }
6308 + /**
6309 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6310 + */
6311 public Builder addAllRelations(
6312 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.Relation> values) {
6313 ensureRelationsIsMutable();
6314 - super.addAll(values, relations_);
6315 -
6316 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
6317 + values, relations_);
6318 +
6319 return this;
6320 }
6321 + /**
6322 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6323 + */
6324 public Builder clearRelations() {
6325 relations_ = java.util.Collections.emptyList();
6326 bitField0_ = (bitField0_ & ~0x00000008);
6327 -
6328 +
6329 return this;
6330 }
6331 + /**
6332 + * <code>repeated .OSMPBF.Relation relations = 4;</code>
6333 + */
6334 public Builder removeRelations(int index) {
6335 ensureRelationsIsMutable();
6336 relations_.remove(index);
6337 -
6338 +
6339 return this;
6340 }
6341 -
6342 - // repeated .OSMPBF.ChangeSet changesets = 5;
6343 +
6344 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet> changesets_ =
6345 java.util.Collections.emptyList();
6346 private void ensureChangesetsIsMutable() {
6347 @@ -2991,16 +4445,28 @@ public final class Osmformat {
6348 bitField0_ |= 0x00000010;
6349 }
6350 }
6351 -
6352 +
6353 + /**
6354 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6355 + */
6356 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet> getChangesetsList() {
6357 return java.util.Collections.unmodifiableList(changesets_);
6358 }
6359 + /**
6360 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6361 + */
6362 public int getChangesetsCount() {
6363 return changesets_.size();
6364 }
6365 + /**
6366 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6367 + */
6368 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet getChangesets(int index) {
6369 return changesets_.get(index);
6370 }
6371 + /**
6372 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6373 + */
6374 public Builder setChangesets(
6375 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet value) {
6376 if (value == null) {
6377 @@ -3008,25 +4474,34 @@ public final class Osmformat {
6378 }
6379 ensureChangesetsIsMutable();
6380 changesets_.set(index, value);
6381 -
6382 +
6383 return this;
6384 }
6385 + /**
6386 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6387 + */
6388 public Builder setChangesets(
6389 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.Builder builderForValue) {
6390 ensureChangesetsIsMutable();
6391 changesets_.set(index, builderForValue.build());
6392 -
6393 +
6394 return this;
6395 }
6396 + /**
6397 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6398 + */
6399 public Builder addChangesets(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet value) {
6400 if (value == null) {
6401 throw new NullPointerException();
6402 }
6403 ensureChangesetsIsMutable();
6404 changesets_.add(value);
6405 -
6406 +
6407 return this;
6408 }
6409 + /**
6410 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6411 + */
6412 public Builder addChangesets(
6413 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet value) {
6414 if (value == null) {
6415 @@ -3034,119 +4509,236 @@ public final class Osmformat {
6416 }
6417 ensureChangesetsIsMutable();
6418 changesets_.add(index, value);
6419 -
6420 +
6421 return this;
6422 }
6423 + /**
6424 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6425 + */
6426 public Builder addChangesets(
6427 org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.Builder builderForValue) {
6428 ensureChangesetsIsMutable();
6429 changesets_.add(builderForValue.build());
6430 -
6431 +
6432 return this;
6433 }
6434 + /**
6435 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6436 + */
6437 public Builder addChangesets(
6438 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.Builder builderForValue) {
6439 ensureChangesetsIsMutable();
6440 changesets_.add(index, builderForValue.build());
6441 -
6442 +
6443 return this;
6444 }
6445 + /**
6446 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6447 + */
6448 public Builder addAllChangesets(
6449 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet> values) {
6450 ensureChangesetsIsMutable();
6451 - super.addAll(values, changesets_);
6452 -
6453 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
6454 + values, changesets_);
6455 +
6456 return this;
6457 }
6458 + /**
6459 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6460 + */
6461 public Builder clearChangesets() {
6462 changesets_ = java.util.Collections.emptyList();
6463 bitField0_ = (bitField0_ & ~0x00000010);
6464 -
6465 +
6466 return this;
6467 }
6468 + /**
6469 + * <code>repeated .OSMPBF.ChangeSet changesets = 5;</code>
6470 + */
6471 public Builder removeChangesets(int index) {
6472 ensureChangesetsIsMutable();
6473 changesets_.remove(index);
6474 -
6475 +
6476 return this;
6477 }
6478 -
6479 +
6480 // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveGroup)
6481 }
6482 -
6483 +
6484 static {
6485 defaultInstance = new PrimitiveGroup(true);
6486 defaultInstance.initFields();
6487 }
6488 -
6489 +
6490 // @@protoc_insertion_point(class_scope:OSMPBF.PrimitiveGroup)
6491 }
6492 -
6493 - public interface StringTableOrBuilder
6494 - extends com.google.protobuf.MessageLiteOrBuilder {
6495 -
6496 - // repeated bytes s = 1;
6497 +
6498 + public interface StringTableOrBuilder extends
6499 + // @@protoc_insertion_point(interface_extends:OSMPBF.StringTable)
6500 + com.google.protobuf.MessageLiteOrBuilder {
6501 +
6502 + /**
6503 + * <code>repeated bytes s = 1;</code>
6504 + */
6505 java.util.List<com.google.protobuf.ByteString> getSList();
6506 + /**
6507 + * <code>repeated bytes s = 1;</code>
6508 + */
6509 int getSCount();
6510 + /**
6511 + * <code>repeated bytes s = 1;</code>
6512 + */
6513 com.google.protobuf.ByteString getS(int index);
6514 }
6515 + /**
6516 + * Protobuf type {@code OSMPBF.StringTable}
6517 + *
6518 + * <pre>
6519 + ** String table, contains the common strings in each block.
6520 + *Note that we reserve index '0' as a delimiter, so the entry at that
6521 + *index in the table is ALWAYS blank and unused.
6522 + * </pre>
6523 + */
6524 public static final class StringTable extends
6525 - com.google.protobuf.GeneratedMessageLite
6526 - implements StringTableOrBuilder {
6527 + com.google.protobuf.GeneratedMessageLite implements
6528 + // @@protoc_insertion_point(message_implements:OSMPBF.StringTable)
6529 + StringTableOrBuilder {
6530 // Use StringTable.newBuilder() to construct.
6531 - private StringTable(Builder builder) {
6532 + private StringTable(com.google.protobuf.GeneratedMessageLite.Builder builder) {
6533 super(builder);
6534 + this.unknownFields = builder.getUnknownFields();
6535 }
6536 - private StringTable(boolean noInit) {}
6537 -
6538 + private StringTable(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
6539 +
6540 private static final StringTable defaultInstance;
6541 public static StringTable getDefaultInstance() {
6542 return defaultInstance;
6543 }
6544 -
6545 +
6546 public StringTable getDefaultInstanceForType() {
6547 return defaultInstance;
6548 }
6549 -
6550 - // repeated bytes s = 1;
6551 - public static final int S_FIELD_NUMBER = 1;
6552 - private java.util.List<com.google.protobuf.ByteString> s_;
6553 - public java.util.List<com.google.protobuf.ByteString>
6554 - getSList() {
6555 - return s_;
6556 - }
6557 - public int getSCount() {
6558 - return s_.size();
6559 +
6560 + private final com.google.protobuf.ByteString unknownFields;
6561 + private StringTable(
6562 + com.google.protobuf.CodedInputStream input,
6563 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6564 + throws com.google.protobuf.InvalidProtocolBufferException {
6565 + initFields();
6566 + int mutable_bitField0_ = 0;
6567 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
6568 + com.google.protobuf.ByteString.newOutput();
6569 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
6570 + com.google.protobuf.CodedOutputStream.newInstance(
6571 + unknownFieldsOutput);
6572 + try {
6573 + boolean done = false;
6574 + while (!done) {
6575 + int tag = input.readTag();
6576 + switch (tag) {
6577 + case 0:
6578 + done = true;
6579 + break;
6580 + default: {
6581 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
6582 + extensionRegistry, tag)) {
6583 + done = true;
6584 + }
6585 + break;
6586 + }
6587 + case 10: {
6588 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
6589 + s_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
6590 + mutable_bitField0_ |= 0x00000001;
6591 + }
6592 + s_.add(input.readBytes());
6593 + break;
6594 + }
6595 + }
6596 + }
6597 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
6598 + throw e.setUnfinishedMessage(this);
6599 + } catch (java.io.IOException e) {
6600 + throw new com.google.protobuf.InvalidProtocolBufferException(
6601 + e.getMessage()).setUnfinishedMessage(this);
6602 + } finally {
6603 + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
6604 + s_ = java.util.Collections.unmodifiableList(s_);
6605 + }
6606 + try {
6607 + unknownFieldsCodedOutput.flush();
6608 + } catch (java.io.IOException e) {
6609 + // Should not happen
6610 + } finally {
6611 + unknownFields = unknownFieldsOutput.toByteString();
6612 + }
6613 + makeExtensionsImmutable();
6614 + }
6615 + }
6616 + public static com.google.protobuf.Parser<StringTable> PARSER =
6617 + new com.google.protobuf.AbstractParser<StringTable>() {
6618 + public StringTable parsePartialFrom(
6619 + com.google.protobuf.CodedInputStream input,
6620 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6621 + throws com.google.protobuf.InvalidProtocolBufferException {
6622 + return new StringTable(input, extensionRegistry);
6623 + }
6624 + };
6625 +
6626 + @java.lang.Override
6627 + public com.google.protobuf.Parser<StringTable> getParserForType() {
6628 + return PARSER;
6629 + }
6630 +
6631 + public static final int S_FIELD_NUMBER = 1;
6632 + private java.util.List<com.google.protobuf.ByteString> s_;
6633 + /**
6634 + * <code>repeated bytes s = 1;</code>
6635 + */
6636 + public java.util.List<com.google.protobuf.ByteString>
6637 + getSList() {
6638 + return s_;
6639 + }
6640 + /**
6641 + * <code>repeated bytes s = 1;</code>
6642 + */
6643 + public int getSCount() {
6644 + return s_.size();
6645 }
6646 + /**
6647 + * <code>repeated bytes s = 1;</code>
6648 + */
6649 public com.google.protobuf.ByteString getS(int index) {
6650 return s_.get(index);
6651 }
6652 -
6653 +
6654 private void initFields() {
6655 - s_ = java.util.Collections.emptyList();;
6656 + s_ = java.util.Collections.emptyList();
6657 }
6658 private byte memoizedIsInitialized = -1;
6659 public final boolean isInitialized() {
6660 byte isInitialized = memoizedIsInitialized;
6661 - if (isInitialized != -1) return isInitialized == 1;
6662 -
6663 + if (isInitialized == 1) return true;
6664 + if (isInitialized == 0) return false;
6665 +
6666 memoizedIsInitialized = 1;
6667 return true;
6668 }
6669 -
6670 +
6671 public void writeTo(com.google.protobuf.CodedOutputStream output)
6672 throws java.io.IOException {
6673 getSerializedSize();
6674 for (int i = 0; i < s_.size(); i++) {
6675 output.writeBytes(1, s_.get(i));
6676 }
6677 + output.writeRawBytes(unknownFields);
6678 }
6679 -
6680 +
6681 private int memoizedSerializedSize = -1;
6682 public int getSerializedSize() {
6683 int size = memoizedSerializedSize;
6684 if (size != -1) return size;
6685 -
6686 +
6687 size = 0;
6688 {
6689 int dataSize = 0;
6690 @@ -3157,121 +4749,119 @@ public final class Osmformat {
6691 size += dataSize;
6692 size += 1 * getSList().size();
6693 }
6694 + size += unknownFields.size();
6695 memoizedSerializedSize = size;
6696 return size;
6697 }
6698 -
6699 +
6700 private static final long serialVersionUID = 0L;
6701 @java.lang.Override
6702 protected java.lang.Object writeReplace()
6703 throws java.io.ObjectStreamException {
6704 return super.writeReplace();
6705 }
6706 -
6707 +
6708 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6709 com.google.protobuf.ByteString data)
6710 throws com.google.protobuf.InvalidProtocolBufferException {
6711 - return newBuilder().mergeFrom(data).buildParsed();
6712 + return PARSER.parseFrom(data);
6713 }
6714 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6715 com.google.protobuf.ByteString data,
6716 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6717 throws com.google.protobuf.InvalidProtocolBufferException {
6718 - return newBuilder().mergeFrom(data, extensionRegistry)
6719 - .buildParsed();
6720 + return PARSER.parseFrom(data, extensionRegistry);
6721 }
6722 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(byte[] data)
6723 throws com.google.protobuf.InvalidProtocolBufferException {
6724 - return newBuilder().mergeFrom(data).buildParsed();
6725 + return PARSER.parseFrom(data);
6726 }
6727 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6728 byte[] data,
6729 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6730 throws com.google.protobuf.InvalidProtocolBufferException {
6731 - return newBuilder().mergeFrom(data, extensionRegistry)
6732 - .buildParsed();
6733 + return PARSER.parseFrom(data, extensionRegistry);
6734 }
6735 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(java.io.InputStream input)
6736 throws java.io.IOException {
6737 - return newBuilder().mergeFrom(input).buildParsed();
6738 + return PARSER.parseFrom(input);
6739 }
6740 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6741 java.io.InputStream input,
6742 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6743 throws java.io.IOException {
6744 - return newBuilder().mergeFrom(input, extensionRegistry)
6745 - .buildParsed();
6746 + return PARSER.parseFrom(input, extensionRegistry);
6747 }
6748 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseDelimitedFrom(java.io.InputStream input)
6749 throws java.io.IOException {
6750 - Builder builder = newBuilder();
6751 - if (builder.mergeDelimitedFrom(input)) {
6752 - return builder.buildParsed();
6753 - } else {
6754 - return null;
6755 - }
6756 + return PARSER.parseDelimitedFrom(input);
6757 }
6758 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseDelimitedFrom(
6759 java.io.InputStream input,
6760 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6761 throws java.io.IOException {
6762 - Builder builder = newBuilder();
6763 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
6764 - return builder.buildParsed();
6765 - } else {
6766 - return null;
6767 - }
6768 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
6769 }
6770 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6771 com.google.protobuf.CodedInputStream input)
6772 throws java.io.IOException {
6773 - return newBuilder().mergeFrom(input).buildParsed();
6774 + return PARSER.parseFrom(input);
6775 }
6776 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
6777 com.google.protobuf.CodedInputStream input,
6778 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6779 throws java.io.IOException {
6780 - return newBuilder().mergeFrom(input, extensionRegistry)
6781 - .buildParsed();
6782 + return PARSER.parseFrom(input, extensionRegistry);
6783 }
6784 -
6785 +
6786 public static Builder newBuilder() { return Builder.create(); }
6787 public Builder newBuilderForType() { return newBuilder(); }
6788 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable prototype) {
6789 return newBuilder().mergeFrom(prototype);
6790 }
6791 public Builder toBuilder() { return newBuilder(this); }
6792 -
6793 +
6794 + /**
6795 + * Protobuf type {@code OSMPBF.StringTable}
6796 + *
6797 + * <pre>
6798 + ** String table, contains the common strings in each block.
6799 + *Note that we reserve index '0' as a delimiter, so the entry at that
6800 + *index in the table is ALWAYS blank and unused.
6801 + * </pre>
6802 + */
6803 public static final class Builder extends
6804 com.google.protobuf.GeneratedMessageLite.Builder<
6805 org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable, Builder>
6806 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder {
6807 + implements
6808 + // @@protoc_insertion_point(builder_implements:OSMPBF.StringTable)
6809 + org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder {
6810 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.newBuilder()
6811 private Builder() {
6812 maybeForceBuilderInitialization();
6813 }
6814 -
6815 +
6816 private void maybeForceBuilderInitialization() {
6817 }
6818 private static Builder create() {
6819 return new Builder();
6820 }
6821 -
6822 +
6823 public Builder clear() {
6824 super.clear();
6825 - s_ = java.util.Collections.emptyList();;
6826 + s_ = java.util.Collections.emptyList();
6827 bitField0_ = (bitField0_ & ~0x00000001);
6828 return this;
6829 }
6830 -
6831 +
6832 public Builder clone() {
6833 return create().mergeFrom(buildPartial());
6834 }
6835 -
6836 +
6837 public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getDefaultInstanceForType() {
6838 return org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance();
6839 }
6840 -
6841 +
6842 public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable build() {
6843 org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable result = buildPartial();
6844 if (!result.isInitialized()) {
6845 @@ -3279,17 +4869,7 @@ public final class Osmformat {
6846 }
6847 return result;
6848 }
6849 -
6850 - private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable buildParsed()
6851 - throws com.google.protobuf.InvalidProtocolBufferException {
6852 - org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable result = buildPartial();
6853 - if (!result.isInitialized()) {
6854 - throw newUninitializedMessageException(
6855 - result).asInvalidProtocolBufferException();
6856 - }
6857 - return result;
6858 - }
6859 -
6860 +
6861 public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable buildPartial() {
6862 org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable result = new org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable(this);
6863 int from_bitField0_ = bitField0_;
6864 @@ -3300,7 +4880,7 @@ public final class Osmformat {
6865 result.s_ = s_;
6866 return result;
6867 }
6868 -
6869 +
6870 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable other) {
6871 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance()) return this;
6872 if (!other.s_.isEmpty()) {
6873 @@ -3313,59 +4893,63 @@ public final class Osmformat {
6874 }
6875
6876 }
6877 + setUnknownFields(
6878 + getUnknownFields().concat(other.unknownFields));
6879 return this;
6880 }
6881 -
6882 +
6883 public final boolean isInitialized() {
6884 return true;
6885 }
6886 -
6887 +
6888 public Builder mergeFrom(
6889 com.google.protobuf.CodedInputStream input,
6890 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
6891 throws java.io.IOException {
6892 - while (true) {
6893 - int tag = input.readTag();
6894 - switch (tag) {
6895 - case 0:
6896 -
6897 - return this;
6898 - default: {
6899 - if (!parseUnknownField(input, extensionRegistry, tag)) {
6900 -
6901 - return this;
6902 - }
6903 - break;
6904 - }
6905 - case 10: {
6906 - ensureSIsMutable();
6907 - s_.add(input.readBytes());
6908 - break;
6909 - }
6910 + org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parsedMessage = null;
6911 + try {
6912 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
6913 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
6914 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable) e.getUnfinishedMessage();
6915 + throw e;
6916 + } finally {
6917 + if (parsedMessage != null) {
6918 + mergeFrom(parsedMessage);
6919 }
6920 }
6921 + return this;
6922 }
6923 -
6924 private int bitField0_;
6925 -
6926 - // repeated bytes s = 1;
6927 - private java.util.List<com.google.protobuf.ByteString> s_ = java.util.Collections.emptyList();;
6928 +
6929 + private java.util.List<com.google.protobuf.ByteString> s_ = java.util.Collections.emptyList();
6930 private void ensureSIsMutable() {
6931 if (!((bitField0_ & 0x00000001) == 0x00000001)) {
6932 s_ = new java.util.ArrayList<com.google.protobuf.ByteString>(s_);
6933 bitField0_ |= 0x00000001;
6934 }
6935 }
6936 + /**
6937 + * <code>repeated bytes s = 1;</code>
6938 + */
6939 public java.util.List<com.google.protobuf.ByteString>
6940 getSList() {
6941 return java.util.Collections.unmodifiableList(s_);
6942 }
6943 + /**
6944 + * <code>repeated bytes s = 1;</code>
6945 + */
6946 public int getSCount() {
6947 return s_.size();
6948 }
6949 + /**
6950 + * <code>repeated bytes s = 1;</code>
6951 + */
6952 public com.google.protobuf.ByteString getS(int index) {
6953 return s_.get(index);
6954 }
6955 + /**
6956 + * <code>repeated bytes s = 1;</code>
6957 + */
6958 public Builder setS(
6959 int index, com.google.protobuf.ByteString value) {
6960 if (value == null) {
6961 @@ -3376,6 +4960,9 @@ public final class Osmformat {
6962
6963 return this;
6964 }
6965 + /**
6966 + * <code>repeated bytes s = 1;</code>
6967 + */
6968 public Builder addS(com.google.protobuf.ByteString value) {
6969 if (value == null) {
6970 throw new NullPointerException();
6971 @@ -3385,137 +4972,364 @@ public final class Osmformat {
6972
6973 return this;
6974 }
6975 + /**
6976 + * <code>repeated bytes s = 1;</code>
6977 + */
6978 public Builder addAllS(
6979 java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
6980 ensureSIsMutable();
6981 - super.addAll(values, s_);
6982 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
6983 + values, s_);
6984
6985 return this;
6986 }
6987 + /**
6988 + * <code>repeated bytes s = 1;</code>
6989 + */
6990 public Builder clearS() {
6991 - s_ = java.util.Collections.emptyList();;
6992 + s_ = java.util.Collections.emptyList();
6993 bitField0_ = (bitField0_ & ~0x00000001);
6994
6995 return this;
6996 }
6997 -
6998 +
6999 // @@protoc_insertion_point(builder_scope:OSMPBF.StringTable)
7000 }
7001 -
7002 +
7003 static {
7004 defaultInstance = new StringTable(true);
7005 defaultInstance.initFields();
7006 }
7007 -
7008 +
7009 // @@protoc_insertion_point(class_scope:OSMPBF.StringTable)
7010 }
7011 -
7012 - public interface InfoOrBuilder
7013 - extends com.google.protobuf.MessageLiteOrBuilder {
7014 -
7015 - // optional int32 version = 1 [default = -1];
7016 +
7017 + public interface InfoOrBuilder extends
7018 + // @@protoc_insertion_point(interface_extends:OSMPBF.Info)
7019 + com.google.protobuf.MessageLiteOrBuilder {
7020 +
7021 + /**
7022 + * <code>optional int32 version = 1 [default = -1];</code>
7023 + */
7024 boolean hasVersion();
7025 + /**
7026 + * <code>optional int32 version = 1 [default = -1];</code>
7027 + */
7028 int getVersion();
7029 -
7030 - // optional int64 timestamp = 2;
7031 +
7032 + /**
7033 + * <code>optional int64 timestamp = 2;</code>
7034 + */
7035 boolean hasTimestamp();
7036 + /**
7037 + * <code>optional int64 timestamp = 2;</code>
7038 + */
7039 long getTimestamp();
7040 -
7041 - // optional int64 changeset = 3;
7042 +
7043 + /**
7044 + * <code>optional int64 changeset = 3;</code>
7045 + */
7046 boolean hasChangeset();
7047 + /**
7048 + * <code>optional int64 changeset = 3;</code>
7049 + */
7050 long getChangeset();
7051 -
7052 - // optional int32 uid = 4;
7053 +
7054 + /**
7055 + * <code>optional int32 uid = 4;</code>
7056 + */
7057 boolean hasUid();
7058 + /**
7059 + * <code>optional int32 uid = 4;</code>
7060 + */
7061 int getUid();
7062 -
7063 - // optional uint32 user_sid = 5;
7064 +
7065 + /**
7066 + * <code>optional uint32 user_sid = 5;</code>
7067 + *
7068 + * <pre>
7069 + * String IDs
7070 + * </pre>
7071 + */
7072 boolean hasUserSid();
7073 + /**
7074 + * <code>optional uint32 user_sid = 5;</code>
7075 + *
7076 + * <pre>
7077 + * String IDs
7078 + * </pre>
7079 + */
7080 int getUserSid();
7081 -
7082 - // optional bool visible = 6;
7083 +
7084 + /**
7085 + * <code>optional bool visible = 6;</code>
7086 + *
7087 + * <pre>
7088 + * The visible flag is used to store history information. It indicates that
7089 + * the current object version has been created by a delete operation on the
7090 + * OSM API.
7091 + * When a writer sets this flag, it MUST add a required_features tag with
7092 + * value "HistoricalInformation" to the HeaderBlock.
7093 + * If this flag is not available for some object it MUST be assumed to be
7094 + * true if the file has the required_features tag "HistoricalInformation"
7095 + * set.
7096 + * </pre>
7097 + */
7098 boolean hasVisible();
7099 + /**
7100 + * <code>optional bool visible = 6;</code>
7101 + *
7102 + * <pre>
7103 + * The visible flag is used to store history information. It indicates that
7104 + * the current object version has been created by a delete operation on the
7105 + * OSM API.
7106 + * When a writer sets this flag, it MUST add a required_features tag with
7107 + * value "HistoricalInformation" to the HeaderBlock.
7108 + * If this flag is not available for some object it MUST be assumed to be
7109 + * true if the file has the required_features tag "HistoricalInformation"
7110 + * set.
7111 + * </pre>
7112 + */
7113 boolean getVisible();
7114 }
7115 + /**
7116 + * Protobuf type {@code OSMPBF.Info}
7117 + *
7118 + * <pre>
7119 + * Optional metadata that may be included into each primitive.
7120 + * </pre>
7121 + */
7122 public static final class Info extends
7123 - com.google.protobuf.GeneratedMessageLite
7124 - implements InfoOrBuilder {
7125 + com.google.protobuf.GeneratedMessageLite implements
7126 + // @@protoc_insertion_point(message_implements:OSMPBF.Info)
7127 + InfoOrBuilder {
7128 // Use Info.newBuilder() to construct.
7129 - private Info(Builder builder) {
7130 + private Info(com.google.protobuf.GeneratedMessageLite.Builder builder) {
7131 super(builder);
7132 + this.unknownFields = builder.getUnknownFields();
7133 }
7134 - private Info(boolean noInit) {}
7135 -
7136 + private Info(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
7137 +
7138 private static final Info defaultInstance;
7139 public static Info getDefaultInstance() {
7140 return defaultInstance;
7141 }
7142 -
7143 +
7144 public Info getDefaultInstanceForType() {
7145 return defaultInstance;
7146 }
7147 -
7148 +
7149 + private final com.google.protobuf.ByteString unknownFields;
7150 + private Info(
7151 + com.google.protobuf.CodedInputStream input,
7152 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7153 + throws com.google.protobuf.InvalidProtocolBufferException {
7154 + initFields();
7155 + int mutable_bitField0_ = 0;
7156 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
7157 + com.google.protobuf.ByteString.newOutput();
7158 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
7159 + com.google.protobuf.CodedOutputStream.newInstance(
7160 + unknownFieldsOutput);
7161 + try {
7162 + boolean done = false;
7163 + while (!done) {
7164 + int tag = input.readTag();
7165 + switch (tag) {
7166 + case 0:
7167 + done = true;
7168 + break;
7169 + default: {
7170 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
7171 + extensionRegistry, tag)) {
7172 + done = true;
7173 + }
7174 + break;
7175 + }
7176 + case 8: {
7177 + bitField0_ |= 0x00000001;
7178 + version_ = input.readInt32();
7179 + break;
7180 + }
7181 + case 16: {
7182 + bitField0_ |= 0x00000002;
7183 + timestamp_ = input.readInt64();
7184 + break;
7185 + }
7186 + case 24: {
7187 + bitField0_ |= 0x00000004;
7188 + changeset_ = input.readInt64();
7189 + break;
7190 + }
7191 + case 32: {
7192 + bitField0_ |= 0x00000008;
7193 + uid_ = input.readInt32();
7194 + break;
7195 + }
7196 + case 40: {
7197 + bitField0_ |= 0x00000010;
7198 + userSid_ = input.readUInt32();
7199 + break;
7200 + }
7201 + case 48: {
7202 + bitField0_ |= 0x00000020;
7203 + visible_ = input.readBool();
7204 + break;
7205 + }
7206 + }
7207 + }
7208 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
7209 + throw e.setUnfinishedMessage(this);
7210 + } catch (java.io.IOException e) {
7211 + throw new com.google.protobuf.InvalidProtocolBufferException(
7212 + e.getMessage()).setUnfinishedMessage(this);
7213 + } finally {
7214 + try {
7215 + unknownFieldsCodedOutput.flush();
7216 + } catch (java.io.IOException e) {
7217 + // Should not happen
7218 + } finally {
7219 + unknownFields = unknownFieldsOutput.toByteString();
7220 + }
7221 + makeExtensionsImmutable();
7222 + }
7223 + }
7224 + public static com.google.protobuf.Parser<Info> PARSER =
7225 + new com.google.protobuf.AbstractParser<Info>() {
7226 + public Info parsePartialFrom(
7227 + com.google.protobuf.CodedInputStream input,
7228 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7229 + throws com.google.protobuf.InvalidProtocolBufferException {
7230 + return new Info(input, extensionRegistry);
7231 + }
7232 + };
7233 +
7234 + @java.lang.Override
7235 + public com.google.protobuf.Parser<Info> getParserForType() {
7236 + return PARSER;
7237 + }
7238 +
7239 private int bitField0_;
7240 - // optional int32 version = 1 [default = -1];
7241 public static final int VERSION_FIELD_NUMBER = 1;
7242 private int version_;
7243 + /**
7244 + * <code>optional int32 version = 1 [default = -1];</code>
7245 + */
7246 public boolean hasVersion() {
7247 return ((bitField0_ & 0x00000001) == 0x00000001);
7248 }
7249 + /**
7250 + * <code>optional int32 version = 1 [default = -1];</code>
7251 + */
7252 public int getVersion() {
7253 return version_;
7254 }
7255 -
7256 - // optional int64 timestamp = 2;
7257 +
7258 public static final int TIMESTAMP_FIELD_NUMBER = 2;
7259 private long timestamp_;
7260 + /**
7261 + * <code>optional int64 timestamp = 2;</code>
7262 + */
7263 public boolean hasTimestamp() {
7264 return ((bitField0_ & 0x00000002) == 0x00000002);
7265 }
7266 + /**
7267 + * <code>optional int64 timestamp = 2;</code>
7268 + */
7269 public long getTimestamp() {
7270 return timestamp_;
7271 }
7272 -
7273 - // optional int64 changeset = 3;
7274 +
7275 public static final int CHANGESET_FIELD_NUMBER = 3;
7276 private long changeset_;
7277 + /**
7278 + * <code>optional int64 changeset = 3;</code>
7279 + */
7280 public boolean hasChangeset() {
7281 return ((bitField0_ & 0x00000004) == 0x00000004);
7282 }
7283 + /**
7284 + * <code>optional int64 changeset = 3;</code>
7285 + */
7286 public long getChangeset() {
7287 return changeset_;
7288 }
7289 -
7290 - // optional int32 uid = 4;
7291 +
7292 public static final int UID_FIELD_NUMBER = 4;
7293 private int uid_;
7294 + /**
7295 + * <code>optional int32 uid = 4;</code>
7296 + */
7297 public boolean hasUid() {
7298 return ((bitField0_ & 0x00000008) == 0x00000008);
7299 }
7300 + /**
7301 + * <code>optional int32 uid = 4;</code>
7302 + */
7303 public int getUid() {
7304 return uid_;
7305 }
7306 -
7307 - // optional uint32 user_sid = 5;
7308 +
7309 public static final int USER_SID_FIELD_NUMBER = 5;
7310 private int userSid_;
7311 + /**
7312 + * <code>optional uint32 user_sid = 5;</code>
7313 + *
7314 + * <pre>
7315 + * String IDs
7316 + * </pre>
7317 + */
7318 public boolean hasUserSid() {
7319 return ((bitField0_ & 0x00000010) == 0x00000010);
7320 }
7321 + /**
7322 + * <code>optional uint32 user_sid = 5;</code>
7323 + *
7324 + * <pre>
7325 + * String IDs
7326 + * </pre>
7327 + */
7328 public int getUserSid() {
7329 return userSid_;
7330 }
7331 -
7332 - // optional bool visible = 6;
7333 +
7334 public static final int VISIBLE_FIELD_NUMBER = 6;
7335 private boolean visible_;
7336 + /**
7337 + * <code>optional bool visible = 6;</code>
7338 + *
7339 + * <pre>
7340 + * The visible flag is used to store history information. It indicates that
7341 + * the current object version has been created by a delete operation on the
7342 + * OSM API.
7343 + * When a writer sets this flag, it MUST add a required_features tag with
7344 + * value "HistoricalInformation" to the HeaderBlock.
7345 + * If this flag is not available for some object it MUST be assumed to be
7346 + * true if the file has the required_features tag "HistoricalInformation"
7347 + * set.
7348 + * </pre>
7349 + */
7350 public boolean hasVisible() {
7351 return ((bitField0_ & 0x00000020) == 0x00000020);
7352 }
7353 + /**
7354 + * <code>optional bool visible = 6;</code>
7355 + *
7356 + * <pre>
7357 + * The visible flag is used to store history information. It indicates that
7358 + * the current object version has been created by a delete operation on the
7359 + * OSM API.
7360 + * When a writer sets this flag, it MUST add a required_features tag with
7361 + * value "HistoricalInformation" to the HeaderBlock.
7362 + * If this flag is not available for some object it MUST be assumed to be
7363 + * true if the file has the required_features tag "HistoricalInformation"
7364 + * set.
7365 + * </pre>
7366 + */
7367 public boolean getVisible() {
7368 return visible_;
7369 }
7370 -
7371 +
7372 private void initFields() {
7373 version_ = -1;
7374 timestamp_ = 0L;
7375 @@ -3527,12 +5341,13 @@ public final class Osmformat {
7376 private byte memoizedIsInitialized = -1;
7377 public final boolean isInitialized() {
7378 byte isInitialized = memoizedIsInitialized;
7379 - if (isInitialized != -1) return isInitialized == 1;
7380 -
7381 + if (isInitialized == 1) return true;
7382 + if (isInitialized == 0) return false;
7383 +
7384 memoizedIsInitialized = 1;
7385 return true;
7386 }
7387 -
7388 +
7389 public void writeTo(com.google.protobuf.CodedOutputStream output)
7390 throws java.io.IOException {
7391 getSerializedSize();
7392 @@ -3554,13 +5369,14 @@ public final class Osmformat {
7393 if (((bitField0_ & 0x00000020) == 0x00000020)) {
7394 output.writeBool(6, visible_);
7395 }
7396 + output.writeRawBytes(unknownFields);
7397 }
7398 -
7399 +
7400 private int memoizedSerializedSize = -1;
7401 public int getSerializedSize() {
7402 int size = memoizedSerializedSize;
7403 if (size != -1) return size;
7404 -
7405 +
7406 size = 0;
7407 if (((bitField0_ & 0x00000001) == 0x00000001)) {
7408 size += com.google.protobuf.CodedOutputStream
7409 @@ -3586,106 +5402,102 @@ public final class Osmformat {
7410 size += com.google.protobuf.CodedOutputStream
7411 .computeBoolSize(6, visible_);
7412 }
7413 + size += unknownFields.size();
7414 memoizedSerializedSize = size;
7415 return size;
7416 }
7417 -
7418 +
7419 private static final long serialVersionUID = 0L;
7420 @java.lang.Override
7421 protected java.lang.Object writeReplace()
7422 throws java.io.ObjectStreamException {
7423 return super.writeReplace();
7424 }
7425 -
7426 +
7427 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7428 com.google.protobuf.ByteString data)
7429 throws com.google.protobuf.InvalidProtocolBufferException {
7430 - return newBuilder().mergeFrom(data).buildParsed();
7431 + return PARSER.parseFrom(data);
7432 }
7433 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7434 com.google.protobuf.ByteString data,
7435 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7436 throws com.google.protobuf.InvalidProtocolBufferException {
7437 - return newBuilder().mergeFrom(data, extensionRegistry)
7438 - .buildParsed();
7439 + return PARSER.parseFrom(data, extensionRegistry);
7440 }
7441 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(byte[] data)
7442 throws com.google.protobuf.InvalidProtocolBufferException {
7443 - return newBuilder().mergeFrom(data).buildParsed();
7444 + return PARSER.parseFrom(data);
7445 }
7446 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7447 byte[] data,
7448 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7449 throws com.google.protobuf.InvalidProtocolBufferException {
7450 - return newBuilder().mergeFrom(data, extensionRegistry)
7451 - .buildParsed();
7452 + return PARSER.parseFrom(data, extensionRegistry);
7453 }
7454 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(java.io.InputStream input)
7455 throws java.io.IOException {
7456 - return newBuilder().mergeFrom(input).buildParsed();
7457 + return PARSER.parseFrom(input);
7458 }
7459 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7460 java.io.InputStream input,
7461 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7462 throws java.io.IOException {
7463 - return newBuilder().mergeFrom(input, extensionRegistry)
7464 - .buildParsed();
7465 + return PARSER.parseFrom(input, extensionRegistry);
7466 }
7467 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseDelimitedFrom(java.io.InputStream input)
7468 throws java.io.IOException {
7469 - Builder builder = newBuilder();
7470 - if (builder.mergeDelimitedFrom(input)) {
7471 - return builder.buildParsed();
7472 - } else {
7473 - return null;
7474 - }
7475 + return PARSER.parseDelimitedFrom(input);
7476 }
7477 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseDelimitedFrom(
7478 java.io.InputStream input,
7479 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7480 throws java.io.IOException {
7481 - Builder builder = newBuilder();
7482 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
7483 - return builder.buildParsed();
7484 - } else {
7485 - return null;
7486 - }
7487 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
7488 }
7489 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7490 com.google.protobuf.CodedInputStream input)
7491 throws java.io.IOException {
7492 - return newBuilder().mergeFrom(input).buildParsed();
7493 + return PARSER.parseFrom(input);
7494 }
7495 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
7496 com.google.protobuf.CodedInputStream input,
7497 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7498 throws java.io.IOException {
7499 - return newBuilder().mergeFrom(input, extensionRegistry)
7500 - .buildParsed();
7501 + return PARSER.parseFrom(input, extensionRegistry);
7502 }
7503 -
7504 +
7505 public static Builder newBuilder() { return Builder.create(); }
7506 public Builder newBuilderForType() { return newBuilder(); }
7507 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Info prototype) {
7508 return newBuilder().mergeFrom(prototype);
7509 }
7510 public Builder toBuilder() { return newBuilder(this); }
7511 -
7512 +
7513 + /**
7514 + * Protobuf type {@code OSMPBF.Info}
7515 + *
7516 + * <pre>
7517 + * Optional metadata that may be included into each primitive.
7518 + * </pre>
7519 + */
7520 public static final class Builder extends
7521 com.google.protobuf.GeneratedMessageLite.Builder<
7522 org.openstreetmap.osmosis.osmbinary.Osmformat.Info, Builder>
7523 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.InfoOrBuilder {
7524 + implements
7525 + // @@protoc_insertion_point(builder_implements:OSMPBF.Info)
7526 + org.openstreetmap.osmosis.osmbinary.Osmformat.InfoOrBuilder {
7527 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.Info.newBuilder()
7528 private Builder() {
7529 maybeForceBuilderInitialization();
7530 }
7531 -
7532 +
7533 private void maybeForceBuilderInitialization() {
7534 }
7535 private static Builder create() {
7536 return new Builder();
7537 }
7538 -
7539 +
7540 public Builder clear() {
7541 super.clear();
7542 version_ = -1;
7543 @@ -3702,15 +5514,15 @@ public final class Osmformat {
7544 bitField0_ = (bitField0_ & ~0x00000020);
7545 return this;
7546 }
7547 -
7548 +
7549 public Builder clone() {
7550 return create().mergeFrom(buildPartial());
7551 }
7552 -
7553 +
7554 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getDefaultInstanceForType() {
7555 return org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
7556 }
7557 -
7558 +
7559 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info build() {
7560 org.openstreetmap.osmosis.osmbinary.Osmformat.Info result = buildPartial();
7561 if (!result.isInitialized()) {
7562 @@ -3718,17 +5530,7 @@ public final class Osmformat {
7563 }
7564 return result;
7565 }
7566 -
7567 - private org.openstreetmap.osmosis.osmbinary.Osmformat.Info buildParsed()
7568 - throws com.google.protobuf.InvalidProtocolBufferException {
7569 - org.openstreetmap.osmosis.osmbinary.Osmformat.Info result = buildPartial();
7570 - if (!result.isInitialized()) {
7571 - throw newUninitializedMessageException(
7572 - result).asInvalidProtocolBufferException();
7573 - }
7574 - return result;
7575 - }
7576 -
7577 +
7578 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info buildPartial() {
7579 org.openstreetmap.osmosis.osmbinary.Osmformat.Info result = new org.openstreetmap.osmosis.osmbinary.Osmformat.Info(this);
7580 int from_bitField0_ = bitField0_;
7581 @@ -3760,7 +5562,7 @@ public final class Osmformat {
7582 result.bitField0_ = to_bitField0_;
7583 return result;
7584 }
7585 -
7586 +
7587 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.Info other) {
7588 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance()) return this;
7589 if (other.hasVersion()) {
7590 @@ -3781,361 +5583,928 @@ public final class Osmformat {
7591 if (other.hasVisible()) {
7592 setVisible(other.getVisible());
7593 }
7594 + setUnknownFields(
7595 + getUnknownFields().concat(other.unknownFields));
7596 return this;
7597 }
7598 -
7599 +
7600 public final boolean isInitialized() {
7601 return true;
7602 }
7603 -
7604 +
7605 public Builder mergeFrom(
7606 com.google.protobuf.CodedInputStream input,
7607 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
7608 throws java.io.IOException {
7609 - while (true) {
7610 - int tag = input.readTag();
7611 - switch (tag) {
7612 - case 0:
7613 -
7614 - return this;
7615 - default: {
7616 - if (!parseUnknownField(input, extensionRegistry, tag)) {
7617 -
7618 - return this;
7619 - }
7620 - break;
7621 - }
7622 - case 8: {
7623 - bitField0_ |= 0x00000001;
7624 - version_ = input.readInt32();
7625 - break;
7626 - }
7627 - case 16: {
7628 - bitField0_ |= 0x00000002;
7629 - timestamp_ = input.readInt64();
7630 - break;
7631 - }
7632 - case 24: {
7633 - bitField0_ |= 0x00000004;
7634 - changeset_ = input.readInt64();
7635 - break;
7636 - }
7637 - case 32: {
7638 - bitField0_ |= 0x00000008;
7639 - uid_ = input.readInt32();
7640 - break;
7641 - }
7642 - case 40: {
7643 - bitField0_ |= 0x00000010;
7644 - userSid_ = input.readUInt32();
7645 - break;
7646 - }
7647 - case 48: {
7648 - bitField0_ |= 0x00000020;
7649 - visible_ = input.readBool();
7650 - break;
7651 - }
7652 + org.openstreetmap.osmosis.osmbinary.Osmformat.Info parsedMessage = null;
7653 + try {
7654 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
7655 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
7656 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.Info) e.getUnfinishedMessage();
7657 + throw e;
7658 + } finally {
7659 + if (parsedMessage != null) {
7660 + mergeFrom(parsedMessage);
7661 }
7662 }
7663 + return this;
7664 }
7665 -
7666 private int bitField0_;
7667 -
7668 - // optional int32 version = 1 [default = -1];
7669 +
7670 private int version_ = -1;
7671 + /**
7672 + * <code>optional int32 version = 1 [default = -1];</code>
7673 + */
7674 public boolean hasVersion() {
7675 return ((bitField0_ & 0x00000001) == 0x00000001);
7676 }
7677 + /**
7678 + * <code>optional int32 version = 1 [default = -1];</code>
7679 + */
7680 public int getVersion() {
7681 return version_;
7682 }
7683 + /**
7684 + * <code>optional int32 version = 1 [default = -1];</code>
7685 + */
7686 public Builder setVersion(int value) {
7687 bitField0_ |= 0x00000001;
7688 version_ = value;
7689
7690 return this;
7691 }
7692 + /**
7693 + * <code>optional int32 version = 1 [default = -1];</code>
7694 + */
7695 public Builder clearVersion() {
7696 bitField0_ = (bitField0_ & ~0x00000001);
7697 version_ = -1;
7698
7699 return this;
7700 }
7701 -
7702 - // optional int64 timestamp = 2;
7703 +
7704 private long timestamp_ ;
7705 + /**
7706 + * <code>optional int64 timestamp = 2;</code>
7707 + */
7708 public boolean hasTimestamp() {
7709 return ((bitField0_ & 0x00000002) == 0x00000002);
7710 }
7711 + /**
7712 + * <code>optional int64 timestamp = 2;</code>
7713 + */
7714 public long getTimestamp() {
7715 return timestamp_;
7716 }
7717 + /**
7718 + * <code>optional int64 timestamp = 2;</code>
7719 + */
7720 public Builder setTimestamp(long value) {
7721 bitField0_ |= 0x00000002;
7722 timestamp_ = value;
7723
7724 return this;
7725 }
7726 + /**
7727 + * <code>optional int64 timestamp = 2;</code>
7728 + */
7729 public Builder clearTimestamp() {
7730 bitField0_ = (bitField0_ & ~0x00000002);
7731 timestamp_ = 0L;
7732
7733 return this;
7734 }
7735 -
7736 - // optional int64 changeset = 3;
7737 +
7738 private long changeset_ ;
7739 + /**
7740 + * <code>optional int64 changeset = 3;</code>
7741 + */
7742 public boolean hasChangeset() {
7743 return ((bitField0_ & 0x00000004) == 0x00000004);
7744 }
7745 + /**
7746 + * <code>optional int64 changeset = 3;</code>
7747 + */
7748 public long getChangeset() {
7749 return changeset_;
7750 }
7751 + /**
7752 + * <code>optional int64 changeset = 3;</code>
7753 + */
7754 public Builder setChangeset(long value) {
7755 bitField0_ |= 0x00000004;
7756 changeset_ = value;
7757
7758 return this;
7759 }
7760 + /**
7761 + * <code>optional int64 changeset = 3;</code>
7762 + */
7763 public Builder clearChangeset() {
7764 bitField0_ = (bitField0_ & ~0x00000004);
7765 changeset_ = 0L;
7766
7767 return this;
7768 }
7769 -
7770 - // optional int32 uid = 4;
7771 +
7772 private int uid_ ;
7773 + /**
7774 + * <code>optional int32 uid = 4;</code>
7775 + */
7776 public boolean hasUid() {
7777 return ((bitField0_ & 0x00000008) == 0x00000008);
7778 }
7779 + /**
7780 + * <code>optional int32 uid = 4;</code>
7781 + */
7782 public int getUid() {
7783 return uid_;
7784 }
7785 + /**
7786 + * <code>optional int32 uid = 4;</code>
7787 + */
7788 public Builder setUid(int value) {
7789 bitField0_ |= 0x00000008;
7790 uid_ = value;
7791
7792 return this;
7793 }
7794 + /**
7795 + * <code>optional int32 uid = 4;</code>
7796 + */
7797 public Builder clearUid() {
7798 bitField0_ = (bitField0_ & ~0x00000008);
7799 uid_ = 0;
7800
7801 return this;
7802 }
7803 -
7804 - // optional uint32 user_sid = 5;
7805 +
7806 private int userSid_ ;
7807 + /**
7808 + * <code>optional uint32 user_sid = 5;</code>
7809 + *
7810 + * <pre>
7811 + * String IDs
7812 + * </pre>
7813 + */
7814 public boolean hasUserSid() {
7815 return ((bitField0_ & 0x00000010) == 0x00000010);
7816 }
7817 + /**
7818 + * <code>optional uint32 user_sid = 5;</code>
7819 + *
7820 + * <pre>
7821 + * String IDs
7822 + * </pre>
7823 + */
7824 public int getUserSid() {
7825 return userSid_;
7826 }
7827 + /**
7828 + * <code>optional uint32 user_sid = 5;</code>
7829 + *
7830 + * <pre>
7831 + * String IDs
7832 + * </pre>
7833 + */
7834 public Builder setUserSid(int value) {
7835 bitField0_ |= 0x00000010;
7836 userSid_ = value;
7837
7838 return this;
7839 }
7840 + /**
7841 + * <code>optional uint32 user_sid = 5;</code>
7842 + *
7843 + * <pre>
7844 + * String IDs
7845 + * </pre>
7846 + */
7847 public Builder clearUserSid() {
7848 bitField0_ = (bitField0_ & ~0x00000010);
7849 userSid_ = 0;
7850
7851 return this;
7852 }
7853 -
7854 - // optional bool visible = 6;
7855 +
7856 private boolean visible_ ;
7857 + /**
7858 + * <code>optional bool visible = 6;</code>
7859 + *
7860 + * <pre>
7861 + * The visible flag is used to store history information. It indicates that
7862 + * the current object version has been created by a delete operation on the
7863 + * OSM API.
7864 + * When a writer sets this flag, it MUST add a required_features tag with
7865 + * value "HistoricalInformation" to the HeaderBlock.
7866 + * If this flag is not available for some object it MUST be assumed to be
7867 + * true if the file has the required_features tag "HistoricalInformation"
7868 + * set.
7869 + * </pre>
7870 + */
7871 public boolean hasVisible() {
7872 return ((bitField0_ & 0x00000020) == 0x00000020);
7873 }
7874 + /**
7875 + * <code>optional bool visible = 6;</code>
7876 + *
7877 + * <pre>
7878 + * The visible flag is used to store history information. It indicates that
7879 + * the current object version has been created by a delete operation on the
7880 + * OSM API.
7881 + * When a writer sets this flag, it MUST add a required_features tag with
7882 + * value "HistoricalInformation" to the HeaderBlock.
7883 + * If this flag is not available for some object it MUST be assumed to be
7884 + * true if the file has the required_features tag "HistoricalInformation"
7885 + * set.
7886 + * </pre>
7887 + */
7888 public boolean getVisible() {
7889 return visible_;
7890 }
7891 + /**
7892 + * <code>optional bool visible = 6;</code>
7893 + *
7894 + * <pre>
7895 + * The visible flag is used to store history information. It indicates that
7896 + * the current object version has been created by a delete operation on the
7897 + * OSM API.
7898 + * When a writer sets this flag, it MUST add a required_features tag with
7899 + * value "HistoricalInformation" to the HeaderBlock.
7900 + * If this flag is not available for some object it MUST be assumed to be
7901 + * true if the file has the required_features tag "HistoricalInformation"
7902 + * set.
7903 + * </pre>
7904 + */
7905 public Builder setVisible(boolean value) {
7906 bitField0_ |= 0x00000020;
7907 visible_ = value;
7908
7909 return this;
7910 }
7911 + /**
7912 + * <code>optional bool visible = 6;</code>
7913 + *
7914 + * <pre>
7915 + * The visible flag is used to store history information. It indicates that
7916 + * the current object version has been created by a delete operation on the
7917 + * OSM API.
7918 + * When a writer sets this flag, it MUST add a required_features tag with
7919 + * value "HistoricalInformation" to the HeaderBlock.
7920 + * If this flag is not available for some object it MUST be assumed to be
7921 + * true if the file has the required_features tag "HistoricalInformation"
7922 + * set.
7923 + * </pre>
7924 + */
7925 public Builder clearVisible() {
7926 bitField0_ = (bitField0_ & ~0x00000020);
7927 visible_ = false;
7928
7929 return this;
7930 }
7931 -
7932 +
7933 // @@protoc_insertion_point(builder_scope:OSMPBF.Info)
7934 }
7935 -
7936 +
7937 static {
7938 defaultInstance = new Info(true);
7939 defaultInstance.initFields();
7940 }
7941 -
7942 +
7943 // @@protoc_insertion_point(class_scope:OSMPBF.Info)
7944 }
7945 -
7946 - public interface DenseInfoOrBuilder
7947 - extends com.google.protobuf.MessageLiteOrBuilder {
7948 -
7949 - // repeated int32 version = 1 [packed = true];
7950 +
7951 + public interface DenseInfoOrBuilder extends
7952 + // @@protoc_insertion_point(interface_extends:OSMPBF.DenseInfo)
7953 + com.google.protobuf.MessageLiteOrBuilder {
7954 +
7955 + /**
7956 + * <code>repeated int32 version = 1 [packed = true];</code>
7957 + */
7958 java.util.List<java.lang.Integer> getVersionList();
7959 + /**
7960 + * <code>repeated int32 version = 1 [packed = true];</code>
7961 + */
7962 int getVersionCount();
7963 + /**
7964 + * <code>repeated int32 version = 1 [packed = true];</code>
7965 + */
7966 int getVersion(int index);
7967 -
7968 - // repeated sint64 timestamp = 2 [packed = true];
7969 +
7970 + /**
7971 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
7972 + *
7973 + * <pre>
7974 + * DELTA coded
7975 + * </pre>
7976 + */
7977 java.util.List<java.lang.Long> getTimestampList();
7978 + /**
7979 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
7980 + *
7981 + * <pre>
7982 + * DELTA coded
7983 + * </pre>
7984 + */
7985 int getTimestampCount();
7986 + /**
7987 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
7988 + *
7989 + * <pre>
7990 + * DELTA coded
7991 + * </pre>
7992 + */
7993 long getTimestamp(int index);
7994 -
7995 - // repeated sint64 changeset = 3 [packed = true];
7996 +
7997 + /**
7998 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
7999 + *
8000 + * <pre>
8001 + * DELTA coded
8002 + * </pre>
8003 + */
8004 java.util.List<java.lang.Long> getChangesetList();
8005 + /**
8006 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
8007 + *
8008 + * <pre>
8009 + * DELTA coded
8010 + * </pre>
8011 + */
8012 int getChangesetCount();
8013 + /**
8014 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
8015 + *
8016 + * <pre>
8017 + * DELTA coded
8018 + * </pre>
8019 + */
8020 long getChangeset(int index);
8021 -
8022 - // repeated sint32 uid = 4 [packed = true];
8023 +
8024 + /**
8025 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8026 + *
8027 + * <pre>
8028 + * DELTA coded
8029 + * </pre>
8030 + */
8031 java.util.List<java.lang.Integer> getUidList();
8032 + /**
8033 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8034 + *
8035 + * <pre>
8036 + * DELTA coded
8037 + * </pre>
8038 + */
8039 int getUidCount();
8040 + /**
8041 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8042 + *
8043 + * <pre>
8044 + * DELTA coded
8045 + * </pre>
8046 + */
8047 int getUid(int index);
8048 -
8049 - // repeated sint32 user_sid = 5 [packed = true];
8050 +
8051 + /**
8052 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8053 + *
8054 + * <pre>
8055 + * String IDs for usernames. DELTA coded
8056 + * </pre>
8057 + */
8058 java.util.List<java.lang.Integer> getUserSidList();
8059 + /**
8060 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8061 + *
8062 + * <pre>
8063 + * String IDs for usernames. DELTA coded
8064 + * </pre>
8065 + */
8066 int getUserSidCount();
8067 + /**
8068 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8069 + *
8070 + * <pre>
8071 + * String IDs for usernames. DELTA coded
8072 + * </pre>
8073 + */
8074 int getUserSid(int index);
8075 -
8076 - // repeated bool visible = 6 [packed = true];
8077 +
8078 + /**
8079 + * <code>repeated bool visible = 6 [packed = true];</code>
8080 + *
8081 + * <pre>
8082 + * The visible flag is used to store history information. It indicates that
8083 + * the current object version has been created by a delete operation on the
8084 + * OSM API.
8085 + * When a writer sets this flag, it MUST add a required_features tag with
8086 + * value "HistoricalInformation" to the HeaderBlock.
8087 + * If this flag is not available for some object it MUST be assumed to be
8088 + * true if the file has the required_features tag "HistoricalInformation"
8089 + * set.
8090 + * </pre>
8091 + */
8092 java.util.List<java.lang.Boolean> getVisibleList();
8093 + /**
8094 + * <code>repeated bool visible = 6 [packed = true];</code>
8095 + *
8096 + * <pre>
8097 + * The visible flag is used to store history information. It indicates that
8098 + * the current object version has been created by a delete operation on the
8099 + * OSM API.
8100 + * When a writer sets this flag, it MUST add a required_features tag with
8101 + * value "HistoricalInformation" to the HeaderBlock.
8102 + * If this flag is not available for some object it MUST be assumed to be
8103 + * true if the file has the required_features tag "HistoricalInformation"
8104 + * set.
8105 + * </pre>
8106 + */
8107 int getVisibleCount();
8108 + /**
8109 + * <code>repeated bool visible = 6 [packed = true];</code>
8110 + *
8111 + * <pre>
8112 + * The visible flag is used to store history information. It indicates that
8113 + * the current object version has been created by a delete operation on the
8114 + * OSM API.
8115 + * When a writer sets this flag, it MUST add a required_features tag with
8116 + * value "HistoricalInformation" to the HeaderBlock.
8117 + * If this flag is not available for some object it MUST be assumed to be
8118 + * true if the file has the required_features tag "HistoricalInformation"
8119 + * set.
8120 + * </pre>
8121 + */
8122 boolean getVisible(int index);
8123 }
8124 + /**
8125 + * Protobuf type {@code OSMPBF.DenseInfo}
8126 + *
8127 + * <pre>
8128 + ** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes.
8129 + * </pre>
8130 + */
8131 public static final class DenseInfo extends
8132 - com.google.protobuf.GeneratedMessageLite
8133 - implements DenseInfoOrBuilder {
8134 + com.google.protobuf.GeneratedMessageLite implements
8135 + // @@protoc_insertion_point(message_implements:OSMPBF.DenseInfo)
8136 + DenseInfoOrBuilder {
8137 // Use DenseInfo.newBuilder() to construct.
8138 - private DenseInfo(Builder builder) {
8139 + private DenseInfo(com.google.protobuf.GeneratedMessageLite.Builder builder) {
8140 super(builder);
8141 + this.unknownFields = builder.getUnknownFields();
8142 }
8143 - private DenseInfo(boolean noInit) {}
8144 -
8145 + private DenseInfo(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
8146 +
8147 private static final DenseInfo defaultInstance;
8148 public static DenseInfo getDefaultInstance() {
8149 return defaultInstance;
8150 }
8151 -
8152 +
8153 public DenseInfo getDefaultInstanceForType() {
8154 return defaultInstance;
8155 }
8156 -
8157 - // repeated int32 version = 1 [packed = true];
8158 +
8159 + private final com.google.protobuf.ByteString unknownFields;
8160 + private DenseInfo(
8161 + com.google.protobuf.CodedInputStream input,
8162 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8163 + throws com.google.protobuf.InvalidProtocolBufferException {
8164 + initFields();
8165 + int mutable_bitField0_ = 0;
8166 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
8167 + com.google.protobuf.ByteString.newOutput();
8168 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
8169 + com.google.protobuf.CodedOutputStream.newInstance(
8170 + unknownFieldsOutput);
8171 + try {
8172 + boolean done = false;
8173 + while (!done) {
8174 + int tag = input.readTag();
8175 + switch (tag) {
8176 + case 0:
8177 + done = true;
8178 + break;
8179 + default: {
8180 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
8181 + extensionRegistry, tag)) {
8182 + done = true;
8183 + }
8184 + break;
8185 + }
8186 + case 8: {
8187 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
8188 + version_ = new java.util.ArrayList<java.lang.Integer>();
8189 + mutable_bitField0_ |= 0x00000001;
8190 + }
8191 + version_.add(input.readInt32());
8192 + break;
8193 + }
8194 + case 10: {
8195 + int length = input.readRawVarint32();
8196 + int limit = input.pushLimit(length);
8197 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) {
8198 + version_ = new java.util.ArrayList<java.lang.Integer>();
8199 + mutable_bitField0_ |= 0x00000001;
8200 + }
8201 + while (input.getBytesUntilLimit() > 0) {
8202 + version_.add(input.readInt32());
8203 + }
8204 + input.popLimit(limit);
8205 + break;
8206 + }
8207 + case 16: {
8208 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
8209 + timestamp_ = new java.util.ArrayList<java.lang.Long>();
8210 + mutable_bitField0_ |= 0x00000002;
8211 + }
8212 + timestamp_.add(input.readSInt64());
8213 + break;
8214 + }
8215 + case 18: {
8216 + int length = input.readRawVarint32();
8217 + int limit = input.pushLimit(length);
8218 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
8219 + timestamp_ = new java.util.ArrayList<java.lang.Long>();
8220 + mutable_bitField0_ |= 0x00000002;
8221 + }
8222 + while (input.getBytesUntilLimit() > 0) {
8223 + timestamp_.add(input.readSInt64());
8224 + }
8225 + input.popLimit(limit);
8226 + break;
8227 + }
8228 + case 24: {
8229 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
8230 + changeset_ = new java.util.ArrayList<java.lang.Long>();
8231 + mutable_bitField0_ |= 0x00000004;
8232 + }
8233 + changeset_.add(input.readSInt64());
8234 + break;
8235 + }
8236 + case 26: {
8237 + int length = input.readRawVarint32();
8238 + int limit = input.pushLimit(length);
8239 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
8240 + changeset_ = new java.util.ArrayList<java.lang.Long>();
8241 + mutable_bitField0_ |= 0x00000004;
8242 + }
8243 + while (input.getBytesUntilLimit() > 0) {
8244 + changeset_.add(input.readSInt64());
8245 + }
8246 + input.popLimit(limit);
8247 + break;
8248 + }
8249 + case 32: {
8250 + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
8251 + uid_ = new java.util.ArrayList<java.lang.Integer>();
8252 + mutable_bitField0_ |= 0x00000008;
8253 + }
8254 + uid_.add(input.readSInt32());
8255 + break;
8256 + }
8257 + case 34: {
8258 + int length = input.readRawVarint32();
8259 + int limit = input.pushLimit(length);
8260 + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008) && input.getBytesUntilLimit() > 0) {
8261 + uid_ = new java.util.ArrayList<java.lang.Integer>();
8262 + mutable_bitField0_ |= 0x00000008;
8263 + }
8264 + while (input.getBytesUntilLimit() > 0) {
8265 + uid_.add(input.readSInt32());
8266 + }
8267 + input.popLimit(limit);
8268 + break;
8269 + }
8270 + case 40: {
8271 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
8272 + userSid_ = new java.util.ArrayList<java.lang.Integer>();
8273 + mutable_bitField0_ |= 0x00000010;
8274 + }
8275 + userSid_.add(input.readSInt32());
8276 + break;
8277 + }
8278 + case 42: {
8279 + int length = input.readRawVarint32();
8280 + int limit = input.pushLimit(length);
8281 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
8282 + userSid_ = new java.util.ArrayList<java.lang.Integer>();
8283 + mutable_bitField0_ |= 0x00000010;
8284 + }
8285 + while (input.getBytesUntilLimit() > 0) {
8286 + userSid_.add(input.readSInt32());
8287 + }
8288 + input.popLimit(limit);
8289 + break;
8290 + }
8291 + case 48: {
8292 + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
8293 + visible_ = new java.util.ArrayList<java.lang.Boolean>();
8294 + mutable_bitField0_ |= 0x00000020;
8295 + }
8296 + visible_.add(input.readBool());
8297 + break;
8298 + }
8299 + case 50: {
8300 + int length = input.readRawVarint32();
8301 + int limit = input.pushLimit(length);
8302 + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
8303 + visible_ = new java.util.ArrayList<java.lang.Boolean>();
8304 + mutable_bitField0_ |= 0x00000020;
8305 + }
8306 + while (input.getBytesUntilLimit() > 0) {
8307 + visible_.add(input.readBool());
8308 + }
8309 + input.popLimit(limit);
8310 + break;
8311 + }
8312 + }
8313 + }
8314 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
8315 + throw e.setUnfinishedMessage(this);
8316 + } catch (java.io.IOException e) {
8317 + throw new com.google.protobuf.InvalidProtocolBufferException(
8318 + e.getMessage()).setUnfinishedMessage(this);
8319 + } finally {
8320 + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
8321 + version_ = java.util.Collections.unmodifiableList(version_);
8322 + }
8323 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
8324 + timestamp_ = java.util.Collections.unmodifiableList(timestamp_);
8325 + }
8326 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
8327 + changeset_ = java.util.Collections.unmodifiableList(changeset_);
8328 + }
8329 + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
8330 + uid_ = java.util.Collections.unmodifiableList(uid_);
8331 + }
8332 + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
8333 + userSid_ = java.util.Collections.unmodifiableList(userSid_);
8334 + }
8335 + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
8336 + visible_ = java.util.Collections.unmodifiableList(visible_);
8337 + }
8338 + try {
8339 + unknownFieldsCodedOutput.flush();
8340 + } catch (java.io.IOException e) {
8341 + // Should not happen
8342 + } finally {
8343 + unknownFields = unknownFieldsOutput.toByteString();
8344 + }
8345 + makeExtensionsImmutable();
8346 + }
8347 + }
8348 + public static com.google.protobuf.Parser<DenseInfo> PARSER =
8349 + new com.google.protobuf.AbstractParser<DenseInfo>() {
8350 + public DenseInfo parsePartialFrom(
8351 + com.google.protobuf.CodedInputStream input,
8352 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8353 + throws com.google.protobuf.InvalidProtocolBufferException {
8354 + return new DenseInfo(input, extensionRegistry);
8355 + }
8356 + };
8357 +
8358 + @java.lang.Override
8359 + public com.google.protobuf.Parser<DenseInfo> getParserForType() {
8360 + return PARSER;
8361 + }
8362 +
8363 public static final int VERSION_FIELD_NUMBER = 1;
8364 private java.util.List<java.lang.Integer> version_;
8365 + /**
8366 + * <code>repeated int32 version = 1 [packed = true];</code>
8367 + */
8368 public java.util.List<java.lang.Integer>
8369 getVersionList() {
8370 return version_;
8371 }
8372 + /**
8373 + * <code>repeated int32 version = 1 [packed = true];</code>
8374 + */
8375 public int getVersionCount() {
8376 return version_.size();
8377 }
8378 + /**
8379 + * <code>repeated int32 version = 1 [packed = true];</code>
8380 + */
8381 public int getVersion(int index) {
8382 return version_.get(index);
8383 }
8384 private int versionMemoizedSerializedSize = -1;
8385 -
8386 - // repeated sint64 timestamp = 2 [packed = true];
8387 +
8388 public static final int TIMESTAMP_FIELD_NUMBER = 2;
8389 private java.util.List<java.lang.Long> timestamp_;
8390 + /**
8391 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
8392 + *
8393 + * <pre>
8394 + * DELTA coded
8395 + * </pre>
8396 + */
8397 public java.util.List<java.lang.Long>
8398 getTimestampList() {
8399 return timestamp_;
8400 }
8401 + /**
8402 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
8403 + *
8404 + * <pre>
8405 + * DELTA coded
8406 + * </pre>
8407 + */
8408 public int getTimestampCount() {
8409 return timestamp_.size();
8410 }
8411 + /**
8412 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
8413 + *
8414 + * <pre>
8415 + * DELTA coded
8416 + * </pre>
8417 + */
8418 public long getTimestamp(int index) {
8419 return timestamp_.get(index);
8420 }
8421 private int timestampMemoizedSerializedSize = -1;
8422 -
8423 - // repeated sint64 changeset = 3 [packed = true];
8424 +
8425 public static final int CHANGESET_FIELD_NUMBER = 3;
8426 private java.util.List<java.lang.Long> changeset_;
8427 + /**
8428 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
8429 + *
8430 + * <pre>
8431 + * DELTA coded
8432 + * </pre>
8433 + */
8434 public java.util.List<java.lang.Long>
8435 getChangesetList() {
8436 return changeset_;
8437 }
8438 + /**
8439 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
8440 + *
8441 + * <pre>
8442 + * DELTA coded
8443 + * </pre>
8444 + */
8445 public int getChangesetCount() {
8446 return changeset_.size();
8447 }
8448 + /**
8449 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
8450 + *
8451 + * <pre>
8452 + * DELTA coded
8453 + * </pre>
8454 + */
8455 public long getChangeset(int index) {
8456 return changeset_.get(index);
8457 }
8458 private int changesetMemoizedSerializedSize = -1;
8459 -
8460 - // repeated sint32 uid = 4 [packed = true];
8461 +
8462 public static final int UID_FIELD_NUMBER = 4;
8463 private java.util.List<java.lang.Integer> uid_;
8464 + /**
8465 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8466 + *
8467 + * <pre>
8468 + * DELTA coded
8469 + * </pre>
8470 + */
8471 public java.util.List<java.lang.Integer>
8472 getUidList() {
8473 return uid_;
8474 }
8475 + /**
8476 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8477 + *
8478 + * <pre>
8479 + * DELTA coded
8480 + * </pre>
8481 + */
8482 public int getUidCount() {
8483 return uid_.size();
8484 }
8485 + /**
8486 + * <code>repeated sint32 uid = 4 [packed = true];</code>
8487 + *
8488 + * <pre>
8489 + * DELTA coded
8490 + * </pre>
8491 + */
8492 public int getUid(int index) {
8493 return uid_.get(index);
8494 }
8495 private int uidMemoizedSerializedSize = -1;
8496 -
8497 - // repeated sint32 user_sid = 5 [packed = true];
8498 +
8499 public static final int USER_SID_FIELD_NUMBER = 5;
8500 private java.util.List<java.lang.Integer> userSid_;
8501 + /**
8502 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8503 + *
8504 + * <pre>
8505 + * String IDs for usernames. DELTA coded
8506 + * </pre>
8507 + */
8508 public java.util.List<java.lang.Integer>
8509 getUserSidList() {
8510 return userSid_;
8511 }
8512 + /**
8513 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8514 + *
8515 + * <pre>
8516 + * String IDs for usernames. DELTA coded
8517 + * </pre>
8518 + */
8519 public int getUserSidCount() {
8520 return userSid_.size();
8521 }
8522 + /**
8523 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
8524 + *
8525 + * <pre>
8526 + * String IDs for usernames. DELTA coded
8527 + * </pre>
8528 + */
8529 public int getUserSid(int index) {
8530 return userSid_.get(index);
8531 }
8532 private int userSidMemoizedSerializedSize = -1;
8533 -
8534 - // repeated bool visible = 6 [packed = true];
8535 +
8536 public static final int VISIBLE_FIELD_NUMBER = 6;
8537 private java.util.List<java.lang.Boolean> visible_;
8538 + /**
8539 + * <code>repeated bool visible = 6 [packed = true];</code>
8540 + *
8541 + * <pre>
8542 + * The visible flag is used to store history information. It indicates that
8543 + * the current object version has been created by a delete operation on the
8544 + * OSM API.
8545 + * When a writer sets this flag, it MUST add a required_features tag with
8546 + * value "HistoricalInformation" to the HeaderBlock.
8547 + * If this flag is not available for some object it MUST be assumed to be
8548 + * true if the file has the required_features tag "HistoricalInformation"
8549 + * set.
8550 + * </pre>
8551 + */
8552 public java.util.List<java.lang.Boolean>
8553 getVisibleList() {
8554 return visible_;
8555 }
8556 + /**
8557 + * <code>repeated bool visible = 6 [packed = true];</code>
8558 + *
8559 + * <pre>
8560 + * The visible flag is used to store history information. It indicates that
8561 + * the current object version has been created by a delete operation on the
8562 + * OSM API.
8563 + * When a writer sets this flag, it MUST add a required_features tag with
8564 + * value "HistoricalInformation" to the HeaderBlock.
8565 + * If this flag is not available for some object it MUST be assumed to be
8566 + * true if the file has the required_features tag "HistoricalInformation"
8567 + * set.
8568 + * </pre>
8569 + */
8570 public int getVisibleCount() {
8571 return visible_.size();
8572 }
8573 + /**
8574 + * <code>repeated bool visible = 6 [packed = true];</code>
8575 + *
8576 + * <pre>
8577 + * The visible flag is used to store history information. It indicates that
8578 + * the current object version has been created by a delete operation on the
8579 + * OSM API.
8580 + * When a writer sets this flag, it MUST add a required_features tag with
8581 + * value "HistoricalInformation" to the HeaderBlock.
8582 + * If this flag is not available for some object it MUST be assumed to be
8583 + * true if the file has the required_features tag "HistoricalInformation"
8584 + * set.
8585 + * </pre>
8586 + */
8587 public boolean getVisible(int index) {
8588 return visible_.get(index);
8589 }
8590 private int visibleMemoizedSerializedSize = -1;
8591 -
8592 +
8593 private void initFields() {
8594 - version_ = java.util.Collections.emptyList();;
8595 - timestamp_ = java.util.Collections.emptyList();;
8596 - changeset_ = java.util.Collections.emptyList();;
8597 - uid_ = java.util.Collections.emptyList();;
8598 - userSid_ = java.util.Collections.emptyList();;
8599 - visible_ = java.util.Collections.emptyList();;
8600 + version_ = java.util.Collections.emptyList();
8601 + timestamp_ = java.util.Collections.emptyList();
8602 + changeset_ = java.util.Collections.emptyList();
8603 + uid_ = java.util.Collections.emptyList();
8604 + userSid_ = java.util.Collections.emptyList();
8605 + visible_ = java.util.Collections.emptyList();
8606 }
8607 private byte memoizedIsInitialized = -1;
8608 public final boolean isInitialized() {
8609 byte isInitialized = memoizedIsInitialized;
8610 - if (isInitialized != -1) return isInitialized == 1;
8611 -
8612 + if (isInitialized == 1) return true;
8613 + if (isInitialized == 0) return false;
8614 +
8615 memoizedIsInitialized = 1;
8616 return true;
8617 }
8618 -
8619 +
8620 public void writeTo(com.google.protobuf.CodedOutputStream output)
8621 throws java.io.IOException {
8622 getSerializedSize();
8623 @@ -4181,13 +6550,14 @@ public final class Osmformat {
8624 for (int i = 0; i < visible_.size(); i++) {
8625 output.writeBoolNoTag(visible_.get(i));
8626 }
8627 + output.writeRawBytes(unknownFields);
8628 }
8629 -
8630 +
8631 private int memoizedSerializedSize = -1;
8632 public int getSerializedSize() {
8633 int size = memoizedSerializedSize;
8634 if (size != -1) return size;
8635 -
8636 +
8637 size = 0;
8638 {
8639 int dataSize = 0;
8640 @@ -4270,131 +6640,127 @@ public final class Osmformat {
8641 }
8642 visibleMemoizedSerializedSize = dataSize;
8643 }
8644 + size += unknownFields.size();
8645 memoizedSerializedSize = size;
8646 return size;
8647 }
8648 -
8649 +
8650 private static final long serialVersionUID = 0L;
8651 @java.lang.Override
8652 protected java.lang.Object writeReplace()
8653 throws java.io.ObjectStreamException {
8654 return super.writeReplace();
8655 }
8656 -
8657 +
8658 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8659 com.google.protobuf.ByteString data)
8660 throws com.google.protobuf.InvalidProtocolBufferException {
8661 - return newBuilder().mergeFrom(data).buildParsed();
8662 + return PARSER.parseFrom(data);
8663 }
8664 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8665 com.google.protobuf.ByteString data,
8666 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8667 throws com.google.protobuf.InvalidProtocolBufferException {
8668 - return newBuilder().mergeFrom(data, extensionRegistry)
8669 - .buildParsed();
8670 + return PARSER.parseFrom(data, extensionRegistry);
8671 }
8672 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(byte[] data)
8673 throws com.google.protobuf.InvalidProtocolBufferException {
8674 - return newBuilder().mergeFrom(data).buildParsed();
8675 + return PARSER.parseFrom(data);
8676 }
8677 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8678 byte[] data,
8679 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8680 throws com.google.protobuf.InvalidProtocolBufferException {
8681 - return newBuilder().mergeFrom(data, extensionRegistry)
8682 - .buildParsed();
8683 + return PARSER.parseFrom(data, extensionRegistry);
8684 }
8685 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(java.io.InputStream input)
8686 throws java.io.IOException {
8687 - return newBuilder().mergeFrom(input).buildParsed();
8688 + return PARSER.parseFrom(input);
8689 }
8690 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8691 java.io.InputStream input,
8692 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8693 throws java.io.IOException {
8694 - return newBuilder().mergeFrom(input, extensionRegistry)
8695 - .buildParsed();
8696 + return PARSER.parseFrom(input, extensionRegistry);
8697 }
8698 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseDelimitedFrom(java.io.InputStream input)
8699 throws java.io.IOException {
8700 - Builder builder = newBuilder();
8701 - if (builder.mergeDelimitedFrom(input)) {
8702 - return builder.buildParsed();
8703 - } else {
8704 - return null;
8705 - }
8706 + return PARSER.parseDelimitedFrom(input);
8707 }
8708 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseDelimitedFrom(
8709 java.io.InputStream input,
8710 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8711 throws java.io.IOException {
8712 - Builder builder = newBuilder();
8713 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
8714 - return builder.buildParsed();
8715 - } else {
8716 - return null;
8717 - }
8718 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
8719 }
8720 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8721 com.google.protobuf.CodedInputStream input)
8722 throws java.io.IOException {
8723 - return newBuilder().mergeFrom(input).buildParsed();
8724 + return PARSER.parseFrom(input);
8725 }
8726 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
8727 com.google.protobuf.CodedInputStream input,
8728 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8729 throws java.io.IOException {
8730 - return newBuilder().mergeFrom(input, extensionRegistry)
8731 - .buildParsed();
8732 + return PARSER.parseFrom(input, extensionRegistry);
8733 }
8734 -
8735 +
8736 public static Builder newBuilder() { return Builder.create(); }
8737 public Builder newBuilderForType() { return newBuilder(); }
8738 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo prototype) {
8739 return newBuilder().mergeFrom(prototype);
8740 }
8741 public Builder toBuilder() { return newBuilder(this); }
8742 -
8743 +
8744 + /**
8745 + * Protobuf type {@code OSMPBF.DenseInfo}
8746 + *
8747 + * <pre>
8748 + ** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes.
8749 + * </pre>
8750 + */
8751 public static final class Builder extends
8752 com.google.protobuf.GeneratedMessageLite.Builder<
8753 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo, Builder>
8754 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfoOrBuilder {
8755 + implements
8756 + // @@protoc_insertion_point(builder_implements:OSMPBF.DenseInfo)
8757 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfoOrBuilder {
8758 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.newBuilder()
8759 private Builder() {
8760 maybeForceBuilderInitialization();
8761 }
8762 -
8763 +
8764 private void maybeForceBuilderInitialization() {
8765 }
8766 private static Builder create() {
8767 return new Builder();
8768 }
8769 -
8770 +
8771 public Builder clear() {
8772 super.clear();
8773 - version_ = java.util.Collections.emptyList();;
8774 + version_ = java.util.Collections.emptyList();
8775 bitField0_ = (bitField0_ & ~0x00000001);
8776 - timestamp_ = java.util.Collections.emptyList();;
8777 + timestamp_ = java.util.Collections.emptyList();
8778 bitField0_ = (bitField0_ & ~0x00000002);
8779 - changeset_ = java.util.Collections.emptyList();;
8780 + changeset_ = java.util.Collections.emptyList();
8781 bitField0_ = (bitField0_ & ~0x00000004);
8782 - uid_ = java.util.Collections.emptyList();;
8783 + uid_ = java.util.Collections.emptyList();
8784 bitField0_ = (bitField0_ & ~0x00000008);
8785 - userSid_ = java.util.Collections.emptyList();;
8786 + userSid_ = java.util.Collections.emptyList();
8787 bitField0_ = (bitField0_ & ~0x00000010);
8788 - visible_ = java.util.Collections.emptyList();;
8789 + visible_ = java.util.Collections.emptyList();
8790 bitField0_ = (bitField0_ & ~0x00000020);
8791 return this;
8792 }
8793 -
8794 +
8795 public Builder clone() {
8796 return create().mergeFrom(buildPartial());
8797 }
8798 -
8799 +
8800 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo getDefaultInstanceForType() {
8801 return org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance();
8802 }
8803 -
8804 +
8805 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo build() {
8806 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo result = buildPartial();
8807 if (!result.isInitialized()) {
8808 @@ -4402,17 +6768,7 @@ public final class Osmformat {
8809 }
8810 return result;
8811 }
8812 -
8813 - private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo buildParsed()
8814 - throws com.google.protobuf.InvalidProtocolBufferException {
8815 - org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo result = buildPartial();
8816 - if (!result.isInitialized()) {
8817 - throw newUninitializedMessageException(
8818 - result).asInvalidProtocolBufferException();
8819 - }
8820 - return result;
8821 - }
8822 -
8823 +
8824 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo buildPartial() {
8825 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo result = new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo(this);
8826 int from_bitField0_ = bitField0_;
8827 @@ -4448,7 +6804,7 @@ public final class Osmformat {
8828 result.visible_ = visible_;
8829 return result;
8830 }
8831 -
8832 +
8833 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo other) {
8834 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance()) return this;
8835 if (!other.version_.isEmpty()) {
8836 @@ -4511,138 +6867,63 @@ public final class Osmformat {
8837 }
8838
8839 }
8840 + setUnknownFields(
8841 + getUnknownFields().concat(other.unknownFields));
8842 return this;
8843 }
8844 -
8845 +
8846 public final boolean isInitialized() {
8847 return true;
8848 }
8849 -
8850 +
8851 public Builder mergeFrom(
8852 com.google.protobuf.CodedInputStream input,
8853 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
8854 throws java.io.IOException {
8855 - while (true) {
8856 - int tag = input.readTag();
8857 - switch (tag) {
8858 - case 0:
8859 -
8860 - return this;
8861 - default: {
8862 - if (!parseUnknownField(input, extensionRegistry, tag)) {
8863 -
8864 - return this;
8865 - }
8866 - break;
8867 - }
8868 - case 8: {
8869 - ensureVersionIsMutable();
8870 - version_.add(input.readInt32());
8871 - break;
8872 - }
8873 - case 10: {
8874 - int length = input.readRawVarint32();
8875 - int limit = input.pushLimit(length);
8876 - while (input.getBytesUntilLimit() > 0) {
8877 - addVersion(input.readInt32());
8878 - }
8879 - input.popLimit(limit);
8880 - break;
8881 - }
8882 - case 16: {
8883 - ensureTimestampIsMutable();
8884 - timestamp_.add(input.readSInt64());
8885 - break;
8886 - }
8887 - case 18: {
8888 - int length = input.readRawVarint32();
8889 - int limit = input.pushLimit(length);
8890 - while (input.getBytesUntilLimit() > 0) {
8891 - addTimestamp(input.readSInt64());
8892 - }
8893 - input.popLimit(limit);
8894 - break;
8895 - }
8896 - case 24: {
8897 - ensureChangesetIsMutable();
8898 - changeset_.add(input.readSInt64());
8899 - break;
8900 - }
8901 - case 26: {
8902 - int length = input.readRawVarint32();
8903 - int limit = input.pushLimit(length);
8904 - while (input.getBytesUntilLimit() > 0) {
8905 - addChangeset(input.readSInt64());
8906 - }
8907 - input.popLimit(limit);
8908 - break;
8909 - }
8910 - case 32: {
8911 - ensureUidIsMutable();
8912 - uid_.add(input.readSInt32());
8913 - break;
8914 - }
8915 - case 34: {
8916 - int length = input.readRawVarint32();
8917 - int limit = input.pushLimit(length);
8918 - while (input.getBytesUntilLimit() > 0) {
8919 - addUid(input.readSInt32());
8920 - }
8921 - input.popLimit(limit);
8922 - break;
8923 - }
8924 - case 40: {
8925 - ensureUserSidIsMutable();
8926 - userSid_.add(input.readSInt32());
8927 - break;
8928 - }
8929 - case 42: {
8930 - int length = input.readRawVarint32();
8931 - int limit = input.pushLimit(length);
8932 - while (input.getBytesUntilLimit() > 0) {
8933 - addUserSid(input.readSInt32());
8934 - }
8935 - input.popLimit(limit);
8936 - break;
8937 - }
8938 - case 48: {
8939 - ensureVisibleIsMutable();
8940 - visible_.add(input.readBool());
8941 - break;
8942 - }
8943 - case 50: {
8944 - int length = input.readRawVarint32();
8945 - int limit = input.pushLimit(length);
8946 - while (input.getBytesUntilLimit() > 0) {
8947 - addVisible(input.readBool());
8948 - }
8949 - input.popLimit(limit);
8950 - break;
8951 - }
8952 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parsedMessage = null;
8953 + try {
8954 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
8955 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
8956 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo) e.getUnfinishedMessage();
8957 + throw e;
8958 + } finally {
8959 + if (parsedMessage != null) {
8960 + mergeFrom(parsedMessage);
8961 }
8962 }
8963 + return this;
8964 }
8965 -
8966 private int bitField0_;
8967 -
8968 - // repeated int32 version = 1 [packed = true];
8969 - private java.util.List<java.lang.Integer> version_ = java.util.Collections.emptyList();;
8970 +
8971 + private java.util.List<java.lang.Integer> version_ = java.util.Collections.emptyList();
8972 private void ensureVersionIsMutable() {
8973 if (!((bitField0_ & 0x00000001) == 0x00000001)) {
8974 version_ = new java.util.ArrayList<java.lang.Integer>(version_);
8975 bitField0_ |= 0x00000001;
8976 }
8977 }
8978 + /**
8979 + * <code>repeated int32 version = 1 [packed = true];</code>
8980 + */
8981 public java.util.List<java.lang.Integer>
8982 getVersionList() {
8983 return java.util.Collections.unmodifiableList(version_);
8984 }
8985 + /**
8986 + * <code>repeated int32 version = 1 [packed = true];</code>
8987 + */
8988 public int getVersionCount() {
8989 return version_.size();
8990 }
8991 + /**
8992 + * <code>repeated int32 version = 1 [packed = true];</code>
8993 + */
8994 public int getVersion(int index) {
8995 return version_.get(index);
8996 }
8997 + /**
8998 + * <code>repeated int32 version = 1 [packed = true];</code>
8999 + */
9000 public Builder setVersion(
9001 int index, int value) {
9002 ensureVersionIsMutable();
9003 @@ -4650,44 +6931,81 @@ public final class Osmformat {
9004
9005 return this;
9006 }
9007 + /**
9008 + * <code>repeated int32 version = 1 [packed = true];</code>
9009 + */
9010 public Builder addVersion(int value) {
9011 ensureVersionIsMutable();
9012 version_.add(value);
9013
9014 return this;
9015 }
9016 + /**
9017 + * <code>repeated int32 version = 1 [packed = true];</code>
9018 + */
9019 public Builder addAllVersion(
9020 java.lang.Iterable<? extends java.lang.Integer> values) {
9021 ensureVersionIsMutable();
9022 - super.addAll(values, version_);
9023 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9024 + values, version_);
9025
9026 return this;
9027 }
9028 + /**
9029 + * <code>repeated int32 version = 1 [packed = true];</code>
9030 + */
9031 public Builder clearVersion() {
9032 - version_ = java.util.Collections.emptyList();;
9033 + version_ = java.util.Collections.emptyList();
9034 bitField0_ = (bitField0_ & ~0x00000001);
9035
9036 return this;
9037 }
9038 -
9039 - // repeated sint64 timestamp = 2 [packed = true];
9040 - private java.util.List<java.lang.Long> timestamp_ = java.util.Collections.emptyList();;
9041 +
9042 + private java.util.List<java.lang.Long> timestamp_ = java.util.Collections.emptyList();
9043 private void ensureTimestampIsMutable() {
9044 if (!((bitField0_ & 0x00000002) == 0x00000002)) {
9045 timestamp_ = new java.util.ArrayList<java.lang.Long>(timestamp_);
9046 bitField0_ |= 0x00000002;
9047 }
9048 }
9049 + /**
9050 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9051 + *
9052 + * <pre>
9053 + * DELTA coded
9054 + * </pre>
9055 + */
9056 public java.util.List<java.lang.Long>
9057 getTimestampList() {
9058 return java.util.Collections.unmodifiableList(timestamp_);
9059 }
9060 + /**
9061 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9062 + *
9063 + * <pre>
9064 + * DELTA coded
9065 + * </pre>
9066 + */
9067 public int getTimestampCount() {
9068 return timestamp_.size();
9069 }
9070 + /**
9071 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9072 + *
9073 + * <pre>
9074 + * DELTA coded
9075 + * </pre>
9076 + */
9077 public long getTimestamp(int index) {
9078 return timestamp_.get(index);
9079 }
9080 + /**
9081 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9082 + *
9083 + * <pre>
9084 + * DELTA coded
9085 + * </pre>
9086 + */
9087 public Builder setTimestamp(
9088 int index, long value) {
9089 ensureTimestampIsMutable();
9090 @@ -4695,44 +7013,93 @@ public final class Osmformat {
9091
9092 return this;
9093 }
9094 + /**
9095 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9096 + *
9097 + * <pre>
9098 + * DELTA coded
9099 + * </pre>
9100 + */
9101 public Builder addTimestamp(long value) {
9102 ensureTimestampIsMutable();
9103 timestamp_.add(value);
9104
9105 return this;
9106 }
9107 + /**
9108 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9109 + *
9110 + * <pre>
9111 + * DELTA coded
9112 + * </pre>
9113 + */
9114 public Builder addAllTimestamp(
9115 java.lang.Iterable<? extends java.lang.Long> values) {
9116 ensureTimestampIsMutable();
9117 - super.addAll(values, timestamp_);
9118 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9119 + values, timestamp_);
9120
9121 return this;
9122 }
9123 + /**
9124 + * <code>repeated sint64 timestamp = 2 [packed = true];</code>
9125 + *
9126 + * <pre>
9127 + * DELTA coded
9128 + * </pre>
9129 + */
9130 public Builder clearTimestamp() {
9131 - timestamp_ = java.util.Collections.emptyList();;
9132 + timestamp_ = java.util.Collections.emptyList();
9133 bitField0_ = (bitField0_ & ~0x00000002);
9134
9135 return this;
9136 }
9137 -
9138 - // repeated sint64 changeset = 3 [packed = true];
9139 - private java.util.List<java.lang.Long> changeset_ = java.util.Collections.emptyList();;
9140 +
9141 + private java.util.List<java.lang.Long> changeset_ = java.util.Collections.emptyList();
9142 private void ensureChangesetIsMutable() {
9143 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
9144 changeset_ = new java.util.ArrayList<java.lang.Long>(changeset_);
9145 bitField0_ |= 0x00000004;
9146 }
9147 }
9148 + /**
9149 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9150 + *
9151 + * <pre>
9152 + * DELTA coded
9153 + * </pre>
9154 + */
9155 public java.util.List<java.lang.Long>
9156 getChangesetList() {
9157 return java.util.Collections.unmodifiableList(changeset_);
9158 }
9159 + /**
9160 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9161 + *
9162 + * <pre>
9163 + * DELTA coded
9164 + * </pre>
9165 + */
9166 public int getChangesetCount() {
9167 return changeset_.size();
9168 }
9169 + /**
9170 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9171 + *
9172 + * <pre>
9173 + * DELTA coded
9174 + * </pre>
9175 + */
9176 public long getChangeset(int index) {
9177 return changeset_.get(index);
9178 }
9179 + /**
9180 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9181 + *
9182 + * <pre>
9183 + * DELTA coded
9184 + * </pre>
9185 + */
9186 public Builder setChangeset(
9187 int index, long value) {
9188 ensureChangesetIsMutable();
9189 @@ -4740,44 +7107,93 @@ public final class Osmformat {
9190
9191 return this;
9192 }
9193 + /**
9194 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9195 + *
9196 + * <pre>
9197 + * DELTA coded
9198 + * </pre>
9199 + */
9200 public Builder addChangeset(long value) {
9201 ensureChangesetIsMutable();
9202 changeset_.add(value);
9203
9204 return this;
9205 }
9206 + /**
9207 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9208 + *
9209 + * <pre>
9210 + * DELTA coded
9211 + * </pre>
9212 + */
9213 public Builder addAllChangeset(
9214 java.lang.Iterable<? extends java.lang.Long> values) {
9215 ensureChangesetIsMutable();
9216 - super.addAll(values, changeset_);
9217 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9218 + values, changeset_);
9219
9220 return this;
9221 }
9222 + /**
9223 + * <code>repeated sint64 changeset = 3 [packed = true];</code>
9224 + *
9225 + * <pre>
9226 + * DELTA coded
9227 + * </pre>
9228 + */
9229 public Builder clearChangeset() {
9230 - changeset_ = java.util.Collections.emptyList();;
9231 + changeset_ = java.util.Collections.emptyList();
9232 bitField0_ = (bitField0_ & ~0x00000004);
9233
9234 return this;
9235 }
9236 -
9237 - // repeated sint32 uid = 4 [packed = true];
9238 - private java.util.List<java.lang.Integer> uid_ = java.util.Collections.emptyList();;
9239 +
9240 + private java.util.List<java.lang.Integer> uid_ = java.util.Collections.emptyList();
9241 private void ensureUidIsMutable() {
9242 if (!((bitField0_ & 0x00000008) == 0x00000008)) {
9243 uid_ = new java.util.ArrayList<java.lang.Integer>(uid_);
9244 bitField0_ |= 0x00000008;
9245 }
9246 }
9247 + /**
9248 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9249 + *
9250 + * <pre>
9251 + * DELTA coded
9252 + * </pre>
9253 + */
9254 public java.util.List<java.lang.Integer>
9255 getUidList() {
9256 return java.util.Collections.unmodifiableList(uid_);
9257 }
9258 + /**
9259 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9260 + *
9261 + * <pre>
9262 + * DELTA coded
9263 + * </pre>
9264 + */
9265 public int getUidCount() {
9266 return uid_.size();
9267 }
9268 + /**
9269 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9270 + *
9271 + * <pre>
9272 + * DELTA coded
9273 + * </pre>
9274 + */
9275 public int getUid(int index) {
9276 return uid_.get(index);
9277 }
9278 + /**
9279 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9280 + *
9281 + * <pre>
9282 + * DELTA coded
9283 + * </pre>
9284 + */
9285 public Builder setUid(
9286 int index, int value) {
9287 ensureUidIsMutable();
9288 @@ -4785,44 +7201,93 @@ public final class Osmformat {
9289
9290 return this;
9291 }
9292 + /**
9293 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9294 + *
9295 + * <pre>
9296 + * DELTA coded
9297 + * </pre>
9298 + */
9299 public Builder addUid(int value) {
9300 ensureUidIsMutable();
9301 uid_.add(value);
9302
9303 return this;
9304 }
9305 + /**
9306 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9307 + *
9308 + * <pre>
9309 + * DELTA coded
9310 + * </pre>
9311 + */
9312 public Builder addAllUid(
9313 java.lang.Iterable<? extends java.lang.Integer> values) {
9314 ensureUidIsMutable();
9315 - super.addAll(values, uid_);
9316 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9317 + values, uid_);
9318
9319 return this;
9320 }
9321 + /**
9322 + * <code>repeated sint32 uid = 4 [packed = true];</code>
9323 + *
9324 + * <pre>
9325 + * DELTA coded
9326 + * </pre>
9327 + */
9328 public Builder clearUid() {
9329 - uid_ = java.util.Collections.emptyList();;
9330 + uid_ = java.util.Collections.emptyList();
9331 bitField0_ = (bitField0_ & ~0x00000008);
9332
9333 return this;
9334 }
9335 -
9336 - // repeated sint32 user_sid = 5 [packed = true];
9337 - private java.util.List<java.lang.Integer> userSid_ = java.util.Collections.emptyList();;
9338 +
9339 + private java.util.List<java.lang.Integer> userSid_ = java.util.Collections.emptyList();
9340 private void ensureUserSidIsMutable() {
9341 if (!((bitField0_ & 0x00000010) == 0x00000010)) {
9342 userSid_ = new java.util.ArrayList<java.lang.Integer>(userSid_);
9343 bitField0_ |= 0x00000010;
9344 }
9345 }
9346 + /**
9347 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9348 + *
9349 + * <pre>
9350 + * String IDs for usernames. DELTA coded
9351 + * </pre>
9352 + */
9353 public java.util.List<java.lang.Integer>
9354 getUserSidList() {
9355 return java.util.Collections.unmodifiableList(userSid_);
9356 }
9357 + /**
9358 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9359 + *
9360 + * <pre>
9361 + * String IDs for usernames. DELTA coded
9362 + * </pre>
9363 + */
9364 public int getUserSidCount() {
9365 return userSid_.size();
9366 }
9367 + /**
9368 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9369 + *
9370 + * <pre>
9371 + * String IDs for usernames. DELTA coded
9372 + * </pre>
9373 + */
9374 public int getUserSid(int index) {
9375 return userSid_.get(index);
9376 }
9377 + /**
9378 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9379 + *
9380 + * <pre>
9381 + * String IDs for usernames. DELTA coded
9382 + * </pre>
9383 + */
9384 public Builder setUserSid(
9385 int index, int value) {
9386 ensureUserSidIsMutable();
9387 @@ -4830,44 +7295,121 @@ public final class Osmformat {
9388
9389 return this;
9390 }
9391 + /**
9392 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9393 + *
9394 + * <pre>
9395 + * String IDs for usernames. DELTA coded
9396 + * </pre>
9397 + */
9398 public Builder addUserSid(int value) {
9399 ensureUserSidIsMutable();
9400 userSid_.add(value);
9401
9402 return this;
9403 }
9404 + /**
9405 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9406 + *
9407 + * <pre>
9408 + * String IDs for usernames. DELTA coded
9409 + * </pre>
9410 + */
9411 public Builder addAllUserSid(
9412 java.lang.Iterable<? extends java.lang.Integer> values) {
9413 ensureUserSidIsMutable();
9414 - super.addAll(values, userSid_);
9415 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9416 + values, userSid_);
9417
9418 return this;
9419 }
9420 + /**
9421 + * <code>repeated sint32 user_sid = 5 [packed = true];</code>
9422 + *
9423 + * <pre>
9424 + * String IDs for usernames. DELTA coded
9425 + * </pre>
9426 + */
9427 public Builder clearUserSid() {
9428 - userSid_ = java.util.Collections.emptyList();;
9429 + userSid_ = java.util.Collections.emptyList();
9430 bitField0_ = (bitField0_ & ~0x00000010);
9431
9432 return this;
9433 }
9434 -
9435 - // repeated bool visible = 6 [packed = true];
9436 - private java.util.List<java.lang.Boolean> visible_ = java.util.Collections.emptyList();;
9437 +
9438 + private java.util.List<java.lang.Boolean> visible_ = java.util.Collections.emptyList();
9439 private void ensureVisibleIsMutable() {
9440 if (!((bitField0_ & 0x00000020) == 0x00000020)) {
9441 visible_ = new java.util.ArrayList<java.lang.Boolean>(visible_);
9442 bitField0_ |= 0x00000020;
9443 }
9444 }
9445 + /**
9446 + * <code>repeated bool visible = 6 [packed = true];</code>
9447 + *
9448 + * <pre>
9449 + * The visible flag is used to store history information. It indicates that
9450 + * the current object version has been created by a delete operation on the
9451 + * OSM API.
9452 + * When a writer sets this flag, it MUST add a required_features tag with
9453 + * value "HistoricalInformation" to the HeaderBlock.
9454 + * If this flag is not available for some object it MUST be assumed to be
9455 + * true if the file has the required_features tag "HistoricalInformation"
9456 + * set.
9457 + * </pre>
9458 + */
9459 public java.util.List<java.lang.Boolean>
9460 getVisibleList() {
9461 return java.util.Collections.unmodifiableList(visible_);
9462 }
9463 + /**
9464 + * <code>repeated bool visible = 6 [packed = true];</code>
9465 + *
9466 + * <pre>
9467 + * The visible flag is used to store history information. It indicates that
9468 + * the current object version has been created by a delete operation on the
9469 + * OSM API.
9470 + * When a writer sets this flag, it MUST add a required_features tag with
9471 + * value "HistoricalInformation" to the HeaderBlock.
9472 + * If this flag is not available for some object it MUST be assumed to be
9473 + * true if the file has the required_features tag "HistoricalInformation"
9474 + * set.
9475 + * </pre>
9476 + */
9477 public int getVisibleCount() {
9478 return visible_.size();
9479 }
9480 + /**
9481 + * <code>repeated bool visible = 6 [packed = true];</code>
9482 + *
9483 + * <pre>
9484 + * The visible flag is used to store history information. It indicates that
9485 + * the current object version has been created by a delete operation on the
9486 + * OSM API.
9487 + * When a writer sets this flag, it MUST add a required_features tag with
9488 + * value "HistoricalInformation" to the HeaderBlock.
9489 + * If this flag is not available for some object it MUST be assumed to be
9490 + * true if the file has the required_features tag "HistoricalInformation"
9491 + * set.
9492 + * </pre>
9493 + */
9494 public boolean getVisible(int index) {
9495 return visible_.get(index);
9496 }
9497 + /**
9498 + * <code>repeated bool visible = 6 [packed = true];</code>
9499 + *
9500 + * <pre>
9501 + * The visible flag is used to store history information. It indicates that
9502 + * the current object version has been created by a delete operation on the
9503 + * OSM API.
9504 + * When a writer sets this flag, it MUST add a required_features tag with
9505 + * value "HistoricalInformation" to the HeaderBlock.
9506 + * If this flag is not available for some object it MUST be assumed to be
9507 + * true if the file has the required_features tag "HistoricalInformation"
9508 + * set.
9509 + * </pre>
9510 + */
9511 public Builder setVisible(
9512 int index, boolean value) {
9513 ensureVisibleIsMutable();
9514 @@ -4875,81 +7417,243 @@ public final class Osmformat {
9515
9516 return this;
9517 }
9518 + /**
9519 + * <code>repeated bool visible = 6 [packed = true];</code>
9520 + *
9521 + * <pre>
9522 + * The visible flag is used to store history information. It indicates that
9523 + * the current object version has been created by a delete operation on the
9524 + * OSM API.
9525 + * When a writer sets this flag, it MUST add a required_features tag with
9526 + * value "HistoricalInformation" to the HeaderBlock.
9527 + * If this flag is not available for some object it MUST be assumed to be
9528 + * true if the file has the required_features tag "HistoricalInformation"
9529 + * set.
9530 + * </pre>
9531 + */
9532 public Builder addVisible(boolean value) {
9533 ensureVisibleIsMutable();
9534 visible_.add(value);
9535
9536 return this;
9537 }
9538 + /**
9539 + * <code>repeated bool visible = 6 [packed = true];</code>
9540 + *
9541 + * <pre>
9542 + * The visible flag is used to store history information. It indicates that
9543 + * the current object version has been created by a delete operation on the
9544 + * OSM API.
9545 + * When a writer sets this flag, it MUST add a required_features tag with
9546 + * value "HistoricalInformation" to the HeaderBlock.
9547 + * If this flag is not available for some object it MUST be assumed to be
9548 + * true if the file has the required_features tag "HistoricalInformation"
9549 + * set.
9550 + * </pre>
9551 + */
9552 public Builder addAllVisible(
9553 java.lang.Iterable<? extends java.lang.Boolean> values) {
9554 ensureVisibleIsMutable();
9555 - super.addAll(values, visible_);
9556 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
9557 + values, visible_);
9558
9559 return this;
9560 }
9561 + /**
9562 + * <code>repeated bool visible = 6 [packed = true];</code>
9563 + *
9564 + * <pre>
9565 + * The visible flag is used to store history information. It indicates that
9566 + * the current object version has been created by a delete operation on the
9567 + * OSM API.
9568 + * When a writer sets this flag, it MUST add a required_features tag with
9569 + * value "HistoricalInformation" to the HeaderBlock.
9570 + * If this flag is not available for some object it MUST be assumed to be
9571 + * true if the file has the required_features tag "HistoricalInformation"
9572 + * set.
9573 + * </pre>
9574 + */
9575 public Builder clearVisible() {
9576 - visible_ = java.util.Collections.emptyList();;
9577 + visible_ = java.util.Collections.emptyList();
9578 bitField0_ = (bitField0_ & ~0x00000020);
9579
9580 return this;
9581 }
9582 -
9583 +
9584 // @@protoc_insertion_point(builder_scope:OSMPBF.DenseInfo)
9585 }
9586 -
9587 +
9588 static {
9589 defaultInstance = new DenseInfo(true);
9590 defaultInstance.initFields();
9591 }
9592 -
9593 +
9594 // @@protoc_insertion_point(class_scope:OSMPBF.DenseInfo)
9595 }
9596 -
9597 - public interface ChangeSetOrBuilder
9598 - extends com.google.protobuf.MessageLiteOrBuilder {
9599 -
9600 - // required int64 id = 1;
9601 +
9602 + public interface ChangeSetOrBuilder extends
9603 + // @@protoc_insertion_point(interface_extends:OSMPBF.ChangeSet)
9604 + com.google.protobuf.MessageLiteOrBuilder {
9605 +
9606 + /**
9607 + * <code>required int64 id = 1;</code>
9608 + *
9609 + * <pre>
9610 + *
9611 + * // Parallel arrays.
9612 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
9613 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
9614 + * optional Info info = 4;
9615 + * </pre>
9616 + */
9617 boolean hasId();
9618 + /**
9619 + * <code>required int64 id = 1;</code>
9620 + *
9621 + * <pre>
9622 + *
9623 + * // Parallel arrays.
9624 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
9625 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
9626 + * optional Info info = 4;
9627 + * </pre>
9628 + */
9629 long getId();
9630 }
9631 + /**
9632 + * Protobuf type {@code OSMPBF.ChangeSet}
9633 + *
9634 + * <pre>
9635 + * THIS IS STUB DESIGN FOR CHANGESETS. NOT USED RIGHT NOW.
9636 + * TODO: REMOVE THIS?
9637 + * </pre>
9638 + */
9639 public static final class ChangeSet extends
9640 - com.google.protobuf.GeneratedMessageLite
9641 - implements ChangeSetOrBuilder {
9642 + com.google.protobuf.GeneratedMessageLite implements
9643 + // @@protoc_insertion_point(message_implements:OSMPBF.ChangeSet)
9644 + ChangeSetOrBuilder {
9645 // Use ChangeSet.newBuilder() to construct.
9646 - private ChangeSet(Builder builder) {
9647 + private ChangeSet(com.google.protobuf.GeneratedMessageLite.Builder builder) {
9648 super(builder);
9649 + this.unknownFields = builder.getUnknownFields();
9650 }
9651 - private ChangeSet(boolean noInit) {}
9652 -
9653 + private ChangeSet(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
9654 +
9655 private static final ChangeSet defaultInstance;
9656 public static ChangeSet getDefaultInstance() {
9657 return defaultInstance;
9658 }
9659 -
9660 +
9661 public ChangeSet getDefaultInstanceForType() {
9662 return defaultInstance;
9663 }
9664 -
9665 +
9666 + private final com.google.protobuf.ByteString unknownFields;
9667 + private ChangeSet(
9668 + com.google.protobuf.CodedInputStream input,
9669 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9670 + throws com.google.protobuf.InvalidProtocolBufferException {
9671 + initFields();
9672 + int mutable_bitField0_ = 0;
9673 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
9674 + com.google.protobuf.ByteString.newOutput();
9675 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
9676 + com.google.protobuf.CodedOutputStream.newInstance(
9677 + unknownFieldsOutput);
9678 + try {
9679 + boolean done = false;
9680 + while (!done) {
9681 + int tag = input.readTag();
9682 + switch (tag) {
9683 + case 0:
9684 + done = true;
9685 + break;
9686 + default: {
9687 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
9688 + extensionRegistry, tag)) {
9689 + done = true;
9690 + }
9691 + break;
9692 + }
9693 + case 8: {
9694 + bitField0_ |= 0x00000001;
9695 + id_ = input.readInt64();
9696 + break;
9697 + }
9698 + }
9699 + }
9700 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
9701 + throw e.setUnfinishedMessage(this);
9702 + } catch (java.io.IOException e) {
9703 + throw new com.google.protobuf.InvalidProtocolBufferException(
9704 + e.getMessage()).setUnfinishedMessage(this);
9705 + } finally {
9706 + try {
9707 + unknownFieldsCodedOutput.flush();
9708 + } catch (java.io.IOException e) {
9709 + // Should not happen
9710 + } finally {
9711 + unknownFields = unknownFieldsOutput.toByteString();
9712 + }
9713 + makeExtensionsImmutable();
9714 + }
9715 + }
9716 + public static com.google.protobuf.Parser<ChangeSet> PARSER =
9717 + new com.google.protobuf.AbstractParser<ChangeSet>() {
9718 + public ChangeSet parsePartialFrom(
9719 + com.google.protobuf.CodedInputStream input,
9720 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9721 + throws com.google.protobuf.InvalidProtocolBufferException {
9722 + return new ChangeSet(input, extensionRegistry);
9723 + }
9724 + };
9725 +
9726 + @java.lang.Override
9727 + public com.google.protobuf.Parser<ChangeSet> getParserForType() {
9728 + return PARSER;
9729 + }
9730 +
9731 private int bitField0_;
9732 - // required int64 id = 1;
9733 public static final int ID_FIELD_NUMBER = 1;
9734 private long id_;
9735 + /**
9736 + * <code>required int64 id = 1;</code>
9737 + *
9738 + * <pre>
9739 + *
9740 + * // Parallel arrays.
9741 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
9742 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
9743 + * optional Info info = 4;
9744 + * </pre>
9745 + */
9746 public boolean hasId() {
9747 return ((bitField0_ & 0x00000001) == 0x00000001);
9748 }
9749 + /**
9750 + * <code>required int64 id = 1;</code>
9751 + *
9752 + * <pre>
9753 + *
9754 + * // Parallel arrays.
9755 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
9756 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
9757 + * optional Info info = 4;
9758 + * </pre>
9759 + */
9760 public long getId() {
9761 return id_;
9762 }
9763 -
9764 +
9765 private void initFields() {
9766 id_ = 0L;
9767 }
9768 private byte memoizedIsInitialized = -1;
9769 public final boolean isInitialized() {
9770 byte isInitialized = memoizedIsInitialized;
9771 - if (isInitialized != -1) return isInitialized == 1;
9772 -
9773 + if (isInitialized == 1) return true;
9774 + if (isInitialized == 0) return false;
9775 +
9776 if (!hasId()) {
9777 memoizedIsInitialized = 0;
9778 return false;
9779 @@ -4957,140 +7661,138 @@ public final class Osmformat {
9780 memoizedIsInitialized = 1;
9781 return true;
9782 }
9783 -
9784 +
9785 public void writeTo(com.google.protobuf.CodedOutputStream output)
9786 throws java.io.IOException {
9787 getSerializedSize();
9788 if (((bitField0_ & 0x00000001) == 0x00000001)) {
9789 output.writeInt64(1, id_);
9790 }
9791 + output.writeRawBytes(unknownFields);
9792 }
9793 -
9794 +
9795 private int memoizedSerializedSize = -1;
9796 public int getSerializedSize() {
9797 int size = memoizedSerializedSize;
9798 if (size != -1) return size;
9799 -
9800 +
9801 size = 0;
9802 if (((bitField0_ & 0x00000001) == 0x00000001)) {
9803 size += com.google.protobuf.CodedOutputStream
9804 .computeInt64Size(1, id_);
9805 }
9806 + size += unknownFields.size();
9807 memoizedSerializedSize = size;
9808 return size;
9809 }
9810 -
9811 +
9812 private static final long serialVersionUID = 0L;
9813 @java.lang.Override
9814 protected java.lang.Object writeReplace()
9815 throws java.io.ObjectStreamException {
9816 return super.writeReplace();
9817 }
9818 -
9819 +
9820 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9821 com.google.protobuf.ByteString data)
9822 throws com.google.protobuf.InvalidProtocolBufferException {
9823 - return newBuilder().mergeFrom(data).buildParsed();
9824 + return PARSER.parseFrom(data);
9825 }
9826 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9827 com.google.protobuf.ByteString data,
9828 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9829 throws com.google.protobuf.InvalidProtocolBufferException {
9830 - return newBuilder().mergeFrom(data, extensionRegistry)
9831 - .buildParsed();
9832 + return PARSER.parseFrom(data, extensionRegistry);
9833 }
9834 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(byte[] data)
9835 throws com.google.protobuf.InvalidProtocolBufferException {
9836 - return newBuilder().mergeFrom(data).buildParsed();
9837 + return PARSER.parseFrom(data);
9838 }
9839 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9840 byte[] data,
9841 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9842 throws com.google.protobuf.InvalidProtocolBufferException {
9843 - return newBuilder().mergeFrom(data, extensionRegistry)
9844 - .buildParsed();
9845 + return PARSER.parseFrom(data, extensionRegistry);
9846 }
9847 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(java.io.InputStream input)
9848 throws java.io.IOException {
9849 - return newBuilder().mergeFrom(input).buildParsed();
9850 + return PARSER.parseFrom(input);
9851 }
9852 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9853 java.io.InputStream input,
9854 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9855 throws java.io.IOException {
9856 - return newBuilder().mergeFrom(input, extensionRegistry)
9857 - .buildParsed();
9858 + return PARSER.parseFrom(input, extensionRegistry);
9859 }
9860 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseDelimitedFrom(java.io.InputStream input)
9861 throws java.io.IOException {
9862 - Builder builder = newBuilder();
9863 - if (builder.mergeDelimitedFrom(input)) {
9864 - return builder.buildParsed();
9865 - } else {
9866 - return null;
9867 - }
9868 + return PARSER.parseDelimitedFrom(input);
9869 }
9870 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseDelimitedFrom(
9871 java.io.InputStream input,
9872 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9873 throws java.io.IOException {
9874 - Builder builder = newBuilder();
9875 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
9876 - return builder.buildParsed();
9877 - } else {
9878 - return null;
9879 - }
9880 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
9881 }
9882 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9883 com.google.protobuf.CodedInputStream input)
9884 throws java.io.IOException {
9885 - return newBuilder().mergeFrom(input).buildParsed();
9886 + return PARSER.parseFrom(input);
9887 }
9888 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
9889 com.google.protobuf.CodedInputStream input,
9890 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
9891 throws java.io.IOException {
9892 - return newBuilder().mergeFrom(input, extensionRegistry)
9893 - .buildParsed();
9894 + return PARSER.parseFrom(input, extensionRegistry);
9895 }
9896 -
9897 +
9898 public static Builder newBuilder() { return Builder.create(); }
9899 public Builder newBuilderForType() { return newBuilder(); }
9900 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet prototype) {
9901 return newBuilder().mergeFrom(prototype);
9902 }
9903 public Builder toBuilder() { return newBuilder(this); }
9904 -
9905 +
9906 + /**
9907 + * Protobuf type {@code OSMPBF.ChangeSet}
9908 + *
9909 + * <pre>
9910 + * THIS IS STUB DESIGN FOR CHANGESETS. NOT USED RIGHT NOW.
9911 + * TODO: REMOVE THIS?
9912 + * </pre>
9913 + */
9914 public static final class Builder extends
9915 com.google.protobuf.GeneratedMessageLite.Builder<
9916 org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet, Builder>
9917 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSetOrBuilder {
9918 + implements
9919 + // @@protoc_insertion_point(builder_implements:OSMPBF.ChangeSet)
9920 + org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSetOrBuilder {
9921 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.newBuilder()
9922 private Builder() {
9923 maybeForceBuilderInitialization();
9924 }
9925 -
9926 +
9927 private void maybeForceBuilderInitialization() {
9928 }
9929 private static Builder create() {
9930 return new Builder();
9931 }
9932 -
9933 +
9934 public Builder clear() {
9935 super.clear();
9936 id_ = 0L;
9937 bitField0_ = (bitField0_ & ~0x00000001);
9938 return this;
9939 }
9940 -
9941 +
9942 public Builder clone() {
9943 return create().mergeFrom(buildPartial());
9944 }
9945 -
9946 +
9947 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet getDefaultInstanceForType() {
9948 return org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.getDefaultInstance();
9949 }
9950 -
9951 +
9952 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet build() {
9953 org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet result = buildPartial();
9954 if (!result.isInitialized()) {
9955 @@ -5098,17 +7800,7 @@ public final class Osmformat {
9956 }
9957 return result;
9958 }
9959 -
9960 - private org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet buildParsed()
9961 - throws com.google.protobuf.InvalidProtocolBufferException {
9962 - org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet result = buildPartial();
9963 - if (!result.isInitialized()) {
9964 - throw newUninitializedMessageException(
9965 - result).asInvalidProtocolBufferException();
9966 - }
9967 - return result;
9968 - }
9969 -
9970 +
9971 public org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet buildPartial() {
9972 org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet result = new org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet(this);
9973 int from_bitField0_ = bitField0_;
9974 @@ -5120,15 +7812,17 @@ public final class Osmformat {
9975 result.bitField0_ = to_bitField0_;
9976 return result;
9977 }
9978 -
9979 +
9980 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet other) {
9981 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet.getDefaultInstance()) return this;
9982 if (other.hasId()) {
9983 setId(other.getId());
9984 }
9985 + setUnknownFields(
9986 + getUnknownFields().concat(other.unknownFields));
9987 return this;
9988 }
9989 -
9990 +
9991 public final boolean isInitialized() {
9992 if (!hasId()) {
9993
9994 @@ -5136,189 +7830,501 @@ public final class Osmformat {
9995 }
9996 return true;
9997 }
9998 -
9999 +
10000 public Builder mergeFrom(
10001 com.google.protobuf.CodedInputStream input,
10002 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10003 throws java.io.IOException {
10004 - while (true) {
10005 - int tag = input.readTag();
10006 - switch (tag) {
10007 - case 0:
10008 -
10009 - return this;
10010 - default: {
10011 - if (!parseUnknownField(input, extensionRegistry, tag)) {
10012 -
10013 - return this;
10014 - }
10015 - break;
10016 - }
10017 - case 8: {
10018 - bitField0_ |= 0x00000001;
10019 - id_ = input.readInt64();
10020 - break;
10021 - }
10022 + org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parsedMessage = null;
10023 + try {
10024 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
10025 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
10026 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet) e.getUnfinishedMessage();
10027 + throw e;
10028 + } finally {
10029 + if (parsedMessage != null) {
10030 + mergeFrom(parsedMessage);
10031 }
10032 }
10033 + return this;
10034 }
10035 -
10036 private int bitField0_;
10037 -
10038 - // required int64 id = 1;
10039 +
10040 private long id_ ;
10041 + /**
10042 + * <code>required int64 id = 1;</code>
10043 + *
10044 + * <pre>
10045 + *
10046 + * // Parallel arrays.
10047 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
10048 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
10049 + * optional Info info = 4;
10050 + * </pre>
10051 + */
10052 public boolean hasId() {
10053 return ((bitField0_ & 0x00000001) == 0x00000001);
10054 }
10055 + /**
10056 + * <code>required int64 id = 1;</code>
10057 + *
10058 + * <pre>
10059 + *
10060 + * // Parallel arrays.
10061 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
10062 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
10063 + * optional Info info = 4;
10064 + * </pre>
10065 + */
10066 public long getId() {
10067 return id_;
10068 }
10069 + /**
10070 + * <code>required int64 id = 1;</code>
10071 + *
10072 + * <pre>
10073 + *
10074 + * // Parallel arrays.
10075 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
10076 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
10077 + * optional Info info = 4;
10078 + * </pre>
10079 + */
10080 public Builder setId(long value) {
10081 bitField0_ |= 0x00000001;
10082 id_ = value;
10083
10084 return this;
10085 }
10086 + /**
10087 + * <code>required int64 id = 1;</code>
10088 + *
10089 + * <pre>
10090 + *
10091 + * // Parallel arrays.
10092 + * repeated uint32 keys = 2 [packed = true]; // String IDs.
10093 + * repeated uint32 vals = 3 [packed = true]; // String IDs.
10094 + * optional Info info = 4;
10095 + * </pre>
10096 + */
10097 public Builder clearId() {
10098 bitField0_ = (bitField0_ & ~0x00000001);
10099 id_ = 0L;
10100
10101 return this;
10102 }
10103 -
10104 +
10105 // @@protoc_insertion_point(builder_scope:OSMPBF.ChangeSet)
10106 }
10107 -
10108 +
10109 static {
10110 defaultInstance = new ChangeSet(true);
10111 defaultInstance.initFields();
10112 }
10113 -
10114 +
10115 // @@protoc_insertion_point(class_scope:OSMPBF.ChangeSet)
10116 }
10117 -
10118 - public interface NodeOrBuilder
10119 - extends com.google.protobuf.MessageLiteOrBuilder {
10120 -
10121 - // required sint64 id = 1;
10122 +
10123 + public interface NodeOrBuilder extends
10124 + // @@protoc_insertion_point(interface_extends:OSMPBF.Node)
10125 + com.google.protobuf.MessageLiteOrBuilder {
10126 +
10127 + /**
10128 + * <code>required sint64 id = 1;</code>
10129 + */
10130 boolean hasId();
10131 + /**
10132 + * <code>required sint64 id = 1;</code>
10133 + */
10134 long getId();
10135 -
10136 - // repeated uint32 keys = 2 [packed = true];
10137 +
10138 + /**
10139 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10140 + *
10141 + * <pre>
10142 + * Parallel arrays.
10143 + * </pre>
10144 + */
10145 java.util.List<java.lang.Integer> getKeysList();
10146 + /**
10147 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10148 + *
10149 + * <pre>
10150 + * Parallel arrays.
10151 + * </pre>
10152 + */
10153 int getKeysCount();
10154 + /**
10155 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10156 + *
10157 + * <pre>
10158 + * Parallel arrays.
10159 + * </pre>
10160 + */
10161 int getKeys(int index);
10162 -
10163 - // repeated uint32 vals = 3 [packed = true];
10164 +
10165 + /**
10166 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10167 + *
10168 + * <pre>
10169 + * String IDs.
10170 + * </pre>
10171 + */
10172 java.util.List<java.lang.Integer> getValsList();
10173 + /**
10174 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10175 + *
10176 + * <pre>
10177 + * String IDs.
10178 + * </pre>
10179 + */
10180 int getValsCount();
10181 + /**
10182 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10183 + *
10184 + * <pre>
10185 + * String IDs.
10186 + * </pre>
10187 + */
10188 int getVals(int index);
10189 -
10190 - // optional .OSMPBF.Info info = 4;
10191 +
10192 + /**
10193 + * <code>optional .OSMPBF.Info info = 4;</code>
10194 + *
10195 + * <pre>
10196 + * May be omitted in omitmeta
10197 + * </pre>
10198 + */
10199 boolean hasInfo();
10200 + /**
10201 + * <code>optional .OSMPBF.Info info = 4;</code>
10202 + *
10203 + * <pre>
10204 + * May be omitted in omitmeta
10205 + * </pre>
10206 + */
10207 org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo();
10208 -
10209 - // required sint64 lat = 8;
10210 +
10211 + /**
10212 + * <code>required sint64 lat = 8;</code>
10213 + */
10214 boolean hasLat();
10215 + /**
10216 + * <code>required sint64 lat = 8;</code>
10217 + */
10218 long getLat();
10219 -
10220 - // required sint64 lon = 9;
10221 +
10222 + /**
10223 + * <code>required sint64 lon = 9;</code>
10224 + */
10225 boolean hasLon();
10226 + /**
10227 + * <code>required sint64 lon = 9;</code>
10228 + */
10229 long getLon();
10230 }
10231 + /**
10232 + * Protobuf type {@code OSMPBF.Node}
10233 + */
10234 public static final class Node extends
10235 - com.google.protobuf.GeneratedMessageLite
10236 - implements NodeOrBuilder {
10237 + com.google.protobuf.GeneratedMessageLite implements
10238 + // @@protoc_insertion_point(message_implements:OSMPBF.Node)
10239 + NodeOrBuilder {
10240 // Use Node.newBuilder() to construct.
10241 - private Node(Builder builder) {
10242 + private Node(com.google.protobuf.GeneratedMessageLite.Builder builder) {
10243 super(builder);
10244 + this.unknownFields = builder.getUnknownFields();
10245 }
10246 - private Node(boolean noInit) {}
10247 -
10248 + private Node(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
10249 +
10250 private static final Node defaultInstance;
10251 public static Node getDefaultInstance() {
10252 return defaultInstance;
10253 }
10254 -
10255 +
10256 public Node getDefaultInstanceForType() {
10257 return defaultInstance;
10258 }
10259 -
10260 +
10261 + private final com.google.protobuf.ByteString unknownFields;
10262 + private Node(
10263 + com.google.protobuf.CodedInputStream input,
10264 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10265 + throws com.google.protobuf.InvalidProtocolBufferException {
10266 + initFields();
10267 + int mutable_bitField0_ = 0;
10268 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
10269 + com.google.protobuf.ByteString.newOutput();
10270 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
10271 + com.google.protobuf.CodedOutputStream.newInstance(
10272 + unknownFieldsOutput);
10273 + try {
10274 + boolean done = false;
10275 + while (!done) {
10276 + int tag = input.readTag();
10277 + switch (tag) {
10278 + case 0:
10279 + done = true;
10280 + break;
10281 + default: {
10282 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
10283 + extensionRegistry, tag)) {
10284 + done = true;
10285 + }
10286 + break;
10287 + }
10288 + case 8: {
10289 + bitField0_ |= 0x00000001;
10290 + id_ = input.readSInt64();
10291 + break;
10292 + }
10293 + case 16: {
10294 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
10295 + keys_ = new java.util.ArrayList<java.lang.Integer>();
10296 + mutable_bitField0_ |= 0x00000002;
10297 + }
10298 + keys_.add(input.readUInt32());
10299 + break;
10300 + }
10301 + case 18: {
10302 + int length = input.readRawVarint32();
10303 + int limit = input.pushLimit(length);
10304 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
10305 + keys_ = new java.util.ArrayList<java.lang.Integer>();
10306 + mutable_bitField0_ |= 0x00000002;
10307 + }
10308 + while (input.getBytesUntilLimit() > 0) {
10309 + keys_.add(input.readUInt32());
10310 + }
10311 + input.popLimit(limit);
10312 + break;
10313 + }
10314 + case 24: {
10315 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
10316 + vals_ = new java.util.ArrayList<java.lang.Integer>();
10317 + mutable_bitField0_ |= 0x00000004;
10318 + }
10319 + vals_.add(input.readUInt32());
10320 + break;
10321 + }
10322 + case 26: {
10323 + int length = input.readRawVarint32();
10324 + int limit = input.pushLimit(length);
10325 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
10326 + vals_ = new java.util.ArrayList<java.lang.Integer>();
10327 + mutable_bitField0_ |= 0x00000004;
10328 + }
10329 + while (input.getBytesUntilLimit() > 0) {
10330 + vals_.add(input.readUInt32());
10331 + }
10332 + input.popLimit(limit);
10333 + break;
10334 + }
10335 + case 34: {
10336 + org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = null;
10337 + if (((bitField0_ & 0x00000002) == 0x00000002)) {
10338 + subBuilder = info_.toBuilder();
10339 + }
10340 + info_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Info.PARSER, extensionRegistry);
10341 + if (subBuilder != null) {
10342 + subBuilder.mergeFrom(info_);
10343 + info_ = subBuilder.buildPartial();
10344 + }
10345 + bitField0_ |= 0x00000002;
10346 + break;
10347 + }
10348 + case 64: {
10349 + bitField0_ |= 0x00000004;
10350 + lat_ = input.readSInt64();
10351 + break;
10352 + }
10353 + case 72: {
10354 + bitField0_ |= 0x00000008;
10355 + lon_ = input.readSInt64();
10356 + break;
10357 + }
10358 + }
10359 + }
10360 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
10361 + throw e.setUnfinishedMessage(this);
10362 + } catch (java.io.IOException e) {
10363 + throw new com.google.protobuf.InvalidProtocolBufferException(
10364 + e.getMessage()).setUnfinishedMessage(this);
10365 + } finally {
10366 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
10367 + keys_ = java.util.Collections.unmodifiableList(keys_);
10368 + }
10369 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
10370 + vals_ = java.util.Collections.unmodifiableList(vals_);
10371 + }
10372 + try {
10373 + unknownFieldsCodedOutput.flush();
10374 + } catch (java.io.IOException e) {
10375 + // Should not happen
10376 + } finally {
10377 + unknownFields = unknownFieldsOutput.toByteString();
10378 + }
10379 + makeExtensionsImmutable();
10380 + }
10381 + }
10382 + public static com.google.protobuf.Parser<Node> PARSER =
10383 + new com.google.protobuf.AbstractParser<Node>() {
10384 + public Node parsePartialFrom(
10385 + com.google.protobuf.CodedInputStream input,
10386 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10387 + throws com.google.protobuf.InvalidProtocolBufferException {
10388 + return new Node(input, extensionRegistry);
10389 + }
10390 + };
10391 +
10392 + @java.lang.Override
10393 + public com.google.protobuf.Parser<Node> getParserForType() {
10394 + return PARSER;
10395 + }
10396 +
10397 private int bitField0_;
10398 - // required sint64 id = 1;
10399 public static final int ID_FIELD_NUMBER = 1;
10400 private long id_;
10401 + /**
10402 + * <code>required sint64 id = 1;</code>
10403 + */
10404 public boolean hasId() {
10405 return ((bitField0_ & 0x00000001) == 0x00000001);
10406 }
10407 + /**
10408 + * <code>required sint64 id = 1;</code>
10409 + */
10410 public long getId() {
10411 return id_;
10412 }
10413 -
10414 - // repeated uint32 keys = 2 [packed = true];
10415 +
10416 public static final int KEYS_FIELD_NUMBER = 2;
10417 private java.util.List<java.lang.Integer> keys_;
10418 + /**
10419 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10420 + *
10421 + * <pre>
10422 + * Parallel arrays.
10423 + * </pre>
10424 + */
10425 public java.util.List<java.lang.Integer>
10426 getKeysList() {
10427 return keys_;
10428 }
10429 + /**
10430 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10431 + *
10432 + * <pre>
10433 + * Parallel arrays.
10434 + * </pre>
10435 + */
10436 public int getKeysCount() {
10437 return keys_.size();
10438 }
10439 + /**
10440 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10441 + *
10442 + * <pre>
10443 + * Parallel arrays.
10444 + * </pre>
10445 + */
10446 public int getKeys(int index) {
10447 return keys_.get(index);
10448 }
10449 private int keysMemoizedSerializedSize = -1;
10450 -
10451 - // repeated uint32 vals = 3 [packed = true];
10452 +
10453 public static final int VALS_FIELD_NUMBER = 3;
10454 private java.util.List<java.lang.Integer> vals_;
10455 + /**
10456 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10457 + *
10458 + * <pre>
10459 + * String IDs.
10460 + * </pre>
10461 + */
10462 public java.util.List<java.lang.Integer>
10463 getValsList() {
10464 return vals_;
10465 }
10466 + /**
10467 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10468 + *
10469 + * <pre>
10470 + * String IDs.
10471 + * </pre>
10472 + */
10473 public int getValsCount() {
10474 return vals_.size();
10475 }
10476 + /**
10477 + * <code>repeated uint32 vals = 3 [packed = true];</code>
10478 + *
10479 + * <pre>
10480 + * String IDs.
10481 + * </pre>
10482 + */
10483 public int getVals(int index) {
10484 return vals_.get(index);
10485 }
10486 private int valsMemoizedSerializedSize = -1;
10487 -
10488 - // optional .OSMPBF.Info info = 4;
10489 +
10490 public static final int INFO_FIELD_NUMBER = 4;
10491 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_;
10492 + /**
10493 + * <code>optional .OSMPBF.Info info = 4;</code>
10494 + *
10495 + * <pre>
10496 + * May be omitted in omitmeta
10497 + * </pre>
10498 + */
10499 public boolean hasInfo() {
10500 return ((bitField0_ & 0x00000002) == 0x00000002);
10501 }
10502 + /**
10503 + * <code>optional .OSMPBF.Info info = 4;</code>
10504 + *
10505 + * <pre>
10506 + * May be omitted in omitmeta
10507 + * </pre>
10508 + */
10509 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
10510 return info_;
10511 }
10512 -
10513 - // required sint64 lat = 8;
10514 +
10515 public static final int LAT_FIELD_NUMBER = 8;
10516 private long lat_;
10517 + /**
10518 + * <code>required sint64 lat = 8;</code>
10519 + */
10520 public boolean hasLat() {
10521 return ((bitField0_ & 0x00000004) == 0x00000004);
10522 }
10523 + /**
10524 + * <code>required sint64 lat = 8;</code>
10525 + */
10526 public long getLat() {
10527 return lat_;
10528 }
10529 -
10530 - // required sint64 lon = 9;
10531 +
10532 public static final int LON_FIELD_NUMBER = 9;
10533 private long lon_;
10534 + /**
10535 + * <code>required sint64 lon = 9;</code>
10536 + */
10537 public boolean hasLon() {
10538 return ((bitField0_ & 0x00000008) == 0x00000008);
10539 }
10540 + /**
10541 + * <code>required sint64 lon = 9;</code>
10542 + */
10543 public long getLon() {
10544 return lon_;
10545 }
10546 -
10547 +
10548 private void initFields() {
10549 id_ = 0L;
10550 - keys_ = java.util.Collections.emptyList();;
10551 - vals_ = java.util.Collections.emptyList();;
10552 + keys_ = java.util.Collections.emptyList();
10553 + vals_ = java.util.Collections.emptyList();
10554 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
10555 lat_ = 0L;
10556 lon_ = 0L;
10557 @@ -5326,8 +8332,9 @@ public final class Osmformat {
10558 private byte memoizedIsInitialized = -1;
10559 public final boolean isInitialized() {
10560 byte isInitialized = memoizedIsInitialized;
10561 - if (isInitialized != -1) return isInitialized == 1;
10562 -
10563 + if (isInitialized == 1) return true;
10564 + if (isInitialized == 0) return false;
10565 +
10566 if (!hasId()) {
10567 memoizedIsInitialized = 0;
10568 return false;
10569 @@ -5343,7 +8350,7 @@ public final class Osmformat {
10570 memoizedIsInitialized = 1;
10571 return true;
10572 }
10573 -
10574 +
10575 public void writeTo(com.google.protobuf.CodedOutputStream output)
10576 throws java.io.IOException {
10577 getSerializedSize();
10578 @@ -5373,13 +8380,14 @@ public final class Osmformat {
10579 if (((bitField0_ & 0x00000008) == 0x00000008)) {
10580 output.writeSInt64(9, lon_);
10581 }
10582 + output.writeRawBytes(unknownFields);
10583 }
10584 -
10585 +
10586 private int memoizedSerializedSize = -1;
10587 public int getSerializedSize() {
10588 int size = memoizedSerializedSize;
10589 if (size != -1) return size;
10590 -
10591 +
10592 size = 0;
10593 if (((bitField0_ & 0x00000001) == 0x00000001)) {
10594 size += com.google.protobuf.CodedOutputStream
10595 @@ -5425,113 +8433,105 @@ public final class Osmformat {
10596 size += com.google.protobuf.CodedOutputStream
10597 .computeSInt64Size(9, lon_);
10598 }
10599 + size += unknownFields.size();
10600 memoizedSerializedSize = size;
10601 return size;
10602 }
10603 -
10604 +
10605 private static final long serialVersionUID = 0L;
10606 @java.lang.Override
10607 protected java.lang.Object writeReplace()
10608 throws java.io.ObjectStreamException {
10609 return super.writeReplace();
10610 }
10611 -
10612 +
10613 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10614 com.google.protobuf.ByteString data)
10615 throws com.google.protobuf.InvalidProtocolBufferException {
10616 - return newBuilder().mergeFrom(data).buildParsed();
10617 + return PARSER.parseFrom(data);
10618 }
10619 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10620 com.google.protobuf.ByteString data,
10621 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10622 throws com.google.protobuf.InvalidProtocolBufferException {
10623 - return newBuilder().mergeFrom(data, extensionRegistry)
10624 - .buildParsed();
10625 + return PARSER.parseFrom(data, extensionRegistry);
10626 }
10627 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(byte[] data)
10628 throws com.google.protobuf.InvalidProtocolBufferException {
10629 - return newBuilder().mergeFrom(data).buildParsed();
10630 + return PARSER.parseFrom(data);
10631 }
10632 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10633 byte[] data,
10634 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10635 throws com.google.protobuf.InvalidProtocolBufferException {
10636 - return newBuilder().mergeFrom(data, extensionRegistry)
10637 - .buildParsed();
10638 + return PARSER.parseFrom(data, extensionRegistry);
10639 }
10640 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(java.io.InputStream input)
10641 throws java.io.IOException {
10642 - return newBuilder().mergeFrom(input).buildParsed();
10643 + return PARSER.parseFrom(input);
10644 }
10645 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10646 java.io.InputStream input,
10647 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10648 throws java.io.IOException {
10649 - return newBuilder().mergeFrom(input, extensionRegistry)
10650 - .buildParsed();
10651 + return PARSER.parseFrom(input, extensionRegistry);
10652 }
10653 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseDelimitedFrom(java.io.InputStream input)
10654 throws java.io.IOException {
10655 - Builder builder = newBuilder();
10656 - if (builder.mergeDelimitedFrom(input)) {
10657 - return builder.buildParsed();
10658 - } else {
10659 - return null;
10660 - }
10661 + return PARSER.parseDelimitedFrom(input);
10662 }
10663 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseDelimitedFrom(
10664 java.io.InputStream input,
10665 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10666 throws java.io.IOException {
10667 - Builder builder = newBuilder();
10668 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
10669 - return builder.buildParsed();
10670 - } else {
10671 - return null;
10672 - }
10673 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
10674 }
10675 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10676 com.google.protobuf.CodedInputStream input)
10677 throws java.io.IOException {
10678 - return newBuilder().mergeFrom(input).buildParsed();
10679 + return PARSER.parseFrom(input);
10680 }
10681 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
10682 com.google.protobuf.CodedInputStream input,
10683 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10684 throws java.io.IOException {
10685 - return newBuilder().mergeFrom(input, extensionRegistry)
10686 - .buildParsed();
10687 + return PARSER.parseFrom(input, extensionRegistry);
10688 }
10689 -
10690 +
10691 public static Builder newBuilder() { return Builder.create(); }
10692 public Builder newBuilderForType() { return newBuilder(); }
10693 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Node prototype) {
10694 return newBuilder().mergeFrom(prototype);
10695 }
10696 public Builder toBuilder() { return newBuilder(this); }
10697 -
10698 +
10699 + /**
10700 + * Protobuf type {@code OSMPBF.Node}
10701 + */
10702 public static final class Builder extends
10703 com.google.protobuf.GeneratedMessageLite.Builder<
10704 org.openstreetmap.osmosis.osmbinary.Osmformat.Node, Builder>
10705 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.NodeOrBuilder {
10706 + implements
10707 + // @@protoc_insertion_point(builder_implements:OSMPBF.Node)
10708 + org.openstreetmap.osmosis.osmbinary.Osmformat.NodeOrBuilder {
10709 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.Node.newBuilder()
10710 private Builder() {
10711 maybeForceBuilderInitialization();
10712 }
10713 -
10714 +
10715 private void maybeForceBuilderInitialization() {
10716 }
10717 private static Builder create() {
10718 return new Builder();
10719 }
10720 -
10721 +
10722 public Builder clear() {
10723 super.clear();
10724 id_ = 0L;
10725 bitField0_ = (bitField0_ & ~0x00000001);
10726 - keys_ = java.util.Collections.emptyList();;
10727 + keys_ = java.util.Collections.emptyList();
10728 bitField0_ = (bitField0_ & ~0x00000002);
10729 - vals_ = java.util.Collections.emptyList();;
10730 + vals_ = java.util.Collections.emptyList();
10731 bitField0_ = (bitField0_ & ~0x00000004);
10732 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
10733 bitField0_ = (bitField0_ & ~0x00000008);
10734 @@ -5541,15 +8541,15 @@ public final class Osmformat {
10735 bitField0_ = (bitField0_ & ~0x00000020);
10736 return this;
10737 }
10738 -
10739 +
10740 public Builder clone() {
10741 return create().mergeFrom(buildPartial());
10742 }
10743 -
10744 +
10745 public org.openstreetmap.osmosis.osmbinary.Osmformat.Node getDefaultInstanceForType() {
10746 return org.openstreetmap.osmosis.osmbinary.Osmformat.Node.getDefaultInstance();
10747 }
10748 -
10749 +
10750 public org.openstreetmap.osmosis.osmbinary.Osmformat.Node build() {
10751 org.openstreetmap.osmosis.osmbinary.Osmformat.Node result = buildPartial();
10752 if (!result.isInitialized()) {
10753 @@ -5557,17 +8557,7 @@ public final class Osmformat {
10754 }
10755 return result;
10756 }
10757 -
10758 - private org.openstreetmap.osmosis.osmbinary.Osmformat.Node buildParsed()
10759 - throws com.google.protobuf.InvalidProtocolBufferException {
10760 - org.openstreetmap.osmosis.osmbinary.Osmformat.Node result = buildPartial();
10761 - if (!result.isInitialized()) {
10762 - throw newUninitializedMessageException(
10763 - result).asInvalidProtocolBufferException();
10764 - }
10765 - return result;
10766 - }
10767 -
10768 +
10769 public org.openstreetmap.osmosis.osmbinary.Osmformat.Node buildPartial() {
10770 org.openstreetmap.osmosis.osmbinary.Osmformat.Node result = new org.openstreetmap.osmosis.osmbinary.Osmformat.Node(this);
10771 int from_bitField0_ = bitField0_;
10772 @@ -5601,7 +8591,7 @@ public final class Osmformat {
10773 result.bitField0_ = to_bitField0_;
10774 return result;
10775 }
10776 -
10777 +
10778 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.Node other) {
10779 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.Node.getDefaultInstance()) return this;
10780 if (other.hasId()) {
10781 @@ -5636,9 +8626,11 @@ public final class Osmformat {
10782 if (other.hasLon()) {
10783 setLon(other.getLon());
10784 }
10785 + setUnknownFields(
10786 + getUnknownFields().concat(other.unknownFields));
10787 return this;
10788 }
10789 -
10790 +
10791 public final boolean isInitialized() {
10792 if (!hasId()) {
10793
10794 @@ -5654,121 +8646,103 @@ public final class Osmformat {
10795 }
10796 return true;
10797 }
10798 -
10799 +
10800 public Builder mergeFrom(
10801 com.google.protobuf.CodedInputStream input,
10802 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
10803 throws java.io.IOException {
10804 - while (true) {
10805 - int tag = input.readTag();
10806 - switch (tag) {
10807 - case 0:
10808 -
10809 - return this;
10810 - default: {
10811 - if (!parseUnknownField(input, extensionRegistry, tag)) {
10812 -
10813 - return this;
10814 - }
10815 - break;
10816 - }
10817 - case 8: {
10818 - bitField0_ |= 0x00000001;
10819 - id_ = input.readSInt64();
10820 - break;
10821 - }
10822 - case 16: {
10823 - ensureKeysIsMutable();
10824 - keys_.add(input.readUInt32());
10825 - break;
10826 - }
10827 - case 18: {
10828 - int length = input.readRawVarint32();
10829 - int limit = input.pushLimit(length);
10830 - while (input.getBytesUntilLimit() > 0) {
10831 - addKeys(input.readUInt32());
10832 - }
10833 - input.popLimit(limit);
10834 - break;
10835 - }
10836 - case 24: {
10837 - ensureValsIsMutable();
10838 - vals_.add(input.readUInt32());
10839 - break;
10840 - }
10841 - case 26: {
10842 - int length = input.readRawVarint32();
10843 - int limit = input.pushLimit(length);
10844 - while (input.getBytesUntilLimit() > 0) {
10845 - addVals(input.readUInt32());
10846 - }
10847 - input.popLimit(limit);
10848 - break;
10849 - }
10850 - case 34: {
10851 - org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.newBuilder();
10852 - if (hasInfo()) {
10853 - subBuilder.mergeFrom(getInfo());
10854 - }
10855 - input.readMessage(subBuilder, extensionRegistry);
10856 - setInfo(subBuilder.buildPartial());
10857 - break;
10858 - }
10859 - case 64: {
10860 - bitField0_ |= 0x00000010;
10861 - lat_ = input.readSInt64();
10862 - break;
10863 - }
10864 - case 72: {
10865 - bitField0_ |= 0x00000020;
10866 - lon_ = input.readSInt64();
10867 - break;
10868 - }
10869 + org.openstreetmap.osmosis.osmbinary.Osmformat.Node parsedMessage = null;
10870 + try {
10871 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
10872 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
10873 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.Node) e.getUnfinishedMessage();
10874 + throw e;
10875 + } finally {
10876 + if (parsedMessage != null) {
10877 + mergeFrom(parsedMessage);
10878 }
10879 }
10880 + return this;
10881 }
10882 -
10883 private int bitField0_;
10884 -
10885 - // required sint64 id = 1;
10886 +
10887 private long id_ ;
10888 + /**
10889 + * <code>required sint64 id = 1;</code>
10890 + */
10891 public boolean hasId() {
10892 return ((bitField0_ & 0x00000001) == 0x00000001);
10893 }
10894 + /**
10895 + * <code>required sint64 id = 1;</code>
10896 + */
10897 public long getId() {
10898 return id_;
10899 }
10900 + /**
10901 + * <code>required sint64 id = 1;</code>
10902 + */
10903 public Builder setId(long value) {
10904 bitField0_ |= 0x00000001;
10905 id_ = value;
10906
10907 return this;
10908 }
10909 + /**
10910 + * <code>required sint64 id = 1;</code>
10911 + */
10912 public Builder clearId() {
10913 bitField0_ = (bitField0_ & ~0x00000001);
10914 id_ = 0L;
10915
10916 return this;
10917 }
10918 -
10919 - // repeated uint32 keys = 2 [packed = true];
10920 - private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();;
10921 +
10922 + private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();
10923 private void ensureKeysIsMutable() {
10924 if (!((bitField0_ & 0x00000002) == 0x00000002)) {
10925 keys_ = new java.util.ArrayList<java.lang.Integer>(keys_);
10926 bitField0_ |= 0x00000002;
10927 }
10928 }
10929 + /**
10930 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10931 + *
10932 + * <pre>
10933 + * Parallel arrays.
10934 + * </pre>
10935 + */
10936 public java.util.List<java.lang.Integer>
10937 getKeysList() {
10938 return java.util.Collections.unmodifiableList(keys_);
10939 }
10940 + /**
10941 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10942 + *
10943 + * <pre>
10944 + * Parallel arrays.
10945 + * </pre>
10946 + */
10947 public int getKeysCount() {
10948 return keys_.size();
10949 }
10950 + /**
10951 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10952 + *
10953 + * <pre>
10954 + * Parallel arrays.
10955 + * </pre>
10956 + */
10957 public int getKeys(int index) {
10958 return keys_.get(index);
10959 }
10960 + /**
10961 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10962 + *
10963 + * <pre>
10964 + * Parallel arrays.
10965 + * </pre>
10966 + */
10967 public Builder setKeys(
10968 int index, int value) {
10969 ensureKeysIsMutable();
10970 @@ -5776,44 +8750,93 @@ public final class Osmformat {
10971
10972 return this;
10973 }
10974 + /**
10975 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10976 + *
10977 + * <pre>
10978 + * Parallel arrays.
10979 + * </pre>
10980 + */
10981 public Builder addKeys(int value) {
10982 ensureKeysIsMutable();
10983 keys_.add(value);
10984
10985 return this;
10986 }
10987 + /**
10988 + * <code>repeated uint32 keys = 2 [packed = true];</code>
10989 + *
10990 + * <pre>
10991 + * Parallel arrays.
10992 + * </pre>
10993 + */
10994 public Builder addAllKeys(
10995 java.lang.Iterable<? extends java.lang.Integer> values) {
10996 ensureKeysIsMutable();
10997 - super.addAll(values, keys_);
10998 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
10999 + values, keys_);
11000
11001 return this;
11002 }
11003 + /**
11004 + * <code>repeated uint32 keys = 2 [packed = true];</code>
11005 + *
11006 + * <pre>
11007 + * Parallel arrays.
11008 + * </pre>
11009 + */
11010 public Builder clearKeys() {
11011 - keys_ = java.util.Collections.emptyList();;
11012 + keys_ = java.util.Collections.emptyList();
11013 bitField0_ = (bitField0_ & ~0x00000002);
11014
11015 return this;
11016 }
11017 -
11018 - // repeated uint32 vals = 3 [packed = true];
11019 - private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();;
11020 +
11021 + private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();
11022 private void ensureValsIsMutable() {
11023 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
11024 vals_ = new java.util.ArrayList<java.lang.Integer>(vals_);
11025 bitField0_ |= 0x00000004;
11026 }
11027 }
11028 + /**
11029 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11030 + *
11031 + * <pre>
11032 + * String IDs.
11033 + * </pre>
11034 + */
11035 public java.util.List<java.lang.Integer>
11036 getValsList() {
11037 return java.util.Collections.unmodifiableList(vals_);
11038 }
11039 + /**
11040 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11041 + *
11042 + * <pre>
11043 + * String IDs.
11044 + * </pre>
11045 + */
11046 public int getValsCount() {
11047 return vals_.size();
11048 }
11049 + /**
11050 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11051 + *
11052 + * <pre>
11053 + * String IDs.
11054 + * </pre>
11055 + */
11056 public int getVals(int index) {
11057 return vals_.get(index);
11058 }
11059 + /**
11060 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11061 + *
11062 + * <pre>
11063 + * String IDs.
11064 + * </pre>
11065 + */
11066 public Builder setVals(
11067 int index, int value) {
11068 ensureValsIsMutable();
11069 @@ -5821,50 +8844,106 @@ public final class Osmformat {
11070
11071 return this;
11072 }
11073 + /**
11074 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11075 + *
11076 + * <pre>
11077 + * String IDs.
11078 + * </pre>
11079 + */
11080 public Builder addVals(int value) {
11081 ensureValsIsMutable();
11082 vals_.add(value);
11083
11084 return this;
11085 }
11086 + /**
11087 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11088 + *
11089 + * <pre>
11090 + * String IDs.
11091 + * </pre>
11092 + */
11093 public Builder addAllVals(
11094 java.lang.Iterable<? extends java.lang.Integer> values) {
11095 ensureValsIsMutable();
11096 - super.addAll(values, vals_);
11097 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
11098 + values, vals_);
11099
11100 return this;
11101 }
11102 + /**
11103 + * <code>repeated uint32 vals = 3 [packed = true];</code>
11104 + *
11105 + * <pre>
11106 + * String IDs.
11107 + * </pre>
11108 + */
11109 public Builder clearVals() {
11110 - vals_ = java.util.Collections.emptyList();;
11111 + vals_ = java.util.Collections.emptyList();
11112 bitField0_ = (bitField0_ & ~0x00000004);
11113
11114 return this;
11115 }
11116 -
11117 - // optional .OSMPBF.Info info = 4;
11118 +
11119 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
11120 + /**
11121 + * <code>optional .OSMPBF.Info info = 4;</code>
11122 + *
11123 + * <pre>
11124 + * May be omitted in omitmeta
11125 + * </pre>
11126 + */
11127 public boolean hasInfo() {
11128 return ((bitField0_ & 0x00000008) == 0x00000008);
11129 }
11130 + /**
11131 + * <code>optional .OSMPBF.Info info = 4;</code>
11132 + *
11133 + * <pre>
11134 + * May be omitted in omitmeta
11135 + * </pre>
11136 + */
11137 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
11138 return info_;
11139 }
11140 + /**
11141 + * <code>optional .OSMPBF.Info info = 4;</code>
11142 + *
11143 + * <pre>
11144 + * May be omitted in omitmeta
11145 + * </pre>
11146 + */
11147 public Builder setInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
11148 if (value == null) {
11149 throw new NullPointerException();
11150 }
11151 info_ = value;
11152 -
11153 +
11154 bitField0_ |= 0x00000008;
11155 return this;
11156 }
11157 + /**
11158 + * <code>optional .OSMPBF.Info info = 4;</code>
11159 + *
11160 + * <pre>
11161 + * May be omitted in omitmeta
11162 + * </pre>
11163 + */
11164 public Builder setInfo(
11165 org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder builderForValue) {
11166 info_ = builderForValue.build();
11167 -
11168 +
11169 bitField0_ |= 0x00000008;
11170 return this;
11171 }
11172 + /**
11173 + * <code>optional .OSMPBF.Info info = 4;</code>
11174 + *
11175 + * <pre>
11176 + * May be omitted in omitmeta
11177 + * </pre>
11178 + */
11179 public Builder mergeInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
11180 if (((bitField0_ & 0x00000008) == 0x00000008) &&
11181 info_ != org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance()) {
11182 @@ -5873,202 +8952,593 @@ public final class Osmformat {
11183 } else {
11184 info_ = value;
11185 }
11186 -
11187 +
11188 bitField0_ |= 0x00000008;
11189 return this;
11190 }
11191 + /**
11192 + * <code>optional .OSMPBF.Info info = 4;</code>
11193 + *
11194 + * <pre>
11195 + * May be omitted in omitmeta
11196 + * </pre>
11197 + */
11198 public Builder clearInfo() {
11199 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
11200 -
11201 +
11202 bitField0_ = (bitField0_ & ~0x00000008);
11203 return this;
11204 }
11205 -
11206 - // required sint64 lat = 8;
11207 +
11208 private long lat_ ;
11209 + /**
11210 + * <code>required sint64 lat = 8;</code>
11211 + */
11212 public boolean hasLat() {
11213 return ((bitField0_ & 0x00000010) == 0x00000010);
11214 }
11215 + /**
11216 + * <code>required sint64 lat = 8;</code>
11217 + */
11218 public long getLat() {
11219 return lat_;
11220 }
11221 + /**
11222 + * <code>required sint64 lat = 8;</code>
11223 + */
11224 public Builder setLat(long value) {
11225 bitField0_ |= 0x00000010;
11226 lat_ = value;
11227
11228 return this;
11229 }
11230 + /**
11231 + * <code>required sint64 lat = 8;</code>
11232 + */
11233 public Builder clearLat() {
11234 bitField0_ = (bitField0_ & ~0x00000010);
11235 lat_ = 0L;
11236
11237 return this;
11238 }
11239 -
11240 - // required sint64 lon = 9;
11241 +
11242 private long lon_ ;
11243 + /**
11244 + * <code>required sint64 lon = 9;</code>
11245 + */
11246 public boolean hasLon() {
11247 return ((bitField0_ & 0x00000020) == 0x00000020);
11248 }
11249 + /**
11250 + * <code>required sint64 lon = 9;</code>
11251 + */
11252 public long getLon() {
11253 return lon_;
11254 }
11255 + /**
11256 + * <code>required sint64 lon = 9;</code>
11257 + */
11258 public Builder setLon(long value) {
11259 bitField0_ |= 0x00000020;
11260 lon_ = value;
11261
11262 return this;
11263 }
11264 + /**
11265 + * <code>required sint64 lon = 9;</code>
11266 + */
11267 public Builder clearLon() {
11268 bitField0_ = (bitField0_ & ~0x00000020);
11269 lon_ = 0L;
11270
11271 return this;
11272 }
11273 -
11274 +
11275 // @@protoc_insertion_point(builder_scope:OSMPBF.Node)
11276 }
11277 -
11278 +
11279 static {
11280 defaultInstance = new Node(true);
11281 defaultInstance.initFields();
11282 }
11283 -
11284 +
11285 // @@protoc_insertion_point(class_scope:OSMPBF.Node)
11286 }
11287 -
11288 - public interface DenseNodesOrBuilder
11289 - extends com.google.protobuf.MessageLiteOrBuilder {
11290 -
11291 - // repeated sint64 id = 1 [packed = true];
11292 +
11293 + public interface DenseNodesOrBuilder extends
11294 + // @@protoc_insertion_point(interface_extends:OSMPBF.DenseNodes)
11295 + com.google.protobuf.MessageLiteOrBuilder {
11296 +
11297 + /**
11298 + * <code>repeated sint64 id = 1 [packed = true];</code>
11299 + *
11300 + * <pre>
11301 + * DELTA coded
11302 + * </pre>
11303 + */
11304 java.util.List<java.lang.Long> getIdList();
11305 + /**
11306 + * <code>repeated sint64 id = 1 [packed = true];</code>
11307 + *
11308 + * <pre>
11309 + * DELTA coded
11310 + * </pre>
11311 + */
11312 int getIdCount();
11313 + /**
11314 + * <code>repeated sint64 id = 1 [packed = true];</code>
11315 + *
11316 + * <pre>
11317 + * DELTA coded
11318 + * </pre>
11319 + */
11320 long getId(int index);
11321 -
11322 - // optional .OSMPBF.DenseInfo denseinfo = 5;
11323 +
11324 + /**
11325 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
11326 + *
11327 + * <pre>
11328 + *repeated Info info = 4;
11329 + * </pre>
11330 + */
11331 boolean hasDenseinfo();
11332 + /**
11333 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
11334 + *
11335 + * <pre>
11336 + *repeated Info info = 4;
11337 + * </pre>
11338 + */
11339 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo getDenseinfo();
11340 -
11341 - // repeated sint64 lat = 8 [packed = true];
11342 +
11343 + /**
11344 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11345 + *
11346 + * <pre>
11347 + * DELTA coded
11348 + * </pre>
11349 + */
11350 java.util.List<java.lang.Long> getLatList();
11351 + /**
11352 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11353 + *
11354 + * <pre>
11355 + * DELTA coded
11356 + * </pre>
11357 + */
11358 int getLatCount();
11359 + /**
11360 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11361 + *
11362 + * <pre>
11363 + * DELTA coded
11364 + * </pre>
11365 + */
11366 long getLat(int index);
11367 -
11368 - // repeated sint64 lon = 9 [packed = true];
11369 +
11370 + /**
11371 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11372 + *
11373 + * <pre>
11374 + * DELTA coded
11375 + * </pre>
11376 + */
11377 java.util.List<java.lang.Long> getLonList();
11378 + /**
11379 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11380 + *
11381 + * <pre>
11382 + * DELTA coded
11383 + * </pre>
11384 + */
11385 int getLonCount();
11386 + /**
11387 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11388 + *
11389 + * <pre>
11390 + * DELTA coded
11391 + * </pre>
11392 + */
11393 long getLon(int index);
11394 -
11395 - // repeated int32 keys_vals = 10 [packed = true];
11396 +
11397 + /**
11398 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11399 + *
11400 + * <pre>
11401 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11402 + * </pre>
11403 + */
11404 java.util.List<java.lang.Integer> getKeysValsList();
11405 + /**
11406 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11407 + *
11408 + * <pre>
11409 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11410 + * </pre>
11411 + */
11412 int getKeysValsCount();
11413 + /**
11414 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11415 + *
11416 + * <pre>
11417 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11418 + * </pre>
11419 + */
11420 int getKeysVals(int index);
11421 }
11422 + /**
11423 + * Protobuf type {@code OSMPBF.DenseNodes}
11424 + */
11425 public static final class DenseNodes extends
11426 - com.google.protobuf.GeneratedMessageLite
11427 - implements DenseNodesOrBuilder {
11428 + com.google.protobuf.GeneratedMessageLite implements
11429 + // @@protoc_insertion_point(message_implements:OSMPBF.DenseNodes)
11430 + DenseNodesOrBuilder {
11431 // Use DenseNodes.newBuilder() to construct.
11432 - private DenseNodes(Builder builder) {
11433 + private DenseNodes(com.google.protobuf.GeneratedMessageLite.Builder builder) {
11434 super(builder);
11435 + this.unknownFields = builder.getUnknownFields();
11436 }
11437 - private DenseNodes(boolean noInit) {}
11438 -
11439 + private DenseNodes(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
11440 +
11441 private static final DenseNodes defaultInstance;
11442 public static DenseNodes getDefaultInstance() {
11443 return defaultInstance;
11444 }
11445 -
11446 +
11447 public DenseNodes getDefaultInstanceForType() {
11448 return defaultInstance;
11449 }
11450 -
11451 +
11452 + private final com.google.protobuf.ByteString unknownFields;
11453 + private DenseNodes(
11454 + com.google.protobuf.CodedInputStream input,
11455 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11456 + throws com.google.protobuf.InvalidProtocolBufferException {
11457 + initFields();
11458 + int mutable_bitField0_ = 0;
11459 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
11460 + com.google.protobuf.ByteString.newOutput();
11461 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
11462 + com.google.protobuf.CodedOutputStream.newInstance(
11463 + unknownFieldsOutput);
11464 + try {
11465 + boolean done = false;
11466 + while (!done) {
11467 + int tag = input.readTag();
11468 + switch (tag) {
11469 + case 0:
11470 + done = true;
11471 + break;
11472 + default: {
11473 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
11474 + extensionRegistry, tag)) {
11475 + done = true;
11476 + }
11477 + break;
11478 + }
11479 + case 8: {
11480 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
11481 + id_ = new java.util.ArrayList<java.lang.Long>();
11482 + mutable_bitField0_ |= 0x00000001;
11483 + }
11484 + id_.add(input.readSInt64());
11485 + break;
11486 + }
11487 + case 10: {
11488 + int length = input.readRawVarint32();
11489 + int limit = input.pushLimit(length);
11490 + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) {
11491 + id_ = new java.util.ArrayList<java.lang.Long>();
11492 + mutable_bitField0_ |= 0x00000001;
11493 + }
11494 + while (input.getBytesUntilLimit() > 0) {
11495 + id_.add(input.readSInt64());
11496 + }
11497 + input.popLimit(limit);
11498 + break;
11499 + }
11500 + case 42: {
11501 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.Builder subBuilder = null;
11502 + if (((bitField0_ & 0x00000001) == 0x00000001)) {
11503 + subBuilder = denseinfo_.toBuilder();
11504 + }
11505 + denseinfo_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.PARSER, extensionRegistry);
11506 + if (subBuilder != null) {
11507 + subBuilder.mergeFrom(denseinfo_);
11508 + denseinfo_ = subBuilder.buildPartial();
11509 + }
11510 + bitField0_ |= 0x00000001;
11511 + break;
11512 + }
11513 + case 64: {
11514 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
11515 + lat_ = new java.util.ArrayList<java.lang.Long>();
11516 + mutable_bitField0_ |= 0x00000004;
11517 + }
11518 + lat_.add(input.readSInt64());
11519 + break;
11520 + }
11521 + case 66: {
11522 + int length = input.readRawVarint32();
11523 + int limit = input.pushLimit(length);
11524 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
11525 + lat_ = new java.util.ArrayList<java.lang.Long>();
11526 + mutable_bitField0_ |= 0x00000004;
11527 + }
11528 + while (input.getBytesUntilLimit() > 0) {
11529 + lat_.add(input.readSInt64());
11530 + }
11531 + input.popLimit(limit);
11532 + break;
11533 + }
11534 + case 72: {
11535 + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
11536 + lon_ = new java.util.ArrayList<java.lang.Long>();
11537 + mutable_bitField0_ |= 0x00000008;
11538 + }
11539 + lon_.add(input.readSInt64());
11540 + break;
11541 + }
11542 + case 74: {
11543 + int length = input.readRawVarint32();
11544 + int limit = input.pushLimit(length);
11545 + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008) && input.getBytesUntilLimit() > 0) {
11546 + lon_ = new java.util.ArrayList<java.lang.Long>();
11547 + mutable_bitField0_ |= 0x00000008;
11548 + }
11549 + while (input.getBytesUntilLimit() > 0) {
11550 + lon_.add(input.readSInt64());
11551 + }
11552 + input.popLimit(limit);
11553 + break;
11554 + }
11555 + case 80: {
11556 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
11557 + keysVals_ = new java.util.ArrayList<java.lang.Integer>();
11558 + mutable_bitField0_ |= 0x00000010;
11559 + }
11560 + keysVals_.add(input.readInt32());
11561 + break;
11562 + }
11563 + case 82: {
11564 + int length = input.readRawVarint32();
11565 + int limit = input.pushLimit(length);
11566 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
11567 + keysVals_ = new java.util.ArrayList<java.lang.Integer>();
11568 + mutable_bitField0_ |= 0x00000010;
11569 + }
11570 + while (input.getBytesUntilLimit() > 0) {
11571 + keysVals_.add(input.readInt32());
11572 + }
11573 + input.popLimit(limit);
11574 + break;
11575 + }
11576 + }
11577 + }
11578 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
11579 + throw e.setUnfinishedMessage(this);
11580 + } catch (java.io.IOException e) {
11581 + throw new com.google.protobuf.InvalidProtocolBufferException(
11582 + e.getMessage()).setUnfinishedMessage(this);
11583 + } finally {
11584 + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
11585 + id_ = java.util.Collections.unmodifiableList(id_);
11586 + }
11587 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
11588 + lat_ = java.util.Collections.unmodifiableList(lat_);
11589 + }
11590 + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
11591 + lon_ = java.util.Collections.unmodifiableList(lon_);
11592 + }
11593 + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
11594 + keysVals_ = java.util.Collections.unmodifiableList(keysVals_);
11595 + }
11596 + try {
11597 + unknownFieldsCodedOutput.flush();
11598 + } catch (java.io.IOException e) {
11599 + // Should not happen
11600 + } finally {
11601 + unknownFields = unknownFieldsOutput.toByteString();
11602 + }
11603 + makeExtensionsImmutable();
11604 + }
11605 + }
11606 + public static com.google.protobuf.Parser<DenseNodes> PARSER =
11607 + new com.google.protobuf.AbstractParser<DenseNodes>() {
11608 + public DenseNodes parsePartialFrom(
11609 + com.google.protobuf.CodedInputStream input,
11610 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11611 + throws com.google.protobuf.InvalidProtocolBufferException {
11612 + return new DenseNodes(input, extensionRegistry);
11613 + }
11614 + };
11615 +
11616 + @java.lang.Override
11617 + public com.google.protobuf.Parser<DenseNodes> getParserForType() {
11618 + return PARSER;
11619 + }
11620 +
11621 private int bitField0_;
11622 - // repeated sint64 id = 1 [packed = true];
11623 public static final int ID_FIELD_NUMBER = 1;
11624 private java.util.List<java.lang.Long> id_;
11625 + /**
11626 + * <code>repeated sint64 id = 1 [packed = true];</code>
11627 + *
11628 + * <pre>
11629 + * DELTA coded
11630 + * </pre>
11631 + */
11632 public java.util.List<java.lang.Long>
11633 getIdList() {
11634 return id_;
11635 }
11636 + /**
11637 + * <code>repeated sint64 id = 1 [packed = true];</code>
11638 + *
11639 + * <pre>
11640 + * DELTA coded
11641 + * </pre>
11642 + */
11643 public int getIdCount() {
11644 return id_.size();
11645 }
11646 + /**
11647 + * <code>repeated sint64 id = 1 [packed = true];</code>
11648 + *
11649 + * <pre>
11650 + * DELTA coded
11651 + * </pre>
11652 + */
11653 public long getId(int index) {
11654 return id_.get(index);
11655 }
11656 private int idMemoizedSerializedSize = -1;
11657 -
11658 - // optional .OSMPBF.DenseInfo denseinfo = 5;
11659 +
11660 public static final int DENSEINFO_FIELD_NUMBER = 5;
11661 private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo denseinfo_;
11662 + /**
11663 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
11664 + *
11665 + * <pre>
11666 + *repeated Info info = 4;
11667 + * </pre>
11668 + */
11669 public boolean hasDenseinfo() {
11670 return ((bitField0_ & 0x00000001) == 0x00000001);
11671 }
11672 + /**
11673 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
11674 + *
11675 + * <pre>
11676 + *repeated Info info = 4;
11677 + * </pre>
11678 + */
11679 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo getDenseinfo() {
11680 return denseinfo_;
11681 }
11682 -
11683 - // repeated sint64 lat = 8 [packed = true];
11684 +
11685 public static final int LAT_FIELD_NUMBER = 8;
11686 private java.util.List<java.lang.Long> lat_;
11687 + /**
11688 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11689 + *
11690 + * <pre>
11691 + * DELTA coded
11692 + * </pre>
11693 + */
11694 public java.util.List<java.lang.Long>
11695 getLatList() {
11696 return lat_;
11697 }
11698 + /**
11699 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11700 + *
11701 + * <pre>
11702 + * DELTA coded
11703 + * </pre>
11704 + */
11705 public int getLatCount() {
11706 return lat_.size();
11707 }
11708 + /**
11709 + * <code>repeated sint64 lat = 8 [packed = true];</code>
11710 + *
11711 + * <pre>
11712 + * DELTA coded
11713 + * </pre>
11714 + */
11715 public long getLat(int index) {
11716 return lat_.get(index);
11717 }
11718 private int latMemoizedSerializedSize = -1;
11719 -
11720 - // repeated sint64 lon = 9 [packed = true];
11721 +
11722 public static final int LON_FIELD_NUMBER = 9;
11723 private java.util.List<java.lang.Long> lon_;
11724 + /**
11725 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11726 + *
11727 + * <pre>
11728 + * DELTA coded
11729 + * </pre>
11730 + */
11731 public java.util.List<java.lang.Long>
11732 getLonList() {
11733 return lon_;
11734 }
11735 + /**
11736 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11737 + *
11738 + * <pre>
11739 + * DELTA coded
11740 + * </pre>
11741 + */
11742 public int getLonCount() {
11743 return lon_.size();
11744 }
11745 + /**
11746 + * <code>repeated sint64 lon = 9 [packed = true];</code>
11747 + *
11748 + * <pre>
11749 + * DELTA coded
11750 + * </pre>
11751 + */
11752 public long getLon(int index) {
11753 return lon_.get(index);
11754 }
11755 private int lonMemoizedSerializedSize = -1;
11756 -
11757 - // repeated int32 keys_vals = 10 [packed = true];
11758 +
11759 public static final int KEYS_VALS_FIELD_NUMBER = 10;
11760 private java.util.List<java.lang.Integer> keysVals_;
11761 + /**
11762 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11763 + *
11764 + * <pre>
11765 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11766 + * </pre>
11767 + */
11768 public java.util.List<java.lang.Integer>
11769 getKeysValsList() {
11770 return keysVals_;
11771 }
11772 + /**
11773 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11774 + *
11775 + * <pre>
11776 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11777 + * </pre>
11778 + */
11779 public int getKeysValsCount() {
11780 return keysVals_.size();
11781 }
11782 + /**
11783 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
11784 + *
11785 + * <pre>
11786 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
11787 + * </pre>
11788 + */
11789 public int getKeysVals(int index) {
11790 return keysVals_.get(index);
11791 }
11792 private int keysValsMemoizedSerializedSize = -1;
11793 -
11794 +
11795 private void initFields() {
11796 - id_ = java.util.Collections.emptyList();;
11797 + id_ = java.util.Collections.emptyList();
11798 denseinfo_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance();
11799 - lat_ = java.util.Collections.emptyList();;
11800 - lon_ = java.util.Collections.emptyList();;
11801 - keysVals_ = java.util.Collections.emptyList();;
11802 + lat_ = java.util.Collections.emptyList();
11803 + lon_ = java.util.Collections.emptyList();
11804 + keysVals_ = java.util.Collections.emptyList();
11805 }
11806 private byte memoizedIsInitialized = -1;
11807 public final boolean isInitialized() {
11808 byte isInitialized = memoizedIsInitialized;
11809 - if (isInitialized != -1) return isInitialized == 1;
11810 -
11811 + if (isInitialized == 1) return true;
11812 + if (isInitialized == 0) return false;
11813 +
11814 memoizedIsInitialized = 1;
11815 return true;
11816 }
11817 -
11818 +
11819 public void writeTo(com.google.protobuf.CodedOutputStream output)
11820 throws java.io.IOException {
11821 getSerializedSize();
11822 @@ -6103,13 +9573,14 @@ public final class Osmformat {
11823 for (int i = 0; i < keysVals_.size(); i++) {
11824 output.writeInt32NoTag(keysVals_.get(i));
11825 }
11826 + output.writeRawBytes(unknownFields);
11827 }
11828 -
11829 +
11830 private int memoizedSerializedSize = -1;
11831 public int getSerializedSize() {
11832 int size = memoizedSerializedSize;
11833 if (size != -1) return size;
11834 -
11835 +
11836 size = 0;
11837 {
11838 int dataSize = 0;
11839 @@ -6171,129 +9642,121 @@ public final class Osmformat {
11840 }
11841 keysValsMemoizedSerializedSize = dataSize;
11842 }
11843 + size += unknownFields.size();
11844 memoizedSerializedSize = size;
11845 return size;
11846 }
11847 -
11848 +
11849 private static final long serialVersionUID = 0L;
11850 @java.lang.Override
11851 protected java.lang.Object writeReplace()
11852 throws java.io.ObjectStreamException {
11853 return super.writeReplace();
11854 }
11855 -
11856 +
11857 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11858 com.google.protobuf.ByteString data)
11859 throws com.google.protobuf.InvalidProtocolBufferException {
11860 - return newBuilder().mergeFrom(data).buildParsed();
11861 + return PARSER.parseFrom(data);
11862 }
11863 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11864 com.google.protobuf.ByteString data,
11865 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11866 throws com.google.protobuf.InvalidProtocolBufferException {
11867 - return newBuilder().mergeFrom(data, extensionRegistry)
11868 - .buildParsed();
11869 + return PARSER.parseFrom(data, extensionRegistry);
11870 }
11871 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(byte[] data)
11872 throws com.google.protobuf.InvalidProtocolBufferException {
11873 - return newBuilder().mergeFrom(data).buildParsed();
11874 + return PARSER.parseFrom(data);
11875 }
11876 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11877 byte[] data,
11878 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11879 throws com.google.protobuf.InvalidProtocolBufferException {
11880 - return newBuilder().mergeFrom(data, extensionRegistry)
11881 - .buildParsed();
11882 + return PARSER.parseFrom(data, extensionRegistry);
11883 }
11884 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(java.io.InputStream input)
11885 throws java.io.IOException {
11886 - return newBuilder().mergeFrom(input).buildParsed();
11887 + return PARSER.parseFrom(input);
11888 }
11889 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11890 java.io.InputStream input,
11891 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11892 throws java.io.IOException {
11893 - return newBuilder().mergeFrom(input, extensionRegistry)
11894 - .buildParsed();
11895 + return PARSER.parseFrom(input, extensionRegistry);
11896 }
11897 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseDelimitedFrom(java.io.InputStream input)
11898 throws java.io.IOException {
11899 - Builder builder = newBuilder();
11900 - if (builder.mergeDelimitedFrom(input)) {
11901 - return builder.buildParsed();
11902 - } else {
11903 - return null;
11904 - }
11905 + return PARSER.parseDelimitedFrom(input);
11906 }
11907 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseDelimitedFrom(
11908 java.io.InputStream input,
11909 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11910 throws java.io.IOException {
11911 - Builder builder = newBuilder();
11912 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
11913 - return builder.buildParsed();
11914 - } else {
11915 - return null;
11916 - }
11917 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
11918 }
11919 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11920 com.google.protobuf.CodedInputStream input)
11921 throws java.io.IOException {
11922 - return newBuilder().mergeFrom(input).buildParsed();
11923 + return PARSER.parseFrom(input);
11924 }
11925 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
11926 com.google.protobuf.CodedInputStream input,
11927 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11928 throws java.io.IOException {
11929 - return newBuilder().mergeFrom(input, extensionRegistry)
11930 - .buildParsed();
11931 + return PARSER.parseFrom(input, extensionRegistry);
11932 }
11933 -
11934 +
11935 public static Builder newBuilder() { return Builder.create(); }
11936 public Builder newBuilderForType() { return newBuilder(); }
11937 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes prototype) {
11938 return newBuilder().mergeFrom(prototype);
11939 }
11940 public Builder toBuilder() { return newBuilder(this); }
11941 -
11942 +
11943 + /**
11944 + * Protobuf type {@code OSMPBF.DenseNodes}
11945 + */
11946 public static final class Builder extends
11947 com.google.protobuf.GeneratedMessageLite.Builder<
11948 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes, Builder>
11949 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodesOrBuilder {
11950 + implements
11951 + // @@protoc_insertion_point(builder_implements:OSMPBF.DenseNodes)
11952 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodesOrBuilder {
11953 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.newBuilder()
11954 private Builder() {
11955 maybeForceBuilderInitialization();
11956 }
11957 -
11958 +
11959 private void maybeForceBuilderInitialization() {
11960 }
11961 private static Builder create() {
11962 return new Builder();
11963 }
11964 -
11965 +
11966 public Builder clear() {
11967 super.clear();
11968 - id_ = java.util.Collections.emptyList();;
11969 + id_ = java.util.Collections.emptyList();
11970 bitField0_ = (bitField0_ & ~0x00000001);
11971 denseinfo_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance();
11972 bitField0_ = (bitField0_ & ~0x00000002);
11973 - lat_ = java.util.Collections.emptyList();;
11974 + lat_ = java.util.Collections.emptyList();
11975 bitField0_ = (bitField0_ & ~0x00000004);
11976 - lon_ = java.util.Collections.emptyList();;
11977 + lon_ = java.util.Collections.emptyList();
11978 bitField0_ = (bitField0_ & ~0x00000008);
11979 - keysVals_ = java.util.Collections.emptyList();;
11980 + keysVals_ = java.util.Collections.emptyList();
11981 bitField0_ = (bitField0_ & ~0x00000010);
11982 return this;
11983 }
11984 -
11985 +
11986 public Builder clone() {
11987 return create().mergeFrom(buildPartial());
11988 }
11989 -
11990 +
11991 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes getDefaultInstanceForType() {
11992 return org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance();
11993 }
11994 -
11995 +
11996 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes build() {
11997 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes result = buildPartial();
11998 if (!result.isInitialized()) {
11999 @@ -6301,17 +9764,7 @@ public final class Osmformat {
12000 }
12001 return result;
12002 }
12003 -
12004 - private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes buildParsed()
12005 - throws com.google.protobuf.InvalidProtocolBufferException {
12006 - org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes result = buildPartial();
12007 - if (!result.isInitialized()) {
12008 - throw newUninitializedMessageException(
12009 - result).asInvalidProtocolBufferException();
12010 - }
12011 - return result;
12012 - }
12013 -
12014 +
12015 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes buildPartial() {
12016 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes result = new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes(this);
12017 int from_bitField0_ = bitField0_;
12018 @@ -6343,7 +9796,7 @@ public final class Osmformat {
12019 result.bitField0_ = to_bitField0_;
12020 return result;
12021 }
12022 -
12023 +
12024 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes other) {
12025 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.getDefaultInstance()) return this;
12026 if (!other.id_.isEmpty()) {
12027 @@ -6389,119 +9842,79 @@ public final class Osmformat {
12028 }
12029
12030 }
12031 + setUnknownFields(
12032 + getUnknownFields().concat(other.unknownFields));
12033 return this;
12034 }
12035 -
12036 +
12037 public final boolean isInitialized() {
12038 return true;
12039 }
12040 -
12041 +
12042 public Builder mergeFrom(
12043 com.google.protobuf.CodedInputStream input,
12044 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
12045 throws java.io.IOException {
12046 - while (true) {
12047 - int tag = input.readTag();
12048 - switch (tag) {
12049 - case 0:
12050 -
12051 - return this;
12052 - default: {
12053 - if (!parseUnknownField(input, extensionRegistry, tag)) {
12054 -
12055 - return this;
12056 - }
12057 - break;
12058 - }
12059 - case 8: {
12060 - ensureIdIsMutable();
12061 - id_.add(input.readSInt64());
12062 - break;
12063 - }
12064 - case 10: {
12065 - int length = input.readRawVarint32();
12066 - int limit = input.pushLimit(length);
12067 - while (input.getBytesUntilLimit() > 0) {
12068 - addId(input.readSInt64());
12069 - }
12070 - input.popLimit(limit);
12071 - break;
12072 - }
12073 - case 42: {
12074 - org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.newBuilder();
12075 - if (hasDenseinfo()) {
12076 - subBuilder.mergeFrom(getDenseinfo());
12077 - }
12078 - input.readMessage(subBuilder, extensionRegistry);
12079 - setDenseinfo(subBuilder.buildPartial());
12080 - break;
12081 - }
12082 - case 64: {
12083 - ensureLatIsMutable();
12084 - lat_.add(input.readSInt64());
12085 - break;
12086 - }
12087 - case 66: {
12088 - int length = input.readRawVarint32();
12089 - int limit = input.pushLimit(length);
12090 - while (input.getBytesUntilLimit() > 0) {
12091 - addLat(input.readSInt64());
12092 - }
12093 - input.popLimit(limit);
12094 - break;
12095 - }
12096 - case 72: {
12097 - ensureLonIsMutable();
12098 - lon_.add(input.readSInt64());
12099 - break;
12100 - }
12101 - case 74: {
12102 - int length = input.readRawVarint32();
12103 - int limit = input.pushLimit(length);
12104 - while (input.getBytesUntilLimit() > 0) {
12105 - addLon(input.readSInt64());
12106 - }
12107 - input.popLimit(limit);
12108 - break;
12109 - }
12110 - case 80: {
12111 - ensureKeysValsIsMutable();
12112 - keysVals_.add(input.readInt32());
12113 - break;
12114 - }
12115 - case 82: {
12116 - int length = input.readRawVarint32();
12117 - int limit = input.pushLimit(length);
12118 - while (input.getBytesUntilLimit() > 0) {
12119 - addKeysVals(input.readInt32());
12120 - }
12121 - input.popLimit(limit);
12122 - break;
12123 - }
12124 + org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parsedMessage = null;
12125 + try {
12126 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
12127 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
12128 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes) e.getUnfinishedMessage();
12129 + throw e;
12130 + } finally {
12131 + if (parsedMessage != null) {
12132 + mergeFrom(parsedMessage);
12133 }
12134 }
12135 + return this;
12136 }
12137 -
12138 private int bitField0_;
12139 -
12140 - // repeated sint64 id = 1 [packed = true];
12141 - private java.util.List<java.lang.Long> id_ = java.util.Collections.emptyList();;
12142 +
12143 + private java.util.List<java.lang.Long> id_ = java.util.Collections.emptyList();
12144 private void ensureIdIsMutable() {
12145 if (!((bitField0_ & 0x00000001) == 0x00000001)) {
12146 id_ = new java.util.ArrayList<java.lang.Long>(id_);
12147 bitField0_ |= 0x00000001;
12148 }
12149 }
12150 + /**
12151 + * <code>repeated sint64 id = 1 [packed = true];</code>
12152 + *
12153 + * <pre>
12154 + * DELTA coded
12155 + * </pre>
12156 + */
12157 public java.util.List<java.lang.Long>
12158 getIdList() {
12159 return java.util.Collections.unmodifiableList(id_);
12160 }
12161 + /**
12162 + * <code>repeated sint64 id = 1 [packed = true];</code>
12163 + *
12164 + * <pre>
12165 + * DELTA coded
12166 + * </pre>
12167 + */
12168 public int getIdCount() {
12169 return id_.size();
12170 }
12171 + /**
12172 + * <code>repeated sint64 id = 1 [packed = true];</code>
12173 + *
12174 + * <pre>
12175 + * DELTA coded
12176 + * </pre>
12177 + */
12178 public long getId(int index) {
12179 return id_.get(index);
12180 }
12181 + /**
12182 + * <code>repeated sint64 id = 1 [packed = true];</code>
12183 + *
12184 + * <pre>
12185 + * DELTA coded
12186 + * </pre>
12187 + */
12188 public Builder setId(
12189 int index, long value) {
12190 ensureIdIsMutable();
12191 @@ -6509,50 +9922,106 @@ public final class Osmformat {
12192
12193 return this;
12194 }
12195 + /**
12196 + * <code>repeated sint64 id = 1 [packed = true];</code>
12197 + *
12198 + * <pre>
12199 + * DELTA coded
12200 + * </pre>
12201 + */
12202 public Builder addId(long value) {
12203 ensureIdIsMutable();
12204 id_.add(value);
12205
12206 return this;
12207 }
12208 + /**
12209 + * <code>repeated sint64 id = 1 [packed = true];</code>
12210 + *
12211 + * <pre>
12212 + * DELTA coded
12213 + * </pre>
12214 + */
12215 public Builder addAllId(
12216 java.lang.Iterable<? extends java.lang.Long> values) {
12217 ensureIdIsMutable();
12218 - super.addAll(values, id_);
12219 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
12220 + values, id_);
12221
12222 return this;
12223 }
12224 + /**
12225 + * <code>repeated sint64 id = 1 [packed = true];</code>
12226 + *
12227 + * <pre>
12228 + * DELTA coded
12229 + * </pre>
12230 + */
12231 public Builder clearId() {
12232 - id_ = java.util.Collections.emptyList();;
12233 + id_ = java.util.Collections.emptyList();
12234 bitField0_ = (bitField0_ & ~0x00000001);
12235
12236 return this;
12237 }
12238 -
12239 - // optional .OSMPBF.DenseInfo denseinfo = 5;
12240 +
12241 private org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo denseinfo_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance();
12242 + /**
12243 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12244 + *
12245 + * <pre>
12246 + *repeated Info info = 4;
12247 + * </pre>
12248 + */
12249 public boolean hasDenseinfo() {
12250 return ((bitField0_ & 0x00000002) == 0x00000002);
12251 }
12252 + /**
12253 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12254 + *
12255 + * <pre>
12256 + *repeated Info info = 4;
12257 + * </pre>
12258 + */
12259 public org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo getDenseinfo() {
12260 return denseinfo_;
12261 }
12262 + /**
12263 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12264 + *
12265 + * <pre>
12266 + *repeated Info info = 4;
12267 + * </pre>
12268 + */
12269 public Builder setDenseinfo(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo value) {
12270 if (value == null) {
12271 throw new NullPointerException();
12272 }
12273 denseinfo_ = value;
12274 -
12275 +
12276 bitField0_ |= 0x00000002;
12277 return this;
12278 }
12279 + /**
12280 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12281 + *
12282 + * <pre>
12283 + *repeated Info info = 4;
12284 + * </pre>
12285 + */
12286 public Builder setDenseinfo(
12287 org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.Builder builderForValue) {
12288 denseinfo_ = builderForValue.build();
12289 -
12290 +
12291 bitField0_ |= 0x00000002;
12292 return this;
12293 }
12294 + /**
12295 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12296 + *
12297 + * <pre>
12298 + *repeated Info info = 4;
12299 + * </pre>
12300 + */
12301 public Builder mergeDenseinfo(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo value) {
12302 if (((bitField0_ & 0x00000002) == 0x00000002) &&
12303 denseinfo_ != org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance()) {
12304 @@ -6561,35 +10030,69 @@ public final class Osmformat {
12305 } else {
12306 denseinfo_ = value;
12307 }
12308 -
12309 +
12310 bitField0_ |= 0x00000002;
12311 return this;
12312 }
12313 + /**
12314 + * <code>optional .OSMPBF.DenseInfo denseinfo = 5;</code>
12315 + *
12316 + * <pre>
12317 + *repeated Info info = 4;
12318 + * </pre>
12319 + */
12320 public Builder clearDenseinfo() {
12321 denseinfo_ = org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo.getDefaultInstance();
12322 -
12323 +
12324 bitField0_ = (bitField0_ & ~0x00000002);
12325 return this;
12326 }
12327 -
12328 - // repeated sint64 lat = 8 [packed = true];
12329 - private java.util.List<java.lang.Long> lat_ = java.util.Collections.emptyList();;
12330 +
12331 + private java.util.List<java.lang.Long> lat_ = java.util.Collections.emptyList();
12332 private void ensureLatIsMutable() {
12333 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
12334 lat_ = new java.util.ArrayList<java.lang.Long>(lat_);
12335 bitField0_ |= 0x00000004;
12336 }
12337 }
12338 + /**
12339 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12340 + *
12341 + * <pre>
12342 + * DELTA coded
12343 + * </pre>
12344 + */
12345 public java.util.List<java.lang.Long>
12346 getLatList() {
12347 return java.util.Collections.unmodifiableList(lat_);
12348 }
12349 + /**
12350 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12351 + *
12352 + * <pre>
12353 + * DELTA coded
12354 + * </pre>
12355 + */
12356 public int getLatCount() {
12357 return lat_.size();
12358 }
12359 + /**
12360 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12361 + *
12362 + * <pre>
12363 + * DELTA coded
12364 + * </pre>
12365 + */
12366 public long getLat(int index) {
12367 return lat_.get(index);
12368 }
12369 + /**
12370 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12371 + *
12372 + * <pre>
12373 + * DELTA coded
12374 + * </pre>
12375 + */
12376 public Builder setLat(
12377 int index, long value) {
12378 ensureLatIsMutable();
12379 @@ -6597,44 +10100,93 @@ public final class Osmformat {
12380
12381 return this;
12382 }
12383 + /**
12384 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12385 + *
12386 + * <pre>
12387 + * DELTA coded
12388 + * </pre>
12389 + */
12390 public Builder addLat(long value) {
12391 ensureLatIsMutable();
12392 lat_.add(value);
12393
12394 return this;
12395 }
12396 + /**
12397 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12398 + *
12399 + * <pre>
12400 + * DELTA coded
12401 + * </pre>
12402 + */
12403 public Builder addAllLat(
12404 java.lang.Iterable<? extends java.lang.Long> values) {
12405 ensureLatIsMutable();
12406 - super.addAll(values, lat_);
12407 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
12408 + values, lat_);
12409
12410 return this;
12411 }
12412 + /**
12413 + * <code>repeated sint64 lat = 8 [packed = true];</code>
12414 + *
12415 + * <pre>
12416 + * DELTA coded
12417 + * </pre>
12418 + */
12419 public Builder clearLat() {
12420 - lat_ = java.util.Collections.emptyList();;
12421 + lat_ = java.util.Collections.emptyList();
12422 bitField0_ = (bitField0_ & ~0x00000004);
12423
12424 return this;
12425 }
12426 -
12427 - // repeated sint64 lon = 9 [packed = true];
12428 - private java.util.List<java.lang.Long> lon_ = java.util.Collections.emptyList();;
12429 +
12430 + private java.util.List<java.lang.Long> lon_ = java.util.Collections.emptyList();
12431 private void ensureLonIsMutable() {
12432 if (!((bitField0_ & 0x00000008) == 0x00000008)) {
12433 lon_ = new java.util.ArrayList<java.lang.Long>(lon_);
12434 bitField0_ |= 0x00000008;
12435 }
12436 }
12437 + /**
12438 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12439 + *
12440 + * <pre>
12441 + * DELTA coded
12442 + * </pre>
12443 + */
12444 public java.util.List<java.lang.Long>
12445 getLonList() {
12446 return java.util.Collections.unmodifiableList(lon_);
12447 }
12448 + /**
12449 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12450 + *
12451 + * <pre>
12452 + * DELTA coded
12453 + * </pre>
12454 + */
12455 public int getLonCount() {
12456 return lon_.size();
12457 }
12458 + /**
12459 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12460 + *
12461 + * <pre>
12462 + * DELTA coded
12463 + * </pre>
12464 + */
12465 public long getLon(int index) {
12466 return lon_.get(index);
12467 }
12468 + /**
12469 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12470 + *
12471 + * <pre>
12472 + * DELTA coded
12473 + * </pre>
12474 + */
12475 public Builder setLon(
12476 int index, long value) {
12477 ensureLonIsMutable();
12478 @@ -6642,44 +10194,93 @@ public final class Osmformat {
12479
12480 return this;
12481 }
12482 + /**
12483 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12484 + *
12485 + * <pre>
12486 + * DELTA coded
12487 + * </pre>
12488 + */
12489 public Builder addLon(long value) {
12490 ensureLonIsMutable();
12491 lon_.add(value);
12492
12493 return this;
12494 }
12495 + /**
12496 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12497 + *
12498 + * <pre>
12499 + * DELTA coded
12500 + * </pre>
12501 + */
12502 public Builder addAllLon(
12503 java.lang.Iterable<? extends java.lang.Long> values) {
12504 ensureLonIsMutable();
12505 - super.addAll(values, lon_);
12506 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
12507 + values, lon_);
12508
12509 return this;
12510 }
12511 + /**
12512 + * <code>repeated sint64 lon = 9 [packed = true];</code>
12513 + *
12514 + * <pre>
12515 + * DELTA coded
12516 + * </pre>
12517 + */
12518 public Builder clearLon() {
12519 - lon_ = java.util.Collections.emptyList();;
12520 + lon_ = java.util.Collections.emptyList();
12521 bitField0_ = (bitField0_ & ~0x00000008);
12522
12523 return this;
12524 }
12525 -
12526 - // repeated int32 keys_vals = 10 [packed = true];
12527 - private java.util.List<java.lang.Integer> keysVals_ = java.util.Collections.emptyList();;
12528 +
12529 + private java.util.List<java.lang.Integer> keysVals_ = java.util.Collections.emptyList();
12530 private void ensureKeysValsIsMutable() {
12531 if (!((bitField0_ & 0x00000010) == 0x00000010)) {
12532 keysVals_ = new java.util.ArrayList<java.lang.Integer>(keysVals_);
12533 bitField0_ |= 0x00000010;
12534 }
12535 }
12536 + /**
12537 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12538 + *
12539 + * <pre>
12540 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12541 + * </pre>
12542 + */
12543 public java.util.List<java.lang.Integer>
12544 getKeysValsList() {
12545 return java.util.Collections.unmodifiableList(keysVals_);
12546 }
12547 + /**
12548 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12549 + *
12550 + * <pre>
12551 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12552 + * </pre>
12553 + */
12554 public int getKeysValsCount() {
12555 return keysVals_.size();
12556 }
12557 + /**
12558 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12559 + *
12560 + * <pre>
12561 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12562 + * </pre>
12563 + */
12564 public int getKeysVals(int index) {
12565 return keysVals_.get(index);
12566 }
12567 + /**
12568 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12569 + *
12570 + * <pre>
12571 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12572 + * </pre>
12573 + */
12574 public Builder setKeysVals(
12575 int index, int value) {
12576 ensureKeysValsIsMutable();
12577 @@ -6687,159 +10288,454 @@ public final class Osmformat {
12578
12579 return this;
12580 }
12581 + /**
12582 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12583 + *
12584 + * <pre>
12585 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12586 + * </pre>
12587 + */
12588 public Builder addKeysVals(int value) {
12589 ensureKeysValsIsMutable();
12590 keysVals_.add(value);
12591
12592 return this;
12593 }
12594 + /**
12595 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12596 + *
12597 + * <pre>
12598 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12599 + * </pre>
12600 + */
12601 public Builder addAllKeysVals(
12602 java.lang.Iterable<? extends java.lang.Integer> values) {
12603 ensureKeysValsIsMutable();
12604 - super.addAll(values, keysVals_);
12605 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
12606 + values, keysVals_);
12607
12608 return this;
12609 }
12610 + /**
12611 + * <code>repeated int32 keys_vals = 10 [packed = true];</code>
12612 + *
12613 + * <pre>
12614 + * Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
12615 + * </pre>
12616 + */
12617 public Builder clearKeysVals() {
12618 - keysVals_ = java.util.Collections.emptyList();;
12619 + keysVals_ = java.util.Collections.emptyList();
12620 bitField0_ = (bitField0_ & ~0x00000010);
12621
12622 return this;
12623 }
12624 -
12625 +
12626 // @@protoc_insertion_point(builder_scope:OSMPBF.DenseNodes)
12627 }
12628 -
12629 +
12630 static {
12631 defaultInstance = new DenseNodes(true);
12632 defaultInstance.initFields();
12633 }
12634 -
12635 +
12636 // @@protoc_insertion_point(class_scope:OSMPBF.DenseNodes)
12637 }
12638 -
12639 - public interface WayOrBuilder
12640 - extends com.google.protobuf.MessageLiteOrBuilder {
12641 -
12642 - // required int64 id = 1;
12643 +
12644 + public interface WayOrBuilder extends
12645 + // @@protoc_insertion_point(interface_extends:OSMPBF.Way)
12646 + com.google.protobuf.MessageLiteOrBuilder {
12647 +
12648 + /**
12649 + * <code>required int64 id = 1;</code>
12650 + */
12651 boolean hasId();
12652 + /**
12653 + * <code>required int64 id = 1;</code>
12654 + */
12655 long getId();
12656 -
12657 - // repeated uint32 keys = 2 [packed = true];
12658 +
12659 + /**
12660 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12661 + *
12662 + * <pre>
12663 + * Parallel arrays.
12664 + * </pre>
12665 + */
12666 java.util.List<java.lang.Integer> getKeysList();
12667 + /**
12668 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12669 + *
12670 + * <pre>
12671 + * Parallel arrays.
12672 + * </pre>
12673 + */
12674 int getKeysCount();
12675 + /**
12676 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12677 + *
12678 + * <pre>
12679 + * Parallel arrays.
12680 + * </pre>
12681 + */
12682 int getKeys(int index);
12683 -
12684 - // repeated uint32 vals = 3 [packed = true];
12685 +
12686 + /**
12687 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12688 + */
12689 java.util.List<java.lang.Integer> getValsList();
12690 + /**
12691 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12692 + */
12693 int getValsCount();
12694 + /**
12695 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12696 + */
12697 int getVals(int index);
12698 -
12699 - // optional .OSMPBF.Info info = 4;
12700 +
12701 + /**
12702 + * <code>optional .OSMPBF.Info info = 4;</code>
12703 + */
12704 boolean hasInfo();
12705 + /**
12706 + * <code>optional .OSMPBF.Info info = 4;</code>
12707 + */
12708 org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo();
12709 -
12710 - // repeated sint64 refs = 8 [packed = true];
12711 +
12712 + /**
12713 + * <code>repeated sint64 refs = 8 [packed = true];</code>
12714 + *
12715 + * <pre>
12716 + * DELTA coded
12717 + * </pre>
12718 + */
12719 java.util.List<java.lang.Long> getRefsList();
12720 + /**
12721 + * <code>repeated sint64 refs = 8 [packed = true];</code>
12722 + *
12723 + * <pre>
12724 + * DELTA coded
12725 + * </pre>
12726 + */
12727 int getRefsCount();
12728 + /**
12729 + * <code>repeated sint64 refs = 8 [packed = true];</code>
12730 + *
12731 + * <pre>
12732 + * DELTA coded
12733 + * </pre>
12734 + */
12735 long getRefs(int index);
12736 }
12737 + /**
12738 + * Protobuf type {@code OSMPBF.Way}
12739 + */
12740 public static final class Way extends
12741 - com.google.protobuf.GeneratedMessageLite
12742 - implements WayOrBuilder {
12743 + com.google.protobuf.GeneratedMessageLite implements
12744 + // @@protoc_insertion_point(message_implements:OSMPBF.Way)
12745 + WayOrBuilder {
12746 // Use Way.newBuilder() to construct.
12747 - private Way(Builder builder) {
12748 + private Way(com.google.protobuf.GeneratedMessageLite.Builder builder) {
12749 super(builder);
12750 + this.unknownFields = builder.getUnknownFields();
12751 }
12752 - private Way(boolean noInit) {}
12753 -
12754 + private Way(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
12755 +
12756 private static final Way defaultInstance;
12757 public static Way getDefaultInstance() {
12758 return defaultInstance;
12759 }
12760 -
12761 +
12762 public Way getDefaultInstanceForType() {
12763 return defaultInstance;
12764 }
12765 -
12766 +
12767 + private final com.google.protobuf.ByteString unknownFields;
12768 + private Way(
12769 + com.google.protobuf.CodedInputStream input,
12770 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
12771 + throws com.google.protobuf.InvalidProtocolBufferException {
12772 + initFields();
12773 + int mutable_bitField0_ = 0;
12774 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
12775 + com.google.protobuf.ByteString.newOutput();
12776 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
12777 + com.google.protobuf.CodedOutputStream.newInstance(
12778 + unknownFieldsOutput);
12779 + try {
12780 + boolean done = false;
12781 + while (!done) {
12782 + int tag = input.readTag();
12783 + switch (tag) {
12784 + case 0:
12785 + done = true;
12786 + break;
12787 + default: {
12788 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
12789 + extensionRegistry, tag)) {
12790 + done = true;
12791 + }
12792 + break;
12793 + }
12794 + case 8: {
12795 + bitField0_ |= 0x00000001;
12796 + id_ = input.readInt64();
12797 + break;
12798 + }
12799 + case 16: {
12800 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
12801 + keys_ = new java.util.ArrayList<java.lang.Integer>();
12802 + mutable_bitField0_ |= 0x00000002;
12803 + }
12804 + keys_.add(input.readUInt32());
12805 + break;
12806 + }
12807 + case 18: {
12808 + int length = input.readRawVarint32();
12809 + int limit = input.pushLimit(length);
12810 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
12811 + keys_ = new java.util.ArrayList<java.lang.Integer>();
12812 + mutable_bitField0_ |= 0x00000002;
12813 + }
12814 + while (input.getBytesUntilLimit() > 0) {
12815 + keys_.add(input.readUInt32());
12816 + }
12817 + input.popLimit(limit);
12818 + break;
12819 + }
12820 + case 24: {
12821 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
12822 + vals_ = new java.util.ArrayList<java.lang.Integer>();
12823 + mutable_bitField0_ |= 0x00000004;
12824 + }
12825 + vals_.add(input.readUInt32());
12826 + break;
12827 + }
12828 + case 26: {
12829 + int length = input.readRawVarint32();
12830 + int limit = input.pushLimit(length);
12831 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
12832 + vals_ = new java.util.ArrayList<java.lang.Integer>();
12833 + mutable_bitField0_ |= 0x00000004;
12834 + }
12835 + while (input.getBytesUntilLimit() > 0) {
12836 + vals_.add(input.readUInt32());
12837 + }
12838 + input.popLimit(limit);
12839 + break;
12840 + }
12841 + case 34: {
12842 + org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = null;
12843 + if (((bitField0_ & 0x00000002) == 0x00000002)) {
12844 + subBuilder = info_.toBuilder();
12845 + }
12846 + info_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Info.PARSER, extensionRegistry);
12847 + if (subBuilder != null) {
12848 + subBuilder.mergeFrom(info_);
12849 + info_ = subBuilder.buildPartial();
12850 + }
12851 + bitField0_ |= 0x00000002;
12852 + break;
12853 + }
12854 + case 64: {
12855 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
12856 + refs_ = new java.util.ArrayList<java.lang.Long>();
12857 + mutable_bitField0_ |= 0x00000010;
12858 + }
12859 + refs_.add(input.readSInt64());
12860 + break;
12861 + }
12862 + case 66: {
12863 + int length = input.readRawVarint32();
12864 + int limit = input.pushLimit(length);
12865 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
12866 + refs_ = new java.util.ArrayList<java.lang.Long>();
12867 + mutable_bitField0_ |= 0x00000010;
12868 + }
12869 + while (input.getBytesUntilLimit() > 0) {
12870 + refs_.add(input.readSInt64());
12871 + }
12872 + input.popLimit(limit);
12873 + break;
12874 + }
12875 + }
12876 + }
12877 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
12878 + throw e.setUnfinishedMessage(this);
12879 + } catch (java.io.IOException e) {
12880 + throw new com.google.protobuf.InvalidProtocolBufferException(
12881 + e.getMessage()).setUnfinishedMessage(this);
12882 + } finally {
12883 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
12884 + keys_ = java.util.Collections.unmodifiableList(keys_);
12885 + }
12886 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
12887 + vals_ = java.util.Collections.unmodifiableList(vals_);
12888 + }
12889 + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
12890 + refs_ = java.util.Collections.unmodifiableList(refs_);
12891 + }
12892 + try {
12893 + unknownFieldsCodedOutput.flush();
12894 + } catch (java.io.IOException e) {
12895 + // Should not happen
12896 + } finally {
12897 + unknownFields = unknownFieldsOutput.toByteString();
12898 + }
12899 + makeExtensionsImmutable();
12900 + }
12901 + }
12902 + public static com.google.protobuf.Parser<Way> PARSER =
12903 + new com.google.protobuf.AbstractParser<Way>() {
12904 + public Way parsePartialFrom(
12905 + com.google.protobuf.CodedInputStream input,
12906 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
12907 + throws com.google.protobuf.InvalidProtocolBufferException {
12908 + return new Way(input, extensionRegistry);
12909 + }
12910 + };
12911 +
12912 + @java.lang.Override
12913 + public com.google.protobuf.Parser<Way> getParserForType() {
12914 + return PARSER;
12915 + }
12916 +
12917 private int bitField0_;
12918 - // required int64 id = 1;
12919 public static final int ID_FIELD_NUMBER = 1;
12920 private long id_;
12921 + /**
12922 + * <code>required int64 id = 1;</code>
12923 + */
12924 public boolean hasId() {
12925 return ((bitField0_ & 0x00000001) == 0x00000001);
12926 }
12927 + /**
12928 + * <code>required int64 id = 1;</code>
12929 + */
12930 public long getId() {
12931 return id_;
12932 }
12933 -
12934 - // repeated uint32 keys = 2 [packed = true];
12935 +
12936 public static final int KEYS_FIELD_NUMBER = 2;
12937 private java.util.List<java.lang.Integer> keys_;
12938 + /**
12939 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12940 + *
12941 + * <pre>
12942 + * Parallel arrays.
12943 + * </pre>
12944 + */
12945 public java.util.List<java.lang.Integer>
12946 getKeysList() {
12947 return keys_;
12948 }
12949 + /**
12950 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12951 + *
12952 + * <pre>
12953 + * Parallel arrays.
12954 + * </pre>
12955 + */
12956 public int getKeysCount() {
12957 return keys_.size();
12958 }
12959 + /**
12960 + * <code>repeated uint32 keys = 2 [packed = true];</code>
12961 + *
12962 + * <pre>
12963 + * Parallel arrays.
12964 + * </pre>
12965 + */
12966 public int getKeys(int index) {
12967 return keys_.get(index);
12968 }
12969 private int keysMemoizedSerializedSize = -1;
12970 -
12971 - // repeated uint32 vals = 3 [packed = true];
12972 +
12973 public static final int VALS_FIELD_NUMBER = 3;
12974 private java.util.List<java.lang.Integer> vals_;
12975 + /**
12976 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12977 + */
12978 public java.util.List<java.lang.Integer>
12979 getValsList() {
12980 return vals_;
12981 }
12982 + /**
12983 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12984 + */
12985 public int getValsCount() {
12986 return vals_.size();
12987 }
12988 + /**
12989 + * <code>repeated uint32 vals = 3 [packed = true];</code>
12990 + */
12991 public int getVals(int index) {
12992 return vals_.get(index);
12993 }
12994 private int valsMemoizedSerializedSize = -1;
12995 -
12996 - // optional .OSMPBF.Info info = 4;
12997 +
12998 public static final int INFO_FIELD_NUMBER = 4;
12999 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_;
13000 + /**
13001 + * <code>optional .OSMPBF.Info info = 4;</code>
13002 + */
13003 public boolean hasInfo() {
13004 return ((bitField0_ & 0x00000002) == 0x00000002);
13005 }
13006 + /**
13007 + * <code>optional .OSMPBF.Info info = 4;</code>
13008 + */
13009 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
13010 return info_;
13011 }
13012 -
13013 - // repeated sint64 refs = 8 [packed = true];
13014 +
13015 public static final int REFS_FIELD_NUMBER = 8;
13016 private java.util.List<java.lang.Long> refs_;
13017 + /**
13018 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13019 + *
13020 + * <pre>
13021 + * DELTA coded
13022 + * </pre>
13023 + */
13024 public java.util.List<java.lang.Long>
13025 getRefsList() {
13026 return refs_;
13027 }
13028 + /**
13029 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13030 + *
13031 + * <pre>
13032 + * DELTA coded
13033 + * </pre>
13034 + */
13035 public int getRefsCount() {
13036 return refs_.size();
13037 }
13038 + /**
13039 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13040 + *
13041 + * <pre>
13042 + * DELTA coded
13043 + * </pre>
13044 + */
13045 public long getRefs(int index) {
13046 return refs_.get(index);
13047 }
13048 private int refsMemoizedSerializedSize = -1;
13049 -
13050 +
13051 private void initFields() {
13052 id_ = 0L;
13053 - keys_ = java.util.Collections.emptyList();;
13054 - vals_ = java.util.Collections.emptyList();;
13055 + keys_ = java.util.Collections.emptyList();
13056 + vals_ = java.util.Collections.emptyList();
13057 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
13058 - refs_ = java.util.Collections.emptyList();;
13059 + refs_ = java.util.Collections.emptyList();
13060 }
13061 private byte memoizedIsInitialized = -1;
13062 public final boolean isInitialized() {
13063 byte isInitialized = memoizedIsInitialized;
13064 - if (isInitialized != -1) return isInitialized == 1;
13065 -
13066 + if (isInitialized == 1) return true;
13067 + if (isInitialized == 0) return false;
13068 +
13069 if (!hasId()) {
13070 memoizedIsInitialized = 0;
13071 return false;
13072 @@ -6847,7 +10743,7 @@ public final class Osmformat {
13073 memoizedIsInitialized = 1;
13074 return true;
13075 }
13076 -
13077 +
13078 public void writeTo(com.google.protobuf.CodedOutputStream output)
13079 throws java.io.IOException {
13080 getSerializedSize();
13081 @@ -6878,13 +10774,14 @@ public final class Osmformat {
13082 for (int i = 0; i < refs_.size(); i++) {
13083 output.writeSInt64NoTag(refs_.get(i));
13084 }
13085 + output.writeRawBytes(unknownFields);
13086 }
13087 -
13088 +
13089 private int memoizedSerializedSize = -1;
13090 public int getSerializedSize() {
13091 int size = memoizedSerializedSize;
13092 if (size != -1) return size;
13093 -
13094 +
13095 size = 0;
13096 if (((bitField0_ & 0x00000001) == 0x00000001)) {
13097 size += com.google.protobuf.CodedOutputStream
13098 @@ -6936,129 +10833,121 @@ public final class Osmformat {
13099 }
13100 refsMemoizedSerializedSize = dataSize;
13101 }
13102 + size += unknownFields.size();
13103 memoizedSerializedSize = size;
13104 return size;
13105 }
13106 -
13107 +
13108 private static final long serialVersionUID = 0L;
13109 @java.lang.Override
13110 protected java.lang.Object writeReplace()
13111 throws java.io.ObjectStreamException {
13112 return super.writeReplace();
13113 }
13114 -
13115 +
13116 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13117 com.google.protobuf.ByteString data)
13118 throws com.google.protobuf.InvalidProtocolBufferException {
13119 - return newBuilder().mergeFrom(data).buildParsed();
13120 + return PARSER.parseFrom(data);
13121 }
13122 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13123 com.google.protobuf.ByteString data,
13124 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13125 throws com.google.protobuf.InvalidProtocolBufferException {
13126 - return newBuilder().mergeFrom(data, extensionRegistry)
13127 - .buildParsed();
13128 + return PARSER.parseFrom(data, extensionRegistry);
13129 }
13130 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(byte[] data)
13131 throws com.google.protobuf.InvalidProtocolBufferException {
13132 - return newBuilder().mergeFrom(data).buildParsed();
13133 + return PARSER.parseFrom(data);
13134 }
13135 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13136 byte[] data,
13137 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13138 throws com.google.protobuf.InvalidProtocolBufferException {
13139 - return newBuilder().mergeFrom(data, extensionRegistry)
13140 - .buildParsed();
13141 + return PARSER.parseFrom(data, extensionRegistry);
13142 }
13143 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(java.io.InputStream input)
13144 throws java.io.IOException {
13145 - return newBuilder().mergeFrom(input).buildParsed();
13146 + return PARSER.parseFrom(input);
13147 }
13148 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13149 java.io.InputStream input,
13150 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13151 throws java.io.IOException {
13152 - return newBuilder().mergeFrom(input, extensionRegistry)
13153 - .buildParsed();
13154 + return PARSER.parseFrom(input, extensionRegistry);
13155 }
13156 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseDelimitedFrom(java.io.InputStream input)
13157 throws java.io.IOException {
13158 - Builder builder = newBuilder();
13159 - if (builder.mergeDelimitedFrom(input)) {
13160 - return builder.buildParsed();
13161 - } else {
13162 - return null;
13163 - }
13164 + return PARSER.parseDelimitedFrom(input);
13165 }
13166 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseDelimitedFrom(
13167 java.io.InputStream input,
13168 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13169 throws java.io.IOException {
13170 - Builder builder = newBuilder();
13171 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
13172 - return builder.buildParsed();
13173 - } else {
13174 - return null;
13175 - }
13176 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
13177 }
13178 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13179 com.google.protobuf.CodedInputStream input)
13180 throws java.io.IOException {
13181 - return newBuilder().mergeFrom(input).buildParsed();
13182 + return PARSER.parseFrom(input);
13183 }
13184 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
13185 com.google.protobuf.CodedInputStream input,
13186 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13187 throws java.io.IOException {
13188 - return newBuilder().mergeFrom(input, extensionRegistry)
13189 - .buildParsed();
13190 + return PARSER.parseFrom(input, extensionRegistry);
13191 }
13192 -
13193 +
13194 public static Builder newBuilder() { return Builder.create(); }
13195 public Builder newBuilderForType() { return newBuilder(); }
13196 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Way prototype) {
13197 return newBuilder().mergeFrom(prototype);
13198 }
13199 public Builder toBuilder() { return newBuilder(this); }
13200 -
13201 +
13202 + /**
13203 + * Protobuf type {@code OSMPBF.Way}
13204 + */
13205 public static final class Builder extends
13206 com.google.protobuf.GeneratedMessageLite.Builder<
13207 org.openstreetmap.osmosis.osmbinary.Osmformat.Way, Builder>
13208 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.WayOrBuilder {
13209 + implements
13210 + // @@protoc_insertion_point(builder_implements:OSMPBF.Way)
13211 + org.openstreetmap.osmosis.osmbinary.Osmformat.WayOrBuilder {
13212 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.Way.newBuilder()
13213 private Builder() {
13214 maybeForceBuilderInitialization();
13215 }
13216 -
13217 +
13218 private void maybeForceBuilderInitialization() {
13219 }
13220 private static Builder create() {
13221 return new Builder();
13222 }
13223 -
13224 +
13225 public Builder clear() {
13226 super.clear();
13227 id_ = 0L;
13228 bitField0_ = (bitField0_ & ~0x00000001);
13229 - keys_ = java.util.Collections.emptyList();;
13230 + keys_ = java.util.Collections.emptyList();
13231 bitField0_ = (bitField0_ & ~0x00000002);
13232 - vals_ = java.util.Collections.emptyList();;
13233 + vals_ = java.util.Collections.emptyList();
13234 bitField0_ = (bitField0_ & ~0x00000004);
13235 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
13236 bitField0_ = (bitField0_ & ~0x00000008);
13237 - refs_ = java.util.Collections.emptyList();;
13238 + refs_ = java.util.Collections.emptyList();
13239 bitField0_ = (bitField0_ & ~0x00000010);
13240 return this;
13241 }
13242 -
13243 +
13244 public Builder clone() {
13245 return create().mergeFrom(buildPartial());
13246 }
13247 -
13248 +
13249 public org.openstreetmap.osmosis.osmbinary.Osmformat.Way getDefaultInstanceForType() {
13250 return org.openstreetmap.osmosis.osmbinary.Osmformat.Way.getDefaultInstance();
13251 }
13252 -
13253 +
13254 public org.openstreetmap.osmosis.osmbinary.Osmformat.Way build() {
13255 org.openstreetmap.osmosis.osmbinary.Osmformat.Way result = buildPartial();
13256 if (!result.isInitialized()) {
13257 @@ -7066,17 +10955,7 @@ public final class Osmformat {
13258 }
13259 return result;
13260 }
13261 -
13262 - private org.openstreetmap.osmosis.osmbinary.Osmformat.Way buildParsed()
13263 - throws com.google.protobuf.InvalidProtocolBufferException {
13264 - org.openstreetmap.osmosis.osmbinary.Osmformat.Way result = buildPartial();
13265 - if (!result.isInitialized()) {
13266 - throw newUninitializedMessageException(
13267 - result).asInvalidProtocolBufferException();
13268 - }
13269 - return result;
13270 - }
13271 -
13272 +
13273 public org.openstreetmap.osmosis.osmbinary.Osmformat.Way buildPartial() {
13274 org.openstreetmap.osmosis.osmbinary.Osmformat.Way result = new org.openstreetmap.osmosis.osmbinary.Osmformat.Way(this);
13275 int from_bitField0_ = bitField0_;
13276 @@ -7107,7 +10986,7 @@ public final class Osmformat {
13277 result.bitField0_ = to_bitField0_;
13278 return result;
13279 }
13280 -
13281 +
13282 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.Way other) {
13283 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.Way.getDefaultInstance()) return this;
13284 if (other.hasId()) {
13285 @@ -7119,162 +10998,142 @@ public final class Osmformat {
13286 bitField0_ = (bitField0_ & ~0x00000002);
13287 } else {
13288 ensureKeysIsMutable();
13289 - keys_.addAll(other.keys_);
13290 - }
13291 -
13292 - }
13293 - if (!other.vals_.isEmpty()) {
13294 - if (vals_.isEmpty()) {
13295 - vals_ = other.vals_;
13296 - bitField0_ = (bitField0_ & ~0x00000004);
13297 - } else {
13298 - ensureValsIsMutable();
13299 - vals_.addAll(other.vals_);
13300 - }
13301 -
13302 - }
13303 - if (other.hasInfo()) {
13304 - mergeInfo(other.getInfo());
13305 - }
13306 - if (!other.refs_.isEmpty()) {
13307 - if (refs_.isEmpty()) {
13308 - refs_ = other.refs_;
13309 - bitField0_ = (bitField0_ & ~0x00000010);
13310 - } else {
13311 - ensureRefsIsMutable();
13312 - refs_.addAll(other.refs_);
13313 - }
13314 -
13315 - }
13316 - return this;
13317 - }
13318 -
13319 - public final boolean isInitialized() {
13320 - if (!hasId()) {
13321 -
13322 - return false;
13323 - }
13324 - return true;
13325 - }
13326 -
13327 - public Builder mergeFrom(
13328 - com.google.protobuf.CodedInputStream input,
13329 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13330 - throws java.io.IOException {
13331 - while (true) {
13332 - int tag = input.readTag();
13333 - switch (tag) {
13334 - case 0:
13335 -
13336 - return this;
13337 - default: {
13338 - if (!parseUnknownField(input, extensionRegistry, tag)) {
13339 -
13340 - return this;
13341 - }
13342 - break;
13343 - }
13344 - case 8: {
13345 - bitField0_ |= 0x00000001;
13346 - id_ = input.readInt64();
13347 - break;
13348 - }
13349 - case 16: {
13350 - ensureKeysIsMutable();
13351 - keys_.add(input.readUInt32());
13352 - break;
13353 - }
13354 - case 18: {
13355 - int length = input.readRawVarint32();
13356 - int limit = input.pushLimit(length);
13357 - while (input.getBytesUntilLimit() > 0) {
13358 - addKeys(input.readUInt32());
13359 - }
13360 - input.popLimit(limit);
13361 - break;
13362 - }
13363 - case 24: {
13364 - ensureValsIsMutable();
13365 - vals_.add(input.readUInt32());
13366 - break;
13367 - }
13368 - case 26: {
13369 - int length = input.readRawVarint32();
13370 - int limit = input.pushLimit(length);
13371 - while (input.getBytesUntilLimit() > 0) {
13372 - addVals(input.readUInt32());
13373 - }
13374 - input.popLimit(limit);
13375 - break;
13376 - }
13377 - case 34: {
13378 - org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.newBuilder();
13379 - if (hasInfo()) {
13380 - subBuilder.mergeFrom(getInfo());
13381 - }
13382 - input.readMessage(subBuilder, extensionRegistry);
13383 - setInfo(subBuilder.buildPartial());
13384 - break;
13385 - }
13386 - case 64: {
13387 - ensureRefsIsMutable();
13388 - refs_.add(input.readSInt64());
13389 - break;
13390 - }
13391 - case 66: {
13392 - int length = input.readRawVarint32();
13393 - int limit = input.pushLimit(length);
13394 - while (input.getBytesUntilLimit() > 0) {
13395 - addRefs(input.readSInt64());
13396 - }
13397 - input.popLimit(limit);
13398 - break;
13399 - }
13400 + keys_.addAll(other.keys_);
13401 + }
13402 +
13403 + }
13404 + if (!other.vals_.isEmpty()) {
13405 + if (vals_.isEmpty()) {
13406 + vals_ = other.vals_;
13407 + bitField0_ = (bitField0_ & ~0x00000004);
13408 + } else {
13409 + ensureValsIsMutable();
13410 + vals_.addAll(other.vals_);
13411 + }
13412 +
13413 + }
13414 + if (other.hasInfo()) {
13415 + mergeInfo(other.getInfo());
13416 + }
13417 + if (!other.refs_.isEmpty()) {
13418 + if (refs_.isEmpty()) {
13419 + refs_ = other.refs_;
13420 + bitField0_ = (bitField0_ & ~0x00000010);
13421 + } else {
13422 + ensureRefsIsMutable();
13423 + refs_.addAll(other.refs_);
13424 + }
13425 +
13426 + }
13427 + setUnknownFields(
13428 + getUnknownFields().concat(other.unknownFields));
13429 + return this;
13430 + }
13431 +
13432 + public final boolean isInitialized() {
13433 + if (!hasId()) {
13434 +
13435 + return false;
13436 + }
13437 + return true;
13438 + }
13439 +
13440 + public Builder mergeFrom(
13441 + com.google.protobuf.CodedInputStream input,
13442 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
13443 + throws java.io.IOException {
13444 + org.openstreetmap.osmosis.osmbinary.Osmformat.Way parsedMessage = null;
13445 + try {
13446 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
13447 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
13448 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.Way) e.getUnfinishedMessage();
13449 + throw e;
13450 + } finally {
13451 + if (parsedMessage != null) {
13452 + mergeFrom(parsedMessage);
13453 }
13454 }
13455 + return this;
13456 }
13457 -
13458 private int bitField0_;
13459 -
13460 - // required int64 id = 1;
13461 +
13462 private long id_ ;
13463 + /**
13464 + * <code>required int64 id = 1;</code>
13465 + */
13466 public boolean hasId() {
13467 return ((bitField0_ & 0x00000001) == 0x00000001);
13468 }
13469 + /**
13470 + * <code>required int64 id = 1;</code>
13471 + */
13472 public long getId() {
13473 return id_;
13474 }
13475 + /**
13476 + * <code>required int64 id = 1;</code>
13477 + */
13478 public Builder setId(long value) {
13479 bitField0_ |= 0x00000001;
13480 id_ = value;
13481
13482 return this;
13483 }
13484 + /**
13485 + * <code>required int64 id = 1;</code>
13486 + */
13487 public Builder clearId() {
13488 bitField0_ = (bitField0_ & ~0x00000001);
13489 id_ = 0L;
13490
13491 return this;
13492 }
13493 -
13494 - // repeated uint32 keys = 2 [packed = true];
13495 - private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();;
13496 +
13497 + private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();
13498 private void ensureKeysIsMutable() {
13499 if (!((bitField0_ & 0x00000002) == 0x00000002)) {
13500 keys_ = new java.util.ArrayList<java.lang.Integer>(keys_);
13501 bitField0_ |= 0x00000002;
13502 }
13503 }
13504 + /**
13505 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13506 + *
13507 + * <pre>
13508 + * Parallel arrays.
13509 + * </pre>
13510 + */
13511 public java.util.List<java.lang.Integer>
13512 getKeysList() {
13513 return java.util.Collections.unmodifiableList(keys_);
13514 }
13515 + /**
13516 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13517 + *
13518 + * <pre>
13519 + * Parallel arrays.
13520 + * </pre>
13521 + */
13522 public int getKeysCount() {
13523 return keys_.size();
13524 }
13525 + /**
13526 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13527 + *
13528 + * <pre>
13529 + * Parallel arrays.
13530 + * </pre>
13531 + */
13532 public int getKeys(int index) {
13533 return keys_.get(index);
13534 }
13535 + /**
13536 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13537 + *
13538 + * <pre>
13539 + * Parallel arrays.
13540 + * </pre>
13541 + */
13542 public Builder setKeys(
13543 int index, int value) {
13544 ensureKeysIsMutable();
13545 @@ -7282,44 +11141,77 @@ public final class Osmformat {
13546
13547 return this;
13548 }
13549 + /**
13550 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13551 + *
13552 + * <pre>
13553 + * Parallel arrays.
13554 + * </pre>
13555 + */
13556 public Builder addKeys(int value) {
13557 ensureKeysIsMutable();
13558 keys_.add(value);
13559
13560 return this;
13561 }
13562 + /**
13563 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13564 + *
13565 + * <pre>
13566 + * Parallel arrays.
13567 + * </pre>
13568 + */
13569 public Builder addAllKeys(
13570 java.lang.Iterable<? extends java.lang.Integer> values) {
13571 ensureKeysIsMutable();
13572 - super.addAll(values, keys_);
13573 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
13574 + values, keys_);
13575
13576 return this;
13577 }
13578 + /**
13579 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13580 + *
13581 + * <pre>
13582 + * Parallel arrays.
13583 + * </pre>
13584 + */
13585 public Builder clearKeys() {
13586 - keys_ = java.util.Collections.emptyList();;
13587 + keys_ = java.util.Collections.emptyList();
13588 bitField0_ = (bitField0_ & ~0x00000002);
13589
13590 return this;
13591 }
13592 -
13593 - // repeated uint32 vals = 3 [packed = true];
13594 - private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();;
13595 +
13596 + private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();
13597 private void ensureValsIsMutable() {
13598 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
13599 vals_ = new java.util.ArrayList<java.lang.Integer>(vals_);
13600 bitField0_ |= 0x00000004;
13601 }
13602 }
13603 + /**
13604 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13605 + */
13606 public java.util.List<java.lang.Integer>
13607 getValsList() {
13608 return java.util.Collections.unmodifiableList(vals_);
13609 }
13610 + /**
13611 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13612 + */
13613 public int getValsCount() {
13614 return vals_.size();
13615 }
13616 + /**
13617 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13618 + */
13619 public int getVals(int index) {
13620 return vals_.get(index);
13621 }
13622 + /**
13623 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13624 + */
13625 public Builder setVals(
13626 int index, int value) {
13627 ensureValsIsMutable();
13628 @@ -7327,50 +11219,74 @@ public final class Osmformat {
13629
13630 return this;
13631 }
13632 + /**
13633 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13634 + */
13635 public Builder addVals(int value) {
13636 ensureValsIsMutable();
13637 vals_.add(value);
13638
13639 return this;
13640 }
13641 + /**
13642 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13643 + */
13644 public Builder addAllVals(
13645 java.lang.Iterable<? extends java.lang.Integer> values) {
13646 ensureValsIsMutable();
13647 - super.addAll(values, vals_);
13648 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
13649 + values, vals_);
13650
13651 return this;
13652 }
13653 + /**
13654 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13655 + */
13656 public Builder clearVals() {
13657 - vals_ = java.util.Collections.emptyList();;
13658 + vals_ = java.util.Collections.emptyList();
13659 bitField0_ = (bitField0_ & ~0x00000004);
13660
13661 return this;
13662 }
13663 -
13664 - // optional .OSMPBF.Info info = 4;
13665 +
13666 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
13667 + /**
13668 + * <code>optional .OSMPBF.Info info = 4;</code>
13669 + */
13670 public boolean hasInfo() {
13671 return ((bitField0_ & 0x00000008) == 0x00000008);
13672 }
13673 + /**
13674 + * <code>optional .OSMPBF.Info info = 4;</code>
13675 + */
13676 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
13677 return info_;
13678 }
13679 + /**
13680 + * <code>optional .OSMPBF.Info info = 4;</code>
13681 + */
13682 public Builder setInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
13683 if (value == null) {
13684 throw new NullPointerException();
13685 }
13686 info_ = value;
13687 -
13688 +
13689 bitField0_ |= 0x00000008;
13690 return this;
13691 }
13692 + /**
13693 + * <code>optional .OSMPBF.Info info = 4;</code>
13694 + */
13695 public Builder setInfo(
13696 org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder builderForValue) {
13697 info_ = builderForValue.build();
13698 -
13699 +
13700 bitField0_ |= 0x00000008;
13701 return this;
13702 }
13703 + /**
13704 + * <code>optional .OSMPBF.Info info = 4;</code>
13705 + */
13706 public Builder mergeInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
13707 if (((bitField0_ & 0x00000008) == 0x00000008) &&
13708 info_ != org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance()) {
13709 @@ -7379,35 +11295,65 @@ public final class Osmformat {
13710 } else {
13711 info_ = value;
13712 }
13713 -
13714 +
13715 bitField0_ |= 0x00000008;
13716 return this;
13717 }
13718 + /**
13719 + * <code>optional .OSMPBF.Info info = 4;</code>
13720 + */
13721 public Builder clearInfo() {
13722 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
13723 -
13724 +
13725 bitField0_ = (bitField0_ & ~0x00000008);
13726 return this;
13727 }
13728 -
13729 - // repeated sint64 refs = 8 [packed = true];
13730 - private java.util.List<java.lang.Long> refs_ = java.util.Collections.emptyList();;
13731 +
13732 + private java.util.List<java.lang.Long> refs_ = java.util.Collections.emptyList();
13733 private void ensureRefsIsMutable() {
13734 if (!((bitField0_ & 0x00000010) == 0x00000010)) {
13735 refs_ = new java.util.ArrayList<java.lang.Long>(refs_);
13736 bitField0_ |= 0x00000010;
13737 }
13738 }
13739 + /**
13740 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13741 + *
13742 + * <pre>
13743 + * DELTA coded
13744 + * </pre>
13745 + */
13746 public java.util.List<java.lang.Long>
13747 getRefsList() {
13748 return java.util.Collections.unmodifiableList(refs_);
13749 }
13750 + /**
13751 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13752 + *
13753 + * <pre>
13754 + * DELTA coded
13755 + * </pre>
13756 + */
13757 public int getRefsCount() {
13758 return refs_.size();
13759 }
13760 + /**
13761 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13762 + *
13763 + * <pre>
13764 + * DELTA coded
13765 + * </pre>
13766 + */
13767 public long getRefs(int index) {
13768 return refs_.get(index);
13769 }
13770 + /**
13771 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13772 + *
13773 + * <pre>
13774 + * DELTA coded
13775 + * </pre>
13776 + */
13777 public Builder setRefs(
13778 int index, long value) {
13779 ensureRefsIsMutable();
13780 @@ -7415,105 +11361,452 @@ public final class Osmformat {
13781
13782 return this;
13783 }
13784 + /**
13785 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13786 + *
13787 + * <pre>
13788 + * DELTA coded
13789 + * </pre>
13790 + */
13791 public Builder addRefs(long value) {
13792 ensureRefsIsMutable();
13793 refs_.add(value);
13794
13795 return this;
13796 }
13797 + /**
13798 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13799 + *
13800 + * <pre>
13801 + * DELTA coded
13802 + * </pre>
13803 + */
13804 public Builder addAllRefs(
13805 java.lang.Iterable<? extends java.lang.Long> values) {
13806 ensureRefsIsMutable();
13807 - super.addAll(values, refs_);
13808 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
13809 + values, refs_);
13810
13811 return this;
13812 }
13813 + /**
13814 + * <code>repeated sint64 refs = 8 [packed = true];</code>
13815 + *
13816 + * <pre>
13817 + * DELTA coded
13818 + * </pre>
13819 + */
13820 public Builder clearRefs() {
13821 - refs_ = java.util.Collections.emptyList();;
13822 + refs_ = java.util.Collections.emptyList();
13823 bitField0_ = (bitField0_ & ~0x00000010);
13824
13825 return this;
13826 }
13827 -
13828 +
13829 // @@protoc_insertion_point(builder_scope:OSMPBF.Way)
13830 }
13831 -
13832 +
13833 static {
13834 defaultInstance = new Way(true);
13835 defaultInstance.initFields();
13836 }
13837 -
13838 +
13839 // @@protoc_insertion_point(class_scope:OSMPBF.Way)
13840 }
13841 -
13842 - public interface RelationOrBuilder
13843 - extends com.google.protobuf.MessageLiteOrBuilder {
13844 -
13845 - // required int64 id = 1;
13846 +
13847 + public interface RelationOrBuilder extends
13848 + // @@protoc_insertion_point(interface_extends:OSMPBF.Relation)
13849 + com.google.protobuf.MessageLiteOrBuilder {
13850 +
13851 + /**
13852 + * <code>required int64 id = 1;</code>
13853 + */
13854 boolean hasId();
13855 + /**
13856 + * <code>required int64 id = 1;</code>
13857 + */
13858 long getId();
13859 -
13860 - // repeated uint32 keys = 2 [packed = true];
13861 +
13862 + /**
13863 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13864 + *
13865 + * <pre>
13866 + * Parallel arrays.
13867 + * </pre>
13868 + */
13869 java.util.List<java.lang.Integer> getKeysList();
13870 + /**
13871 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13872 + *
13873 + * <pre>
13874 + * Parallel arrays.
13875 + * </pre>
13876 + */
13877 int getKeysCount();
13878 + /**
13879 + * <code>repeated uint32 keys = 2 [packed = true];</code>
13880 + *
13881 + * <pre>
13882 + * Parallel arrays.
13883 + * </pre>
13884 + */
13885 int getKeys(int index);
13886 -
13887 - // repeated uint32 vals = 3 [packed = true];
13888 +
13889 + /**
13890 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13891 + */
13892 java.util.List<java.lang.Integer> getValsList();
13893 + /**
13894 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13895 + */
13896 int getValsCount();
13897 + /**
13898 + * <code>repeated uint32 vals = 3 [packed = true];</code>
13899 + */
13900 int getVals(int index);
13901 -
13902 - // optional .OSMPBF.Info info = 4;
13903 +
13904 + /**
13905 + * <code>optional .OSMPBF.Info info = 4;</code>
13906 + */
13907 boolean hasInfo();
13908 + /**
13909 + * <code>optional .OSMPBF.Info info = 4;</code>
13910 + */
13911 org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo();
13912 -
13913 - // repeated int32 roles_sid = 8 [packed = true];
13914 +
13915 + /**
13916 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
13917 + *
13918 + * <pre>
13919 + * Parallel arrays
13920 + * </pre>
13921 + */
13922 java.util.List<java.lang.Integer> getRolesSidList();
13923 + /**
13924 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
13925 + *
13926 + * <pre>
13927 + * Parallel arrays
13928 + * </pre>
13929 + */
13930 int getRolesSidCount();
13931 + /**
13932 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
13933 + *
13934 + * <pre>
13935 + * Parallel arrays
13936 + * </pre>
13937 + */
13938 int getRolesSid(int index);
13939 -
13940 - // repeated sint64 memids = 9 [packed = true];
13941 +
13942 + /**
13943 + * <code>repeated sint64 memids = 9 [packed = true];</code>
13944 + *
13945 + * <pre>
13946 + * DELTA encoded
13947 + * </pre>
13948 + */
13949 java.util.List<java.lang.Long> getMemidsList();
13950 + /**
13951 + * <code>repeated sint64 memids = 9 [packed = true];</code>
13952 + *
13953 + * <pre>
13954 + * DELTA encoded
13955 + * </pre>
13956 + */
13957 int getMemidsCount();
13958 + /**
13959 + * <code>repeated sint64 memids = 9 [packed = true];</code>
13960 + *
13961 + * <pre>
13962 + * DELTA encoded
13963 + * </pre>
13964 + */
13965 long getMemids(int index);
13966 -
13967 - // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
13968 +
13969 + /**
13970 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
13971 + */
13972 java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> getTypesList();
13973 + /**
13974 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
13975 + */
13976 int getTypesCount();
13977 + /**
13978 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
13979 + */
13980 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType getTypes(int index);
13981 }
13982 + /**
13983 + * Protobuf type {@code OSMPBF.Relation}
13984 + */
13985 public static final class Relation extends
13986 - com.google.protobuf.GeneratedMessageLite
13987 - implements RelationOrBuilder {
13988 + com.google.protobuf.GeneratedMessageLite implements
13989 + // @@protoc_insertion_point(message_implements:OSMPBF.Relation)
13990 + RelationOrBuilder {
13991 // Use Relation.newBuilder() to construct.
13992 - private Relation(Builder builder) {
13993 + private Relation(com.google.protobuf.GeneratedMessageLite.Builder builder) {
13994 super(builder);
13995 + this.unknownFields = builder.getUnknownFields();
13996 }
13997 - private Relation(boolean noInit) {}
13998 -
13999 + private Relation(boolean noInit) { this.unknownFields = com.google.protobuf.ByteString.EMPTY;}
14000 +
14001 private static final Relation defaultInstance;
14002 public static Relation getDefaultInstance() {
14003 return defaultInstance;
14004 }
14005 -
14006 +
14007 public Relation getDefaultInstanceForType() {
14008 return defaultInstance;
14009 }
14010 -
14011 +
14012 + private final com.google.protobuf.ByteString unknownFields;
14013 + private Relation(
14014 + com.google.protobuf.CodedInputStream input,
14015 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14016 + throws com.google.protobuf.InvalidProtocolBufferException {
14017 + initFields();
14018 + int mutable_bitField0_ = 0;
14019 + com.google.protobuf.ByteString.Output unknownFieldsOutput =
14020 + com.google.protobuf.ByteString.newOutput();
14021 + com.google.protobuf.CodedOutputStream unknownFieldsCodedOutput =
14022 + com.google.protobuf.CodedOutputStream.newInstance(
14023 + unknownFieldsOutput);
14024 + try {
14025 + boolean done = false;
14026 + while (!done) {
14027 + int tag = input.readTag();
14028 + switch (tag) {
14029 + case 0:
14030 + done = true;
14031 + break;
14032 + default: {
14033 + if (!parseUnknownField(input, unknownFieldsCodedOutput,
14034 + extensionRegistry, tag)) {
14035 + done = true;
14036 + }
14037 + break;
14038 + }
14039 + case 8: {
14040 + bitField0_ |= 0x00000001;
14041 + id_ = input.readInt64();
14042 + break;
14043 + }
14044 + case 16: {
14045 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
14046 + keys_ = new java.util.ArrayList<java.lang.Integer>();
14047 + mutable_bitField0_ |= 0x00000002;
14048 + }
14049 + keys_.add(input.readUInt32());
14050 + break;
14051 + }
14052 + case 18: {
14053 + int length = input.readRawVarint32();
14054 + int limit = input.pushLimit(length);
14055 + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
14056 + keys_ = new java.util.ArrayList<java.lang.Integer>();
14057 + mutable_bitField0_ |= 0x00000002;
14058 + }
14059 + while (input.getBytesUntilLimit() > 0) {
14060 + keys_.add(input.readUInt32());
14061 + }
14062 + input.popLimit(limit);
14063 + break;
14064 + }
14065 + case 24: {
14066 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
14067 + vals_ = new java.util.ArrayList<java.lang.Integer>();
14068 + mutable_bitField0_ |= 0x00000004;
14069 + }
14070 + vals_.add(input.readUInt32());
14071 + break;
14072 + }
14073 + case 26: {
14074 + int length = input.readRawVarint32();
14075 + int limit = input.pushLimit(length);
14076 + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
14077 + vals_ = new java.util.ArrayList<java.lang.Integer>();
14078 + mutable_bitField0_ |= 0x00000004;
14079 + }
14080 + while (input.getBytesUntilLimit() > 0) {
14081 + vals_.add(input.readUInt32());
14082 + }
14083 + input.popLimit(limit);
14084 + break;
14085 + }
14086 + case 34: {
14087 + org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = null;
14088 + if (((bitField0_ & 0x00000002) == 0x00000002)) {
14089 + subBuilder = info_.toBuilder();
14090 + }
14091 + info_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Info.PARSER, extensionRegistry);
14092 + if (subBuilder != null) {
14093 + subBuilder.mergeFrom(info_);
14094 + info_ = subBuilder.buildPartial();
14095 + }
14096 + bitField0_ |= 0x00000002;
14097 + break;
14098 + }
14099 + case 64: {
14100 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
14101 + rolesSid_ = new java.util.ArrayList<java.lang.Integer>();
14102 + mutable_bitField0_ |= 0x00000010;
14103 + }
14104 + rolesSid_.add(input.readInt32());
14105 + break;
14106 + }
14107 + case 66: {
14108 + int length = input.readRawVarint32();
14109 + int limit = input.pushLimit(length);
14110 + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010) && input.getBytesUntilLimit() > 0) {
14111 + rolesSid_ = new java.util.ArrayList<java.lang.Integer>();
14112 + mutable_bitField0_ |= 0x00000010;
14113 + }
14114 + while (input.getBytesUntilLimit() > 0) {
14115 + rolesSid_.add(input.readInt32());
14116 + }
14117 + input.popLimit(limit);
14118 + break;
14119 + }
14120 + case 72: {
14121 + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
14122 + memids_ = new java.util.ArrayList<java.lang.Long>();
14123 + mutable_bitField0_ |= 0x00000020;
14124 + }
14125 + memids_.add(input.readSInt64());
14126 + break;
14127 + }
14128 + case 74: {
14129 + int length = input.readRawVarint32();
14130 + int limit = input.pushLimit(length);
14131 + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
14132 + memids_ = new java.util.ArrayList<java.lang.Long>();
14133 + mutable_bitField0_ |= 0x00000020;
14134 + }
14135 + while (input.getBytesUntilLimit() > 0) {
14136 + memids_.add(input.readSInt64());
14137 + }
14138 + input.popLimit(limit);
14139 + break;
14140 + }
14141 + case 80: {
14142 + int rawValue = input.readEnum();
14143 + org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value = org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType.valueOf(rawValue);
14144 + if (value == null) {
14145 + unknownFieldsCodedOutput.writeRawVarint32(tag);
14146 + unknownFieldsCodedOutput.writeRawVarint32(rawValue);
14147 + } else {
14148 + if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
14149 + types_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType>();
14150 + mutable_bitField0_ |= 0x00000040;
14151 + }
14152 + types_.add(value);
14153 + }
14154 + break;
14155 + }
14156 + case 82: {
14157 + int length = input.readRawVarint32();
14158 + int oldLimit = input.pushLimit(length);
14159 + while(input.getBytesUntilLimit() > 0) {
14160 + int rawValue = input.readEnum();
14161 + org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value = org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType.valueOf(rawValue);
14162 + if (value == null) {
14163 + unknownFieldsCodedOutput.writeRawVarint32(tag);
14164 + unknownFieldsCodedOutput.writeRawVarint32(rawValue);
14165 + } else {
14166 + if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
14167 + types_ = new java.util.ArrayList<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType>();
14168 + mutable_bitField0_ |= 0x00000040;
14169 + }
14170 + types_.add(value);
14171 + }
14172 + }
14173 + input.popLimit(oldLimit);
14174 + break;
14175 + }
14176 + }
14177 + }
14178 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
14179 + throw e.setUnfinishedMessage(this);
14180 + } catch (java.io.IOException e) {
14181 + throw new com.google.protobuf.InvalidProtocolBufferException(
14182 + e.getMessage()).setUnfinishedMessage(this);
14183 + } finally {
14184 + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
14185 + keys_ = java.util.Collections.unmodifiableList(keys_);
14186 + }
14187 + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
14188 + vals_ = java.util.Collections.unmodifiableList(vals_);
14189 + }
14190 + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
14191 + rolesSid_ = java.util.Collections.unmodifiableList(rolesSid_);
14192 + }
14193 + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
14194 + memids_ = java.util.Collections.unmodifiableList(memids_);
14195 + }
14196 + if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
14197 + types_ = java.util.Collections.unmodifiableList(types_);
14198 + }
14199 + try {
14200 + unknownFieldsCodedOutput.flush();
14201 + } catch (java.io.IOException e) {
14202 + // Should not happen
14203 + } finally {
14204 + unknownFields = unknownFieldsOutput.toByteString();
14205 + }
14206 + makeExtensionsImmutable();
14207 + }
14208 + }
14209 + public static com.google.protobuf.Parser<Relation> PARSER =
14210 + new com.google.protobuf.AbstractParser<Relation>() {
14211 + public Relation parsePartialFrom(
14212 + com.google.protobuf.CodedInputStream input,
14213 + com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14214 + throws com.google.protobuf.InvalidProtocolBufferException {
14215 + return new Relation(input, extensionRegistry);
14216 + }
14217 + };
14218 +
14219 + @java.lang.Override
14220 + public com.google.protobuf.Parser<Relation> getParserForType() {
14221 + return PARSER;
14222 + }
14223 +
14224 + /**
14225 + * Protobuf enum {@code OSMPBF.Relation.MemberType}
14226 + */
14227 public enum MemberType
14228 implements com.google.protobuf.Internal.EnumLite {
14229 + /**
14230 + * <code>NODE = 0;</code>
14231 + */
14232 NODE(0, 0),
14233 + /**
14234 + * <code>WAY = 1;</code>
14235 + */
14236 WAY(1, 1),
14237 + /**
14238 + * <code>RELATION = 2;</code>
14239 + */
14240 RELATION(2, 2),
14241 ;
14242 -
14243 +
14244 + /**
14245 + * <code>NODE = 0;</code>
14246 + */
14247 public static final int NODE_VALUE = 0;
14248 + /**
14249 + * <code>WAY = 1;</code>
14250 + */
14251 public static final int WAY_VALUE = 1;
14252 + /**
14253 + * <code>RELATION = 2;</code>
14254 + */
14255 public static final int RELATION_VALUE = 2;
14256 -
14257 -
14258 +
14259 +
14260 public final int getNumber() { return value; }
14261 -
14262 +
14263 public static MemberType valueOf(int value) {
14264 switch (value) {
14265 case 0: return NODE;
14266 @@ -7522,7 +11815,7 @@ public final class Osmformat {
14267 default: return null;
14268 }
14269 }
14270 -
14271 +
14272 public static com.google.protobuf.Internal.EnumLiteMap<MemberType>
14273 internalGetValueMap() {
14274 return internalValueMap;
14275 @@ -7534,125 +11827,212 @@ public final class Osmformat {
14276 return MemberType.valueOf(number);
14277 }
14278 };
14279 -
14280 +
14281 private final int value;
14282 -
14283 +
14284 private MemberType(int index, int value) {
14285 this.value = value;
14286 }
14287 -
14288 +
14289 // @@protoc_insertion_point(enum_scope:OSMPBF.Relation.MemberType)
14290 }
14291 -
14292 +
14293 private int bitField0_;
14294 - // required int64 id = 1;
14295 public static final int ID_FIELD_NUMBER = 1;
14296 private long id_;
14297 + /**
14298 + * <code>required int64 id = 1;</code>
14299 + */
14300 public boolean hasId() {
14301 return ((bitField0_ & 0x00000001) == 0x00000001);
14302 }
14303 + /**
14304 + * <code>required int64 id = 1;</code>
14305 + */
14306 public long getId() {
14307 return id_;
14308 }
14309 -
14310 - // repeated uint32 keys = 2 [packed = true];
14311 +
14312 public static final int KEYS_FIELD_NUMBER = 2;
14313 private java.util.List<java.lang.Integer> keys_;
14314 + /**
14315 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14316 + *
14317 + * <pre>
14318 + * Parallel arrays.
14319 + * </pre>
14320 + */
14321 public java.util.List<java.lang.Integer>
14322 getKeysList() {
14323 return keys_;
14324 }
14325 + /**
14326 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14327 + *
14328 + * <pre>
14329 + * Parallel arrays.
14330 + * </pre>
14331 + */
14332 public int getKeysCount() {
14333 return keys_.size();
14334 }
14335 + /**
14336 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14337 + *
14338 + * <pre>
14339 + * Parallel arrays.
14340 + * </pre>
14341 + */
14342 public int getKeys(int index) {
14343 return keys_.get(index);
14344 }
14345 private int keysMemoizedSerializedSize = -1;
14346 -
14347 - // repeated uint32 vals = 3 [packed = true];
14348 +
14349 public static final int VALS_FIELD_NUMBER = 3;
14350 private java.util.List<java.lang.Integer> vals_;
14351 + /**
14352 + * <code>repeated uint32 vals = 3 [packed = true];</code>
14353 + */
14354 public java.util.List<java.lang.Integer>
14355 getValsList() {
14356 return vals_;
14357 }
14358 + /**
14359 + * <code>repeated uint32 vals = 3 [packed = true];</code>
14360 + */
14361 public int getValsCount() {
14362 return vals_.size();
14363 }
14364 + /**
14365 + * <code>repeated uint32 vals = 3 [packed = true];</code>
14366 + */
14367 public int getVals(int index) {
14368 return vals_.get(index);
14369 }
14370 private int valsMemoizedSerializedSize = -1;
14371 -
14372 - // optional .OSMPBF.Info info = 4;
14373 +
14374 public static final int INFO_FIELD_NUMBER = 4;
14375 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_;
14376 + /**
14377 + * <code>optional .OSMPBF.Info info = 4;</code>
14378 + */
14379 public boolean hasInfo() {
14380 return ((bitField0_ & 0x00000002) == 0x00000002);
14381 }
14382 + /**
14383 + * <code>optional .OSMPBF.Info info = 4;</code>
14384 + */
14385 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
14386 return info_;
14387 }
14388 -
14389 - // repeated int32 roles_sid = 8 [packed = true];
14390 +
14391 public static final int ROLES_SID_FIELD_NUMBER = 8;
14392 private java.util.List<java.lang.Integer> rolesSid_;
14393 + /**
14394 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
14395 + *
14396 + * <pre>
14397 + * Parallel arrays
14398 + * </pre>
14399 + */
14400 public java.util.List<java.lang.Integer>
14401 getRolesSidList() {
14402 return rolesSid_;
14403 }
14404 + /**
14405 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
14406 + *
14407 + * <pre>
14408 + * Parallel arrays
14409 + * </pre>
14410 + */
14411 public int getRolesSidCount() {
14412 return rolesSid_.size();
14413 }
14414 + /**
14415 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
14416 + *
14417 + * <pre>
14418 + * Parallel arrays
14419 + * </pre>
14420 + */
14421 public int getRolesSid(int index) {
14422 return rolesSid_.get(index);
14423 }
14424 private int rolesSidMemoizedSerializedSize = -1;
14425 -
14426 - // repeated sint64 memids = 9 [packed = true];
14427 +
14428 public static final int MEMIDS_FIELD_NUMBER = 9;
14429 private java.util.List<java.lang.Long> memids_;
14430 + /**
14431 + * <code>repeated sint64 memids = 9 [packed = true];</code>
14432 + *
14433 + * <pre>
14434 + * DELTA encoded
14435 + * </pre>
14436 + */
14437 public java.util.List<java.lang.Long>
14438 getMemidsList() {
14439 return memids_;
14440 }
14441 + /**
14442 + * <code>repeated sint64 memids = 9 [packed = true];</code>
14443 + *
14444 + * <pre>
14445 + * DELTA encoded
14446 + * </pre>
14447 + */
14448 public int getMemidsCount() {
14449 return memids_.size();
14450 }
14451 + /**
14452 + * <code>repeated sint64 memids = 9 [packed = true];</code>
14453 + *
14454 + * <pre>
14455 + * DELTA encoded
14456 + * </pre>
14457 + */
14458 public long getMemids(int index) {
14459 return memids_.get(index);
14460 }
14461 private int memidsMemoizedSerializedSize = -1;
14462 -
14463 - // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
14464 +
14465 public static final int TYPES_FIELD_NUMBER = 10;
14466 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> types_;
14467 + /**
14468 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
14469 + */
14470 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> getTypesList() {
14471 return types_;
14472 }
14473 + /**
14474 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
14475 + */
14476 public int getTypesCount() {
14477 return types_.size();
14478 }
14479 + /**
14480 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
14481 + */
14482 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType getTypes(int index) {
14483 return types_.get(index);
14484 }
14485 private int typesMemoizedSerializedSize;
14486 -
14487 +
14488 private void initFields() {
14489 id_ = 0L;
14490 - keys_ = java.util.Collections.emptyList();;
14491 - vals_ = java.util.Collections.emptyList();;
14492 + keys_ = java.util.Collections.emptyList();
14493 + vals_ = java.util.Collections.emptyList();
14494 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
14495 - rolesSid_ = java.util.Collections.emptyList();;
14496 - memids_ = java.util.Collections.emptyList();;
14497 + rolesSid_ = java.util.Collections.emptyList();
14498 + memids_ = java.util.Collections.emptyList();
14499 types_ = java.util.Collections.emptyList();
14500 }
14501 private byte memoizedIsInitialized = -1;
14502 public final boolean isInitialized() {
14503 byte isInitialized = memoizedIsInitialized;
14504 - if (isInitialized != -1) return isInitialized == 1;
14505 -
14506 + if (isInitialized == 1) return true;
14507 + if (isInitialized == 0) return false;
14508 +
14509 if (!hasId()) {
14510 memoizedIsInitialized = 0;
14511 return false;
14512 @@ -7660,7 +12040,7 @@ public final class Osmformat {
14513 memoizedIsInitialized = 1;
14514 return true;
14515 }
14516 -
14517 +
14518 public void writeTo(com.google.protobuf.CodedOutputStream output)
14519 throws java.io.IOException {
14520 getSerializedSize();
14521 @@ -7705,13 +12085,14 @@ public final class Osmformat {
14522 for (int i = 0; i < types_.size(); i++) {
14523 output.writeEnumNoTag(types_.get(i).getNumber());
14524 }
14525 + output.writeRawBytes(unknownFields);
14526 }
14527 -
14528 +
14529 private int memoizedSerializedSize = -1;
14530 public int getSerializedSize() {
14531 int size = memoizedSerializedSize;
14532 if (size != -1) return size;
14533 -
14534 +
14535 size = 0;
14536 if (((bitField0_ & 0x00000001) == 0x00000001)) {
14537 size += com.google.protobuf.CodedOutputStream
14538 @@ -7789,133 +12170,125 @@ public final class Osmformat {
14539 .computeRawVarint32Size(dataSize);
14540 }typesMemoizedSerializedSize = dataSize;
14541 }
14542 + size += unknownFields.size();
14543 memoizedSerializedSize = size;
14544 return size;
14545 }
14546 -
14547 +
14548 private static final long serialVersionUID = 0L;
14549 @java.lang.Override
14550 protected java.lang.Object writeReplace()
14551 throws java.io.ObjectStreamException {
14552 return super.writeReplace();
14553 }
14554 -
14555 +
14556 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14557 com.google.protobuf.ByteString data)
14558 throws com.google.protobuf.InvalidProtocolBufferException {
14559 - return newBuilder().mergeFrom(data).buildParsed();
14560 + return PARSER.parseFrom(data);
14561 }
14562 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14563 com.google.protobuf.ByteString data,
14564 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14565 throws com.google.protobuf.InvalidProtocolBufferException {
14566 - return newBuilder().mergeFrom(data, extensionRegistry)
14567 - .buildParsed();
14568 + return PARSER.parseFrom(data, extensionRegistry);
14569 }
14570 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(byte[] data)
14571 throws com.google.protobuf.InvalidProtocolBufferException {
14572 - return newBuilder().mergeFrom(data).buildParsed();
14573 + return PARSER.parseFrom(data);
14574 }
14575 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14576 byte[] data,
14577 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14578 throws com.google.protobuf.InvalidProtocolBufferException {
14579 - return newBuilder().mergeFrom(data, extensionRegistry)
14580 - .buildParsed();
14581 + return PARSER.parseFrom(data, extensionRegistry);
14582 }
14583 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(java.io.InputStream input)
14584 throws java.io.IOException {
14585 - return newBuilder().mergeFrom(input).buildParsed();
14586 + return PARSER.parseFrom(input);
14587 }
14588 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14589 java.io.InputStream input,
14590 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14591 throws java.io.IOException {
14592 - return newBuilder().mergeFrom(input, extensionRegistry)
14593 - .buildParsed();
14594 + return PARSER.parseFrom(input, extensionRegistry);
14595 }
14596 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseDelimitedFrom(java.io.InputStream input)
14597 throws java.io.IOException {
14598 - Builder builder = newBuilder();
14599 - if (builder.mergeDelimitedFrom(input)) {
14600 - return builder.buildParsed();
14601 - } else {
14602 - return null;
14603 - }
14604 + return PARSER.parseDelimitedFrom(input);
14605 }
14606 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseDelimitedFrom(
14607 java.io.InputStream input,
14608 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14609 throws java.io.IOException {
14610 - Builder builder = newBuilder();
14611 - if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
14612 - return builder.buildParsed();
14613 - } else {
14614 - return null;
14615 - }
14616 + return PARSER.parseDelimitedFrom(input, extensionRegistry);
14617 }
14618 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14619 com.google.protobuf.CodedInputStream input)
14620 throws java.io.IOException {
14621 - return newBuilder().mergeFrom(input).buildParsed();
14622 + return PARSER.parseFrom(input);
14623 }
14624 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
14625 com.google.protobuf.CodedInputStream input,
14626 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14627 throws java.io.IOException {
14628 - return newBuilder().mergeFrom(input, extensionRegistry)
14629 - .buildParsed();
14630 + return PARSER.parseFrom(input, extensionRegistry);
14631 }
14632 -
14633 +
14634 public static Builder newBuilder() { return Builder.create(); }
14635 public Builder newBuilderForType() { return newBuilder(); }
14636 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation prototype) {
14637 return newBuilder().mergeFrom(prototype);
14638 }
14639 public Builder toBuilder() { return newBuilder(this); }
14640 -
14641 +
14642 + /**
14643 + * Protobuf type {@code OSMPBF.Relation}
14644 + */
14645 public static final class Builder extends
14646 com.google.protobuf.GeneratedMessageLite.Builder<
14647 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation, Builder>
14648 - implements org.openstreetmap.osmosis.osmbinary.Osmformat.RelationOrBuilder {
14649 + implements
14650 + // @@protoc_insertion_point(builder_implements:OSMPBF.Relation)
14651 + org.openstreetmap.osmosis.osmbinary.Osmformat.RelationOrBuilder {
14652 // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.newBuilder()
14653 private Builder() {
14654 maybeForceBuilderInitialization();
14655 }
14656 -
14657 +
14658 private void maybeForceBuilderInitialization() {
14659 }
14660 private static Builder create() {
14661 return new Builder();
14662 }
14663 -
14664 +
14665 public Builder clear() {
14666 super.clear();
14667 id_ = 0L;
14668 bitField0_ = (bitField0_ & ~0x00000001);
14669 - keys_ = java.util.Collections.emptyList();;
14670 + keys_ = java.util.Collections.emptyList();
14671 bitField0_ = (bitField0_ & ~0x00000002);
14672 - vals_ = java.util.Collections.emptyList();;
14673 + vals_ = java.util.Collections.emptyList();
14674 bitField0_ = (bitField0_ & ~0x00000004);
14675 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
14676 bitField0_ = (bitField0_ & ~0x00000008);
14677 - rolesSid_ = java.util.Collections.emptyList();;
14678 + rolesSid_ = java.util.Collections.emptyList();
14679 bitField0_ = (bitField0_ & ~0x00000010);
14680 - memids_ = java.util.Collections.emptyList();;
14681 + memids_ = java.util.Collections.emptyList();
14682 bitField0_ = (bitField0_ & ~0x00000020);
14683 types_ = java.util.Collections.emptyList();
14684 bitField0_ = (bitField0_ & ~0x00000040);
14685 return this;
14686 }
14687 -
14688 +
14689 public Builder clone() {
14690 return create().mergeFrom(buildPartial());
14691 }
14692 -
14693 +
14694 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation getDefaultInstanceForType() {
14695 return org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.getDefaultInstance();
14696 }
14697 -
14698 +
14699 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation build() {
14700 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation result = buildPartial();
14701 if (!result.isInitialized()) {
14702 @@ -7923,17 +12296,7 @@ public final class Osmformat {
14703 }
14704 return result;
14705 }
14706 -
14707 - private org.openstreetmap.osmosis.osmbinary.Osmformat.Relation buildParsed()
14708 - throws com.google.protobuf.InvalidProtocolBufferException {
14709 - org.openstreetmap.osmosis.osmbinary.Osmformat.Relation result = buildPartial();
14710 - if (!result.isInitialized()) {
14711 - throw newUninitializedMessageException(
14712 - result).asInvalidProtocolBufferException();
14713 - }
14714 - return result;
14715 - }
14716 -
14717 +
14718 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation buildPartial() {
14719 org.openstreetmap.osmosis.osmbinary.Osmformat.Relation result = new org.openstreetmap.osmosis.osmbinary.Osmformat.Relation(this);
14720 int from_bitField0_ = bitField0_;
14721 @@ -7974,7 +12337,7 @@ public final class Osmformat {
14722 result.bitField0_ = to_bitField0_;
14723 return result;
14724 }
14725 -
14726 +
14727 public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation other) {
14728 if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.getDefaultInstance()) return this;
14729 if (other.hasId()) {
14730 @@ -8033,9 +12396,11 @@ public final class Osmformat {
14731 }
14732
14733 }
14734 + setUnknownFields(
14735 + getUnknownFields().concat(other.unknownFields));
14736 return this;
14737 }
14738 -
14739 +
14740 public final boolean isInitialized() {
14741 if (!hasId()) {
14742
14743 @@ -8043,160 +12408,103 @@ public final class Osmformat {
14744 }
14745 return true;
14746 }
14747 -
14748 +
14749 public Builder mergeFrom(
14750 com.google.protobuf.CodedInputStream input,
14751 com.google.protobuf.ExtensionRegistryLite extensionRegistry)
14752 throws java.io.IOException {
14753 - while (true) {
14754 - int tag = input.readTag();
14755 - switch (tag) {
14756 - case 0:
14757 -
14758 - return this;
14759 - default: {
14760 - if (!parseUnknownField(input, extensionRegistry, tag)) {
14761 -
14762 - return this;
14763 - }
14764 - break;
14765 - }
14766 - case 8: {
14767 - bitField0_ |= 0x00000001;
14768 - id_ = input.readInt64();
14769 - break;
14770 - }
14771 - case 16: {
14772 - ensureKeysIsMutable();
14773 - keys_.add(input.readUInt32());
14774 - break;
14775 - }
14776 - case 18: {
14777 - int length = input.readRawVarint32();
14778 - int limit = input.pushLimit(length);
14779 - while (input.getBytesUntilLimit() > 0) {
14780 - addKeys(input.readUInt32());
14781 - }
14782 - input.popLimit(limit);
14783 - break;
14784 - }
14785 - case 24: {
14786 - ensureValsIsMutable();
14787 - vals_.add(input.readUInt32());
14788 - break;
14789 - }
14790 - case 26: {
14791 - int length = input.readRawVarint32();
14792 - int limit = input.pushLimit(length);
14793 - while (input.getBytesUntilLimit() > 0) {
14794 - addVals(input.readUInt32());
14795 - }
14796 - input.popLimit(limit);
14797 - break;
14798 - }
14799 - case 34: {
14800 - org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder subBuilder = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.newBuilder();
14801 - if (hasInfo()) {
14802 - subBuilder.mergeFrom(getInfo());
14803 - }
14804 - input.readMessage(subBuilder, extensionRegistry);
14805 - setInfo(subBuilder.buildPartial());
14806 - break;
14807 - }
14808 - case 64: {
14809 - ensureRolesSidIsMutable();
14810 - rolesSid_.add(input.readInt32());
14811 - break;
14812 - }
14813 - case 66: {
14814 - int length = input.readRawVarint32();
14815 - int limit = input.pushLimit(length);
14816 - while (input.getBytesUntilLimit() > 0) {
14817 - addRolesSid(input.readInt32());
14818 - }
14819 - input.popLimit(limit);
14820 - break;
14821 - }
14822 - case 72: {
14823 - ensureMemidsIsMutable();
14824 - memids_.add(input.readSInt64());
14825 - break;
14826 - }
14827 - case 74: {
14828 - int length = input.readRawVarint32();
14829 - int limit = input.pushLimit(length);
14830 - while (input.getBytesUntilLimit() > 0) {
14831 - addMemids(input.readSInt64());
14832 - }
14833 - input.popLimit(limit);
14834 - break;
14835 - }
14836 - case 80: {
14837 - int rawValue = input.readEnum();
14838 - org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value = org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType.valueOf(rawValue);
14839 - if (value != null) {
14840 - addTypes(value);
14841 - }
14842 - break;
14843 - }
14844 - case 82: {
14845 - int length = input.readRawVarint32();
14846 - int oldLimit = input.pushLimit(length);
14847 - while(input.getBytesUntilLimit() > 0) {
14848 - int rawValue = input.readEnum();
14849 - org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value = org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType.valueOf(rawValue);
14850 - if (value != null) {
14851 - addTypes(value);
14852 - }
14853 - }
14854 - input.popLimit(oldLimit);
14855 - break;
14856 - }
14857 + org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parsedMessage = null;
14858 + try {
14859 + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
14860 + } catch (com.google.protobuf.InvalidProtocolBufferException e) {
14861 + parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.Relation) e.getUnfinishedMessage();
14862 + throw e;
14863 + } finally {
14864 + if (parsedMessage != null) {
14865 + mergeFrom(parsedMessage);
14866 }
14867 }
14868 + return this;
14869 }
14870 -
14871 private int bitField0_;
14872 -
14873 - // required int64 id = 1;
14874 +
14875 private long id_ ;
14876 + /**
14877 + * <code>required int64 id = 1;</code>
14878 + */
14879 public boolean hasId() {
14880 return ((bitField0_ & 0x00000001) == 0x00000001);
14881 }
14882 + /**
14883 + * <code>required int64 id = 1;</code>
14884 + */
14885 public long getId() {
14886 return id_;
14887 }
14888 + /**
14889 + * <code>required int64 id = 1;</code>
14890 + */
14891 public Builder setId(long value) {
14892 bitField0_ |= 0x00000001;
14893 id_ = value;
14894
14895 return this;
14896 }
14897 + /**
14898 + * <code>required int64 id = 1;</code>
14899 + */
14900 public Builder clearId() {
14901 bitField0_ = (bitField0_ & ~0x00000001);
14902 id_ = 0L;
14903
14904 return this;
14905 }
14906 -
14907 - // repeated uint32 keys = 2 [packed = true];
14908 - private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();;
14909 +
14910 + private java.util.List<java.lang.Integer> keys_ = java.util.Collections.emptyList();
14911 private void ensureKeysIsMutable() {
14912 if (!((bitField0_ & 0x00000002) == 0x00000002)) {
14913 keys_ = new java.util.ArrayList<java.lang.Integer>(keys_);
14914 bitField0_ |= 0x00000002;
14915 }
14916 }
14917 + /**
14918 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14919 + *
14920 + * <pre>
14921 + * Parallel arrays.
14922 + * </pre>
14923 + */
14924 public java.util.List<java.lang.Integer>
14925 getKeysList() {
14926 return java.util.Collections.unmodifiableList(keys_);
14927 }
14928 + /**
14929 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14930 + *
14931 + * <pre>
14932 + * Parallel arrays.
14933 + * </pre>
14934 + */
14935 public int getKeysCount() {
14936 return keys_.size();
14937 }
14938 + /**
14939 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14940 + *
14941 + * <pre>
14942 + * Parallel arrays.
14943 + * </pre>
14944 + */
14945 public int getKeys(int index) {
14946 return keys_.get(index);
14947 }
14948 + /**
14949 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14950 + *
14951 + * <pre>
14952 + * Parallel arrays.
14953 + * </pre>
14954 + */
14955 public Builder setKeys(
14956 int index, int value) {
14957 ensureKeysIsMutable();
14958 @@ -8204,44 +12512,77 @@ public final class Osmformat {
14959
14960 return this;
14961 }
14962 + /**
14963 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14964 + *
14965 + * <pre>
14966 + * Parallel arrays.
14967 + * </pre>
14968 + */
14969 public Builder addKeys(int value) {
14970 ensureKeysIsMutable();
14971 keys_.add(value);
14972
14973 return this;
14974 }
14975 + /**
14976 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14977 + *
14978 + * <pre>
14979 + * Parallel arrays.
14980 + * </pre>
14981 + */
14982 public Builder addAllKeys(
14983 java.lang.Iterable<? extends java.lang.Integer> values) {
14984 ensureKeysIsMutable();
14985 - super.addAll(values, keys_);
14986 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
14987 + values, keys_);
14988
14989 return this;
14990 }
14991 + /**
14992 + * <code>repeated uint32 keys = 2 [packed = true];</code>
14993 + *
14994 + * <pre>
14995 + * Parallel arrays.
14996 + * </pre>
14997 + */
14998 public Builder clearKeys() {
14999 - keys_ = java.util.Collections.emptyList();;
15000 + keys_ = java.util.Collections.emptyList();
15001 bitField0_ = (bitField0_ & ~0x00000002);
15002
15003 return this;
15004 }
15005 -
15006 - // repeated uint32 vals = 3 [packed = true];
15007 - private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();;
15008 +
15009 + private java.util.List<java.lang.Integer> vals_ = java.util.Collections.emptyList();
15010 private void ensureValsIsMutable() {
15011 if (!((bitField0_ & 0x00000004) == 0x00000004)) {
15012 vals_ = new java.util.ArrayList<java.lang.Integer>(vals_);
15013 bitField0_ |= 0x00000004;
15014 }
15015 }
15016 + /**
15017 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15018 + */
15019 public java.util.List<java.lang.Integer>
15020 getValsList() {
15021 return java.util.Collections.unmodifiableList(vals_);
15022 }
15023 + /**
15024 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15025 + */
15026 public int getValsCount() {
15027 return vals_.size();
15028 }
15029 + /**
15030 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15031 + */
15032 public int getVals(int index) {
15033 return vals_.get(index);
15034 }
15035 + /**
15036 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15037 + */
15038 public Builder setVals(
15039 int index, int value) {
15040 ensureValsIsMutable();
15041 @@ -8249,50 +12590,74 @@ public final class Osmformat {
15042
15043 return this;
15044 }
15045 + /**
15046 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15047 + */
15048 public Builder addVals(int value) {
15049 ensureValsIsMutable();
15050 vals_.add(value);
15051
15052 return this;
15053 }
15054 + /**
15055 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15056 + */
15057 public Builder addAllVals(
15058 java.lang.Iterable<? extends java.lang.Integer> values) {
15059 ensureValsIsMutable();
15060 - super.addAll(values, vals_);
15061 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
15062 + values, vals_);
15063
15064 return this;
15065 }
15066 + /**
15067 + * <code>repeated uint32 vals = 3 [packed = true];</code>
15068 + */
15069 public Builder clearVals() {
15070 - vals_ = java.util.Collections.emptyList();;
15071 + vals_ = java.util.Collections.emptyList();
15072 bitField0_ = (bitField0_ & ~0x00000004);
15073
15074 return this;
15075 }
15076 -
15077 - // optional .OSMPBF.Info info = 4;
15078 +
15079 private org.openstreetmap.osmosis.osmbinary.Osmformat.Info info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
15080 + /**
15081 + * <code>optional .OSMPBF.Info info = 4;</code>
15082 + */
15083 public boolean hasInfo() {
15084 return ((bitField0_ & 0x00000008) == 0x00000008);
15085 }
15086 + /**
15087 + * <code>optional .OSMPBF.Info info = 4;</code>
15088 + */
15089 public org.openstreetmap.osmosis.osmbinary.Osmformat.Info getInfo() {
15090 return info_;
15091 }
15092 + /**
15093 + * <code>optional .OSMPBF.Info info = 4;</code>
15094 + */
15095 public Builder setInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
15096 if (value == null) {
15097 throw new NullPointerException();
15098 }
15099 info_ = value;
15100 -
15101 +
15102 bitField0_ |= 0x00000008;
15103 return this;
15104 }
15105 + /**
15106 + * <code>optional .OSMPBF.Info info = 4;</code>
15107 + */
15108 public Builder setInfo(
15109 org.openstreetmap.osmosis.osmbinary.Osmformat.Info.Builder builderForValue) {
15110 info_ = builderForValue.build();
15111 -
15112 +
15113 bitField0_ |= 0x00000008;
15114 return this;
15115 }
15116 + /**
15117 + * <code>optional .OSMPBF.Info info = 4;</code>
15118 + */
15119 public Builder mergeInfo(org.openstreetmap.osmosis.osmbinary.Osmformat.Info value) {
15120 if (((bitField0_ & 0x00000008) == 0x00000008) &&
15121 info_ != org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance()) {
15122 @@ -8301,35 +12666,65 @@ public final class Osmformat {
15123 } else {
15124 info_ = value;
15125 }
15126 -
15127 +
15128 bitField0_ |= 0x00000008;
15129 return this;
15130 }
15131 + /**
15132 + * <code>optional .OSMPBF.Info info = 4;</code>
15133 + */
15134 public Builder clearInfo() {
15135 info_ = org.openstreetmap.osmosis.osmbinary.Osmformat.Info.getDefaultInstance();
15136 -
15137 +
15138 bitField0_ = (bitField0_ & ~0x00000008);
15139 return this;
15140 }
15141 -
15142 - // repeated int32 roles_sid = 8 [packed = true];
15143 - private java.util.List<java.lang.Integer> rolesSid_ = java.util.Collections.emptyList();;
15144 +
15145 + private java.util.List<java.lang.Integer> rolesSid_ = java.util.Collections.emptyList();
15146 private void ensureRolesSidIsMutable() {
15147 if (!((bitField0_ & 0x00000010) == 0x00000010)) {
15148 rolesSid_ = new java.util.ArrayList<java.lang.Integer>(rolesSid_);
15149 bitField0_ |= 0x00000010;
15150 }
15151 }
15152 + /**
15153 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15154 + *
15155 + * <pre>
15156 + * Parallel arrays
15157 + * </pre>
15158 + */
15159 public java.util.List<java.lang.Integer>
15160 getRolesSidList() {
15161 return java.util.Collections.unmodifiableList(rolesSid_);
15162 }
15163 + /**
15164 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15165 + *
15166 + * <pre>
15167 + * Parallel arrays
15168 + * </pre>
15169 + */
15170 public int getRolesSidCount() {
15171 return rolesSid_.size();
15172 }
15173 + /**
15174 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15175 + *
15176 + * <pre>
15177 + * Parallel arrays
15178 + * </pre>
15179 + */
15180 public int getRolesSid(int index) {
15181 return rolesSid_.get(index);
15182 }
15183 + /**
15184 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15185 + *
15186 + * <pre>
15187 + * Parallel arrays
15188 + * </pre>
15189 + */
15190 public Builder setRolesSid(
15191 int index, int value) {
15192 ensureRolesSidIsMutable();
15193 @@ -8337,44 +12732,93 @@ public final class Osmformat {
15194
15195 return this;
15196 }
15197 + /**
15198 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15199 + *
15200 + * <pre>
15201 + * Parallel arrays
15202 + * </pre>
15203 + */
15204 public Builder addRolesSid(int value) {
15205 ensureRolesSidIsMutable();
15206 rolesSid_.add(value);
15207
15208 return this;
15209 }
15210 + /**
15211 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15212 + *
15213 + * <pre>
15214 + * Parallel arrays
15215 + * </pre>
15216 + */
15217 public Builder addAllRolesSid(
15218 java.lang.Iterable<? extends java.lang.Integer> values) {
15219 ensureRolesSidIsMutable();
15220 - super.addAll(values, rolesSid_);
15221 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
15222 + values, rolesSid_);
15223
15224 return this;
15225 }
15226 + /**
15227 + * <code>repeated int32 roles_sid = 8 [packed = true];</code>
15228 + *
15229 + * <pre>
15230 + * Parallel arrays
15231 + * </pre>
15232 + */
15233 public Builder clearRolesSid() {
15234 - rolesSid_ = java.util.Collections.emptyList();;
15235 + rolesSid_ = java.util.Collections.emptyList();
15236 bitField0_ = (bitField0_ & ~0x00000010);
15237
15238 return this;
15239 }
15240 -
15241 - // repeated sint64 memids = 9 [packed = true];
15242 - private java.util.List<java.lang.Long> memids_ = java.util.Collections.emptyList();;
15243 +
15244 + private java.util.List<java.lang.Long> memids_ = java.util.Collections.emptyList();
15245 private void ensureMemidsIsMutable() {
15246 if (!((bitField0_ & 0x00000020) == 0x00000020)) {
15247 memids_ = new java.util.ArrayList<java.lang.Long>(memids_);
15248 bitField0_ |= 0x00000020;
15249 }
15250 }
15251 + /**
15252 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15253 + *
15254 + * <pre>
15255 + * DELTA encoded
15256 + * </pre>
15257 + */
15258 public java.util.List<java.lang.Long>
15259 getMemidsList() {
15260 return java.util.Collections.unmodifiableList(memids_);
15261 }
15262 + /**
15263 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15264 + *
15265 + * <pre>
15266 + * DELTA encoded
15267 + * </pre>
15268 + */
15269 public int getMemidsCount() {
15270 return memids_.size();
15271 }
15272 + /**
15273 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15274 + *
15275 + * <pre>
15276 + * DELTA encoded
15277 + * </pre>
15278 + */
15279 public long getMemids(int index) {
15280 return memids_.get(index);
15281 }
15282 + /**
15283 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15284 + *
15285 + * <pre>
15286 + * DELTA encoded
15287 + * </pre>
15288 + */
15289 public Builder setMemids(
15290 int index, long value) {
15291 ensureMemidsIsMutable();
15292 @@ -8382,27 +12826,48 @@ public final class Osmformat {
15293
15294 return this;
15295 }
15296 + /**
15297 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15298 + *
15299 + * <pre>
15300 + * DELTA encoded
15301 + * </pre>
15302 + */
15303 public Builder addMemids(long value) {
15304 ensureMemidsIsMutable();
15305 memids_.add(value);
15306
15307 return this;
15308 }
15309 + /**
15310 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15311 + *
15312 + * <pre>
15313 + * DELTA encoded
15314 + * </pre>
15315 + */
15316 public Builder addAllMemids(
15317 java.lang.Iterable<? extends java.lang.Long> values) {
15318 ensureMemidsIsMutable();
15319 - super.addAll(values, memids_);
15320 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
15321 + values, memids_);
15322
15323 return this;
15324 }
15325 + /**
15326 + * <code>repeated sint64 memids = 9 [packed = true];</code>
15327 + *
15328 + * <pre>
15329 + * DELTA encoded
15330 + * </pre>
15331 + */
15332 public Builder clearMemids() {
15333 - memids_ = java.util.Collections.emptyList();;
15334 + memids_ = java.util.Collections.emptyList();
15335 bitField0_ = (bitField0_ & ~0x00000020);
15336
15337 return this;
15338 }
15339 -
15340 - // repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];
15341 +
15342 private java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> types_ =
15343 java.util.Collections.emptyList();
15344 private void ensureTypesIsMutable() {
15345 @@ -8411,15 +12876,27 @@ public final class Osmformat {
15346 bitField0_ |= 0x00000040;
15347 }
15348 }
15349 + /**
15350 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15351 + */
15352 public java.util.List<org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> getTypesList() {
15353 return java.util.Collections.unmodifiableList(types_);
15354 }
15355 + /**
15356 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15357 + */
15358 public int getTypesCount() {
15359 return types_.size();
15360 }
15361 + /**
15362 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15363 + */
15364 public org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType getTypes(int index) {
15365 return types_.get(index);
15366 }
15367 + /**
15368 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15369 + */
15370 public Builder setTypes(
15371 int index, org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value) {
15372 if (value == null) {
15373 @@ -8430,6 +12907,9 @@ public final class Osmformat {
15374
15375 return this;
15376 }
15377 + /**
15378 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15379 + */
15380 public Builder addTypes(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType value) {
15381 if (value == null) {
15382 throw new NullPointerException();
15383 @@ -8439,34 +12919,41 @@ public final class Osmformat {
15384
15385 return this;
15386 }
15387 + /**
15388 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15389 + */
15390 public Builder addAllTypes(
15391 java.lang.Iterable<? extends org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.MemberType> values) {
15392 ensureTypesIsMutable();
15393 - super.addAll(values, types_);
15394 + com.google.protobuf.AbstractMessageLite.Builder.addAll(
15395 + values, types_);
15396
15397 return this;
15398 }
15399 + /**
15400 + * <code>repeated .OSMPBF.Relation.MemberType types = 10 [packed = true];</code>
15401 + */
15402 public Builder clearTypes() {
15403 types_ = java.util.Collections.emptyList();
15404 bitField0_ = (bitField0_ & ~0x00000040);
15405
15406 return this;
15407 }
15408 -
15409 +
15410 // @@protoc_insertion_point(builder_scope:OSMPBF.Relation)
15411 }
15412 -
15413 +
15414 static {
15415 defaultInstance = new Relation(true);
15416 defaultInstance.initFields();
15417 }
15418 -
15419 +
15420 // @@protoc_insertion_point(class_scope:OSMPBF.Relation)
15421 }
15422 -
15423 -
15424 +
15425 +
15426 static {
15427 }
15428 -
15429 +
15430 // @@protoc_insertion_point(outer_class_scope)
15431 }
22
33 --- a/build.gradle
44 +++ b/build.gradle
5 @@ -43,7 +43,7 @@ configure(javaProjects) {
5 @@ -46,7 +46,7 @@ configure(javaProjects) {
66 apply plugin: 'maven'
77 apply plugin: 'signing'
88
+0
-25
debian/patches/07-bashism.patch less more
0 Description: Don't exit with negative status, statuses fall between 0 and 255.
1 Exit using the osmosis status in case it fails instead of -1.
2 Author: Bas Couwenberg <sebastic@xs4all.nl>
3 Bug-Debian: https://bugs.debian.org/772355
4 Forwarded: https://github.com/openstreetmap/osmosis/pull/15
5 Applied-Upstream: https://github.com/openstreetmap/osmosis/commit/d12c6d6d221e941eb25a727983b2891b555596b6
6
7 --- a/package/script/contrib/replicate_osm_file.sh
8 +++ b/package/script/contrib/replicate_osm_file.sh
9 @@ -23,11 +23,13 @@ CMD="osmosis -q"
10 # Launch the osmosis process.
11 $CMD --read-change-interval $WORKING_DIRECTORY --read-xml $OSM_FILE --apply-change --bounding-box left=$LEFT bottom=$BOTTOM right=$RIGHT top=$TOP --write-xml $TEMP_OSM_FILE
12
13 +STATUS=$?
14 +
15 # Verify that osmosis ran successfully.
16 -if [ "$?" -ne "0" ]; then
17 +if [ "$STATUS" -ne "0" ]; then
18
19 echo "Osmosis failed, aborting."
20 - exit -1
21 + exit $STATUS
22
23 fi
24
11 02-fix_plexus.patch
22 03-local-dependencies.patch
33 04-osmosis-version.patch
4 05-protobuf-2.6.0.patch
54 06-java-7.patch
6 07-bashism.patch
7 0001-Modify-the-pgsnapshot-load-script-to-more-sensible-d.patch
8 0001-Use-ALTER-TABLE-.-CLUSTER-ON-statements-to-set-what-.patch
9 0001-Disable-synchronous_commit-for-pgsnapshot-loading.patch
10 0001-Manually-set-some-statistics-for-way_nodes-and-relat.patch
11 0001-Update-list-of-expected-schema-migrations.patch
12 0001-Fix-remaining-64-bit-id-tracking-problems.patch
13 0001-Increase-maximum-way-node-count-from-16-bit-to-32-bi.patch
14 0001-replication-Fix-null-pointer-exception-in-merge-repl.patch
15 0001-Set-User-Agent-header-on-HTTP-connections.patch
16 0001-apidb-Support-importing-negative-ids.patch
17 0001-apidb-Fix-one-off-error-in-current-way-relation-load.patch
18 0001-Update-build-to-newest-versions-of-dependent-librari.patch
19 0001-Fix-deprecation-warnings-resulting-from-dependency-u.patch
20 0001-db-server-Add-initial-db-server-docker-image-for-tes.patch
21 0001-db-server-Eclipse-enable-the-new-project.patch
22 0001-db-server-Add-docker-workaround-to-allow-use-of-syml.patch
23 0001-db-server-Perform-full-configuration-of-the-pgosmsna.patch
24 0001-db-server-Create-and-configure-the-api06_test-databa.patch
25 0001-db-server-Allow-remote-connections-to-the-server.patch
26 0001-db-server-Add-a-readme-explaining-basic-docker-usage.patch
27 0001-build-Exclude-db-server-as-a-java-project.patch
28 0001-db-server-Minor-tweaks-to-readme-to-explain-docker-d.patch
29 0001-Fix-query-for-retrieving-way-nodes-in-pgsnapshot-mod.patch
30 0001-pgsnapshot-Fix-checkstyle-errors-introduced-by-previ.patch
31 0001-pgsnapshot-Handle-case-where-WayNodes-might-already-.patch
32 0001-pgsnapshot-Fix-query-for-retrieving-relation-members.patch
33 0001-Fix-checkstyle-errors.patch
34 0001-MessageFormat-needs-an-array-not-a-bare-long.patch
35 0001-Update-replication-urls-to-match-current-planet.osm..patch
36 0001-pgsnapshot-Remove-redundant-way-node-loading-logic.patch