[Git][debian-gis-team/osmosis][upstream] New upstream version 0.47.3

Bas Couwenberg gitlab at salsa.debian.org
Tue Mar 24 16:41:54 GMT 2020



Bas Couwenberg pushed to branch upstream at Debian GIS Project / osmosis


Commits:
f3a58e9d by Bas Couwenberg at 2020-03-24T17:31:11+01:00
New upstream version 0.47.3
- - - - -


14 changed files:

- README.md
- gradle.properties
- osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbVersionConstants.java
- osmosis-core/src/main/java/org/openstreetmap/osmosis/core/store/SegmentedObjectStore.java
- osmosis-core/src/main/java/org/openstreetmap/osmosis/core/store/SimpleObjectStore.java
- − osmosis-core/src/main/java/org/openstreetmap/osmosis/core/util/MultiMemberGZIPInputStream.java
- osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
- osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
- osmosis-osm-binary/src/main/protobuf/fileformat.proto
- osmosis-osm-binary/src/main/protobuf/osmformat.proto
- osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/common/CompressionActivator.java
- osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlDownloader.java
- package/changes.txt
- package/script/contrib/apidb_0.6.sql


Changes:

=====================================
README.md
=====================================
@@ -3,8 +3,8 @@
 
 ## Overview
 
-Osmosis is a command line Java application for processing Open Street Map
-(http://www.openstreetmap.org) data.
+Osmosis is a command line Java application for processing
+[Open Street Map](http://www.openstreetmap.org) data.
 
 The tool consists of a series of pluggable components that can be chained
 together to perform a larger operation. For example, it has components for
@@ -14,17 +14,26 @@ components for sorting data, etc. It has been written so that it is easy to add
 new features without re-writing common tasks such as file or database handling.
 
 Some brief build, running and installation notes are provided below, however
-most documentation may be found on the project wiki page.
-http://wiki.openstreetmap.org/wiki/Osmosis
+most documentation may be found on
+[the project wiki page](http://wiki.openstreetmap.org/wiki/Osmosis).
+
+## Status
+
+Osmosis is in light-maintenance mode.
+[As of 2018 we’ve stopped active development](https://lists.openstreetmap.org/pipermail/osmosis-dev/2018-October/001847.html)
+and transitioned to periodic acceptance of pull requests with tests and minor version releases.
+Keep an eye on [osmosis-dev list](https://lists.openstreetmap.org/listinfo/osmosis-dev)
+for any updates.
 
 ## Installation
 
 It is recommended to use a pre-built distribution archive rather than compile
-from source.  The location of the latest builds are specified on the project
-wiki. These archives may be extracted to a location of your choice.  The bin
-sub-directory should either be added to your PATH, or in the case of UNIX-like
+from source.  The location of the [latest builds are specified on the project
+wiki](https://wiki.openstreetmap.org/wiki/Osmosis#Latest_stable_version)..
+These archives may be extracted to a location of your choice.  The bin
+sub-directory should either be added to your `PATH`, or in the case of UNIX-like
 environments the "osmosis" script may be symlinked into an existing directory
-already on the PATH.
+already on the `PATH`.
 
 ## Development
 
@@ -35,8 +44,8 @@ required to run the full build and test suite.
 
     ./docker.sh
 
-Osmosis is built using the Gradle (http://gradle.org) build tool.  Gradle itself
-does not need to be installed because the gradlew script will install Gradle on
+Osmosis is built using the [Gradle build tool](http://gradle.org).  Gradle itself
+does not need to be installed because the `gradlew` script will install Gradle on
 first usage.  The only requirements are a 1.7 JDK, and an Internet connection.
 Note that in the docker environment all downloads will still occur and be cached
 in your home directory.
@@ -45,33 +54,36 @@ Below are several commands useful to build the software.  All commands must be
 run from the root of the source tree.
 
 Perform a complete build including unit tests:
-    ./gradlew build
+
+    ./docker.sh ./gradlew build
 
 Build the software without running unit tests:
 
-    ./gradlew assemble
+    ./docker.sh ./gradlew assemble
 
 Clean the build tree:
-    ./gradlew clean
+    
+    ./docker.sh ./gradlew clean
 
 Generate project files to allow the project to be imported into IntelliJ..
 
-    ./gradlew idea
+    ./docker.sh ./gradlew idea
 
 Generate project files to allow the project to be imported into Eclipse.
 
-    ./gradlew eclipse
+    ./docker.sh ./gradlew eclipse
 
 Verify checkstyle compliance:
-    ./gradlew checkstyleMain checkstyleTest
+    
+    ./docker.sh ./gradlew checkstyleMain checkstyleTest
 
 After completing the build process, a working Osmosis installation is contained
-in the package sub-directory.  The Osmosis launcher scripts reside in the bin
+in the `package` sub-directory.  The Osmosis launcher scripts reside in the `bin`
 sub-directory of package.  On a UNIX-like environment use the "osmosis" script,
 on a Windows environment use the "osmosis.bat" script.
 
 Distribution archives in zip and tar gzipped formats are contained in the
-package/build/distribution directory.
+`package/build/distribution` directory.
 
 ## Issue Tracking
 


=====================================
gradle.properties
=====================================
@@ -18,7 +18,7 @@ dependencyVersionMySql=8.0.12
 dependencyVersionNetty=3.10.6.Final
 dependencyVersionPostGis=2.2.1
 dependencyVersionPostgreSql=42.2.5
-dependencyVersionProtobuf=3.6.1
+dependencyVersionProtobuf=3.11.4
 dependencyVersionSpring=5.1.0.RELEASE
 dependencyVersionWoodstoxCore=5.1.0
 dependencyVersionWoodstoxStax2=4.1


=====================================
osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbVersionConstants.java
=====================================
@@ -26,7 +26,15 @@ public final class ApidbVersionConstants {
 		"20120214210114", "20120219161649", "20120318201948",
 		"20120328090602", "20120404205604", "20120808231205",
 		"20121005195010", "20121012044047", "20121119165817",
-		"20121202155309", "20121203124841", "20130328184137"
+		"20121202155309", "20121203124841", "20130328184137",
+		"20131212124700", "20140115192822", "20140117185510",
+		"20140210003018", "20140507110937", "20140519141742",
+		"20150110152606", "20150111192335", "20150222101847",
+		"20150818224516", "20160822153055", "20161002153425",
+		"20161011010929", "20170222134109", "20180204153242",
+		"20181020114000", "20181031113522", "20190518115041",
+		"20190623093642", "20190702193519", "20190716173946",
+		"20191120140058"
 	};
 
 	/**


=====================================
osmosis-core/src/main/java/org/openstreetmap/osmosis/core/store/SegmentedObjectStore.java
=====================================
@@ -12,12 +12,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
 import org.openstreetmap.osmosis.core.lifecycle.Completable;
 import org.openstreetmap.osmosis.core.lifecycle.ReleasableIterator;
-import org.openstreetmap.osmosis.core.util.MultiMemberGZIPInputStream;
 
 
 /**
@@ -274,7 +274,7 @@ public class SegmentedObjectStore<T extends Storeable> implements Completable {
 				if (useCompression) {
 					dataInStream = new DataInputStream(
 							new BufferedInputStream(
-									new MultiMemberGZIPInputStream(fileStream), 65536));
+									new GZIPInputStream(fileStream), 65536));
 				} else {
 					dataInStream = new DataInputStream(new BufferedInputStream(fileStream, 65536));
 				}


=====================================
osmosis-core/src/main/java/org/openstreetmap/osmosis/core/store/SimpleObjectStore.java
=====================================
@@ -11,13 +11,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
 import org.openstreetmap.osmosis.core.lifecycle.Completable;
 import org.openstreetmap.osmosis.core.lifecycle.ReleasableIterator;
-import org.openstreetmap.osmosis.core.util.MultiMemberGZIPInputStream;
-
 
 /**
  * Provides a store for writing objects to a file for later retrieval. The
@@ -173,7 +172,7 @@ public class SimpleObjectStore<T extends Storeable> implements Completable {
 			try {
 				if (useCompression) {
 					dataInStream = new DataInputStream(
-							new BufferedInputStream(new MultiMemberGZIPInputStream(fileStream), 65536));
+							new BufferedInputStream(new GZIPInputStream(fileStream), 65536));
 				} else {
 					dataInStream = new DataInputStream(
 							new BufferedInputStream(fileStream, 65536));


=====================================
osmosis-core/src/main/java/org/openstreetmap/osmosis/core/util/MultiMemberGZIPInputStream.java deleted
=====================================
@@ -1,133 +0,0 @@
-// This software is released into the Public Domain.  See copying.txt for details.
-package org.openstreetmap.osmosis.core.util;
-
-import java.io.InputStream;
-import java.io.PushbackInputStream;
-import java.io.IOException;
-import java.util.zip.GZIPInputStream;
-
-
-/**
- * This class was copied directly from the workaround class provided in
- * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4691425.
- */
-public class MultiMemberGZIPInputStream extends GZIPInputStream {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param in
-	 *            The input stream.
-	 * @param size
-	 *            The buffer size.
-	 * @throws IOException
-	 *             if an IO exception occurs.
-	 */
-	public MultiMemberGZIPInputStream(InputStream in, int size)
-			throws IOException {
-		// Wrap the stream in a PushbackInputStream...
-		super(new PushbackInputStream(in, size), size);
-		this.size = size;
-	}
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param in
-	 *            The input stream.
-	 * @throws IOException
-	 *             if an IO exception occurs.
-	 */
-	public MultiMemberGZIPInputStream(InputStream in) throws IOException {
-		// Wrap the stream in a PushbackInputStream...
-		super(new PushbackInputStream(in, 1024));
-		this.size = -1;
-	}
-
-	private MultiMemberGZIPInputStream(MultiMemberGZIPInputStream parent)
-			throws IOException {
-		super(parent.in);
-		this.size = -1;
-		if (parent.parent == null) {
-			this.parent = parent;
-		} else {
-			this.parent = parent.parent;
-		}
-		this.parent.child = this;
-	}
-
-	private MultiMemberGZIPInputStream(MultiMemberGZIPInputStream parent,
-			int size) throws IOException {
-		super(parent.in, size);
-		this.size = size;
-		if (parent.parent == null) {
-			this.parent = parent;
-		} else {
-			this.parent = parent.parent;
-		}
-		this.parent.child = this;
-	}
-
-	private MultiMemberGZIPInputStream parent;
-	private MultiMemberGZIPInputStream child;
-	private int size;
-	private boolean eos;
-
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public int read(byte[] inputBuffer, int inputBufferOffset,
-			int inputBufferLen) throws IOException {
-
-		if (eos) {
-			return -1;
-		}
-		if (this.child != null) {
-			return this.child.read(inputBuffer, inputBufferOffset,
-					inputBufferLen);
-		}
-
-		int charsRead = super.read(inputBuffer, inputBufferOffset,
-				inputBufferLen);
-		if (charsRead == -1) {
-			// Push any remaining buffered data back onto the stream
-			// If the stream is then not empty, use it to construct
-			// a new instance of this class and delegate this and any
-			// future calls to it...
-			int n = inf.getRemaining() - 8;
-			if (n > 0) {
-				// More than 8 bytes remaining in deflater
-				// First 8 are gzip trailer. Add the rest to
-				// any un-read data...
-				((PushbackInputStream) this.in).unread(buf, len - n, n);
-			} else {
-				// Nothing in the buffer. We need to know whether or not
-				// there is unread data available in the underlying stream
-				// since the base class will not handle an empty file.
-				// Read a byte to see if there is data and if so,
-				// push it back onto the stream...
-				byte[] b = new byte[1];
-				int ret = in.read(b, 0, 1);
-				if (ret == -1) {
-					eos = true;
-					return -1;
-				} else {
-					((PushbackInputStream) this.in).unread(b, 0, 1);
-				}
-			}
-
-			MultiMemberGZIPInputStream tmpChild;
-			if (this.size == -1) {
-				tmpChild = new MultiMemberGZIPInputStream(this);
-			} else {
-				tmpChild = new MultiMemberGZIPInputStream(this, this.size);
-			}
-			return tmpChild.read(inputBuffer, inputBufferOffset, inputBufferLen);
-		} else {
-			return charsRead;
-		}
-	}
-
-}


=====================================
osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
=====================================
@@ -8,9 +8,15 @@ public final class Fileformat {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
   public interface BlobOrBuilder extends
       // @@protoc_insertion_point(interface_extends:OSMPBF.Blob)
-      com.google.protobuf.MessageLiteOrBuilder {
+      com.google.protobuf.MessageOrBuilder {
 
     /**
      * <pre>
@@ -18,6 +24,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes raw = 1;</code>
+     * @return Whether the raw field is set.
      */
     boolean hasRaw();
     /**
@@ -26,6 +33,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes raw = 1;</code>
+     * @return The raw.
      */
     com.google.protobuf.ByteString getRaw();
 
@@ -35,6 +43,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional int32 raw_size = 2;</code>
+     * @return Whether the rawSize field is set.
      */
     boolean hasRawSize();
     /**
@@ -43,6 +52,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional int32 raw_size = 2;</code>
+     * @return The rawSize.
      */
     int getRawSize();
 
@@ -52,6 +62,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes zlib_data = 3;</code>
+     * @return Whether the zlibData field is set.
      */
     boolean hasZlibData();
     /**
@@ -60,6 +71,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes zlib_data = 3;</code>
+     * @return The zlibData.
      */
     com.google.protobuf.ByteString getZlibData();
 
@@ -69,6 +81,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes lzma_data = 4;</code>
+     * @return Whether the lzmaData field is set.
      */
     boolean hasLzmaData();
     /**
@@ -77,6 +90,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes lzma_data = 4;</code>
+     * @return The lzmaData.
      */
     com.google.protobuf.ByteString getLzmaData();
 
@@ -86,6 +100,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+     * @return Whether the oBSOLETEBzip2Data field is set.
      */
     @java.lang.Deprecated boolean hasOBSOLETEBzip2Data();
     /**
@@ -94,6 +109,7 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+     * @return The oBSOLETEBzip2Data.
      */
     @java.lang.Deprecated com.google.protobuf.ByteString getOBSOLETEBzip2Data();
   }
@@ -101,16 +117,109 @@ public final class Fileformat {
    * Protobuf type {@code OSMPBF.Blob}
    */
   public  static final class Blob extends
-      com.google.protobuf.GeneratedMessageLite<
-          Blob, Blob.Builder> implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:OSMPBF.Blob)
       BlobOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Blob.newBuilder() to construct.
+    private Blob(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
     private Blob() {
       raw_ = com.google.protobuf.ByteString.EMPTY;
       zlibData_ = com.google.protobuf.ByteString.EMPTY;
       lzmaData_ = com.google.protobuf.ByteString.EMPTY;
       oBSOLETEBzip2Data_ = com.google.protobuf.ByteString.EMPTY;
     }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new Blob();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Blob(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              bitField0_ |= 0x00000001;
+              raw_ = input.readBytes();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              rawSize_ = input.readInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              zlibData_ = input.readBytes();
+              break;
+            }
+            case 34: {
+              bitField0_ |= 0x00000008;
+              lzmaData_ = input.readBytes();
+              break;
+            }
+            case 42: {
+              bitField0_ |= 0x00000010;
+              oBSOLETEBzip2Data_ = input.readBytes();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_Blob_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_Blob_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.class, org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.Builder.class);
+    }
+
     private int bitField0_;
     public static final int RAW_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString raw_;
@@ -120,10 +229,10 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes raw = 1;</code>
+     * @return Whether the raw field is set.
      */
-    @java.lang.Override
     public boolean hasRaw() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <pre>
@@ -131,36 +240,11 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes raw = 1;</code>
+     * @return The raw.
      */
-    @java.lang.Override
     public com.google.protobuf.ByteString getRaw() {
       return raw_;
     }
-    /**
-     * <pre>
-     * No compression
-     * </pre>
-     *
-     * <code>optional bytes raw = 1;</code>
-     */
-    private void setRaw(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-      raw_ = value;
-    }
-    /**
-     * <pre>
-     * No compression
-     * </pre>
-     *
-     * <code>optional bytes raw = 1;</code>
-     */
-    private void clearRaw() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      raw_ = getDefaultInstance().getRaw();
-    }
 
     public static final int RAW_SIZE_FIELD_NUMBER = 2;
     private int rawSize_;
@@ -170,10 +254,10 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional int32 raw_size = 2;</code>
+     * @return Whether the rawSize field is set.
      */
-    @java.lang.Override
     public boolean hasRawSize() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <pre>
@@ -181,33 +265,11 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional int32 raw_size = 2;</code>
+     * @return The rawSize.
      */
-    @java.lang.Override
     public int getRawSize() {
       return rawSize_;
     }
-    /**
-     * <pre>
-     * When compressed, the uncompressed size
-     * </pre>
-     *
-     * <code>optional int32 raw_size = 2;</code>
-     */
-    private void setRawSize(int value) {
-      bitField0_ |= 0x00000002;
-      rawSize_ = value;
-    }
-    /**
-     * <pre>
-     * When compressed, the uncompressed size
-     * </pre>
-     *
-     * <code>optional int32 raw_size = 2;</code>
-     */
-    private void clearRawSize() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      rawSize_ = 0;
-    }
 
     public static final int ZLIB_DATA_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString zlibData_;
@@ -217,10 +279,10 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes zlib_data = 3;</code>
+     * @return Whether the zlibData field is set.
      */
-    @java.lang.Override
     public boolean hasZlibData() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <pre>
@@ -228,36 +290,11 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes zlib_data = 3;</code>
+     * @return The zlibData.
      */
-    @java.lang.Override
     public com.google.protobuf.ByteString getZlibData() {
       return zlibData_;
     }
-    /**
-     * <pre>
-     * Possible compressed versions of the data.
-     * </pre>
-     *
-     * <code>optional bytes zlib_data = 3;</code>
-     */
-    private void setZlibData(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-      zlibData_ = value;
-    }
-    /**
-     * <pre>
-     * Possible compressed versions of the data.
-     * </pre>
-     *
-     * <code>optional bytes zlib_data = 3;</code>
-     */
-    private void clearZlibData() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      zlibData_ = getDefaultInstance().getZlibData();
-    }
 
     public static final int LZMA_DATA_FIELD_NUMBER = 4;
     private com.google.protobuf.ByteString lzmaData_;
@@ -267,10 +304,10 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes lzma_data = 4;</code>
+     * @return Whether the lzmaData field is set.
      */
-    @java.lang.Override
     public boolean hasLzmaData() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      * <pre>
@@ -278,36 +315,11 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes lzma_data = 4;</code>
+     * @return The lzmaData.
      */
-    @java.lang.Override
     public com.google.protobuf.ByteString getLzmaData() {
       return lzmaData_;
     }
-    /**
-     * <pre>
-     * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
-     * </pre>
-     *
-     * <code>optional bytes lzma_data = 4;</code>
-     */
-    private void setLzmaData(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
-      lzmaData_ = value;
-    }
-    /**
-     * <pre>
-     * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
-     * </pre>
-     *
-     * <code>optional bytes lzma_data = 4;</code>
-     */
-    private void clearLzmaData() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      lzmaData_ = getDefaultInstance().getLzmaData();
-    }
 
     public static final int OBSOLETE_BZIP2_DATA_FIELD_NUMBER = 5;
     private com.google.protobuf.ByteString oBSOLETEBzip2Data_;
@@ -317,10 +329,10 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+     * @return Whether the oBSOLETEBzip2Data field is set.
      */
-    @java.lang.Override
     @java.lang.Deprecated public boolean hasOBSOLETEBzip2Data() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      * <pre>
@@ -328,53 +340,39 @@ public final class Fileformat {
      * </pre>
      *
      * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+     * @return The oBSOLETEBzip2Data.
      */
-    @java.lang.Override
     @java.lang.Deprecated public com.google.protobuf.ByteString getOBSOLETEBzip2Data() {
       return oBSOLETEBzip2Data_;
     }
-    /**
-     * <pre>
-     * Formerly used for bzip2 compressed data. Depreciated in 2010.
-     * </pre>
-     *
-     * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
-     */
-    private void setOBSOLETEBzip2Data(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
-      oBSOLETEBzip2Data_ = value;
-    }
-    /**
-     * <pre>
-     * Formerly used for bzip2 compressed data. Depreciated in 2010.
-     * </pre>
-     *
-     * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
-     */
-    private void clearOBSOLETEBzip2Data() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      oBSOLETEBzip2Data_ = getDefaultInstance().getOBSOLETEBzip2Data();
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
     }
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         output.writeBytes(1, raw_);
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeInt32(2, rawSize_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         output.writeBytes(3, zlibData_);
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         output.writeBytes(4, lzmaData_);
       }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+      if (((bitField0_ & 0x00000010) != 0)) {
         output.writeBytes(5, oBSOLETEBzip2Data_);
       }
       unknownFields.writeTo(output);
@@ -382,140 +380,397 @@ public final class Fileformat {
 
     @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+      if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(1, raw_);
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, rawSize_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, zlibData_);
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+      if (((bitField0_ & 0x00000008) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(4, lzmaData_);
       }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+      if (((bitField0_ & 0x00000010) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(5, oBSOLETEBzip2Data_);
       }
       size += unknownFields.getSerializedSize();
-      memoizedSerializedSize = size;
+      memoizedSize = size;
       return size;
     }
 
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.openstreetmap.osmosis.osmbinary.Fileformat.Blob)) {
+        return super.equals(obj);
+      }
+      org.openstreetmap.osmosis.osmbinary.Fileformat.Blob other = (org.openstreetmap.osmosis.osmbinary.Fileformat.Blob) obj;
+
+      if (hasRaw() != other.hasRaw()) return false;
+      if (hasRaw()) {
+        if (!getRaw()
+            .equals(other.getRaw())) return false;
+      }
+      if (hasRawSize() != other.hasRawSize()) return false;
+      if (hasRawSize()) {
+        if (getRawSize()
+            != other.getRawSize()) return false;
+      }
+      if (hasZlibData() != other.hasZlibData()) return false;
+      if (hasZlibData()) {
+        if (!getZlibData()
+            .equals(other.getZlibData())) return false;
+      }
+      if (hasLzmaData() != other.hasLzmaData()) return false;
+      if (hasLzmaData()) {
+        if (!getLzmaData()
+            .equals(other.getLzmaData())) return false;
+      }
+      if (hasOBSOLETEBzip2Data() != other.hasOBSOLETEBzip2Data()) return false;
+      if (hasOBSOLETEBzip2Data()) {
+        if (!getOBSOLETEBzip2Data()
+            .equals(other.getOBSOLETEBzip2Data())) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasRaw()) {
+        hash = (37 * hash) + RAW_FIELD_NUMBER;
+        hash = (53 * hash) + getRaw().hashCode();
+      }
+      if (hasRawSize()) {
+        hash = (37 * hash) + RAW_SIZE_FIELD_NUMBER;
+        hash = (53 * hash) + getRawSize();
+      }
+      if (hasZlibData()) {
+        hash = (37 * hash) + ZLIB_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getZlibData().hashCode();
+      }
+      if (hasLzmaData()) {
+        hash = (37 * hash) + LZMA_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getLzmaData().hashCode();
+      }
+      if (hasOBSOLETEBzip2Data()) {
+        hash = (37 * hash) + OBSOLETE_BZIP2_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getOBSOLETEBzip2Data().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return parseDelimitedFrom(DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
-      return (Builder) DEFAULT_INSTANCE.createBuilder();
+      return DEFAULT_INSTANCE.toBuilder();
     }
     public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob prototype) {
-      return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
     /**
      * Protobuf type {@code OSMPBF.Blob}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessageLite.Builder<
-          org.openstreetmap.osmosis.osmbinary.Fileformat.Blob, Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:OSMPBF.Blob)
         org.openstreetmap.osmosis.osmbinary.Fileformat.BlobOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_Blob_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_Blob_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.class, org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.Builder.class);
+      }
+
       // Construct using org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.newBuilder()
       private Builder() {
-        super(DEFAULT_INSTANCE);
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        raw_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        rawSize_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        zlibData_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        lzmaData_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        oBSOLETEBzip2Data_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_Blob_descriptor;
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob getDefaultInstanceForType() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob build() {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.Blob result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob buildPartial() {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.Blob result = new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.raw_ = raw_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          result.rawSize_ = rawSize_;
+          to_bitField0_ |= 0x00000002;
+        }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.zlibData_ = zlibData_;
+        if (((from_bitField0_ & 0x00000008) != 0)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.lzmaData_ = lzmaData_;
+        if (((from_bitField0_ & 0x00000010) != 0)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.oBSOLETEBzip2Data_ = oBSOLETEBzip2Data_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.openstreetmap.osmosis.osmbinary.Fileformat.Blob) {
+          return mergeFrom((org.openstreetmap.osmosis.osmbinary.Fileformat.Blob)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
 
+      public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob other) {
+        if (other == org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.getDefaultInstance()) return this;
+        if (other.hasRaw()) {
+          setRaw(other.getRaw());
+        }
+        if (other.hasRawSize()) {
+          setRawSize(other.getRawSize());
+        }
+        if (other.hasZlibData()) {
+          setZlibData(other.getZlibData());
+        }
+        if (other.hasLzmaData()) {
+          setLzmaData(other.getLzmaData());
+        }
+        if (other.hasOBSOLETEBzip2Data()) {
+          setOBSOLETEBzip2Data(other.getOBSOLETEBzip2Data());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.openstreetmap.osmosis.osmbinary.Fileformat.Blob) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.ByteString raw_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <pre>
        * No compression
        * </pre>
        *
        * <code>optional bytes raw = 1;</code>
+       * @return Whether the raw field is set.
        */
-      @java.lang.Override
       public boolean hasRaw() {
-        return instance.hasRaw();
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * <pre>
@@ -523,10 +778,10 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes raw = 1;</code>
+       * @return The raw.
        */
-      @java.lang.Override
       public com.google.protobuf.ByteString getRaw() {
-        return instance.getRaw();
+        return raw_;
       }
       /**
        * <pre>
@@ -534,10 +789,16 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes raw = 1;</code>
+       * @param value The raw to set.
+       * @return This builder for chaining.
        */
       public Builder setRaw(com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setRaw(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        raw_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -546,23 +807,26 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes raw = 1;</code>
+       * @return This builder for chaining.
        */
       public Builder clearRaw() {
-        copyOnWrite();
-        instance.clearRaw();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        raw_ = getDefaultInstance().getRaw();
+        onChanged();
         return this;
       }
 
+      private int rawSize_ ;
       /**
        * <pre>
        * When compressed, the uncompressed size
        * </pre>
        *
        * <code>optional int32 raw_size = 2;</code>
+       * @return Whether the rawSize field is set.
        */
-      @java.lang.Override
       public boolean hasRawSize() {
-        return instance.hasRawSize();
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * <pre>
@@ -570,10 +834,10 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional int32 raw_size = 2;</code>
+       * @return The rawSize.
        */
-      @java.lang.Override
       public int getRawSize() {
-        return instance.getRawSize();
+        return rawSize_;
       }
       /**
        * <pre>
@@ -581,10 +845,13 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional int32 raw_size = 2;</code>
+       * @param value The rawSize to set.
+       * @return This builder for chaining.
        */
       public Builder setRawSize(int value) {
-        copyOnWrite();
-        instance.setRawSize(value);
+        bitField0_ |= 0x00000002;
+        rawSize_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -593,23 +860,26 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional int32 raw_size = 2;</code>
+       * @return This builder for chaining.
        */
       public Builder clearRawSize() {
-        copyOnWrite();
-        instance.clearRawSize();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        rawSize_ = 0;
+        onChanged();
         return this;
       }
 
+      private com.google.protobuf.ByteString zlibData_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <pre>
        * Possible compressed versions of the data.
        * </pre>
        *
        * <code>optional bytes zlib_data = 3;</code>
+       * @return Whether the zlibData field is set.
        */
-      @java.lang.Override
       public boolean hasZlibData() {
-        return instance.hasZlibData();
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        * <pre>
@@ -617,10 +887,10 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes zlib_data = 3;</code>
+       * @return The zlibData.
        */
-      @java.lang.Override
       public com.google.protobuf.ByteString getZlibData() {
-        return instance.getZlibData();
+        return zlibData_;
       }
       /**
        * <pre>
@@ -628,10 +898,16 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes zlib_data = 3;</code>
+       * @param value The zlibData to set.
+       * @return This builder for chaining.
        */
       public Builder setZlibData(com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setZlibData(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        zlibData_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -640,23 +916,26 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes zlib_data = 3;</code>
+       * @return This builder for chaining.
        */
       public Builder clearZlibData() {
-        copyOnWrite();
-        instance.clearZlibData();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        zlibData_ = getDefaultInstance().getZlibData();
+        onChanged();
         return this;
       }
 
+      private com.google.protobuf.ByteString lzmaData_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <pre>
        * PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
        * </pre>
        *
        * <code>optional bytes lzma_data = 4;</code>
+       * @return Whether the lzmaData field is set.
        */
-      @java.lang.Override
       public boolean hasLzmaData() {
-        return instance.hasLzmaData();
+        return ((bitField0_ & 0x00000008) != 0);
       }
       /**
        * <pre>
@@ -664,10 +943,10 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes lzma_data = 4;</code>
+       * @return The lzmaData.
        */
-      @java.lang.Override
       public com.google.protobuf.ByteString getLzmaData() {
-        return instance.getLzmaData();
+        return lzmaData_;
       }
       /**
        * <pre>
@@ -675,10 +954,16 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes lzma_data = 4;</code>
+       * @param value The lzmaData to set.
+       * @return This builder for chaining.
        */
       public Builder setLzmaData(com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setLzmaData(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        lzmaData_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -687,23 +972,26 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes lzma_data = 4;</code>
+       * @return This builder for chaining.
        */
       public Builder clearLzmaData() {
-        copyOnWrite();
-        instance.clearLzmaData();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        lzmaData_ = getDefaultInstance().getLzmaData();
+        onChanged();
         return this;
       }
 
+      private com.google.protobuf.ByteString oBSOLETEBzip2Data_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <pre>
        * Formerly used for bzip2 compressed data. Depreciated in 2010.
        * </pre>
        *
        * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+       * @return Whether the oBSOLETEBzip2Data field is set.
        */
-      @java.lang.Override
       @java.lang.Deprecated public boolean hasOBSOLETEBzip2Data() {
-        return instance.hasOBSOLETEBzip2Data();
+        return ((bitField0_ & 0x00000010) != 0);
       }
       /**
        * <pre>
@@ -711,10 +999,10 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+       * @return The oBSOLETEBzip2Data.
        */
-      @java.lang.Override
       @java.lang.Deprecated public com.google.protobuf.ByteString getOBSOLETEBzip2Data() {
-        return instance.getOBSOLETEBzip2Data();
+        return oBSOLETEBzip2Data_;
       }
       /**
        * <pre>
@@ -722,10 +1010,16 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+       * @param value The oBSOLETEBzip2Data to set.
+       * @return This builder for chaining.
        */
       @java.lang.Deprecated public Builder setOBSOLETEBzip2Data(com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setOBSOLETEBzip2Data(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000010;
+        oBSOLETEBzip2Data_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -734,195 +1028,107 @@ public final class Fileformat {
        * </pre>
        *
        * <code>optional bytes OBSOLETE_bzip2_data = 5 [deprecated = true];</code>
+       * @return This builder for chaining.
        */
       @java.lang.Deprecated public Builder clearOBSOLETEBzip2Data() {
-        copyOnWrite();
-        instance.clearOBSOLETEBzip2Data();
+        bitField0_ = (bitField0_ & ~0x00000010);
+        oBSOLETEBzip2Data_ = getDefaultInstance().getOBSOLETEBzip2Data();
+        onChanged();
         return this;
       }
-
-      // @@protoc_insertion_point(builder_scope:OSMPBF.Blob)
-    }
-    @java.lang.Override
-    @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-    protected final java.lang.Object dynamicMethod(
-        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-        java.lang.Object arg0, java.lang.Object arg1) {
-      switch (method) {
-        case NEW_MUTABLE_INSTANCE: {
-          return new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob();
-        }
-        case NEW_BUILDER: {
-          return new Builder();
-        }
-        case IS_INITIALIZED: {
-          return DEFAULT_INSTANCE;
-        }
-        case MAKE_IMMUTABLE: {
-          return null;
-        }
-        case VISIT: {
-          Visitor visitor = (Visitor) arg0;
-          org.openstreetmap.osmosis.osmbinary.Fileformat.Blob other = (org.openstreetmap.osmosis.osmbinary.Fileformat.Blob) arg1;
-          raw_ = visitor.visitByteString(
-              hasRaw(), raw_,
-              other.hasRaw(), other.raw_);
-          rawSize_ = visitor.visitInt(
-              hasRawSize(), rawSize_,
-              other.hasRawSize(), other.rawSize_);
-          zlibData_ = visitor.visitByteString(
-              hasZlibData(), zlibData_,
-              other.hasZlibData(), other.zlibData_);
-          lzmaData_ = visitor.visitByteString(
-              hasLzmaData(), lzmaData_,
-              other.hasLzmaData(), other.lzmaData_);
-          oBSOLETEBzip2Data_ = visitor.visitByteString(
-              hasOBSOLETEBzip2Data(), oBSOLETEBzip2Data_,
-              other.hasOBSOLETEBzip2Data(), other.oBSOLETEBzip2Data_);
-          if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor
-              .INSTANCE) {
-            bitField0_ |= other.bitField0_;
-          }
-          return this;
-        }
-        case MERGE_FROM_STREAM: {
-          com.google.protobuf.CodedInputStream input =
-              (com.google.protobuf.CodedInputStream) arg0;
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry =
-              (com.google.protobuf.ExtensionRegistryLite) arg1;
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
-          try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 10: {
-                  bitField0_ |= 0x00000001;
-                  raw_ = input.readBytes();
-                  break;
-                }
-                case 16: {
-                  bitField0_ |= 0x00000002;
-                  rawSize_ = input.readInt32();
-                  break;
-                }
-                case 26: {
-                  bitField0_ |= 0x00000004;
-                  zlibData_ = input.readBytes();
-                  break;
-                }
-                case 34: {
-                  bitField0_ |= 0x00000008;
-                  lzmaData_ = input.readBytes();
-                  break;
-                }
-                case 42: {
-                  bitField0_ |= 0x00000010;
-                  oBSOLETEBzip2Data_ = input.readBytes();
-                  break;
-                }
-                default: {
-                  if (!parseUnknownField(tag, input)) {
-                    done = true;
-                  }
-                  break;
-                }
-              }
-            }
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw new RuntimeException(e.setUnfinishedMessage(this));
-          } catch (java.io.IOException e) {
-            throw new RuntimeException(
-                new com.google.protobuf.InvalidProtocolBufferException(
-                    e.getMessage()).setUnfinishedMessage(this));
-          } finally {
-          }
-        }
-        // fall through
-        case GET_DEFAULT_INSTANCE: {
-          return DEFAULT_INSTANCE;
-        }
-        case GET_PARSER: {
-          com.google.protobuf.Parser<org.openstreetmap.osmosis.osmbinary.Fileformat.Blob> parser = PARSER;
-          if (parser == null) {
-            synchronized (org.openstreetmap.osmosis.osmbinary.Fileformat.Blob.class) {
-              parser = PARSER;
-              if (parser == null) {
-                parser = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);
-                PARSER = parser;
-              }
-            }
-          }
-          return parser;
-      }
-      case GET_MEMOIZED_IS_INITIALIZED: {
-        return (byte) 1;
-      }
-      case SET_MEMOIZED_IS_INITIALIZED: {
-        return null;
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
       }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
       }
-      throw new UnsupportedOperationException();
-    }
 
 
+      // @@protoc_insertion_point(builder_scope:OSMPBF.Blob)
+    }
+
     // @@protoc_insertion_point(class_scope:OSMPBF.Blob)
     private static final org.openstreetmap.osmosis.osmbinary.Fileformat.Blob DEFAULT_INSTANCE;
     static {
-      // New instances are implicitly immutable so no need to make
-      // immutable.
-      DEFAULT_INSTANCE = new Blob();
+      DEFAULT_INSTANCE = new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob();
     }
 
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static volatile com.google.protobuf.Parser<Blob> PARSER;
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Blob>
+        PARSER = new com.google.protobuf.AbstractParser<Blob>() {
+      @java.lang.Override
+      public Blob parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Blob(input, extensionRegistry);
+      }
+    };
 
     public static com.google.protobuf.Parser<Blob> parser() {
-      return DEFAULT_INSTANCE.getParserForType();
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Blob> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.openstreetmap.osmosis.osmbinary.Fileformat.Blob getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
+
   }
 
   public interface BlobHeaderOrBuilder extends
       // @@protoc_insertion_point(interface_extends:OSMPBF.BlobHeader)
-      com.google.protobuf.MessageLiteOrBuilder {
+      com.google.protobuf.MessageOrBuilder {
 
     /**
      * <code>required string type = 1;</code>
+     * @return Whether the type field is set.
      */
     boolean hasType();
     /**
      * <code>required string type = 1;</code>
+     * @return The type.
      */
     java.lang.String getType();
     /**
      * <code>required string type = 1;</code>
+     * @return The bytes for type.
      */
     com.google.protobuf.ByteString
         getTypeBytes();
 
     /**
      * <code>optional bytes indexdata = 2;</code>
+     * @return Whether the indexdata field is set.
      */
     boolean hasIndexdata();
     /**
      * <code>optional bytes indexdata = 2;</code>
+     * @return The indexdata.
      */
     com.google.protobuf.ByteString getIndexdata();
 
     /**
      * <code>required int32 datasize = 3;</code>
+     * @return Whether the datasize field is set.
      */
     boolean hasDatasize();
     /**
      * <code>required int32 datasize = 3;</code>
+     * @return The datasize.
      */
     int getDatasize();
   }
@@ -930,144 +1136,207 @@ public final class Fileformat {
    * Protobuf type {@code OSMPBF.BlobHeader}
    */
   public  static final class BlobHeader extends
-      com.google.protobuf.GeneratedMessageLite<
-          BlobHeader, BlobHeader.Builder> implements
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:OSMPBF.BlobHeader)
       BlobHeaderOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BlobHeader.newBuilder() to construct.
+    private BlobHeader(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
     private BlobHeader() {
       type_ = "";
       indexdata_ = com.google.protobuf.ByteString.EMPTY;
     }
-    private int bitField0_;
-    public static final int TYPE_FIELD_NUMBER = 1;
-    private java.lang.String type_;
-    /**
-     * <code>required string type = 1;</code>
-     */
+
     @java.lang.Override
-    public boolean hasType() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BlobHeader();
     }
-    /**
-     * <code>required string type = 1;</code>
-     */
+
     @java.lang.Override
-    public java.lang.String getType() {
-      return type_;
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
     }
-    /**
-     * <code>required string type = 1;</code>
-     */
+    private BlobHeader(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              com.google.protobuf.ByteString bs = input.readBytes();
+              bitField0_ |= 0x00000001;
+              type_ = bs;
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              indexdata_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              datasize_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_BlobHeader_descriptor;
+    }
+
     @java.lang.Override
-    public com.google.protobuf.ByteString
-        getTypeBytes() {
-      return com.google.protobuf.ByteString.copyFromUtf8(type_);
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_BlobHeader_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.class, org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.Builder.class);
     }
+
+    private int bitField0_;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private volatile java.lang.Object type_;
     /**
      * <code>required string type = 1;</code>
+     * @return Whether the type field is set.
      */
-    private void setType(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-      type_ = value;
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000001) != 0);
     }
     /**
      * <code>required string type = 1;</code>
+     * @return The type.
      */
-    private void clearType() {
-      bitField0_ = (bitField0_ & ~0x00000001);
-      type_ = getDefaultInstance().getType();
+    public java.lang.String getType() {
+      java.lang.Object ref = type_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          type_ = s;
+        }
+        return s;
+      }
     }
     /**
      * <code>required string type = 1;</code>
+     * @return The bytes for type.
      */
-    private void setTypeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-      type_ = value.toStringUtf8();
+    public com.google.protobuf.ByteString
+        getTypeBytes() {
+      java.lang.Object ref = type_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        type_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     public static final int INDEXDATA_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString indexdata_;
     /**
      * <code>optional bytes indexdata = 2;</code>
+     * @return Whether the indexdata field is set.
      */
-    @java.lang.Override
     public boolean hasIndexdata() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+      return ((bitField0_ & 0x00000002) != 0);
     }
     /**
      * <code>optional bytes indexdata = 2;</code>
+     * @return The indexdata.
      */
-    @java.lang.Override
     public com.google.protobuf.ByteString getIndexdata() {
       return indexdata_;
     }
-    /**
-     * <code>optional bytes indexdata = 2;</code>
-     */
-    private void setIndexdata(com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-      indexdata_ = value;
-    }
-    /**
-     * <code>optional bytes indexdata = 2;</code>
-     */
-    private void clearIndexdata() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      indexdata_ = getDefaultInstance().getIndexdata();
-    }
 
     public static final int DATASIZE_FIELD_NUMBER = 3;
     private int datasize_;
     /**
      * <code>required int32 datasize = 3;</code>
+     * @return Whether the datasize field is set.
      */
-    @java.lang.Override
     public boolean hasDatasize() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <code>required int32 datasize = 3;</code>
+     * @return The datasize.
      */
-    @java.lang.Override
     public int getDatasize() {
       return datasize_;
     }
-    /**
-     * <code>required int32 datasize = 3;</code>
-     */
-    private void setDatasize(int value) {
-      bitField0_ |= 0x00000004;
-      datasize_ = value;
-    }
-    /**
-     * <code>required int32 datasize = 3;</code>
-     */
-    private void clearDatasize() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      datasize_ = 0;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasType()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasDatasize()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
     }
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeString(1, getType());
+      if (((bitField0_ & 0x00000001) != 0)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, type_);
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         output.writeBytes(2, indexdata_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         output.writeInt32(3, datasize_);
       }
       unknownFields.writeTo(output);
@@ -1075,383 +1344,605 @@ public final class Fileformat {
 
     @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeStringSize(1, getType());
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, type_);
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+      if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, indexdata_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+      if (((bitField0_ & 0x00000004) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(3, datasize_);
       }
       size += unknownFields.getSerializedSize();
-      memoizedSerializedSize = size;
+      memoizedSize = size;
       return size;
     }
 
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader)) {
+        return super.equals(obj);
+      }
+      org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader other = (org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader) obj;
+
+      if (hasType() != other.hasType()) return false;
+      if (hasType()) {
+        if (!getType()
+            .equals(other.getType())) return false;
+      }
+      if (hasIndexdata() != other.hasIndexdata()) return false;
+      if (hasIndexdata()) {
+        if (!getIndexdata()
+            .equals(other.getIndexdata())) return false;
+      }
+      if (hasDatasize() != other.hasDatasize()) return false;
+      if (hasDatasize()) {
+        if (getDatasize()
+            != other.getDatasize()) return false;
+      }
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasType()) {
+        hash = (37 * hash) + TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + getType().hashCode();
+      }
+      if (hasIndexdata()) {
+        hash = (37 * hash) + INDEXDATA_FIELD_NUMBER;
+        hash = (53 * hash) + getIndexdata().hashCode();
+      }
+      if (hasDatasize()) {
+        hash = (37 * hash) + DATASIZE_FIELD_NUMBER;
+        hash = (53 * hash) + getDatasize();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data);
+      return PARSER.parseFrom(data);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, data, extensionRegistry);
+      return PARSER.parseFrom(data, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return parseDelimitedFrom(DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageLite.parseFrom(
-          DEFAULT_INSTANCE, input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
-      return (Builder) DEFAULT_INSTANCE.createBuilder();
+      return DEFAULT_INSTANCE.toBuilder();
     }
     public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader prototype) {
-      return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
     /**
      * Protobuf type {@code OSMPBF.BlobHeader}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessageLite.Builder<
-          org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader, Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:OSMPBF.BlobHeader)
         org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeaderOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_BlobHeader_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_BlobHeader_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.class, org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.Builder.class);
+      }
+
       // Construct using org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.newBuilder()
       private Builder() {
-        super(DEFAULT_INSTANCE);
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        type_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        indexdata_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        datasize_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.internal_static_OSMPBF_BlobHeader_descriptor;
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader getDefaultInstanceForType() {
+        return org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader build() {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader buildPartial() {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader result = new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) != 0)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.type_ = type_;
+        if (((from_bitField0_ & 0x00000002) != 0)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.indexdata_ = indexdata_;
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          result.datasize_ = datasize_;
+          to_bitField0_ |= 0x00000004;
+        }
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader) {
+          return mergeFrom((org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader other) {
+        if (other == org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          bitField0_ |= 0x00000001;
+          type_ = other.type_;
+          onChanged();
+        }
+        if (other.hasIndexdata()) {
+          setIndexdata(other.getIndexdata());
+        }
+        if (other.hasDatasize()) {
+          setDatasize(other.getDatasize());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasType()) {
+          return false;
+        }
+        if (!hasDatasize()) {
+          return false;
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
 
+      private java.lang.Object type_ = "";
       /**
        * <code>required string type = 1;</code>
+       * @return Whether the type field is set.
        */
-      @java.lang.Override
       public boolean hasType() {
-        return instance.hasType();
+        return ((bitField0_ & 0x00000001) != 0);
       }
       /**
        * <code>required string type = 1;</code>
+       * @return The type.
        */
-      @java.lang.Override
       public java.lang.String getType() {
-        return instance.getType();
+        java.lang.Object ref = type_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            type_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
        * <code>required string type = 1;</code>
+       * @return The bytes for type.
        */
-      @java.lang.Override
       public com.google.protobuf.ByteString
           getTypeBytes() {
-        return instance.getTypeBytes();
+        java.lang.Object ref = type_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          type_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
       /**
        * <code>required string type = 1;</code>
+       * @param value The type to set.
+       * @return This builder for chaining.
        */
       public Builder setType(
           java.lang.String value) {
-        copyOnWrite();
-        instance.setType(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        type_ = value;
+        onChanged();
         return this;
       }
       /**
        * <code>required string type = 1;</code>
+       * @return This builder for chaining.
        */
       public Builder clearType() {
-        copyOnWrite();
-        instance.clearType();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        type_ = getDefaultInstance().getType();
+        onChanged();
         return this;
       }
       /**
        * <code>required string type = 1;</code>
+       * @param value The bytes for type to set.
+       * @return This builder for chaining.
        */
       public Builder setTypeBytes(
           com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setTypeBytes(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        type_ = value;
+        onChanged();
         return this;
       }
 
+      private com.google.protobuf.ByteString indexdata_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <code>optional bytes indexdata = 2;</code>
+       * @return Whether the indexdata field is set.
        */
-      @java.lang.Override
       public boolean hasIndexdata() {
-        return instance.hasIndexdata();
+        return ((bitField0_ & 0x00000002) != 0);
       }
       /**
        * <code>optional bytes indexdata = 2;</code>
+       * @return The indexdata.
        */
-      @java.lang.Override
       public com.google.protobuf.ByteString getIndexdata() {
-        return instance.getIndexdata();
+        return indexdata_;
       }
       /**
        * <code>optional bytes indexdata = 2;</code>
+       * @param value The indexdata to set.
+       * @return This builder for chaining.
        */
       public Builder setIndexdata(com.google.protobuf.ByteString value) {
-        copyOnWrite();
-        instance.setIndexdata(value);
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        indexdata_ = value;
+        onChanged();
         return this;
       }
       /**
        * <code>optional bytes indexdata = 2;</code>
+       * @return This builder for chaining.
        */
       public Builder clearIndexdata() {
-        copyOnWrite();
-        instance.clearIndexdata();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        indexdata_ = getDefaultInstance().getIndexdata();
+        onChanged();
         return this;
       }
 
+      private int datasize_ ;
       /**
        * <code>required int32 datasize = 3;</code>
+       * @return Whether the datasize field is set.
        */
-      @java.lang.Override
       public boolean hasDatasize() {
-        return instance.hasDatasize();
+        return ((bitField0_ & 0x00000004) != 0);
       }
       /**
        * <code>required int32 datasize = 3;</code>
+       * @return The datasize.
        */
-      @java.lang.Override
       public int getDatasize() {
-        return instance.getDatasize();
+        return datasize_;
       }
       /**
        * <code>required int32 datasize = 3;</code>
+       * @param value The datasize to set.
+       * @return This builder for chaining.
        */
       public Builder setDatasize(int value) {
-        copyOnWrite();
-        instance.setDatasize(value);
+        bitField0_ |= 0x00000004;
+        datasize_ = value;
+        onChanged();
         return this;
       }
       /**
        * <code>required int32 datasize = 3;</code>
+       * @return This builder for chaining.
        */
       public Builder clearDatasize() {
-        copyOnWrite();
-        instance.clearDatasize();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        datasize_ = 0;
+        onChanged();
         return this;
       }
-
-      // @@protoc_insertion_point(builder_scope:OSMPBF.BlobHeader)
-    }
-    private byte memoizedIsInitialized = 2;
-    @java.lang.Override
-    @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
-    protected final java.lang.Object dynamicMethod(
-        com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
-        java.lang.Object arg0, java.lang.Object arg1) {
-      switch (method) {
-        case NEW_MUTABLE_INSTANCE: {
-          return new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader();
-        }
-        case NEW_BUILDER: {
-          return new Builder();
-        }
-        case IS_INITIALIZED: {
-          byte isInitialized = memoizedIsInitialized;
-          if (isInitialized == 1) return DEFAULT_INSTANCE;
-          if (isInitialized == 0) return null;
-
-          boolean shouldMemoize = ((Boolean) arg0).booleanValue();
-          if (!hasType()) {
-            return null;
-          }
-          if (!hasDatasize()) {
-            return null;
-          }
-          return DEFAULT_INSTANCE;
-
-        }
-        case MAKE_IMMUTABLE: {
-          return null;
-        }
-        case VISIT: {
-          Visitor visitor = (Visitor) arg0;
-          org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader other = (org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader) arg1;
-          type_ = visitor.visitString(
-              hasType(), type_,
-              other.hasType(), other.type_);
-          indexdata_ = visitor.visitByteString(
-              hasIndexdata(), indexdata_,
-              other.hasIndexdata(), other.indexdata_);
-          datasize_ = visitor.visitInt(
-              hasDatasize(), datasize_,
-              other.hasDatasize(), other.datasize_);
-          if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor
-              .INSTANCE) {
-            bitField0_ |= other.bitField0_;
-          }
-          return this;
-        }
-        case MERGE_FROM_STREAM: {
-          com.google.protobuf.CodedInputStream input =
-              (com.google.protobuf.CodedInputStream) arg0;
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry =
-              (com.google.protobuf.ExtensionRegistryLite) arg1;
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
-          try {
-            boolean done = false;
-            while (!done) {
-              int tag = input.readTag();
-              switch (tag) {
-                case 0:
-                  done = true;
-                  break;
-                case 10: {
-                  java.lang.String s = input.readString();
-                  bitField0_ |= 0x00000001;
-                  type_ = s;
-                  break;
-                }
-                case 18: {
-                  bitField0_ |= 0x00000002;
-                  indexdata_ = input.readBytes();
-                  break;
-                }
-                case 24: {
-                  bitField0_ |= 0x00000004;
-                  datasize_ = input.readInt32();
-                  break;
-                }
-                default: {
-                  if (!parseUnknownField(tag, input)) {
-                    done = true;
-                  }
-                  break;
-                }
-              }
-            }
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            throw new RuntimeException(e.setUnfinishedMessage(this));
-          } catch (java.io.IOException e) {
-            throw new RuntimeException(
-                new com.google.protobuf.InvalidProtocolBufferException(
-                    e.getMessage()).setUnfinishedMessage(this));
-          } finally {
-          }
-        }
-        // fall through
-        case GET_DEFAULT_INSTANCE: {
-          return DEFAULT_INSTANCE;
-        }
-        case GET_PARSER: {
-          com.google.protobuf.Parser<org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader> parser = PARSER;
-          if (parser == null) {
-            synchronized (org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader.class) {
-              parser = PARSER;
-              if (parser == null) {
-                parser = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);
-                PARSER = parser;
-              }
-            }
-          }
-          return parser;
-      }
-      case GET_MEMOIZED_IS_INITIALIZED: {
-        return memoizedIsInitialized;
-      }
-      case SET_MEMOIZED_IS_INITIALIZED: {
-        memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
-        return null;
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
       }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
       }
-      throw new UnsupportedOperationException();
-    }
 
 
+      // @@protoc_insertion_point(builder_scope:OSMPBF.BlobHeader)
+    }
+
     // @@protoc_insertion_point(class_scope:OSMPBF.BlobHeader)
     private static final org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader DEFAULT_INSTANCE;
     static {
-      // New instances are implicitly immutable so no need to make
-      // immutable.
-      DEFAULT_INSTANCE = new BlobHeader();
+      DEFAULT_INSTANCE = new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader();
     }
 
     public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
-    private static volatile com.google.protobuf.Parser<BlobHeader> PARSER;
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<BlobHeader>
+        PARSER = new com.google.protobuf.AbstractParser<BlobHeader>() {
+      @java.lang.Override
+      public BlobHeader parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BlobHeader(input, extensionRegistry);
+      }
+    };
 
     public static com.google.protobuf.Parser<BlobHeader> parser() {
-      return DEFAULT_INSTANCE.getParserForType();
+      return PARSER;
     }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BlobHeader> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
   }
 
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_OSMPBF_Blob_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_OSMPBF_Blob_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_OSMPBF_BlobHeader_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_OSMPBF_BlobHeader_fieldAccessorTable;
 
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
+    java.lang.String[] descriptorData = {
+      "\n\"src/main/protobuf/fileformat.proto\022\006OS" +
+      "MPBF\"l\n\004Blob\022\013\n\003raw\030\001 \001(\014\022\020\n\010raw_size\030\002 " +
+      "\001(\005\022\021\n\tzlib_data\030\003 \001(\014\022\021\n\tlzma_data\030\004 \001(" +
+      "\014\022\037\n\023OBSOLETE_bzip2_data\030\005 \001(\014B\002\030\001\"?\n\nBl" +
+      "obHeader\022\014\n\004type\030\001 \002(\t\022\021\n\tindexdata\030\002 \001(" +
+      "\014\022\020\n\010datasize\030\003 \002(\005B%\n#org.openstreetmap" +
+      ".osmosis.osmbinary"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_OSMPBF_Blob_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_OSMPBF_Blob_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_OSMPBF_Blob_descriptor,
+        new java.lang.String[] { "Raw", "RawSize", "ZlibData", "LzmaData", "OBSOLETEBzip2Data", });
+    internal_static_OSMPBF_BlobHeader_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_OSMPBF_BlobHeader_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_OSMPBF_BlobHeader_descriptor,
+        new java.lang.String[] { "Type", "Indexdata", "Datasize", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)


=====================================
osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
=====================================
The diff for this file was not included because it is too large.

=====================================
osmosis-osm-binary/src/main/protobuf/fileformat.proto
=====================================
@@ -17,7 +17,7 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
+//option optimize_for = LITE_RUNTIME;
 option java_package = "org.openstreetmap.osmosis.osmbinary";
 package OSMPBF;
 


=====================================
osmosis-osm-binary/src/main/protobuf/osmformat.proto
=====================================
@@ -17,7 +17,7 @@
 
 syntax = "proto2";
 
-option optimize_for = LITE_RUNTIME;
+//option optimize_for = LITE_RUNTIME;
 option java_package = "org.openstreetmap.osmosis.osmbinary";
 package OSMPBF;
 


=====================================
osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/common/CompressionActivator.java
=====================================
@@ -4,13 +4,13 @@ package org.openstreetmap.osmosis.xml.common;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 
 import org.openstreetmap.osmosis.core.OsmosisRuntimeException;
-import org.openstreetmap.osmosis.core.util.MultiMemberGZIPInputStream;
 
 
 /**
@@ -85,7 +85,7 @@ public class CompressionActivator {
 			}
 			
 			if (CompressionMethod.GZip.equals(compressionMethod)) {
-				return new MultiMemberGZIPInputStream(sourceStream);
+				return new GZIPInputStream(sourceStream);
 			}
 			
 			if (CompressionMethod.BZip2.equals(compressionMethod)) {


=====================================
osmosis-xml/src/main/java/org/openstreetmap/osmosis/xml/v0_6/XmlDownloader.java
=====================================
@@ -8,6 +8,7 @@ import java.net.URL;
 import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
@@ -24,7 +25,6 @@ import org.openstreetmap.osmosis.core.container.v0_6.BoundContainer;
 import org.openstreetmap.osmosis.core.domain.v0_6.Bound;
 import org.openstreetmap.osmosis.core.task.v0_6.RunnableSource;
 import org.openstreetmap.osmosis.core.task.v0_6.Sink;
-import org.openstreetmap.osmosis.core.util.MultiMemberGZIPInputStream;
 import org.openstreetmap.osmosis.xml.v0_6.impl.OsmHandler;
 import org.openstreetmap.osmosis.xml.v0_6.impl.XmlConstants;
 
@@ -265,7 +265,7 @@ public class XmlDownloader implements RunnableSource {
 
         responseStream = myActiveConnection.getInputStream();
         if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
-            responseStream = new MultiMemberGZIPInputStream(responseStream);
+            responseStream = new GZIPInputStream(responseStream);
         } else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
             responseStream = new InflaterInputStream(responseStream, new Inflater(true));
         }


=====================================
package/changes.txt
=====================================
@@ -1,8 +1,12 @@
-0.47.2
+0.47.3 (2020-03-24)
+Updated protobuf package to 3.11.4 (#58)
+Replaced custom MultiMemberGZIPInputStream with java.util.zip.GZIPInputStream (#59)
+
+0.47.2 (2020-03-10)
 Removed explicit dependency on xerces in favor of JDK version (PR #51)
 Added $gnupgUserDir to Docker setup (PR #56)
 
-0.47.1
+0.47.1 (2020-03-08)
 Update APIDB schema to remove users.nearby column (PR #54)
 
 0.47


=====================================
package/script/contrib/apidb_0.6.sql
=====================================
The diff for this file was not included because it is too large.


View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/commit/f3a58e9dbc0b4c267541b614c953dce6f8e38d28

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/commit/f3a58e9dbc0b4c267541b614c953dce6f8e38d28
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200324/b91b9578/attachment-0001.html>


More information about the Pkg-grass-devel mailing list