getOptionalFeaturesList();
/**
* repeated string optional_features = 5;
@@ -90,7 +90,7 @@ public interface HeaderBlockOrBuilder extends
* @param index The index of the element to return.
* @return The optionalFeatures at the given index.
*/
- String getOptionalFeatures(int index);
+ java.lang.String getOptionalFeatures(int index);
/**
* repeated string optional_features = 5;
* @param index The index of the value to return.
@@ -108,7 +108,7 @@ public interface HeaderBlockOrBuilder extends
* optional string writingprogram = 16;
* @return The writingprogram.
*/
- String getWritingprogram();
+ java.lang.String getWritingprogram();
/**
* optional string writingprogram = 16;
* @return The bytes for writingprogram.
@@ -133,7 +133,7 @@ public interface HeaderBlockOrBuilder extends
* optional string source = 17;
* @return The source.
*/
- String getSource();
+ java.lang.String getSource();
/**
*
* From the bbox field.
@@ -147,9 +147,9 @@ public interface HeaderBlockOrBuilder extends
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
@@ -158,9 +158,9 @@ public interface HeaderBlockOrBuilder extends
boolean hasOsmosisReplicationTimestamp();
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
@@ -170,7 +170,7 @@ public interface HeaderBlockOrBuilder extends
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
@@ -179,7 +179,7 @@ public interface HeaderBlockOrBuilder extends
boolean hasOsmosisReplicationSequenceNumber();
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
@@ -189,7 +189,7 @@ public interface HeaderBlockOrBuilder extends
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -198,16 +198,16 @@ public interface HeaderBlockOrBuilder extends
boolean hasOsmosisReplicationBaseUrl();
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
* @return The osmosisReplicationBaseUrl.
*/
- String getOsmosisReplicationBaseUrl();
+ java.lang.String getOsmosisReplicationBaseUrl();
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -219,7 +219,7 @@ public interface HeaderBlockOrBuilder extends
/**
* Protobuf type {@code OSMPBF.HeaderBlock}
*/
- public static final class HeaderBlock extends
+ public static final class HeaderBlock extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:OSMPBF.HeaderBlock)
HeaderBlockOrBuilder {
@@ -236,14 +236,14 @@ private HeaderBlock() {
osmosisReplicationBaseUrl_ = "";
}
- @Override
+ @java.lang.Override
@SuppressWarnings({"unused"})
- protected Object newInstance(
+ protected java.lang.Object newInstance(
UnusedPrivateParameter unused) {
return new HeaderBlock();
}
- @Override
+ @java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -254,7 +254,7 @@ private HeaderBlock(
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new NullPointerException();
+ throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -268,11 +268,11 @@ private HeaderBlock(
done = true;
break;
case 10: {
- HeaderBBox.Builder subBuilder = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) != 0)) {
subBuilder = bbox_.toBuilder();
}
- bbox_ = input.readMessage(HeaderBBox.PARSER, extensionRegistry);
+ bbox_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(bbox_);
bbox_ = subBuilder.buildPartial();
@@ -282,7 +282,7 @@ private HeaderBlock(
}
case 34: {
com.google.protobuf.ByteString bs = input.readBytes();
- if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+ if ((mutable_bitField0_ & 0x00000002) == 0) {
requiredFeatures_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
@@ -291,7 +291,7 @@ private HeaderBlock(
}
case 42: {
com.google.protobuf.ByteString bs = input.readBytes();
- if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+ if ((mutable_bitField0_ & 0x00000004) == 0) {
optionalFeatures_ = new com.google.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000004;
}
@@ -337,6 +337,8 @@ private HeaderBlock(
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
@@ -353,24 +355,25 @@ private HeaderBlock(
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_HeaderBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBlock_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_HeaderBlock_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBlock_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- HeaderBlock.class, HeaderBlock.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.class, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.Builder.class);
}
private int bitField0_;
public static final int BBOX_FIELD_NUMBER = 1;
- private HeaderBBox bbox_;
+ private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox bbox_;
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
* @return Whether the bbox field is set.
*/
+ @java.lang.Override
public boolean hasBbox() {
return ((bitField0_ & 0x00000001) != 0);
}
@@ -378,21 +381,23 @@ public boolean hasBbox() {
* optional .OSMPBF.HeaderBBox bbox = 1;
* @return The bbox.
*/
- public HeaderBBox getBbox() {
- return bbox_ == null ? HeaderBBox.getDefaultInstance() : bbox_;
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getBbox() {
+ return bbox_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance() : bbox_;
}
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
- public HeaderBBoxOrBuilder getBboxOrBuilder() {
- return bbox_ == null ? HeaderBBox.getDefaultInstance() : bbox_;
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder getBboxOrBuilder() {
+ return bbox_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance() : bbox_;
}
public static final int REQUIRED_FEATURES_FIELD_NUMBER = 4;
private com.google.protobuf.LazyStringList requiredFeatures_;
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -404,7 +409,7 @@ public HeaderBBoxOrBuilder getBboxOrBuilder() {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -415,19 +420,19 @@ public int getRequiredFeaturesCount() {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
* @param index The index of the element to return.
* @return The requiredFeatures at the given index.
*/
- public String getRequiredFeatures(int index) {
+ public java.lang.String getRequiredFeatures(int index) {
return requiredFeatures_.get(index);
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -461,7 +466,7 @@ public int getOptionalFeaturesCount() {
* @param index The index of the element to return.
* @return The optionalFeatures at the given index.
*/
- public String getOptionalFeatures(int index) {
+ public java.lang.String getOptionalFeatures(int index) {
return optionalFeatures_.get(index);
}
/**
@@ -475,11 +480,12 @@ public String getOptionalFeatures(int index) {
}
public static final int WRITINGPROGRAM_FIELD_NUMBER = 16;
- private volatile Object writingprogram_;
+ private volatile java.lang.Object writingprogram_;
/**
* optional string writingprogram = 16;
* @return Whether the writingprogram field is set.
*/
+ @java.lang.Override
public boolean hasWritingprogram() {
return ((bitField0_ & 0x00000002) != 0);
}
@@ -487,14 +493,15 @@ public boolean hasWritingprogram() {
* optional string writingprogram = 16;
* @return The writingprogram.
*/
- public String getWritingprogram() {
- Object ref = writingprogram_;
- if (ref instanceof String) {
- return (String) ref;
+ @java.lang.Override
+ public java.lang.String getWritingprogram() {
+ java.lang.Object ref = writingprogram_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
writingprogram_ = s;
}
@@ -505,13 +512,14 @@ public String getWritingprogram() {
* optional string writingprogram = 16;
* @return The bytes for writingprogram.
*/
+ @java.lang.Override
public com.google.protobuf.ByteString
getWritingprogramBytes() {
- Object ref = writingprogram_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ java.lang.Object ref = writingprogram_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
writingprogram_ = b;
return b;
} else {
@@ -520,7 +528,7 @@ public String getWritingprogram() {
}
public static final int SOURCE_FIELD_NUMBER = 17;
- private volatile Object source_;
+ private volatile java.lang.Object source_;
/**
*
* From the bbox field.
@@ -529,6 +537,7 @@ public String getWritingprogram() {
* optional string source = 17;
* @return Whether the source field is set.
*/
+ @java.lang.Override
public boolean hasSource() {
return ((bitField0_ & 0x00000004) != 0);
}
@@ -540,14 +549,15 @@ public boolean hasSource() {
* optional string source = 17;
* @return The source.
*/
- public String getSource() {
- Object ref = source_;
- if (ref instanceof String) {
- return (String) ref;
+ @java.lang.Override
+ public java.lang.String getSource() {
+ java.lang.Object ref = source_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
source_ = s;
}
@@ -562,13 +572,14 @@ public String getSource() {
* optional string source = 17;
* @return The bytes for source.
*/
+ @java.lang.Override
public com.google.protobuf.ByteString
getSourceBytes() {
- Object ref = source_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ java.lang.Object ref = source_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
source_ = b;
return b;
} else {
@@ -580,27 +591,29 @@ public String getSource() {
private long osmosisReplicationTimestamp_;
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
* @return Whether the osmosisReplicationTimestamp field is set.
*/
+ @java.lang.Override
public boolean hasOsmosisReplicationTimestamp() {
return ((bitField0_ & 0x00000008) != 0);
}
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
* @return The osmosisReplicationTimestamp.
*/
+ @java.lang.Override
public long getOsmosisReplicationTimestamp() {
return osmosisReplicationTimestamp_;
}
@@ -609,56 +622,60 @@ public long getOsmosisReplicationTimestamp() {
private long osmosisReplicationSequenceNumber_;
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
* @return Whether the osmosisReplicationSequenceNumber field is set.
*/
+ @java.lang.Override
public boolean hasOsmosisReplicationSequenceNumber() {
return ((bitField0_ & 0x00000010) != 0);
}
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
* @return The osmosisReplicationSequenceNumber.
*/
+ @java.lang.Override
public long getOsmosisReplicationSequenceNumber() {
return osmosisReplicationSequenceNumber_;
}
public static final int OSMOSIS_REPLICATION_BASE_URL_FIELD_NUMBER = 34;
- private volatile Object osmosisReplicationBaseUrl_;
+ private volatile java.lang.Object osmosisReplicationBaseUrl_;
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
* @return Whether the osmosisReplicationBaseUrl field is set.
*/
+ @java.lang.Override
public boolean hasOsmosisReplicationBaseUrl() {
return ((bitField0_ & 0x00000020) != 0);
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
* @return The osmosisReplicationBaseUrl.
*/
- public String getOsmosisReplicationBaseUrl() {
- Object ref = osmosisReplicationBaseUrl_;
- if (ref instanceof String) {
- return (String) ref;
+ @java.lang.Override
+ public java.lang.String getOsmosisReplicationBaseUrl() {
+ java.lang.Object ref = osmosisReplicationBaseUrl_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
osmosisReplicationBaseUrl_ = s;
}
@@ -667,19 +684,20 @@ public String getOsmosisReplicationBaseUrl() {
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
* @return The bytes for osmosisReplicationBaseUrl.
*/
+ @java.lang.Override
public com.google.protobuf.ByteString
getOsmosisReplicationBaseUrlBytes() {
- Object ref = osmosisReplicationBaseUrl_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ java.lang.Object ref = osmosisReplicationBaseUrl_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
osmosisReplicationBaseUrl_ = b;
return b;
} else {
@@ -688,7 +706,7 @@ public String getOsmosisReplicationBaseUrl() {
}
private byte memoizedIsInitialized = -1;
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@@ -704,7 +722,7 @@ public final boolean isInitialized() {
return true;
}
- @Override
+ @java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) != 0)) {
@@ -734,7 +752,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
unknownFields.writeTo(output);
}
- @Override
+ @java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@@ -782,15 +800,15 @@ public int getSerializedSize() {
return size;
}
- @Override
- public boolean equals(final Object obj) {
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof HeaderBlock)) {
+ if (!(obj instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock)) {
return super.equals(obj);
}
- HeaderBlock other = (HeaderBlock) obj;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock other = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock) obj;
if (hasBbox() != other.hasBbox()) return false;
if (hasBbox()) {
@@ -826,11 +844,10 @@ public boolean equals(final Object obj) {
if (!getOsmosisReplicationBaseUrl()
.equals(other.getOsmosisReplicationBaseUrl())) return false;
}
- if (!unknownFields.equals(other.unknownFields)) return false;
- return true;
+ return unknownFields.equals(other.unknownFields);
}
- @Override
+ @java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
return memoizedHashCode;
@@ -876,69 +893,69 @@ public int hashCode() {
return hash;
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBlock parseFrom(byte[] data)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBlock parseFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static HeaderBlock parseDelimitedFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static HeaderBlock parseDelimitedFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static HeaderBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -946,23 +963,23 @@ public static HeaderBlock parseFrom(
.parseWithIOException(PARSER, input, extensionRegistry);
}
- @Override
+ @java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(HeaderBlock prototype) {
+ public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
- @Override
+ @java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
}
- @Override
+ @java.lang.Override
protected Builder newBuilderForType(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -972,27 +989,27 @@ protected Builder newBuilderForType(
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
// @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBlock)
- HeaderBlockOrBuilder {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlockOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_HeaderBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBlock_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_HeaderBlock_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBlock_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- HeaderBlock.class, HeaderBlock.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.class, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.Builder.class);
}
- // Construct using HeaderBlock.newBuilder()
+ // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@@ -1002,7 +1019,7 @@ private void maybeForceBuilderInitialization() {
getBboxFieldBuilder();
}
}
- @Override
+ @java.lang.Override
public Builder clear() {
super.clear();
if (bboxBuilder_ == null) {
@@ -1028,29 +1045,29 @@ public Builder clear() {
return this;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return internal_static_OSMPBF_HeaderBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBlock_descriptor;
}
- @Override
- public HeaderBlock getDefaultInstanceForType() {
- return HeaderBlock.getDefaultInstance();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock getDefaultInstanceForType() {
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.getDefaultInstance();
}
- @Override
- public HeaderBlock build() {
- HeaderBlock result = buildPartial();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock build() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- @Override
- public HeaderBlock buildPartial() {
- HeaderBlock result = new HeaderBlock(this);
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock buildPartial() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock result = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1096,50 +1113,50 @@ public HeaderBlock buildPartial() {
return result;
}
- @Override
+ @java.lang.Override
public Builder clone() {
return super.clone();
}
- @Override
+ @java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.setField(field, value);
}
- @Override
+ @java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
- @Override
+ @java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
- @Override
+ @java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return super.setRepeatedField(field, index, value);
}
- @Override
+ @java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.addRepeatedField(field, value);
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof HeaderBlock) {
- return mergeFrom((HeaderBlock)other);
+ if (other instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock) {
+ return mergeFrom((org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(HeaderBlock other) {
- if (other == HeaderBlock.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock other) {
+ if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock.getDefaultInstance()) return this;
if (other.hasBbox()) {
mergeBbox(other.getBbox());
}
@@ -1189,26 +1206,24 @@ public Builder mergeFrom(HeaderBlock other) {
return this;
}
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
if (hasBbox()) {
- if (!getBbox().isInitialized()) {
- return false;
- }
+ return getBbox().isInitialized();
}
return true;
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- HeaderBlock parsedMessage = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (HeaderBlock) e.getUnfinishedMessage();
+ parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -1219,9 +1234,9 @@ public Builder mergeFrom(
}
private int bitField0_;
- private HeaderBBox bbox_;
+ private org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox bbox_;
private com.google.protobuf.SingleFieldBuilderV3<
- HeaderBBox, HeaderBBox.Builder, HeaderBBoxOrBuilder> bboxBuilder_;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder> bboxBuilder_;
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
* @return Whether the bbox field is set.
@@ -1233,9 +1248,9 @@ public boolean hasBbox() {
* optional .OSMPBF.HeaderBBox bbox = 1;
* @return The bbox.
*/
- public HeaderBBox getBbox() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getBbox() {
if (bboxBuilder_ == null) {
- return bbox_ == null ? HeaderBBox.getDefaultInstance() : bbox_;
+ return bbox_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance() : bbox_;
} else {
return bboxBuilder_.getMessage();
}
@@ -1243,7 +1258,7 @@ public HeaderBBox getBbox() {
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
- public Builder setBbox(HeaderBBox value) {
+ public Builder setBbox(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox value) {
if (bboxBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -1260,7 +1275,7 @@ public Builder setBbox(HeaderBBox value) {
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
public Builder setBbox(
- HeaderBBox.Builder builderForValue) {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder builderForValue) {
if (bboxBuilder_ == null) {
bbox_ = builderForValue.build();
onChanged();
@@ -1273,13 +1288,13 @@ public Builder setBbox(
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
- public Builder mergeBbox(HeaderBBox value) {
+ public Builder mergeBbox(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox value) {
if (bboxBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0) &&
bbox_ != null &&
- bbox_ != HeaderBBox.getDefaultInstance()) {
+ bbox_ != org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance()) {
bbox_ =
- HeaderBBox.newBuilder(bbox_).mergeFrom(value).buildPartial();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.newBuilder(bbox_).mergeFrom(value).buildPartial();
} else {
bbox_ = value;
}
@@ -1306,7 +1321,7 @@ public Builder clearBbox() {
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
- public HeaderBBox.Builder getBboxBuilder() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder getBboxBuilder() {
bitField0_ |= 0x00000001;
onChanged();
return getBboxFieldBuilder().getBuilder();
@@ -1314,23 +1329,23 @@ public HeaderBBox.Builder getBboxBuilder() {
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
- public HeaderBBoxOrBuilder getBboxOrBuilder() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder getBboxOrBuilder() {
if (bboxBuilder_ != null) {
return bboxBuilder_.getMessageOrBuilder();
} else {
return bbox_ == null ?
- HeaderBBox.getDefaultInstance() : bbox_;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance() : bbox_;
}
}
/**
* optional .OSMPBF.HeaderBBox bbox = 1;
*/
private com.google.protobuf.SingleFieldBuilderV3<
- HeaderBBox, HeaderBBox.Builder, HeaderBBoxOrBuilder>
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder>
getBboxFieldBuilder() {
if (bboxBuilder_ == null) {
bboxBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
- HeaderBBox, HeaderBBox.Builder, HeaderBBoxOrBuilder>(
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder>(
getBbox(),
getParentForChildren(),
isClean());
@@ -1341,14 +1356,14 @@ public HeaderBBoxOrBuilder getBboxOrBuilder() {
private com.google.protobuf.LazyStringList requiredFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureRequiredFeaturesIsMutable() {
- if (!((bitField0_ & 0x00000002) != 0)) {
+ if ((bitField0_ & 0x00000002) == 0) {
requiredFeatures_ = new com.google.protobuf.LazyStringArrayList(requiredFeatures_);
bitField0_ |= 0x00000002;
}
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1360,7 +1375,7 @@ private void ensureRequiredFeaturesIsMutable() {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1371,19 +1386,19 @@ public int getRequiredFeaturesCount() {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
* @param index The index of the element to return.
* @return The requiredFeatures at the given index.
*/
- public String getRequiredFeatures(int index) {
+ public java.lang.String getRequiredFeatures(int index) {
return requiredFeatures_.get(index);
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1396,7 +1411,7 @@ public String getRequiredFeatures(int index) {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1405,7 +1420,7 @@ public String getRequiredFeatures(int index) {
* @return This builder for chaining.
*/
public Builder setRequiredFeatures(
- int index, String value) {
+ int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1416,7 +1431,7 @@ public Builder setRequiredFeatures(
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1424,7 +1439,7 @@ public Builder setRequiredFeatures(
* @return This builder for chaining.
*/
public Builder addRequiredFeatures(
- String value) {
+ java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1435,7 +1450,7 @@ public Builder addRequiredFeatures(
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1443,7 +1458,7 @@ public Builder addRequiredFeatures(
* @return This builder for chaining.
*/
public Builder addAllRequiredFeatures(
- Iterable values) {
+ java.lang.Iterable values) {
ensureRequiredFeaturesIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, requiredFeatures_);
@@ -1452,7 +1467,7 @@ public Builder addAllRequiredFeatures(
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1466,7 +1481,7 @@ public Builder clearRequiredFeatures() {
}
/**
*
- * Additional tags to aid in parsing this dataset
+ * Additional tags to aid in parsing this dataset
*
*
* repeated string required_features = 4;
@@ -1486,7 +1501,7 @@ public Builder addRequiredFeaturesBytes(
private com.google.protobuf.LazyStringList optionalFeatures_ = com.google.protobuf.LazyStringArrayList.EMPTY;
private void ensureOptionalFeaturesIsMutable() {
- if (!((bitField0_ & 0x00000004) != 0)) {
+ if ((bitField0_ & 0x00000004) == 0) {
optionalFeatures_ = new com.google.protobuf.LazyStringArrayList(optionalFeatures_);
bitField0_ |= 0x00000004;
}
@@ -1511,7 +1526,7 @@ public int getOptionalFeaturesCount() {
* @param index The index of the element to return.
* @return The optionalFeatures at the given index.
*/
- public String getOptionalFeatures(int index) {
+ public java.lang.String getOptionalFeatures(int index) {
return optionalFeatures_.get(index);
}
/**
@@ -1530,7 +1545,7 @@ public String getOptionalFeatures(int index) {
* @return This builder for chaining.
*/
public Builder setOptionalFeatures(
- int index, String value) {
+ int index, java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1545,7 +1560,7 @@ public Builder setOptionalFeatures(
* @return This builder for chaining.
*/
public Builder addOptionalFeatures(
- String value) {
+ java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1560,7 +1575,7 @@ public Builder addOptionalFeatures(
* @return This builder for chaining.
*/
public Builder addAllOptionalFeatures(
- Iterable values) {
+ java.lang.Iterable values) {
ensureOptionalFeaturesIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, optionalFeatures_);
@@ -1593,7 +1608,7 @@ public Builder addOptionalFeaturesBytes(
return this;
}
- private Object writingprogram_ = "";
+ private java.lang.Object writingprogram_ = "";
/**
* optional string writingprogram = 16;
* @return Whether the writingprogram field is set.
@@ -1605,18 +1620,18 @@ public boolean hasWritingprogram() {
* optional string writingprogram = 16;
* @return The writingprogram.
*/
- public String getWritingprogram() {
- Object ref = writingprogram_;
- if (!(ref instanceof String)) {
+ public java.lang.String getWritingprogram() {
+ java.lang.Object ref = writingprogram_;
+ if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
writingprogram_ = s;
}
return s;
} else {
- return (String) ref;
+ return (java.lang.String) ref;
}
}
/**
@@ -1625,11 +1640,11 @@ public String getWritingprogram() {
*/
public com.google.protobuf.ByteString
getWritingprogramBytes() {
- Object ref = writingprogram_;
+ java.lang.Object ref = writingprogram_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
writingprogram_ = b;
return b;
} else {
@@ -1642,7 +1657,7 @@ public String getWritingprogram() {
* @return This builder for chaining.
*/
public Builder setWritingprogram(
- String value) {
+ java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1677,7 +1692,7 @@ public Builder setWritingprogramBytes(
return this;
}
- private Object source_ = "";
+ private java.lang.Object source_ = "";
/**
*
* From the bbox field.
@@ -1697,18 +1712,18 @@ public boolean hasSource() {
* optional string source = 17;
* @return The source.
*/
- public String getSource() {
- Object ref = source_;
- if (!(ref instanceof String)) {
+ public java.lang.String getSource() {
+ java.lang.Object ref = source_;
+ if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
source_ = s;
}
return s;
} else {
- return (String) ref;
+ return (java.lang.String) ref;
}
}
/**
@@ -1721,11 +1736,11 @@ public String getSource() {
*/
public com.google.protobuf.ByteString
getSourceBytes() {
- Object ref = source_;
+ java.lang.Object ref = source_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
source_ = b;
return b;
} else {
@@ -1742,7 +1757,7 @@ public String getSource() {
* @return This builder for chaining.
*/
public Builder setSource(
- String value) {
+ java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1788,35 +1803,37 @@ public Builder setSourceBytes(
private long osmosisReplicationTimestamp_ ;
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
* @return Whether the osmosisReplicationTimestamp field is set.
*/
+ @java.lang.Override
public boolean hasOsmosisReplicationTimestamp() {
return ((bitField0_ & 0x00000020) != 0);
}
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
* @return The osmosisReplicationTimestamp.
*/
+ @java.lang.Override
public long getOsmosisReplicationTimestamp() {
return osmosisReplicationTimestamp_;
}
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
@@ -1831,9 +1848,9 @@ public Builder setOsmosisReplicationTimestamp(long value) {
}
/**
*
- * replication timestamp, expressed in seconds since the epoch,
+ * Replication timestamp, expressed in seconds since the epoch,
* otherwise the same value as in the "timestamp=..." field
- * in the state.txt file used by Osmosis
+ * in the state.txt file used by Osmosis.
*
*
* optional int64 osmosis_replication_timestamp = 32;
@@ -1849,29 +1866,31 @@ public Builder clearOsmosisReplicationTimestamp() {
private long osmosisReplicationSequenceNumber_ ;
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
* @return Whether the osmosisReplicationSequenceNumber field is set.
*/
+ @java.lang.Override
public boolean hasOsmosisReplicationSequenceNumber() {
return ((bitField0_ & 0x00000040) != 0);
}
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
* @return The osmosisReplicationSequenceNumber.
*/
+ @java.lang.Override
public long getOsmosisReplicationSequenceNumber() {
return osmosisReplicationSequenceNumber_;
}
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
@@ -1886,7 +1905,7 @@ public Builder setOsmosisReplicationSequenceNumber(long value) {
}
/**
*
- * replication sequence number (sequenceNumber in state.txt)
+ * Replication sequence number (sequenceNumber in state.txt).
*
*
* optional int64 osmosis_replication_sequence_number = 33;
@@ -1899,10 +1918,10 @@ public Builder clearOsmosisReplicationSequenceNumber() {
return this;
}
- private Object osmosisReplicationBaseUrl_ = "";
+ private java.lang.Object osmosisReplicationBaseUrl_ = "";
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -1913,29 +1932,29 @@ public boolean hasOsmosisReplicationBaseUrl() {
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
* @return The osmosisReplicationBaseUrl.
*/
- public String getOsmosisReplicationBaseUrl() {
- Object ref = osmosisReplicationBaseUrl_;
- if (!(ref instanceof String)) {
+ public java.lang.String getOsmosisReplicationBaseUrl() {
+ java.lang.Object ref = osmosisReplicationBaseUrl_;
+ if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- String s = bs.toStringUtf8();
+ java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
osmosisReplicationBaseUrl_ = s;
}
return s;
} else {
- return (String) ref;
+ return (java.lang.String) ref;
}
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -1943,11 +1962,11 @@ public String getOsmosisReplicationBaseUrl() {
*/
public com.google.protobuf.ByteString
getOsmosisReplicationBaseUrlBytes() {
- Object ref = osmosisReplicationBaseUrl_;
+ java.lang.Object ref = osmosisReplicationBaseUrl_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (String) ref);
+ (java.lang.String) ref);
osmosisReplicationBaseUrl_ = b;
return b;
} else {
@@ -1956,7 +1975,7 @@ public String getOsmosisReplicationBaseUrl() {
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -1964,7 +1983,7 @@ public String getOsmosisReplicationBaseUrl() {
* @return This builder for chaining.
*/
public Builder setOsmosisReplicationBaseUrl(
- String value) {
+ java.lang.String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1975,7 +1994,7 @@ public Builder setOsmosisReplicationBaseUrl(
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -1989,7 +2008,7 @@ public Builder clearOsmosisReplicationBaseUrl() {
}
/**
*
- * replication base URL (from Osmosis' configuration.txt file)
+ * Replication base URL (from Osmosis' configuration.txt file).
*
*
* optional string osmosis_replication_base_url = 34;
@@ -2006,13 +2025,13 @@ public Builder setOsmosisReplicationBaseUrlBytes(
onChanged();
return this;
}
- @Override
+ @java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
- @Override
+ @java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@@ -2023,18 +2042,18 @@ public final Builder mergeUnknownFields(
}
// @@protoc_insertion_point(class_scope:OSMPBF.HeaderBlock)
- private static final HeaderBlock DEFAULT_INSTANCE;
+ private static final org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new HeaderBlock();
+ DEFAULT_INSTANCE = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock();
}
- public static HeaderBlock getDefaultInstance() {
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock getDefaultInstance() {
return DEFAULT_INSTANCE;
}
- @Deprecated public static final com.google.protobuf.Parser
+ @java.lang.Deprecated public static final com.google.protobuf.Parser
PARSER = new com.google.protobuf.AbstractParser() {
- @Override
+ @java.lang.Override
public HeaderBlock parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2047,13 +2066,13 @@ public static com.google.protobuf.Parser parser() {
return PARSER;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- @Override
- public HeaderBlock getDefaultInstanceForType() {
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -2110,7 +2129,7 @@ public interface HeaderBBoxOrBuilder extends
/**
* Protobuf type {@code OSMPBF.HeaderBBox}
*/
- public static final class HeaderBBox extends
+ public static final class HeaderBBox extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:OSMPBF.HeaderBBox)
HeaderBBoxOrBuilder {
@@ -2122,14 +2141,14 @@ private HeaderBBox(com.google.protobuf.GeneratedMessageV3.Builder builder) {
private HeaderBBox() {
}
- @Override
+ @java.lang.Override
@SuppressWarnings({"unused"})
- protected Object newInstance(
+ protected java.lang.Object newInstance(
UnusedPrivateParameter unused) {
return new HeaderBBox();
}
- @Override
+ @java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -2140,7 +2159,7 @@ private HeaderBBox(
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new NullPointerException();
+ throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -2184,6 +2203,8 @@ private HeaderBBox(
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
@@ -2194,15 +2215,15 @@ private HeaderBBox(
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_HeaderBBox_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBBox_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_HeaderBBox_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBBox_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- HeaderBBox.class, HeaderBBox.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.class, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder.class);
}
private int bitField0_;
@@ -2212,6 +2233,7 @@ private HeaderBBox(
* required sint64 left = 1;
* @return Whether the left field is set.
*/
+ @java.lang.Override
public boolean hasLeft() {
return ((bitField0_ & 0x00000001) != 0);
}
@@ -2219,6 +2241,7 @@ public boolean hasLeft() {
* required sint64 left = 1;
* @return The left.
*/
+ @java.lang.Override
public long getLeft() {
return left_;
}
@@ -2229,6 +2252,7 @@ public long getLeft() {
* required sint64 right = 2;
* @return Whether the right field is set.
*/
+ @java.lang.Override
public boolean hasRight() {
return ((bitField0_ & 0x00000002) != 0);
}
@@ -2236,6 +2260,7 @@ public boolean hasRight() {
* required sint64 right = 2;
* @return The right.
*/
+ @java.lang.Override
public long getRight() {
return right_;
}
@@ -2246,6 +2271,7 @@ public long getRight() {
* required sint64 top = 3;
* @return Whether the top field is set.
*/
+ @java.lang.Override
public boolean hasTop() {
return ((bitField0_ & 0x00000004) != 0);
}
@@ -2253,6 +2279,7 @@ public boolean hasTop() {
* required sint64 top = 3;
* @return The top.
*/
+ @java.lang.Override
public long getTop() {
return top_;
}
@@ -2263,6 +2290,7 @@ public long getTop() {
* required sint64 bottom = 4;
* @return Whether the bottom field is set.
*/
+ @java.lang.Override
public boolean hasBottom() {
return ((bitField0_ & 0x00000008) != 0);
}
@@ -2270,12 +2298,13 @@ public boolean hasBottom() {
* required sint64 bottom = 4;
* @return The bottom.
*/
+ @java.lang.Override
public long getBottom() {
return bottom_;
}
private byte memoizedIsInitialized = -1;
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@@ -2301,7 +2330,7 @@ public final boolean isInitialized() {
return true;
}
- @Override
+ @java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) != 0)) {
@@ -2319,7 +2348,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
unknownFields.writeTo(output);
}
- @Override
+ @java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@@ -2346,15 +2375,15 @@ public int getSerializedSize() {
return size;
}
- @Override
- public boolean equals(final Object obj) {
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof HeaderBBox)) {
+ if (!(obj instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox)) {
return super.equals(obj);
}
- HeaderBBox other = (HeaderBBox) obj;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox other = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox) obj;
if (hasLeft() != other.hasLeft()) return false;
if (hasLeft()) {
@@ -2376,11 +2405,10 @@ public boolean equals(final Object obj) {
if (getBottom()
!= other.getBottom()) return false;
}
- if (!unknownFields.equals(other.unknownFields)) return false;
- return true;
+ return unknownFields.equals(other.unknownFields);
}
- @Override
+ @java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
return memoizedHashCode;
@@ -2412,69 +2440,69 @@ public int hashCode() {
return hash;
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBBox parseFrom(byte[] data)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static HeaderBBox parseFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static HeaderBBox parseDelimitedFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static HeaderBBox parseDelimitedFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static HeaderBBox parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -2482,23 +2510,23 @@ public static HeaderBBox parseFrom(
.parseWithIOException(PARSER, input, extensionRegistry);
}
- @Override
+ @java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(HeaderBBox prototype) {
+ public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
- @Override
+ @java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
}
- @Override
+ @java.lang.Override
protected Builder newBuilderForType(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -2508,27 +2536,27 @@ protected Builder newBuilderForType(
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
// @@protoc_insertion_point(builder_implements:OSMPBF.HeaderBBox)
- HeaderBBoxOrBuilder {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBoxOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_HeaderBBox_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBBox_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_HeaderBBox_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBBox_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- HeaderBBox.class, HeaderBBox.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.class, org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.Builder.class);
}
- // Construct using HeaderBBox.newBuilder()
+ // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@@ -2537,7 +2565,7 @@ private void maybeForceBuilderInitialization() {
.alwaysUseFieldBuilders) {
}
}
- @Override
+ @java.lang.Override
public Builder clear() {
super.clear();
left_ = 0L;
@@ -2551,29 +2579,29 @@ public Builder clear() {
return this;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return internal_static_OSMPBF_HeaderBBox_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_HeaderBBox_descriptor;
}
- @Override
- public HeaderBBox getDefaultInstanceForType() {
- return HeaderBBox.getDefaultInstance();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getDefaultInstanceForType() {
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance();
}
- @Override
- public HeaderBBox build() {
- HeaderBBox result = buildPartial();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox build() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- @Override
- public HeaderBBox buildPartial() {
- HeaderBBox result = new HeaderBBox(this);
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox buildPartial() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox result = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2597,50 +2625,50 @@ public HeaderBBox buildPartial() {
return result;
}
- @Override
+ @java.lang.Override
public Builder clone() {
return super.clone();
}
- @Override
+ @java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.setField(field, value);
}
- @Override
+ @java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
- @Override
+ @java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
- @Override
+ @java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return super.setRepeatedField(field, index, value);
}
- @Override
+ @java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.addRepeatedField(field, value);
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof HeaderBBox) {
- return mergeFrom((HeaderBBox)other);
+ if (other instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox) {
+ return mergeFrom((org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(HeaderBBox other) {
- if (other == HeaderBBox.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox other) {
+ if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox.getDefaultInstance()) return this;
if (other.hasLeft()) {
setLeft(other.getLeft());
}
@@ -2658,7 +2686,7 @@ public Builder mergeFrom(HeaderBBox other) {
return this;
}
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
if (!hasLeft()) {
return false;
@@ -2669,22 +2697,19 @@ public final boolean isInitialized() {
if (!hasTop()) {
return false;
}
- if (!hasBottom()) {
- return false;
- }
- return true;
+ return hasBottom();
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- HeaderBBox parsedMessage = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (HeaderBBox) e.getUnfinishedMessage();
+ parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -2700,6 +2725,7 @@ public Builder mergeFrom(
* required sint64 left = 1;
* @return Whether the left field is set.
*/
+ @java.lang.Override
public boolean hasLeft() {
return ((bitField0_ & 0x00000001) != 0);
}
@@ -2707,6 +2733,7 @@ public boolean hasLeft() {
* required sint64 left = 1;
* @return The left.
*/
+ @java.lang.Override
public long getLeft() {
return left_;
}
@@ -2737,6 +2764,7 @@ public Builder clearLeft() {
* required sint64 right = 2;
* @return Whether the right field is set.
*/
+ @java.lang.Override
public boolean hasRight() {
return ((bitField0_ & 0x00000002) != 0);
}
@@ -2744,6 +2772,7 @@ public boolean hasRight() {
* required sint64 right = 2;
* @return The right.
*/
+ @java.lang.Override
public long getRight() {
return right_;
}
@@ -2774,6 +2803,7 @@ public Builder clearRight() {
* required sint64 top = 3;
* @return Whether the top field is set.
*/
+ @java.lang.Override
public boolean hasTop() {
return ((bitField0_ & 0x00000004) != 0);
}
@@ -2781,6 +2811,7 @@ public boolean hasTop() {
* required sint64 top = 3;
* @return The top.
*/
+ @java.lang.Override
public long getTop() {
return top_;
}
@@ -2811,6 +2842,7 @@ public Builder clearTop() {
* required sint64 bottom = 4;
* @return Whether the bottom field is set.
*/
+ @java.lang.Override
public boolean hasBottom() {
return ((bitField0_ & 0x00000008) != 0);
}
@@ -2818,6 +2850,7 @@ public boolean hasBottom() {
* required sint64 bottom = 4;
* @return The bottom.
*/
+ @java.lang.Override
public long getBottom() {
return bottom_;
}
@@ -2842,13 +2875,13 @@ public Builder clearBottom() {
onChanged();
return this;
}
- @Override
+ @java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
- @Override
+ @java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@@ -2859,18 +2892,18 @@ public final Builder mergeUnknownFields(
}
// @@protoc_insertion_point(class_scope:OSMPBF.HeaderBBox)
- private static final HeaderBBox DEFAULT_INSTANCE;
+ private static final org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new HeaderBBox();
+ DEFAULT_INSTANCE = new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox();
}
- public static HeaderBBox getDefaultInstance() {
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getDefaultInstance() {
return DEFAULT_INSTANCE;
}
- @Deprecated public static final com.google.protobuf.Parser
+ @java.lang.Deprecated public static final com.google.protobuf.Parser
PARSER = new com.google.protobuf.AbstractParser() {
- @Override
+ @java.lang.Override
public HeaderBBox parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2883,13 +2916,13 @@ public static com.google.protobuf.Parser parser() {
return PARSER;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- @Override
- public HeaderBBox getDefaultInstanceForType() {
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -2908,21 +2941,21 @@ public interface PrimitiveBlockOrBuilder extends
* required .OSMPBF.StringTable stringtable = 1;
* @return The stringtable.
*/
- StringTable getStringtable();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable();
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- StringTableOrBuilder getStringtableOrBuilder();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder getStringtableOrBuilder();
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- java.util.List
+ java.util.List
getPrimitivegroupList();
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- PrimitiveGroup getPrimitivegroup(int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index);
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
@@ -2930,17 +2963,17 @@ public interface PrimitiveBlockOrBuilder extends
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- java.util.List
+ java.util.List
getPrimitivegroupOrBuilderList();
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
- int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
+ int index);
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
@@ -2949,7 +2982,7 @@ PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
boolean hasGranularity();
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
@@ -2959,7 +2992,7 @@ PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
@@ -2968,7 +3001,7 @@ PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
boolean hasLatOffset();
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
@@ -3009,7 +3042,7 @@ PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
/**
* Protobuf type {@code OSMPBF.PrimitiveBlock}
*/
- public static final class PrimitiveBlock extends
+ public static final class PrimitiveBlock extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveBlock)
PrimitiveBlockOrBuilder {
@@ -3024,14 +3057,14 @@ private PrimitiveBlock() {
dateGranularity_ = 1000;
}
- @Override
+ @java.lang.Override
@SuppressWarnings({"unused"})
- protected Object newInstance(
+ protected java.lang.Object newInstance(
UnusedPrivateParameter unused) {
return new PrimitiveBlock();
}
- @Override
+ @java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -3042,7 +3075,7 @@ private PrimitiveBlock(
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new NullPointerException();
+ throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -3056,11 +3089,11 @@ private PrimitiveBlock(
done = true;
break;
case 10: {
- StringTable.Builder subBuilder = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) != 0)) {
subBuilder = stringtable_.toBuilder();
}
- stringtable_ = input.readMessage(StringTable.PARSER, extensionRegistry);
+ stringtable_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(stringtable_);
stringtable_ = subBuilder.buildPartial();
@@ -3069,12 +3102,12 @@ private PrimitiveBlock(
break;
}
case 18: {
- if (!((mutable_bitField0_ & 0x00000002) != 0)) {
- primitivegroup_ = new java.util.ArrayList();
+ if ((mutable_bitField0_ & 0x00000002) == 0) {
+ primitivegroup_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000002;
}
primitivegroup_.add(
- input.readMessage(PrimitiveGroup.PARSER, extensionRegistry));
+ input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.PARSER, extensionRegistry));
break;
}
case 136: {
@@ -3108,6 +3141,8 @@ private PrimitiveBlock(
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
@@ -3121,24 +3156,25 @@ private PrimitiveBlock(
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_PrimitiveBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_PrimitiveBlock_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_PrimitiveBlock_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_PrimitiveBlock_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- PrimitiveBlock.class, PrimitiveBlock.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.class, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.Builder.class);
}
private int bitField0_;
public static final int STRINGTABLE_FIELD_NUMBER = 1;
- private StringTable stringtable_;
+ private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable stringtable_;
/**
* required .OSMPBF.StringTable stringtable = 1;
* @return Whether the stringtable field is set.
*/
+ @java.lang.Override
public boolean hasStringtable() {
return ((bitField0_ & 0x00000001) != 0);
}
@@ -3146,47 +3182,54 @@ public boolean hasStringtable() {
* required .OSMPBF.StringTable stringtable = 1;
* @return The stringtable.
*/
- public StringTable getStringtable() {
- return stringtable_ == null ? StringTable.getDefaultInstance() : stringtable_;
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable() {
+ return stringtable_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance() : stringtable_;
}
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- public StringTableOrBuilder getStringtableOrBuilder() {
- return stringtable_ == null ? StringTable.getDefaultInstance() : stringtable_;
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder getStringtableOrBuilder() {
+ return stringtable_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance() : stringtable_;
}
public static final int PRIMITIVEGROUP_FIELD_NUMBER = 2;
- private java.util.List primitivegroup_;
+ private java.util.List primitivegroup_;
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public java.util.List getPrimitivegroupList() {
+ @java.lang.Override
+ public java.util.List getPrimitivegroupList() {
return primitivegroup_;
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public java.util.List
+ @java.lang.Override
+ public java.util.List
getPrimitivegroupOrBuilderList() {
return primitivegroup_;
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
+ @java.lang.Override
public int getPrimitivegroupCount() {
return primitivegroup_.size();
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroup getPrimitivegroup(int index) {
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index) {
return primitivegroup_.get(index);
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
int index) {
return primitivegroup_.get(index);
}
@@ -3195,23 +3238,25 @@ public PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
private int granularity_;
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
* @return Whether the granularity field is set.
*/
+ @java.lang.Override
public boolean hasGranularity() {
return ((bitField0_ & 0x00000002) != 0);
}
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
* @return The granularity.
*/
+ @java.lang.Override
public int getGranularity() {
return granularity_;
}
@@ -3220,23 +3265,25 @@ public int getGranularity() {
private long latOffset_;
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
* @return Whether the latOffset field is set.
*/
+ @java.lang.Override
public boolean hasLatOffset() {
return ((bitField0_ & 0x00000004) != 0);
}
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
* @return The latOffset.
*/
+ @java.lang.Override
public long getLatOffset() {
return latOffset_;
}
@@ -3247,6 +3294,7 @@ public long getLatOffset() {
* optional int64 lon_offset = 20 [default = 0];
* @return Whether the lonOffset field is set.
*/
+ @java.lang.Override
public boolean hasLonOffset() {
return ((bitField0_ & 0x00000008) != 0);
}
@@ -3254,6 +3302,7 @@ public boolean hasLonOffset() {
* optional int64 lon_offset = 20 [default = 0];
* @return The lonOffset.
*/
+ @java.lang.Override
public long getLonOffset() {
return lonOffset_;
}
@@ -3268,6 +3317,7 @@ public long getLonOffset() {
* optional int32 date_granularity = 18 [default = 1000];
* @return Whether the dateGranularity field is set.
*/
+ @java.lang.Override
public boolean hasDateGranularity() {
return ((bitField0_ & 0x00000010) != 0);
}
@@ -3279,12 +3329,13 @@ public boolean hasDateGranularity() {
* optional int32 date_granularity = 18 [default = 1000];
* @return The dateGranularity.
*/
+ @java.lang.Override
public int getDateGranularity() {
return dateGranularity_;
}
private byte memoizedIsInitialized = -1;
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@@ -3304,7 +3355,7 @@ public final boolean isInitialized() {
return true;
}
- @Override
+ @java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (((bitField0_ & 0x00000001) != 0)) {
@@ -3328,7 +3379,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
unknownFields.writeTo(output);
}
- @Override
+ @java.lang.Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@@ -3363,15 +3414,15 @@ public int getSerializedSize() {
return size;
}
- @Override
- public boolean equals(final Object obj) {
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof PrimitiveBlock)) {
+ if (!(obj instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock)) {
return super.equals(obj);
}
- PrimitiveBlock other = (PrimitiveBlock) obj;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock other = (org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock) obj;
if (hasStringtable() != other.hasStringtable()) return false;
if (hasStringtable()) {
@@ -3400,11 +3451,10 @@ public boolean equals(final Object obj) {
if (getDateGranularity()
!= other.getDateGranularity()) return false;
}
- if (!unknownFields.equals(other.unknownFields)) return false;
- return true;
+ return unknownFields.equals(other.unknownFields);
}
- @Override
+ @java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
return memoizedHashCode;
@@ -3442,69 +3492,69 @@ public int hashCode() {
return hash;
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static PrimitiveBlock parseFrom(byte[] data)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static PrimitiveBlock parseFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static PrimitiveBlock parseDelimitedFrom(java.io.InputStream input)
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static PrimitiveBlock parseDelimitedFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static PrimitiveBlock parseFrom(
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -3512,23 +3562,23 @@ public static PrimitiveBlock parseFrom(
.parseWithIOException(PARSER, input, extensionRegistry);
}
- @Override
+ @java.lang.Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(PrimitiveBlock prototype) {
+ public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
- @Override
+ @java.lang.Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
}
- @Override
+ @java.lang.Override
protected Builder newBuilderForType(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -3538,27 +3588,27 @@ protected Builder newBuilderForType(
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
// @@protoc_insertion_point(builder_implements:OSMPBF.PrimitiveBlock)
- PrimitiveBlockOrBuilder {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlockOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return internal_static_OSMPBF_PrimitiveBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_PrimitiveBlock_descriptor;
}
- @Override
- protected FieldAccessorTable
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return internal_static_OSMPBF_PrimitiveBlock_fieldAccessorTable
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_PrimitiveBlock_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- PrimitiveBlock.class, PrimitiveBlock.Builder.class);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.class, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.Builder.class);
}
- // Construct using PrimitiveBlock.newBuilder()
+ // Construct using org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
private Builder(
- BuilderParent parent) {
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@@ -3569,7 +3619,7 @@ private void maybeForceBuilderInitialization() {
getPrimitivegroupFieldBuilder();
}
}
- @Override
+ @java.lang.Override
public Builder clear() {
super.clear();
if (stringtableBuilder_ == null) {
@@ -3595,29 +3645,29 @@ public Builder clear() {
return this;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return internal_static_OSMPBF_PrimitiveBlock_descriptor;
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.internal_static_OSMPBF_PrimitiveBlock_descriptor;
}
- @Override
- public PrimitiveBlock getDefaultInstanceForType() {
- return PrimitiveBlock.getDefaultInstance();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock getDefaultInstanceForType() {
+ return org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.getDefaultInstance();
}
- @Override
- public PrimitiveBlock build() {
- PrimitiveBlock result = buildPartial();
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock build() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- @Override
- public PrimitiveBlock buildPartial() {
- PrimitiveBlock result = new PrimitiveBlock(this);
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock buildPartial() {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock result = new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3658,50 +3708,50 @@ public PrimitiveBlock buildPartial() {
return result;
}
- @Override
+ @java.lang.Override
public Builder clone() {
return super.clone();
}
- @Override
+ @java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.setField(field, value);
}
- @Override
+ @java.lang.Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
- @Override
+ @java.lang.Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
- @Override
+ @java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return super.setRepeatedField(field, index, value);
}
- @Override
+ @java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return super.addRepeatedField(field, value);
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof PrimitiveBlock) {
- return mergeFrom((PrimitiveBlock)other);
+ if (other instanceof org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock) {
+ return mergeFrom((org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(PrimitiveBlock other) {
- if (other == PrimitiveBlock.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock other) {
+ if (other == org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock.getDefaultInstance()) return this;
if (other.hasStringtable()) {
mergeStringtable(other.getStringtable());
}
@@ -3723,7 +3773,7 @@ public Builder mergeFrom(PrimitiveBlock other) {
primitivegroupBuilder_ = null;
primitivegroup_ = other.primitivegroup_;
bitField0_ = (bitField0_ & ~0x00000002);
- primitivegroupBuilder_ =
+ primitivegroupBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getPrimitivegroupFieldBuilder() : null;
} else {
@@ -3748,7 +3798,7 @@ public Builder mergeFrom(PrimitiveBlock other) {
return this;
}
- @Override
+ @java.lang.Override
public final boolean isInitialized() {
if (!hasStringtable()) {
return false;
@@ -3761,16 +3811,16 @@ public final boolean isInitialized() {
return true;
}
- @Override
+ @java.lang.Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- PrimitiveBlock parsedMessage = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (PrimitiveBlock) e.getUnfinishedMessage();
+ parsedMessage = (org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -3781,9 +3831,9 @@ public Builder mergeFrom(
}
private int bitField0_;
- private StringTable stringtable_;
+ private org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable stringtable_;
private com.google.protobuf.SingleFieldBuilderV3<
- StringTable, StringTable.Builder, StringTableOrBuilder> stringtableBuilder_;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder> stringtableBuilder_;
/**
* required .OSMPBF.StringTable stringtable = 1;
* @return Whether the stringtable field is set.
@@ -3795,9 +3845,9 @@ public boolean hasStringtable() {
* required .OSMPBF.StringTable stringtable = 1;
* @return The stringtable.
*/
- public StringTable getStringtable() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable getStringtable() {
if (stringtableBuilder_ == null) {
- return stringtable_ == null ? StringTable.getDefaultInstance() : stringtable_;
+ return stringtable_ == null ? org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance() : stringtable_;
} else {
return stringtableBuilder_.getMessage();
}
@@ -3805,7 +3855,7 @@ public StringTable getStringtable() {
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- public Builder setStringtable(StringTable value) {
+ public Builder setStringtable(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable value) {
if (stringtableBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3822,7 +3872,7 @@ public Builder setStringtable(StringTable value) {
* required .OSMPBF.StringTable stringtable = 1;
*/
public Builder setStringtable(
- StringTable.Builder builderForValue) {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder builderForValue) {
if (stringtableBuilder_ == null) {
stringtable_ = builderForValue.build();
onChanged();
@@ -3835,13 +3885,13 @@ public Builder setStringtable(
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- public Builder mergeStringtable(StringTable value) {
+ public Builder mergeStringtable(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable value) {
if (stringtableBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0) &&
stringtable_ != null &&
- stringtable_ != StringTable.getDefaultInstance()) {
+ stringtable_ != org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance()) {
stringtable_ =
- StringTable.newBuilder(stringtable_).mergeFrom(value).buildPartial();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.newBuilder(stringtable_).mergeFrom(value).buildPartial();
} else {
stringtable_ = value;
}
@@ -3868,7 +3918,7 @@ public Builder clearStringtable() {
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- public StringTable.Builder getStringtableBuilder() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder getStringtableBuilder() {
bitField0_ |= 0x00000001;
onChanged();
return getStringtableFieldBuilder().getBuilder();
@@ -3876,23 +3926,23 @@ public StringTable.Builder getStringtableBuilder() {
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
- public StringTableOrBuilder getStringtableOrBuilder() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder getStringtableOrBuilder() {
if (stringtableBuilder_ != null) {
return stringtableBuilder_.getMessageOrBuilder();
} else {
return stringtable_ == null ?
- StringTable.getDefaultInstance() : stringtable_;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.getDefaultInstance() : stringtable_;
}
}
/**
* required .OSMPBF.StringTable stringtable = 1;
*/
private com.google.protobuf.SingleFieldBuilderV3<
- StringTable, StringTable.Builder, StringTableOrBuilder>
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder>
getStringtableFieldBuilder() {
if (stringtableBuilder_ == null) {
stringtableBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
- StringTable, StringTable.Builder, StringTableOrBuilder>(
+ org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.StringTableOrBuilder>(
getStringtable(),
getParentForChildren(),
isClean());
@@ -3901,22 +3951,22 @@ public StringTableOrBuilder getStringtableOrBuilder() {
return stringtableBuilder_;
}
- private java.util.List primitivegroup_ =
+ private java.util.List primitivegroup_ =
java.util.Collections.emptyList();
private void ensurePrimitivegroupIsMutable() {
- if (!((bitField0_ & 0x00000002) != 0)) {
- primitivegroup_ = new java.util.ArrayList(primitivegroup_);
+ if ((bitField0_ & 0x00000002) == 0) {
+ primitivegroup_ = new java.util.ArrayList(primitivegroup_);
bitField0_ |= 0x00000002;
}
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- PrimitiveGroup, PrimitiveGroup.Builder, PrimitiveGroupOrBuilder> primitivegroupBuilder_;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder> primitivegroupBuilder_;
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public java.util.List getPrimitivegroupList() {
+ public java.util.List getPrimitivegroupList() {
if (primitivegroupBuilder_ == null) {
return java.util.Collections.unmodifiableList(primitivegroup_);
} else {
@@ -3936,7 +3986,7 @@ public int getPrimitivegroupCount() {
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroup getPrimitivegroup(int index) {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup getPrimitivegroup(int index) {
if (primitivegroupBuilder_ == null) {
return primitivegroup_.get(index);
} else {
@@ -3947,7 +3997,7 @@ public PrimitiveGroup getPrimitivegroup(int index) {
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder setPrimitivegroup(
- int index, PrimitiveGroup value) {
+ int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
if (primitivegroupBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3964,7 +4014,7 @@ public Builder setPrimitivegroup(
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder setPrimitivegroup(
- int index, PrimitiveGroup.Builder builderForValue) {
+ int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
if (primitivegroupBuilder_ == null) {
ensurePrimitivegroupIsMutable();
primitivegroup_.set(index, builderForValue.build());
@@ -3977,7 +4027,7 @@ public Builder setPrimitivegroup(
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public Builder addPrimitivegroup(PrimitiveGroup value) {
+ public Builder addPrimitivegroup(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
if (primitivegroupBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3994,7 +4044,7 @@ public Builder addPrimitivegroup(PrimitiveGroup value) {
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder addPrimitivegroup(
- int index, PrimitiveGroup value) {
+ int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup value) {
if (primitivegroupBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -4011,7 +4061,7 @@ public Builder addPrimitivegroup(
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder addPrimitivegroup(
- PrimitiveGroup.Builder builderForValue) {
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
if (primitivegroupBuilder_ == null) {
ensurePrimitivegroupIsMutable();
primitivegroup_.add(builderForValue.build());
@@ -4025,7 +4075,7 @@ public Builder addPrimitivegroup(
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder addPrimitivegroup(
- int index, PrimitiveGroup.Builder builderForValue) {
+ int index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder builderForValue) {
if (primitivegroupBuilder_ == null) {
ensurePrimitivegroupIsMutable();
primitivegroup_.add(index, builderForValue.build());
@@ -4039,7 +4089,7 @@ public Builder addPrimitivegroup(
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
public Builder addAllPrimitivegroup(
- Iterable values) {
+ java.lang.Iterable values) {
if (primitivegroupBuilder_ == null) {
ensurePrimitivegroupIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -4079,14 +4129,14 @@ public Builder removePrimitivegroup(int index) {
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroup.Builder getPrimitivegroupBuilder(
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder getPrimitivegroupBuilder(
int index) {
return getPrimitivegroupFieldBuilder().getBuilder(index);
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
int index) {
if (primitivegroupBuilder_ == null) {
return primitivegroup_.get(index); } else {
@@ -4096,7 +4146,7 @@ public PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public java.util.List
+ public java.util.List
getPrimitivegroupOrBuilderList() {
if (primitivegroupBuilder_ != null) {
return primitivegroupBuilder_.getMessageOrBuilderList();
@@ -4107,31 +4157,31 @@ public PrimitiveGroupOrBuilder getPrimitivegroupOrBuilder(
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroup.Builder addPrimitivegroupBuilder() {
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder addPrimitivegroupBuilder() {
return getPrimitivegroupFieldBuilder().addBuilder(
- PrimitiveGroup.getDefaultInstance());
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.getDefaultInstance());
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public PrimitiveGroup.Builder addPrimitivegroupBuilder(
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder addPrimitivegroupBuilder(
int index) {
return getPrimitivegroupFieldBuilder().addBuilder(
- index, PrimitiveGroup.getDefaultInstance());
+ index, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.getDefaultInstance());
}
/**
* repeated .OSMPBF.PrimitiveGroup primitivegroup = 2;
*/
- public java.util.List
+ public java.util.List
getPrimitivegroupBuilderList() {
return getPrimitivegroupFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilderV3<
- PrimitiveGroup, PrimitiveGroup.Builder, PrimitiveGroupOrBuilder>
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder>
getPrimitivegroupFieldBuilder() {
if (primitivegroupBuilder_ == null) {
primitivegroupBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
- PrimitiveGroup, PrimitiveGroup.Builder, PrimitiveGroupOrBuilder>(
+ org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup.Builder, org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroupOrBuilder>(
primitivegroup_,
((bitField0_ & 0x00000002) != 0),
getParentForChildren(),
@@ -4144,29 +4194,31 @@ public PrimitiveGroup.Builder addPrimitivegroupBuilder(
private int granularity_ = 100;
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
* @return Whether the granularity field is set.
*/
+ @java.lang.Override
public boolean hasGranularity() {
return ((bitField0_ & 0x00000004) != 0);
}
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
* @return The granularity.
*/
+ @java.lang.Override
public int getGranularity() {
return granularity_;
}
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
@@ -4181,7 +4233,7 @@ public Builder setGranularity(int value) {
}
/**
*
- * Granularity, units of nanodegrees, used to store coordinates in this block
+ * Granularity, units of nanodegrees, used to store coordinates in this block.
*
*
* optional int32 granularity = 17 [default = 100];
@@ -4197,29 +4249,31 @@ public Builder clearGranularity() {
private long latOffset_ ;
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
* @return Whether the latOffset field is set.
*/
+ @java.lang.Override
public boolean hasLatOffset() {
return ((bitField0_ & 0x00000008) != 0);
}
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
* @return The latOffset.
*/
+ @java.lang.Override
public long getLatOffset() {
return latOffset_;
}
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
@@ -4234,7 +4288,7 @@ public Builder setLatOffset(long value) {
}
/**
*
- * Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
+ * Offset value between the output coordinates and the granularity grid in units of nanodegrees.
*
*
* optional int64 lat_offset = 19 [default = 0];
@@ -4252,6 +4306,7 @@ public Builder clearLatOffset() {
* optional int64 lon_offset = 20 [default = 0];
* @return Whether the lonOffset field is set.
*/
+ @java.lang.Override
public boolean hasLonOffset() {
return ((bitField0_ & 0x00000010) != 0);
}
@@ -4259,6 +4314,7 @@ public boolean hasLonOffset() {
* optional int64 lon_offset = 20 [default = 0];
* @return The lonOffset.
*/
+ @java.lang.Override
public long getLonOffset() {
return lonOffset_;
}
@@ -4293,6 +4349,7 @@ public Builder clearLonOffset() {
* optional int32 date_granularity = 18 [default = 1000];
* @return Whether the dateGranularity field is set.
*/
+ @java.lang.Override
public boolean hasDateGranularity() {
return ((bitField0_ & 0x00000020) != 0);
}
@@ -4304,6 +4361,7 @@ public boolean hasDateGranularity() {
* optional int32 date_granularity = 18 [default = 1000];
* @return The dateGranularity.
*/
+ @java.lang.Override
public int getDateGranularity() {
return dateGranularity_;
}
@@ -4336,13 +4394,13 @@ public Builder clearDateGranularity() {
onChanged();
return this;
}
- @Override
+ @java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
- @Override
+ @java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@@ -4353,18 +4411,18 @@ public final Builder mergeUnknownFields(
}
// @@protoc_insertion_point(class_scope:OSMPBF.PrimitiveBlock)
- private static final PrimitiveBlock DEFAULT_INSTANCE;
+ private static final org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new PrimitiveBlock();
+ DEFAULT_INSTANCE = new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock();
}
- public static PrimitiveBlock getDefaultInstance() {
+ public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock getDefaultInstance() {
return DEFAULT_INSTANCE;
}
- @Deprecated public static final com.google.protobuf.Parser
+ @java.lang.Deprecated public static final com.google.protobuf.Parser
PARSER = new com.google.protobuf.AbstractParser() {
- @Override
+ @java.lang.Override
public PrimitiveBlock parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4377,13 +4435,13 @@ public static com.google.protobuf.Parser parser() {
return PARSER;
}
- @Override
+ @java.lang.Override
public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- @Override
- public PrimitiveBlock getDefaultInstanceForType() {
+ @java.lang.Override
+ public org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -4396,12 +4454,12 @@ public interface PrimitiveGroupOrBuilder extends
/**
* repeated .OSMPBF.Node nodes = 1;
*/
- java.util.List
+ java.util.List
getNodesList();
/**
* repeated .OSMPBF.Node nodes = 1;
*/
- Node getNodes(int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.Node getNodes(int index);
/**
* repeated .OSMPBF.Node nodes = 1;
*/
@@ -4409,13 +4467,13 @@ public interface PrimitiveGroupOrBuilder extends
/**
* repeated .OSMPBF.Node nodes = 1;
*/
- java.util.List
+ java.util.List
getNodesOrBuilderList();
/**
* repeated .OSMPBF.Node nodes = 1;
*/
- NodeOrBuilder getNodesOrBuilder(
- int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.NodeOrBuilder getNodesOrBuilder(
+ int index);
/**
* optional .OSMPBF.DenseNodes dense = 2;
@@ -4426,21 +4484,21 @@ NodeOrBuilder getNodesOrBuilder(
* optional .OSMPBF.DenseNodes dense = 2;
* @return The dense.
*/
- DenseNodes getDense();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes getDense();
/**
* optional .OSMPBF.DenseNodes dense = 2;
*/
- DenseNodesOrBuilder getDenseOrBuilder();
+ org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodesOrBuilder getDenseOrBuilder();
/**
* repeated .OSMPBF.Way ways = 3;
*/
- java.util.List
+ java.util.List
getWaysList();
/**
* repeated .OSMPBF.Way ways = 3;
*/
- Way getWays(int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.Way getWays(int index);
/**
* repeated .OSMPBF.Way ways = 3;
*/
@@ -4448,23 +4506,23 @@ NodeOrBuilder getNodesOrBuilder(
/**
* repeated .OSMPBF.Way ways = 3;
*/
- java.util.List
+ java.util.List
getWaysOrBuilderList();
/**
* repeated .OSMPBF.Way ways = 3;
*/
- WayOrBuilder getWaysOrBuilder(
- int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.WayOrBuilder getWaysOrBuilder(
+ int index);
/**
* repeated .OSMPBF.Relation relations = 4;
*/
- java.util.List
+ java.util.List
getRelationsList();
/**
* repeated .OSMPBF.Relation relations = 4;
*/
- Relation getRelations(int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.Relation getRelations(int index);
/**
* repeated .OSMPBF.Relation relations = 4;
*/
@@ -4472,23 +4530,23 @@ WayOrBuilder getWaysOrBuilder(
/**
* repeated .OSMPBF.Relation relations = 4;
*/
- java.util.List
+ java.util.List
getRelationsOrBuilderList();
/**
* repeated .OSMPBF.Relation relations = 4;
*/
- RelationOrBuilder getRelationsOrBuilder(
- int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.RelationOrBuilder getRelationsOrBuilder(
+ int index);
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
*/
- java.util.List
+ java.util.List
getChangesetsList();
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
*/
- ChangeSet getChangesets(int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet getChangesets(int index);
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
*/
@@ -4496,13 +4554,13 @@ RelationOrBuilder getRelationsOrBuilder(
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
*/
- java.util.List
+ java.util.List
getChangesetsOrBuilderList();
/**
* repeated .OSMPBF.ChangeSet changesets = 5;
*/
- ChangeSetOrBuilder getChangesetsOrBuilder(
- int index);
+ org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSetOrBuilder getChangesetsOrBuilder(
+ int index);
}
/**
*
@@ -4511,7 +4569,7 @@ ChangeSetOrBuilder getChangesetsOrBuilder(
*
* Protobuf type {@code OSMPBF.PrimitiveGroup}
*/
- public static final class PrimitiveGroup extends
+ public static final class PrimitiveGroup extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:OSMPBF.PrimitiveGroup)
PrimitiveGroupOrBuilder {
@@ -4527,14 +4585,14 @@ private PrimitiveGroup() {
changesets_ = java.util.Collections.emptyList();
}
- @Override
+ @java.lang.Override
@SuppressWarnings({"unused"})
- protected Object newInstance(
+ protected java.lang.Object newInstance(
UnusedPrivateParameter unused) {
return new PrimitiveGroup();
}
- @Override
+ @java.lang.Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -4545,7 +4603,7 @@ private PrimitiveGroup(
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new NullPointerException();
+ throw new java.lang.NullPointerException();
}
int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -4559,20 +4617,20 @@ private PrimitiveGroup(
done = true;
break;
case 10: {
- if (!((mutable_bitField0_ & 0x00000001) != 0)) {
- nodes_ = new java.util.ArrayList();
+ if ((mutable_bitField0_ & 0x00000001) == 0) {
+ nodes_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000001;
}
nodes_.add(
- input.readMessage(Node.PARSER, extensionRegistry));
+ input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Node.PARSER, extensionRegistry));
break;
}
case 18: {
- DenseNodes.Builder subBuilder = null;
+ org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) != 0)) {
subBuilder = dense_.toBuilder();
}
- dense_ = input.readMessage(DenseNodes.PARSER, extensionRegistry);
+ dense_ = input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(dense_);
dense_ = subBuilder.buildPartial();
@@ -4581,30 +4639,30 @@ private PrimitiveGroup(
break;
}
case 26: {
- if (!((mutable_bitField0_ & 0x00000004) != 0)) {
- ways_ = new java.util.ArrayList();
+ if ((mutable_bitField0_ & 0x00000004) == 0) {
+ ways_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000004;
}
ways_.add(
- input.readMessage(Way.PARSER, extensionRegistry));
+ input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Way.PARSER, extensionRegistry));
break;
}
case 34: {
- if (!((mutable_bitField0_ & 0x00000008) != 0)) {
- relations_ = new java.util.ArrayList();
+ if ((mutable_bitField0_ & 0x00000008) == 0) {
+ relations_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000008;
}
relations_.add(
- input.readMessage(Relation.PARSER, extensionRegistry));
+ input.readMessage(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation.PARSER, extensionRegistry));
break;
}
case 42: {
- if (!((mutable_bitField0_ & 0x00000010) != 0)) {
- changesets_ = new java.util.ArrayList();
+ if ((mutable_bitField0_ & 0x00000010) == 0) {
+ changesets_ = new java.util.ArrayList