diff --git a/core/pom.xml b/flatmap-core/pom.xml similarity index 100% rename from core/pom.xml rename to flatmap-core/pom.xml diff --git a/core/src/main/java/com/graphhopper/reader/ReaderElementUtils.java b/flatmap-core/src/main/java/com/graphhopper/reader/ReaderElementUtils.java similarity index 100% rename from core/src/main/java/com/graphhopper/reader/ReaderElementUtils.java rename to flatmap-core/src/main/java/com/graphhopper/reader/ReaderElementUtils.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Arguments.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Arguments.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Arguments.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Arguments.java diff --git a/core/src/main/java/com/onthegomap/flatmap/BoundsProvider.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/BoundsProvider.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/BoundsProvider.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/BoundsProvider.java diff --git a/core/src/main/java/com/onthegomap/flatmap/CommonParams.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/CommonParams.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/CommonParams.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/CommonParams.java diff --git a/core/src/main/java/com/onthegomap/flatmap/FeatureCollector.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/FeatureCollector.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/FeatureCollector.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/FeatureCollector.java diff --git a/core/src/main/java/com/onthegomap/flatmap/FeatureMerge.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/FeatureMerge.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/FeatureMerge.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/FeatureMerge.java diff --git a/core/src/main/java/com/onthegomap/flatmap/FileUtils.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/FileUtils.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/FileUtils.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/FileUtils.java diff --git a/core/src/main/java/com/onthegomap/flatmap/FlatMapRunner.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/FlatMapRunner.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/FlatMapRunner.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/FlatMapRunner.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Format.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Format.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Format.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Format.java diff --git a/core/src/main/java/com/onthegomap/flatmap/GeometryType.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/GeometryType.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/GeometryType.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/GeometryType.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Imposm3Parsers.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Imposm3Parsers.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Imposm3Parsers.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Imposm3Parsers.java diff --git a/core/src/main/java/com/onthegomap/flatmap/LayerStats.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/LayerStats.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/LayerStats.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/LayerStats.java diff --git a/core/src/main/java/com/onthegomap/flatmap/MemoryEstimator.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/MemoryEstimator.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/MemoryEstimator.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/MemoryEstimator.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Parse.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Parse.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Parse.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Parse.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Profile.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Profile.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Profile.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Profile.java diff --git a/core/src/main/java/com/onthegomap/flatmap/SourceFeature.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/SourceFeature.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/SourceFeature.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/SourceFeature.java diff --git a/core/src/main/java/com/onthegomap/flatmap/TileExtents.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/TileExtents.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/TileExtents.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/TileExtents.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Translations.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Translations.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Translations.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Translations.java diff --git a/core/src/main/java/com/onthegomap/flatmap/VectorTileEncoder.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/VectorTileEncoder.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/VectorTileEncoder.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/VectorTileEncoder.java diff --git a/core/src/main/java/com/onthegomap/flatmap/Wikidata.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/Wikidata.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/Wikidata.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/Wikidata.java diff --git a/core/src/main/java/com/onthegomap/flatmap/ZoomFunction.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/ZoomFunction.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/ZoomFunction.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/ZoomFunction.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/CacheByZoom.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/CacheByZoom.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/CacheByZoom.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/CacheByZoom.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/CommonStringEncoder.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/CommonStringEncoder.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/CommonStringEncoder.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/CommonStringEncoder.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/ExternalMergeSort.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/ExternalMergeSort.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/ExternalMergeSort.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/ExternalMergeSort.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/FastGzipOutputStream.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FastGzipOutputStream.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/FastGzipOutputStream.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FastGzipOutputStream.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/FeatureGroup.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FeatureGroup.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/FeatureGroup.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FeatureGroup.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/FeatureSort.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FeatureSort.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/FeatureSort.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/FeatureSort.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/IntRange.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/IntRange.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/IntRange.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/IntRange.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/LongLongMap.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/LongLongMap.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/LongLongMap.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/LongLongMap.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/LongLongMultimap.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/LongLongMultimap.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/LongLongMultimap.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/LongLongMultimap.java diff --git a/core/src/main/java/com/onthegomap/flatmap/collections/MutableCoordinateSequence.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/collections/MutableCoordinateSequence.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/collections/MutableCoordinateSequence.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/collections/MutableCoordinateSequence.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifier.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifier.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifier.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifier.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/GeoUtils.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/GeoUtils.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/GeoUtils.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/GeoUtils.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/GeometryException.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/GeometryException.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/GeometryException.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/GeometryException.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/PointIndex.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/PointIndex.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/PointIndex.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/PointIndex.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/PolygonIndex.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/PolygonIndex.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/PolygonIndex.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/PolygonIndex.java diff --git a/core/src/main/java/com/onthegomap/flatmap/geo/TileCoord.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/geo/TileCoord.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/geo/TileCoord.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/geo/TileCoord.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/Counter.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Counter.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/Counter.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Counter.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessInfo.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessInfo.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessInfo.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessInfo.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessTime.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessTime.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessTime.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProcessTime.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/ProgressLoggers.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProgressLoggers.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/ProgressLoggers.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/ProgressLoggers.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/PrometheusStats.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/PrometheusStats.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/PrometheusStats.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/PrometheusStats.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/Stats.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Stats.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/Stats.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Stats.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/Timer.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Timer.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/Timer.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Timer.java diff --git a/core/src/main/java/com/onthegomap/flatmap/monitoring/Timers.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Timers.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/monitoring/Timers.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/monitoring/Timers.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/NaturalEarthReader.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/OpenStreetMapReader.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/OpenStreetMapReader.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/OpenStreetMapReader.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/OpenStreetMapReader.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/OsmInputFile.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmInputFile.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/OsmInputFile.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmInputFile.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/OsmMultipolygon.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmMultipolygon.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/OsmMultipolygon.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmMultipolygon.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/OsmSource.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmSource.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/OsmSource.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/OsmSource.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/Reader.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/Reader.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/Reader.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/Reader.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/ReaderFeature.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/ReaderFeature.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/ReaderFeature.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/ReaderFeature.java diff --git a/core/src/main/java/com/onthegomap/flatmap/read/ShapefileReader.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/read/ShapefileReader.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/read/ShapefileReader.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/read/ShapefileReader.java diff --git a/core/src/main/java/com/onthegomap/flatmap/render/CoordinateSequenceExtractor.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/render/CoordinateSequenceExtractor.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/render/CoordinateSequenceExtractor.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/render/CoordinateSequenceExtractor.java diff --git a/core/src/main/java/com/onthegomap/flatmap/render/FeatureRenderer.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/render/FeatureRenderer.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/render/FeatureRenderer.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/render/FeatureRenderer.java diff --git a/core/src/main/java/com/onthegomap/flatmap/render/RenderedFeature.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/render/RenderedFeature.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/render/RenderedFeature.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/render/RenderedFeature.java diff --git a/core/src/main/java/com/onthegomap/flatmap/render/TiledGeometry.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/render/TiledGeometry.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/render/TiledGeometry.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/render/TiledGeometry.java diff --git a/core/src/main/java/com/onthegomap/flatmap/worker/Topology.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/worker/Topology.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/worker/Topology.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/worker/Topology.java diff --git a/core/src/main/java/com/onthegomap/flatmap/worker/WorkQueue.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/worker/WorkQueue.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/worker/WorkQueue.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/worker/WorkQueue.java diff --git a/core/src/main/java/com/onthegomap/flatmap/worker/Worker.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/worker/Worker.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/worker/Worker.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/worker/Worker.java diff --git a/core/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/write/Mbtiles.java diff --git a/core/src/main/java/com/onthegomap/flatmap/write/MbtilesWriter.java b/flatmap-core/src/main/java/com/onthegomap/flatmap/write/MbtilesWriter.java similarity index 100% rename from core/src/main/java/com/onthegomap/flatmap/write/MbtilesWriter.java rename to flatmap-core/src/main/java/com/onthegomap/flatmap/write/MbtilesWriter.java diff --git a/core/src/main/java/vector_tile/VectorTile.java b/flatmap-core/src/main/java/vector_tile/VectorTile.java similarity index 83% rename from core/src/main/java/vector_tile/VectorTile.java rename to flatmap-core/src/main/java/vector_tile/VectorTile.java index a38d4382..307ee2a0 100644 --- a/core/src/main/java/vector_tile/VectorTile.java +++ b/flatmap-core/src/main/java/vector_tile/VectorTile.java @@ -1,73 +1,61 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/src/main/resources/vector_tile.proto +// source: flatmap-core/src/main/resources/vector_tile.proto package vector_tile; public final class VectorTile { - - private VectorTile() { + private VectorTile() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { } public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { - } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { + com.google.protobuf.ExtensionRegistry registry) { registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); + (com.google.protobuf.ExtensionRegistryLite) registry); } - public interface TileOrBuilder extends - // @@protoc_insertion_point(interface_extends:vector_tile.Tile) - com.google.protobuf.GeneratedMessageV3. - ExtendableMessageOrBuilder { + // @@protoc_insertion_point(interface_extends:vector_tile.Tile) + com.google.protobuf.GeneratedMessageV3. + ExtendableMessageOrBuilder { /** * repeated .vector_tile.Tile.Layer layers = 3; */ - java.util.List - getLayersList(); - + java.util.List + getLayersList(); /** * repeated .vector_tile.Tile.Layer layers = 3; */ vector_tile.VectorTile.Tile.Layer getLayers(int index); - /** * repeated .vector_tile.Tile.Layer layers = 3; */ int getLayersCount(); - /** * repeated .vector_tile.Tile.Layer layers = 3; */ - java.util.List - getLayersOrBuilderList(); - + java.util.List + getLayersOrBuilderList(); /** * repeated .vector_tile.Tile.Layer layers = 3; */ vector_tile.VectorTile.Tile.LayerOrBuilder getLayersOrBuilder( - int index); + int index); } - /** * Protobuf type {@code vector_tile.Tile} */ public static final class Tile extends - com.google.protobuf.GeneratedMessageV3.ExtendableMessage< - Tile> implements - // @@protoc_insertion_point(message_implements:vector_tile.Tile) - TileOrBuilder { - - private static final long serialVersionUID = 0L; - + com.google.protobuf.GeneratedMessageV3.ExtendableMessage< + Tile> implements + // @@protoc_insertion_point(message_implements:vector_tile.Tile) + TileOrBuilder { + private static final long serialVersionUID = 0L; // Use Tile.newBuilder() to construct. private Tile(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder builder) { super(builder); } - private Tile() { layers_ = java.util.Collections.emptyList(); } @@ -75,7 +63,7 @@ public final class VectorTile { @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused) { return new Tile(); } @@ -84,18 +72,17 @@ public final class VectorTile { getUnknownFields() { return this.unknownFields; } - private Tile( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + 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(); + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -110,12 +97,12 @@ public final class VectorTile { mutable_bitField0_ |= 0x00000001; } layers_.add( - input.readMessage(vector_tile.VectorTile.Tile.Layer.PARSER, extensionRegistry)); + input.readMessage(vector_tile.VectorTile.Tile.Layer.PARSER, extensionRegistry)); break; } default: { if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -126,7 +113,7 @@ public final class VectorTile { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { layers_ = java.util.Collections.unmodifiableList(layers_); @@ -135,29 +122,28 @@ public final class VectorTile { makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_fieldAccessorTable - .ensureFieldAccessorsInitialized( - vector_tile.VectorTile.Tile.class, vector_tile.VectorTile.Tile.Builder.class); + .ensureFieldAccessorsInitialized( + vector_tile.VectorTile.Tile.class, vector_tile.VectorTile.Tile.Builder.class); } /** * 
      * GeomType is described in section 4.3.4 of the specification
      *
- *

+ * * Protobuf enum {@code vector_tile.Tile.GeomType} */ public enum GeomType - implements com.google.protobuf.ProtocolMessageEnum { + implements com.google.protobuf.ProtocolMessageEnum { /** * UNKNOWN = 0; */ @@ -214,51 +200,43 @@ public final class VectorTile { */ public static GeomType forNumber(int value) { switch (value) { - case 0: - return UNKNOWN; - case 1: - return POINT; - case 2: - return LINESTRING; - case 3: - return POLYGON; - default: - return null; + case 0: return UNKNOWN; + case 1: return POINT; + case 2: return LINESTRING; + case 3: return POLYGON; + default: return null; } } public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { + internalGetValueMap() { return internalValueMap; } - private static final com.google.protobuf.Internal.EnumLiteMap< - GeomType> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public GeomType findValueByNumber(int number) { - return GeomType.forNumber(number); - } - }; + GeomType> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public GeomType findValueByNumber(int number) { + return GeomType.forNumber(number); + } + }; public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { + getValueDescriptor() { return getDescriptor().getValues().get(ordinal()); } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { + getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.Tile.getDescriptor().getEnumTypes().get(0); } private static final GeomType[] VALUES = values(); public static GeomType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { throw new java.lang.IllegalArgumentException( "EnumValueDescriptor is not for this type."); @@ -276,9 +254,9 @@ public final class VectorTile { } public interface ValueOrBuilder extends - // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Value) - com.google.protobuf.GeneratedMessageV3. - ExtendableMessageOrBuilder { + // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Value) + com.google.protobuf.GeneratedMessageV3. + ExtendableMessageOrBuilder { /** * 

@@ -286,141 +264,113 @@ public final class VectorTile {
        *
* * optional string string_value = 1; - * * @return Whether the stringValue field is set. */ boolean hasStringValue(); - /** * 
        * Exactly one of these values must be present in a valid message
        *
* * optional string string_value = 1; - * * @return The stringValue. */ java.lang.String getStringValue(); - /** * 
        * Exactly one of these values must be present in a valid message
        *
* * optional string string_value = 1; - * * @return The bytes for stringValue. */ com.google.protobuf.ByteString - getStringValueBytes(); + getStringValueBytes(); /** * optional float float_value = 2; - * * @return Whether the floatValue field is set. */ boolean hasFloatValue(); - /** * optional float float_value = 2; - * * @return The floatValue. */ float getFloatValue(); /** * optional double double_value = 3; - * * @return Whether the doubleValue field is set. */ boolean hasDoubleValue(); - /** * optional double double_value = 3; - * * @return The doubleValue. */ double getDoubleValue(); /** * optional int64 int_value = 4; - * * @return Whether the intValue field is set. */ boolean hasIntValue(); - /** * optional int64 int_value = 4; - * * @return The intValue. */ long getIntValue(); /** * optional uint64 uint_value = 5; - * * @return Whether the uintValue field is set. */ boolean hasUintValue(); - /** * optional uint64 uint_value = 5; - * * @return The uintValue. */ long getUintValue(); /** * optional sint64 sint_value = 6; - * * @return Whether the sintValue field is set. */ boolean hasSintValue(); - /** * optional sint64 sint_value = 6; - * * @return The sintValue. */ long getSintValue(); /** * optional bool bool_value = 7; - * * @return Whether the boolValue field is set. */ boolean hasBoolValue(); - /** * optional bool bool_value = 7; - * * @return The boolValue. */ boolean getBoolValue(); } - /** * 
      * Variant type encoding
      * The use of values is described in section 4.1 of the specification
      *
- *

+ * * Protobuf type {@code vector_tile.Tile.Value} */ public static final class Value extends - com.google.protobuf.GeneratedMessageV3.ExtendableMessage< - Value> implements - // @@protoc_insertion_point(message_implements:vector_tile.Tile.Value) - ValueOrBuilder { - - private static final long serialVersionUID = 0L; - + com.google.protobuf.GeneratedMessageV3.ExtendableMessage< + Value> implements + // @@protoc_insertion_point(message_implements:vector_tile.Tile.Value) + ValueOrBuilder { + private static final long serialVersionUID = 0L; // Use Value.newBuilder() to construct. - private Value( - com.google.protobuf.GeneratedMessageV3.ExtendableBuilder builder) { + private Value(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder builder) { super(builder); } - private Value() { stringValue_ = ""; } @@ -428,7 +378,7 @@ public final class VectorTile { @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused) { return new Value(); } @@ -437,18 +387,17 @@ public final class VectorTile { getUnknownFields() { return this.unknownFields; } - private Value( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + 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(); + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -495,7 +444,7 @@ public final class VectorTile { } default: { if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -506,51 +455,46 @@ public final class VectorTile { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_fieldAccessorTable - .ensureFieldAccessorsInitialized( - vector_tile.VectorTile.Tile.Value.class, vector_tile.VectorTile.Tile.Value.Builder.class); + .ensureFieldAccessorsInitialized( + vector_tile.VectorTile.Tile.Value.class, vector_tile.VectorTile.Tile.Value.Builder.class); } private int bitField0_; public static final int STRING_VALUE_FIELD_NUMBER = 1; private volatile java.lang.Object stringValue_; - /** * 

        * Exactly one of these values must be present in a valid message
        *
* * optional string string_value = 1; - * * @return Whether the stringValue field is set. */ @java.lang.Override public boolean hasStringValue() { return ((bitField0_ & 0x00000001) != 0); } - /** * 
        * Exactly one of these values must be present in a valid message
        *
* * optional string string_value = 1; - * * @return The stringValue. */ @java.lang.Override @@ -559,8 +503,8 @@ public final class VectorTile { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { stringValue_ = s; @@ -568,24 +512,22 @@ public final class VectorTile { return s; } } - /** * 
        * Exactly one of these values must be present in a valid message
        *
* * optional string string_value = 1; - * * @return The bytes for stringValue. */ @java.lang.Override public com.google.protobuf.ByteString - getStringValueBytes() { + getStringValueBytes() { java.lang.Object ref = stringValue_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); stringValue_ = b; return b; } else { @@ -595,20 +537,16 @@ public final class VectorTile { public static final int FLOAT_VALUE_FIELD_NUMBER = 2; private float floatValue_; - /** * optional float float_value = 2; - * * @return Whether the floatValue field is set. */ @java.lang.Override public boolean hasFloatValue() { return ((bitField0_ & 0x00000002) != 0); } - /** * optional float float_value = 2; - * * @return The floatValue. */ @java.lang.Override @@ -618,20 +556,16 @@ public final class VectorTile { public static final int DOUBLE_VALUE_FIELD_NUMBER = 3; private double doubleValue_; - /** * optional double double_value = 3; - * * @return Whether the doubleValue field is set. */ @java.lang.Override public boolean hasDoubleValue() { return ((bitField0_ & 0x00000004) != 0); } - /** * optional double double_value = 3; - * * @return The doubleValue. */ @java.lang.Override @@ -641,20 +575,16 @@ public final class VectorTile { public static final int INT_VALUE_FIELD_NUMBER = 4; private long intValue_; - /** * optional int64 int_value = 4; - * * @return Whether the intValue field is set. */ @java.lang.Override public boolean hasIntValue() { return ((bitField0_ & 0x00000008) != 0); } - /** * optional int64 int_value = 4; - * * @return The intValue. */ @java.lang.Override @@ -664,20 +594,16 @@ public final class VectorTile { public static final int UINT_VALUE_FIELD_NUMBER = 5; private long uintValue_; - /** * optional uint64 uint_value = 5; - * * @return Whether the uintValue field is set. */ @java.lang.Override public boolean hasUintValue() { return ((bitField0_ & 0x00000010) != 0); } - /** * optional uint64 uint_value = 5; - * * @return The uintValue. */ @java.lang.Override @@ -687,20 +613,16 @@ public final class VectorTile { public static final int SINT_VALUE_FIELD_NUMBER = 6; private long sintValue_; - /** * optional sint64 sint_value = 6; - * * @return Whether the sintValue field is set. */ @java.lang.Override public boolean hasSintValue() { return ((bitField0_ & 0x00000020) != 0); } - /** * optional sint64 sint_value = 6; - * * @return The sintValue. */ @java.lang.Override @@ -710,20 +632,16 @@ public final class VectorTile { public static final int BOOL_VALUE_FIELD_NUMBER = 7; private boolean boolValue_; - /** * optional bool bool_value = 7; - * * @return Whether the boolValue field is set. */ @java.lang.Override public boolean hasBoolValue() { return ((bitField0_ & 0x00000040) != 0); } - /** * optional bool bool_value = 7; - * * @return The boolValue. */ @java.lang.Override @@ -732,16 +650,11 @@ public final class VectorTile { } 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 (isInitialized == 1) return true; + if (isInitialized == 0) return false; if (!extensionsAreInitialized()) { memoizedIsInitialized = 0; @@ -753,10 +666,10 @@ public final class VectorTile { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { com.google.protobuf.GeneratedMessageV3 .ExtendableMessage.ExtensionWriter - extensionWriter = newExtensionWriter(); + extensionWriter = newExtensionWriter(); if (((bitField0_ & 0x00000001) != 0)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, stringValue_); } @@ -785,9 +698,7 @@ public final class VectorTile { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) { - return size; - } + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) != 0)) { @@ -826,84 +737,53 @@ public final class VectorTile { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof vector_tile.VectorTile.Tile.Value)) { return super.equals(obj); } vector_tile.VectorTile.Tile.Value other = (vector_tile.VectorTile.Tile.Value) obj; - if (hasStringValue() != other.hasStringValue()) { - return false; - } + if (hasStringValue() != other.hasStringValue()) return false; if (hasStringValue()) { if (!getStringValue() - .equals(other.getStringValue())) { - return false; - } - } - if (hasFloatValue() != other.hasFloatValue()) { - return false; + .equals(other.getStringValue())) return false; } + if (hasFloatValue() != other.hasFloatValue()) return false; if (hasFloatValue()) { if (java.lang.Float.floatToIntBits(getFloatValue()) - != java.lang.Float.floatToIntBits( - other.getFloatValue())) { - return false; - } - } - if (hasDoubleValue() != other.hasDoubleValue()) { - return false; + != java.lang.Float.floatToIntBits( + other.getFloatValue())) return false; } + if (hasDoubleValue() != other.hasDoubleValue()) return false; if (hasDoubleValue()) { if (java.lang.Double.doubleToLongBits(getDoubleValue()) - != java.lang.Double.doubleToLongBits( - other.getDoubleValue())) { - return false; - } - } - if (hasIntValue() != other.hasIntValue()) { - return false; + != java.lang.Double.doubleToLongBits( + other.getDoubleValue())) return false; } + if (hasIntValue() != other.hasIntValue()) return false; if (hasIntValue()) { if (getIntValue() - != other.getIntValue()) { - return false; - } - } - if (hasUintValue() != other.hasUintValue()) { - return false; + != other.getIntValue()) return false; } + if (hasUintValue() != other.hasUintValue()) return false; if (hasUintValue()) { if (getUintValue() - != other.getUintValue()) { - return false; - } - } - if (hasSintValue() != other.hasSintValue()) { - return false; + != other.getUintValue()) return false; } + if (hasSintValue() != other.hasSintValue()) return false; if (hasSintValue()) { if (getSintValue() - != other.getSintValue()) { - return false; - } - } - if (hasBoolValue() != other.hasBoolValue()) { - return false; + != other.getSintValue()) return false; } + if (hasBoolValue() != other.hasBoolValue()) return false; if (hasBoolValue()) { if (getBoolValue() - != other.getBoolValue()) { - return false; - } + != other.getBoolValue()) return false; } - if (!unknownFields.equals(other.unknownFields)) { + if (!unknownFields.equals(other.unknownFields)) return false; + if (!getExtensionFields().equals(other.getExtensionFields())) return false; - } - if (!getExtensionFields().equals(other.getExtensionFields())) { - return false; - } return true; } @@ -921,32 +801,32 @@ public final class VectorTile { if (hasFloatValue()) { hash = (37 * hash) + FLOAT_VALUE_FIELD_NUMBER; hash = (53 * hash) + java.lang.Float.floatToIntBits( - getFloatValue()); + getFloatValue()); } if (hasDoubleValue()) { hash = (37 * hash) + DOUBLE_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - java.lang.Double.doubleToLongBits(getDoubleValue())); + java.lang.Double.doubleToLongBits(getDoubleValue())); } if (hasIntValue()) { hash = (37 * hash) + INT_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getIntValue()); + getIntValue()); } if (hasUintValue()) { hash = (37 * hash) + UINT_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUintValue()); + getUintValue()); } if (hasSintValue()) { hash = (37 * hash) + SINT_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getSintValue()); + getSintValue()); } if (hasBoolValue()) { hash = (37 * hash) + BOOL_VALUE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getBoolValue()); + getBoolValue()); } hash = hashFields(hash, getExtensionFields()); hash = (29 * hash) + unknownFields.hashCode(); @@ -955,137 +835,119 @@ public final class VectorTile { } public static vector_tile.VectorTile.Tile.Value parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Value parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Value parseFrom(java.io.InputStream input) - throws java.io.IOException { + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Value parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseDelimitedWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Value parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Value parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(vector_tile.VectorTile.Tile.Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** * 
        * Variant type encoding
        * The use of values is described in section 4.1 of the specification
        *
- *

+ * * Protobuf type {@code vector_tile.Tile.Value} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.ExtendableBuilder< - vector_tile.VectorTile.Tile.Value, Builder> implements - // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Value) - vector_tile.VectorTile.Tile.ValueOrBuilder { - + com.google.protobuf.GeneratedMessageV3.ExtendableBuilder< + vector_tile.VectorTile.Tile.Value, Builder> implements + // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Value) + vector_tile.VectorTile.Tile.ValueOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_fieldAccessorTable - .ensureFieldAccessorsInitialized( - vector_tile.VectorTile.Tile.Value.class, vector_tile.VectorTile.Tile.Value.Builder.class); + .ensureFieldAccessorsInitialized( + vector_tile.VectorTile.Tile.Value.class, vector_tile.VectorTile.Tile.Value.Builder.class); } // Construct using vector_tile.VectorTile.Tile.Value.newBuilder() @@ -1094,17 +956,15 @@ public final class VectorTile { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { + .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); @@ -1127,7 +987,7 @@ public final class VectorTile { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + getDescriptorForType() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_descriptor; } @@ -1187,75 +1047,65 @@ public final class VectorTile { public Builder clone() { return super.clone(); } - @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + 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) { + com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + 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) { + 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) { + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { return super.addRepeatedField(field, value); } - @java.lang.Override public Builder setExtension( - com.google.protobuf.GeneratedMessage.GeneratedExtension< - vector_tile.VectorTile.Tile.Value, Type> extension, - Type value) { + com.google.protobuf.GeneratedMessage.GeneratedExtension< + vector_tile.VectorTile.Tile.Value, Type> extension, + Type value) { return super.setExtension(extension, value); } - @java.lang.Override public Builder setExtension( - com.google.protobuf.GeneratedMessage.GeneratedExtension< - vector_tile.VectorTile.Tile.Value, java.util.List> extension, - int index, Type value) { + com.google.protobuf.GeneratedMessage.GeneratedExtension< + vector_tile.VectorTile.Tile.Value, java.util.List> extension, + int index, Type value) { return super.setExtension(extension, index, value); } - @java.lang.Override public Builder addExtension( - com.google.protobuf.GeneratedMessage.GeneratedExtension< - vector_tile.VectorTile.Tile.Value, java.util.List> extension, - Type value) { + com.google.protobuf.GeneratedMessage.GeneratedExtension< + vector_tile.VectorTile.Tile.Value, java.util.List> extension, + Type value) { return super.addExtension(extension, value); } - @java.lang.Override public Builder clearExtension( - com.google.protobuf.GeneratedMessage.GeneratedExtension< - vector_tile.VectorTile.Tile.Value, ?> extension) { + com.google.protobuf.GeneratedMessage.GeneratedExtension< + vector_tile.VectorTile.Tile.Value, ?> extension) { return super.clearExtension(extension); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof vector_tile.VectorTile.Tile.Value) { - return mergeFrom((vector_tile.VectorTile.Tile.Value) other); + return mergeFrom((vector_tile.VectorTile.Tile.Value)other); } else { super.mergeFrom(other); return this; @@ -1263,9 +1113,7 @@ public final class VectorTile { } public Builder mergeFrom(vector_tile.VectorTile.Tile.Value other) { - if (other == vector_tile.VectorTile.Tile.Value.getDefaultInstance()) { - return this; - } + if (other == vector_tile.VectorTile.Tile.Value.getDefaultInstance()) return this; if (other.hasStringValue()) { bitField0_ |= 0x00000001; stringValue_ = other.stringValue_; @@ -1305,9 +1153,9 @@ public final class VectorTile { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { vector_tile.VectorTile.Tile.Value parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); @@ -1321,38 +1169,33 @@ public final class VectorTile { } return this; } - private int bitField0_; private java.lang.Object stringValue_ = ""; - /** * 

          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @return Whether the stringValue field is set. */ public boolean hasStringValue() { return ((bitField0_ & 0x00000001) != 0); } - /** * 
          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @return The stringValue. */ public java.lang.String getStringValue() { java.lang.Object ref = stringValue_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { stringValue_ = s; @@ -1362,58 +1205,52 @@ public final class VectorTile { return (java.lang.String) ref; } } - /** * 
          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @return The bytes for stringValue. */ public com.google.protobuf.ByteString - getStringValueBytes() { + getStringValueBytes() { java.lang.Object ref = stringValue_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); stringValue_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * 
          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @param value The stringValue to set. * @return This builder for chaining. */ public Builder setStringValue( - java.lang.String value) { + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; stringValue_ = value; onChanged(); return this; } - /** * 
          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @return This builder for chaining. */ public Builder clearStringValue() { @@ -1422,53 +1259,45 @@ public final class VectorTile { onChanged(); return this; } - /** * 
          * Exactly one of these values must be present in a valid message
          *
* * optional string string_value = 1; - * * @param value The bytes for stringValue to set. * @return This builder for chaining. */ public Builder setStringValueBytes( - com.google.protobuf.ByteString value) { + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; stringValue_ = value; onChanged(); return this; } - private float floatValue_; - + private float floatValue_ ; /** * optional float float_value = 2; - * * @return Whether the floatValue field is set. */ @java.lang.Override public boolean hasFloatValue() { return ((bitField0_ & 0x00000002) != 0); } - /** * optional float float_value = 2; - * * @return The floatValue. */ @java.lang.Override public float getFloatValue() { return floatValue_; } - /** * optional float float_value = 2; - * * @param value The floatValue to set. * @return This builder for chaining. */ @@ -1478,10 +1307,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional float float_value = 2; - * * @return This builder for chaining. */ public Builder clearFloatValue() { @@ -1491,31 +1318,25 @@ public final class VectorTile { return this; } - private double doubleValue_; - + private double doubleValue_ ; /** * optional double double_value = 3; - * * @return Whether the doubleValue field is set. */ @java.lang.Override public boolean hasDoubleValue() { return ((bitField0_ & 0x00000004) != 0); } - /** * optional double double_value = 3; - * * @return The doubleValue. */ @java.lang.Override public double getDoubleValue() { return doubleValue_; } - /** * optional double double_value = 3; - * * @param value The doubleValue to set. * @return This builder for chaining. */ @@ -1525,10 +1346,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional double double_value = 3; - * * @return This builder for chaining. */ public Builder clearDoubleValue() { @@ -1538,31 +1357,25 @@ public final class VectorTile { return this; } - private long intValue_; - + private long intValue_ ; /** * optional int64 int_value = 4; - * * @return Whether the intValue field is set. */ @java.lang.Override public boolean hasIntValue() { return ((bitField0_ & 0x00000008) != 0); } - /** * optional int64 int_value = 4; - * * @return The intValue. */ @java.lang.Override public long getIntValue() { return intValue_; } - /** * optional int64 int_value = 4; - * * @param value The intValue to set. * @return This builder for chaining. */ @@ -1572,10 +1385,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional int64 int_value = 4; - * * @return This builder for chaining. */ public Builder clearIntValue() { @@ -1585,31 +1396,25 @@ public final class VectorTile { return this; } - private long uintValue_; - + private long uintValue_ ; /** * optional uint64 uint_value = 5; - * * @return Whether the uintValue field is set. */ @java.lang.Override public boolean hasUintValue() { return ((bitField0_ & 0x00000010) != 0); } - /** * optional uint64 uint_value = 5; - * * @return The uintValue. */ @java.lang.Override public long getUintValue() { return uintValue_; } - /** * optional uint64 uint_value = 5; - * * @param value The uintValue to set. * @return This builder for chaining. */ @@ -1619,10 +1424,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional uint64 uint_value = 5; - * * @return This builder for chaining. */ public Builder clearUintValue() { @@ -1632,31 +1435,25 @@ public final class VectorTile { return this; } - private long sintValue_; - + private long sintValue_ ; /** * optional sint64 sint_value = 6; - * * @return Whether the sintValue field is set. */ @java.lang.Override public boolean hasSintValue() { return ((bitField0_ & 0x00000020) != 0); } - /** * optional sint64 sint_value = 6; - * * @return The sintValue. */ @java.lang.Override public long getSintValue() { return sintValue_; } - /** * optional sint64 sint_value = 6; - * * @param value The sintValue to set. * @return This builder for chaining. */ @@ -1666,10 +1463,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional sint64 sint_value = 6; - * * @return This builder for chaining. */ public Builder clearSintValue() { @@ -1679,31 +1474,25 @@ public final class VectorTile { return this; } - private boolean boolValue_; - + private boolean boolValue_ ; /** * optional bool bool_value = 7; - * * @return Whether the boolValue field is set. */ @java.lang.Override public boolean hasBoolValue() { return ((bitField0_ & 0x00000040) != 0); } - /** * optional bool bool_value = 7; - * * @return The boolValue. */ @java.lang.Override public boolean getBoolValue() { return boolValue_; } - /** * optional bool bool_value = 7; - * * @param value The boolValue to set. * @return This builder for chaining. */ @@ -1713,10 +1502,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional bool bool_value = 7; - * * @return This builder for chaining. */ public Builder clearBoolValue() { @@ -1725,25 +1512,24 @@ public final class VectorTile { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); } + // @@protoc_insertion_point(builder_scope:vector_tile.Tile.Value) } // @@protoc_insertion_point(class_scope:vector_tile.Tile.Value) private static final vector_tile.VectorTile.Tile.Value DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new vector_tile.VectorTile.Tile.Value(); } @@ -1752,14 +1538,13 @@ public final class VectorTile { return DEFAULT_INSTANCE; } - @java.lang.Deprecated - public static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Deprecated public static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public Value parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return new Value(input, extensionRegistry); } }; @@ -1781,19 +1566,16 @@ public final class VectorTile { } public interface FeatureOrBuilder extends - // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Feature) - com.google.protobuf.MessageOrBuilder { + // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Feature) + com.google.protobuf.MessageOrBuilder { /** * optional uint64 id = 1 [default = 0]; - * * @return Whether the id field is set. */ boolean hasId(); - /** * optional uint64 id = 1 [default = 0]; - * * @return The id. */ long getId(); @@ -1807,11 +1589,9 @@ public final class VectorTile { * * * repeated uint32 tags = 2 [packed = true]; - * * @return A list containing the tags. */ java.util.List getTagsList(); - /** * 
        * Tags of this feature are encoded as repeated pairs of
@@ -1821,11 +1601,9 @@ public final class VectorTile {
        *
* * repeated uint32 tags = 2 [packed = true]; - * * @return The count of tags. */ int getTagsCount(); - /** * 
        * Tags of this feature are encoded as repeated pairs of
@@ -1835,7 +1613,6 @@ public final class VectorTile {
        *
* * repeated uint32 tags = 2 [packed = true]; - * * @param index The index of the element to return. * @return The tags at the given index. */ @@ -1847,18 +1624,15 @@ public final class VectorTile { * * * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return Whether the type field is set. */ boolean hasType(); - /** * 
        * The type of geometry stored in this feature.
        *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return The type. */ vector_tile.VectorTile.Tile.GeomType getType(); @@ -1871,11 +1645,9 @@ public final class VectorTile { * * * repeated uint32 geometry = 4 [packed = true]; - * * @return A list containing the geometry. */ java.util.List getGeometryList(); - /** * 
        * Contains a stream of commands and parameters (vertices).
@@ -1884,11 +1656,9 @@ public final class VectorTile {
        *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return The count of geometry. */ int getGeometryCount(); - /** * 
        * Contains a stream of commands and parameters (vertices).
@@ -1897,32 +1667,27 @@ public final class VectorTile {
        *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param index The index of the element to return. * @return The geometry at the given index. */ int getGeometry(int index); } - /** * 
      * Features are described in section 4.2 of the specification
      *
- *

+ * * Protobuf type {@code vector_tile.Tile.Feature} */ public static final class Feature extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:vector_tile.Tile.Feature) - FeatureOrBuilder { - - private static final long serialVersionUID = 0L; - + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:vector_tile.Tile.Feature) + FeatureOrBuilder { + private static final long serialVersionUID = 0L; // Use Feature.newBuilder() to construct. private Feature(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Feature() { tags_ = emptyIntList(); type_ = 0; @@ -1932,7 +1697,7 @@ public final class VectorTile { @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + UnusedPrivateParameter unused) { return new Feature(); } @@ -1941,18 +1706,17 @@ public final class VectorTile { getUnknownFields() { return this.unknownFields; } - private Feature( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + 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(); + com.google.protobuf.UnknownFieldSet.newBuilder(); try { boolean done = false; while (!done) { @@ -1989,7 +1753,7 @@ public final class VectorTile { } case 24: { int rawValue = input.readEnum(); - @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation") vector_tile.VectorTile.Tile.GeomType value = vector_tile.VectorTile.Tile.GeomType.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); @@ -2022,7 +1786,7 @@ public final class VectorTile { } default: { if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { + input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2033,7 +1797,7 @@ public final class VectorTile { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); + e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000002) != 0)) { tags_.makeImmutable(); // C @@ -2045,37 +1809,32 @@ public final class VectorTile { makeExtensionsImmutable(); } } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - vector_tile.VectorTile.Tile.Feature.class, vector_tile.VectorTile.Tile.Feature.Builder.class); + .ensureFieldAccessorsInitialized( + vector_tile.VectorTile.Tile.Feature.class, vector_tile.VectorTile.Tile.Feature.Builder.class); } private int bitField0_; public static final int ID_FIELD_NUMBER = 1; private long id_; - /** * optional uint64 id = 1 [default = 0]; - * * @return Whether the id field is set. */ @java.lang.Override public boolean hasId() { return ((bitField0_ & 0x00000001) != 0); } - /** * optional uint64 id = 1 [default = 0]; - * * @return The id. */ @java.lang.Override @@ -2085,7 +1844,6 @@ public final class VectorTile { public static final int TAGS_FIELD_NUMBER = 2; private com.google.protobuf.Internal.IntList tags_; - /** * 

        * Tags of this feature are encoded as repeated pairs of
@@ -2095,15 +1853,13 @@ public final class VectorTile {
        *
* * repeated uint32 tags = 2 [packed = true]; - * * @return A list containing the tags. */ @java.lang.Override public java.util.List - getTagsList() { + getTagsList() { return tags_; } - /** * 
        * Tags of this feature are encoded as repeated pairs of
@@ -2113,13 +1869,11 @@ public final class VectorTile {
        *
* * repeated uint32 tags = 2 [packed = true]; - * * @return The count of tags. */ public int getTagsCount() { return tags_.size(); } - /** * 
        * Tags of this feature are encoded as repeated pairs of
@@ -2129,44 +1883,36 @@ public final class VectorTile {
        *
* * repeated uint32 tags = 2 [packed = true]; - * * @param index The index of the element to return. * @return The tags at the given index. */ public int getTags(int index) { return tags_.getInt(index); } - private int tagsMemoizedSerializedSize = -1; public static final int TYPE_FIELD_NUMBER = 3; private int type_; - /** * 
        * The type of geometry stored in this feature.
        *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return Whether the type field is set. */ - @java.lang.Override - public boolean hasType() { + @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000002) != 0); } - /** * 
        * The type of geometry stored in this feature.
        *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return The type. */ - @java.lang.Override - public vector_tile.VectorTile.Tile.GeomType getType() { + @java.lang.Override public vector_tile.VectorTile.Tile.GeomType getType() { @SuppressWarnings("deprecation") vector_tile.VectorTile.Tile.GeomType result = vector_tile.VectorTile.Tile.GeomType.valueOf(type_); return result == null ? vector_tile.VectorTile.Tile.GeomType.UNKNOWN : result; @@ -2174,7 +1920,6 @@ public final class VectorTile { public static final int GEOMETRY_FIELD_NUMBER = 4; private com.google.protobuf.Internal.IntList geometry_; - /** * 
        * Contains a stream of commands and parameters (vertices).
@@ -2183,15 +1928,13 @@ public final class VectorTile {
        *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return A list containing the geometry. */ @java.lang.Override public java.util.List - getGeometryList() { + getGeometryList() { return geometry_; } - /** * 
        * Contains a stream of commands and parameters (vertices).
@@ -2200,13 +1943,11 @@ public final class VectorTile {
        *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return The count of geometry. */ public int getGeometryCount() { return geometry_.size(); } - /** * 
        * Contains a stream of commands and parameters (vertices).
@@ -2215,27 +1956,20 @@ public final class VectorTile {
        *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param index The index of the element to return. * @return The geometry at the given index. */ public int getGeometry(int index) { return geometry_.getInt(index); } - private int geometryMemoizedSerializedSize = -1; 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 (isInitialized == 1) return true; + if (isInitialized == 0) return false; memoizedIsInitialized = 1; return true; @@ -2243,7 +1977,7 @@ public final class VectorTile { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) != 0)) { output.writeUInt64(1, id_); @@ -2271,9 +2005,7 @@ public final class VectorTile { @java.lang.Override public int getSerializedSize() { int size = memoizedSize; - if (size != -1) { - return size; - } + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) != 0)) { @@ -2290,7 +2022,7 @@ public final class VectorTile { if (!getTagsList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(dataSize); + .computeInt32SizeNoTag(dataSize); } tagsMemoizedSerializedSize = dataSize; } @@ -2308,7 +2040,7 @@ public final class VectorTile { if (!getGeometryList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(dataSize); + .computeInt32SizeNoTag(dataSize); } geometryMemoizedSerializedSize = dataSize; } @@ -2320,41 +2052,27 @@ public final class VectorTile { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof vector_tile.VectorTile.Tile.Feature)) { return super.equals(obj); } vector_tile.VectorTile.Tile.Feature other = (vector_tile.VectorTile.Tile.Feature) obj; - if (hasId() != other.hasId()) { - return false; - } + if (hasId() != other.hasId()) return false; if (hasId()) { if (getId() - != other.getId()) { - return false; - } + != other.getId()) return false; } if (!getTagsList() - .equals(other.getTagsList())) { - return false; - } - if (hasType() != other.hasType()) { - return false; - } + .equals(other.getTagsList())) return false; + if (hasType() != other.hasType()) return false; if (hasType()) { - if (type_ != other.type_) { - return false; - } + if (type_ != other.type_) return false; } if (!getGeometryList() - .equals(other.getGeometryList())) { - return false; - } - if (!unknownFields.equals(other.unknownFields)) { - return false; - } + .equals(other.getGeometryList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -2368,7 +2086,7 @@ public final class VectorTile { if (hasId()) { hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getId()); + getId()); } if (getTagsCount() > 0) { hash = (37 * hash) + TAGS_FIELD_NUMBER; @@ -2388,135 +2106,117 @@ public final class VectorTile { } public static vector_tile.VectorTile.Tile.Feature parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Feature parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Feature parseFrom(java.io.InputStream input) - throws java.io.IOException { + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Feature parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + .parseDelimitedWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Feature parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + .parseWithIOException(PARSER, input); } - public static vector_tile.VectorTile.Tile.Feature parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(vector_tile.VectorTile.Tile.Feature prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** * 
        * Features are described in section 4.2 of the specification
        *
- *

+ * * Protobuf type {@code vector_tile.Tile.Feature} */ public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Feature) - vector_tile.VectorTile.Tile.FeatureOrBuilder { - + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Feature) + vector_tile.VectorTile.Tile.FeatureOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + getDescriptor() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { + internalGetFieldAccessorTable() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - vector_tile.VectorTile.Tile.Feature.class, vector_tile.VectorTile.Tile.Feature.Builder.class); + .ensureFieldAccessorsInitialized( + vector_tile.VectorTile.Tile.Feature.class, vector_tile.VectorTile.Tile.Feature.Builder.class); } // Construct using vector_tile.VectorTile.Tile.Feature.newBuilder() @@ -2525,17 +2225,15 @@ public final class VectorTile { } private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { + .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); @@ -2552,7 +2250,7 @@ public final class VectorTile { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + getDescriptorForType() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_descriptor; } @@ -2602,44 +2300,38 @@ public final class VectorTile { public Builder clone() { return super.clone(); } - @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + 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) { + com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } - @java.lang.Override public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + 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) { + 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) { + 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 vector_tile.VectorTile.Tile.Feature) { - return mergeFrom((vector_tile.VectorTile.Tile.Feature) other); + return mergeFrom((vector_tile.VectorTile.Tile.Feature)other); } else { super.mergeFrom(other); return this; @@ -2647,9 +2339,7 @@ public final class VectorTile { } public Builder mergeFrom(vector_tile.VectorTile.Tile.Feature other) { - if (other == vector_tile.VectorTile.Tile.Feature.getDefaultInstance()) { - return this; - } + if (other == vector_tile.VectorTile.Tile.Feature.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -2688,9 +2378,9 @@ public final class VectorTile { @java.lang.Override public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { vector_tile.VectorTile.Tile.Feature parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); @@ -2704,34 +2394,27 @@ public final class VectorTile { } return this; } - private int bitField0_; - private long id_; - + private long id_ ; /** * optional uint64 id = 1 [default = 0]; - * * @return Whether the id field is set. */ @java.lang.Override public boolean hasId() { return ((bitField0_ & 0x00000001) != 0); } - /** * optional uint64 id = 1 [default = 0]; - * * @return The id. */ @java.lang.Override public long getId() { return id_; } - /** * optional uint64 id = 1 [default = 0]; - * * @param value The id to set. * @return This builder for chaining. */ @@ -2741,10 +2424,8 @@ public final class VectorTile { onChanged(); return this; } - /** * optional uint64 id = 1 [default = 0]; - * * @return This builder for chaining. */ public Builder clearId() { @@ -2755,14 +2436,12 @@ public final class VectorTile { } private com.google.protobuf.Internal.IntList tags_ = emptyIntList(); - private void ensureTagsIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { tags_ = mutableCopy(tags_); bitField0_ |= 0x00000002; - } + } } - /** * 

          * Tags of this feature are encoded as repeated pairs of
@@ -2772,15 +2451,13 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @return A list containing the tags. */ public java.util.List - getTagsList() { + getTagsList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(tags_) : tags_; + java.util.Collections.unmodifiableList(tags_) : tags_; } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2790,13 +2467,11 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @return The count of tags. */ public int getTagsCount() { return tags_.size(); } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2806,14 +2481,12 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @param index The index of the element to return. * @return The tags at the given index. */ public int getTags(int index) { return tags_.getInt(index); } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2823,19 +2496,17 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @param index The index to set the value at. * @param value The tags to set. * @return This builder for chaining. */ public Builder setTags( - int index, int value) { + int index, int value) { ensureTagsIsMutable(); tags_.setInt(index, value); onChanged(); return this; } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2845,7 +2516,6 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @param value The tags to add. * @return This builder for chaining. */ @@ -2855,7 +2525,6 @@ public final class VectorTile { onChanged(); return this; } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2865,19 +2534,17 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @param values The tags to add. * @return This builder for chaining. */ public Builder addAllTags( - java.lang.Iterable values) { + java.lang.Iterable values) { ensureTagsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, tags_); + values, tags_); onChanged(); return this; } - /** * 
          * Tags of this feature are encoded as repeated pairs of
@@ -2887,7 +2554,6 @@ public final class VectorTile {
          *
* * repeated uint32 tags = 2 [packed = true]; - * * @return This builder for chaining. */ public Builder clearTags() { @@ -2898,28 +2564,23 @@ public final class VectorTile { } private int type_ = 0; - /** * 
          * The type of geometry stored in this feature.
          *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return Whether the type field is set. */ - @java.lang.Override - public boolean hasType() { + @java.lang.Override public boolean hasType() { return ((bitField0_ & 0x00000004) != 0); } - /** * 
          * The type of geometry stored in this feature.
          *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return The type. */ @java.lang.Override @@ -2928,14 +2589,12 @@ public final class VectorTile { vector_tile.VectorTile.Tile.GeomType result = vector_tile.VectorTile.Tile.GeomType.valueOf(type_); return result == null ? vector_tile.VectorTile.Tile.GeomType.UNKNOWN : result; } - /** * 
          * The type of geometry stored in this feature.
          *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @param value The type to set. * @return This builder for chaining. */ @@ -2948,14 +2607,12 @@ public final class VectorTile { onChanged(); return this; } - /** * 
          * The type of geometry stored in this feature.
          *
* * optional .vector_tile.Tile.GeomType type = 3 [default = UNKNOWN]; - * * @return This builder for chaining. */ public Builder clearType() { @@ -2966,14 +2623,12 @@ public final class VectorTile { } private com.google.protobuf.Internal.IntList geometry_ = emptyIntList(); - private void ensureGeometryIsMutable() { if (!((bitField0_ & 0x00000008) != 0)) { geometry_ = mutableCopy(geometry_); bitField0_ |= 0x00000008; - } + } } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -2982,15 +2637,13 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return A list containing the geometry. */ public java.util.List - getGeometryList() { + getGeometryList() { return ((bitField0_ & 0x00000008) != 0) ? - java.util.Collections.unmodifiableList(geometry_) : geometry_; + java.util.Collections.unmodifiableList(geometry_) : geometry_; } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -2999,13 +2652,11 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return The count of geometry. */ public int getGeometryCount() { return geometry_.size(); } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -3014,14 +2665,12 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param index The index of the element to return. * @return The geometry at the given index. */ public int getGeometry(int index) { return geometry_.getInt(index); } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -3030,19 +2679,17 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param index The index to set the value at. * @param value The geometry to set. * @return This builder for chaining. */ public Builder setGeometry( - int index, int value) { + int index, int value) { ensureGeometryIsMutable(); geometry_.setInt(index, value); onChanged(); return this; } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -3051,7 +2698,6 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param value The geometry to add. * @return This builder for chaining. */ @@ -3061,7 +2707,6 @@ public final class VectorTile { onChanged(); return this; } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -3070,19 +2715,17 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @param values The geometry to add. * @return This builder for chaining. */ public Builder addAllGeometry( - java.lang.Iterable values) { + java.lang.Iterable values) { ensureGeometryIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, geometry_); + values, geometry_); onChanged(); return this; } - /** * 
          * Contains a stream of commands and parameters (vertices).
@@ -3091,7 +2734,6 @@ public final class VectorTile {
          *
* * repeated uint32 geometry = 4 [packed = true]; - * * @return This builder for chaining. */ public Builder clearGeometry() { @@ -3100,25 +2742,24 @@ public final class VectorTile { onChanged(); return this; } - @java.lang.Override public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } @java.lang.Override public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { + final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); } + // @@protoc_insertion_point(builder_scope:vector_tile.Tile.Feature) } // @@protoc_insertion_point(class_scope:vector_tile.Tile.Feature) private static final vector_tile.VectorTile.Tile.Feature DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new vector_tile.VectorTile.Tile.Feature(); } @@ -3127,14 +2768,13 @@ public final class VectorTile { return DEFAULT_INSTANCE; } - @java.lang.Deprecated - public static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Deprecated public static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override public Feature parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { return new Feature(input, extensionRegistry); } }; @@ -3156,9 +2796,9 @@ public final class VectorTile { } public interface LayerOrBuilder extends - // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Layer) - com.google.protobuf.GeneratedMessageV3. - ExtendableMessageOrBuilder { + // @@protoc_insertion_point(interface_extends:vector_tile.Tile.Layer) + com.google.protobuf.GeneratedMessageV3. + ExtendableMessageOrBuilder { /** * 
@@ -3169,11 +2809,9 @@ public final class VectorTile {
        *
* * required uint32 version = 15 [default = 1]; - * * @return Whether the version field is set. */ boolean hasVersion(); - /** * 
        * Any compliant implementation must first read the version
@@ -3183,32 +2821,26 @@ public final class VectorTile {
        *
* * required uint32 version = 15 [default = 1]; - * * @return The version. */ int getVersion(); /** * required string name = 1; - * * @return Whether the name field is set. */ boolean hasName(); - /** * required string name = 1; - * * @return The name. */ java.lang.String getName(); - /** * required string name = 1; - * * @return The bytes for name. */ com.google.protobuf.ByteString - getNameBytes(); + getNameBytes(); /** * 
@@ -3217,9 +2849,8 @@ public final class VectorTile {
        *
        * repeated .vector_tile.Tile.Feature features = 2;
        */
-      java.util.List
-      getFeaturesList();
-
+      java.util.List 
+          getFeaturesList();
       /**
        * 
        * The actual features in this tile.
@@ -3228,7 +2859,6 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Feature features = 2;
        */
       vector_tile.VectorTile.Tile.Feature getFeatures(int index);
-
       /**
        * 
        * The actual features in this tile.
@@ -3237,7 +2867,6 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Feature features = 2;
        */
       int getFeaturesCount();
-
       /**
        * 
        * The actual features in this tile.
@@ -3245,9 +2874,8 @@ public final class VectorTile {
        *
        * repeated .vector_tile.Tile.Feature features = 2;
        */
-      java.util.List
-      getFeaturesOrBuilderList();
-
+      java.util.List 
+          getFeaturesOrBuilderList();
       /**
        * 
        * The actual features in this tile.
@@ -3256,7 +2884,7 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Feature features = 2;
        */
       vector_tile.VectorTile.Tile.FeatureOrBuilder getFeaturesOrBuilder(
-        int index);
+          int index);
 
       /**
        * 
@@ -3264,47 +2892,40 @@ public final class VectorTile {
        * 

        *
        * repeated string keys = 3;
-       *
        * @return A list containing the keys.
        */
       java.util.List
-      getKeysList();
-
+          getKeysList();
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @return The count of keys.
        */
       int getKeysCount();
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @param index The index of the element to return.
        * @return The keys at the given index.
        */
       java.lang.String getKeys(int index);
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @param index The index of the value to return.
        * @return The bytes of the keys at the given index.
        */
       com.google.protobuf.ByteString
-      getKeysBytes(int index);
+          getKeysBytes(int index);
 
       /**
        * 
@@ -3313,9 +2934,8 @@ public final class VectorTile {
        *
        * repeated .vector_tile.Tile.Value values = 4;
        */
-      java.util.List
-      getValuesList();
-
+      java.util.List 
+          getValuesList();
       /**
        * 
        * Dictionary encoding for values
@@ -3324,7 +2944,6 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Value values = 4;
        */
       vector_tile.VectorTile.Tile.Value getValues(int index);
-
       /**
        * 
        * Dictionary encoding for values
@@ -3333,7 +2952,6 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Value values = 4;
        */
       int getValuesCount();
-
       /**
        * 
        * Dictionary encoding for values
@@ -3341,9 +2959,8 @@ public final class VectorTile {
        *
        * repeated .vector_tile.Tile.Value values = 4;
        */
-      java.util.List
-      getValuesOrBuilderList();
-
+      java.util.List 
+          getValuesOrBuilderList();
       /**
        * 
        * Dictionary encoding for values
@@ -3352,7 +2969,7 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Value values = 4;
        */
       vector_tile.VectorTile.Tile.ValueOrBuilder getValuesOrBuilder(
-        int index);
+          int index);
 
       /**
        * 
@@ -3361,11 +2978,9 @@ public final class VectorTile {
        * 

        *
        * optional uint32 extent = 5 [default = 4096];
-       *
        * @return Whether the extent field is set.
        */
       boolean hasExtent();
-
       /**
        * 
        * Although this is an "optional" field it is required by the specification.
@@ -3373,33 +2988,27 @@ public final class VectorTile {
        * 

        *
        * optional uint32 extent = 5 [default = 4096];
-       *
        * @return The extent.
        */
       int getExtent();
     }
-
     /**
      * 
      * Layers are described in section 4.1 of the specification
      * 

-     * 

+     *
      * Protobuf type {@code vector_tile.Tile.Layer}
      */
     public static final class Layer extends
-      com.google.protobuf.GeneratedMessageV3.ExtendableMessage<
-        Layer> implements
-      // @@protoc_insertion_point(message_implements:vector_tile.Tile.Layer)
-      LayerOrBuilder {
-
-      private static final long serialVersionUID = 0L;
-
+        com.google.protobuf.GeneratedMessageV3.ExtendableMessage<
+          Layer> implements
+        // @@protoc_insertion_point(message_implements:vector_tile.Tile.Layer)
+        LayerOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use Layer.newBuilder() to construct.
-      private Layer(
-        com.google.protobuf.GeneratedMessageV3.ExtendableBuilder builder) {
+      private Layer(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder builder) {
         super(builder);
       }
-
       private Layer() {
         version_ = 1;
         name_ = "";
@@ -3412,7 +3021,7 @@ public final class VectorTile {
       @java.lang.Override
       @SuppressWarnings({"unused"})
       protected java.lang.Object newInstance(
-        UnusedPrivateParameter unused) {
+          UnusedPrivateParameter unused) {
         return new Layer();
       }
 
@@ -3421,18 +3030,17 @@ public final class VectorTile {
       getUnknownFields() {
         return this.unknownFields;
       }
-
       private Layer(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          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();
+            com.google.protobuf.UnknownFieldSet.newBuilder();
         try {
           boolean done = false;
           while (!done) {
@@ -3453,7 +3061,7 @@ public final class VectorTile {
                   mutable_bitField0_ |= 0x00000004;
                 }
                 features_.add(
-                  input.readMessage(vector_tile.VectorTile.Tile.Feature.PARSER, extensionRegistry));
+                    input.readMessage(vector_tile.VectorTile.Tile.Feature.PARSER, extensionRegistry));
                 break;
               }
               case 26: {
@@ -3471,7 +3079,7 @@ public final class VectorTile {
                   mutable_bitField0_ |= 0x00000010;
                 }
                 values_.add(
-                  input.readMessage(vector_tile.VectorTile.Tile.Value.PARSER, extensionRegistry));
+                    input.readMessage(vector_tile.VectorTile.Tile.Value.PARSER, extensionRegistry));
                 break;
               }
               case 40: {
@@ -3486,7 +3094,7 @@ public final class VectorTile {
               }
               default: {
                 if (!parseUnknownField(
-                  input, unknownFields, extensionRegistry, tag)) {
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -3497,7 +3105,7 @@ public final class VectorTile {
           throw e.setUnfinishedMessage(this);
         } catch (java.io.IOException e) {
           throw new com.google.protobuf.InvalidProtocolBufferException(
-            e).setUnfinishedMessage(this);
+              e).setUnfinishedMessage(this);
         } finally {
           if (((mutable_bitField0_ & 0x00000004) != 0)) {
             features_ = java.util.Collections.unmodifiableList(features_);
@@ -3512,24 +3120,22 @@ public final class VectorTile {
           makeExtensionsImmutable();
         }
       }
-
       public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+          getDescriptor() {
         return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+          internalGetFieldAccessorTable() {
         return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-            vector_tile.VectorTile.Tile.Layer.class, vector_tile.VectorTile.Tile.Layer.Builder.class);
+            .ensureFieldAccessorsInitialized(
+                vector_tile.VectorTile.Tile.Layer.class, vector_tile.VectorTile.Tile.Layer.Builder.class);
       }
 
       private int bitField0_;
       public static final int VERSION_FIELD_NUMBER = 15;
       private int version_;
-
       /**
        * 
        * Any compliant implementation must first read the version
@@ -3539,14 +3145,12 @@ public final class VectorTile {
        * 

        *
        * required uint32 version = 15 [default = 1];
-       *
        * @return Whether the version field is set.
        */
       @java.lang.Override
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000001) != 0);
       }
-
       /**
        * 
        * Any compliant implementation must first read the version
@@ -3556,7 +3160,6 @@ public final class VectorTile {
        * 

        *
        * required uint32 version = 15 [default = 1];
-       *
        * @return The version.
        */
       @java.lang.Override
@@ -3566,20 +3169,16 @@ public final class VectorTile {
 
       public static final int NAME_FIELD_NUMBER = 1;
       private volatile java.lang.Object name_;
-
       /**
        * required string name = 1;
-       *
        * @return Whether the name field is set.
        */
       @java.lang.Override
       public boolean hasName() {
         return ((bitField0_ & 0x00000002) != 0);
       }
-
       /**
        * required string name = 1;
-       *
        * @return The name.
        */
       @java.lang.Override
@@ -3588,8 +3187,8 @@ public final class VectorTile {
         if (ref instanceof java.lang.String) {
           return (java.lang.String) ref;
         } else {
-          com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
+          com.google.protobuf.ByteString bs = 
+              (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
             name_ = s;
@@ -3597,20 +3196,18 @@ public final class VectorTile {
           return s;
         }
       }
-
       /**
        * required string name = 1;
-       *
        * @return The bytes for name.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString
-      getNameBytes() {
+          getNameBytes() {
         java.lang.Object ref = name_;
         if (ref instanceof java.lang.String) {
-          com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
           name_ = b;
           return b;
         } else {
@@ -3620,7 +3217,6 @@ public final class VectorTile {
 
       public static final int FEATURES_FIELD_NUMBER = 2;
       private java.util.List features_;
-
       /**
        * 
        * The actual features in this tile.
@@ -3632,7 +3228,6 @@ public final class VectorTile {
       public java.util.List getFeaturesList() {
         return features_;
       }
-
       /**
        * 
        * The actual features in this tile.
@@ -3641,11 +3236,10 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Feature features = 2;
        */
       @java.lang.Override
-      public java.util.List
-      getFeaturesOrBuilderList() {
+      public java.util.List 
+          getFeaturesOrBuilderList() {
         return features_;
       }
-
       /**
        * 
        * The actual features in this tile.
@@ -3657,7 +3251,6 @@ public final class VectorTile {
       public int getFeaturesCount() {
         return features_.size();
       }
-
       /**
        * 
        * The actual features in this tile.
@@ -3669,7 +3262,6 @@ public final class VectorTile {
       public vector_tile.VectorTile.Tile.Feature getFeatures(int index) {
         return features_.get(index);
       }
-
       /**
        * 
        * The actual features in this tile.
@@ -3679,72 +3271,63 @@ public final class VectorTile {
        */
       @java.lang.Override
       public vector_tile.VectorTile.Tile.FeatureOrBuilder getFeaturesOrBuilder(
-        int index) {
+          int index) {
         return features_.get(index);
       }
 
       public static final int KEYS_FIELD_NUMBER = 3;
       private com.google.protobuf.LazyStringList keys_;
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @return A list containing the keys.
        */
       public com.google.protobuf.ProtocolStringList
-      getKeysList() {
+          getKeysList() {
         return keys_;
       }
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @return The count of keys.
        */
       public int getKeysCount() {
         return keys_.size();
       }
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @param index The index of the element to return.
        * @return The keys at the given index.
        */
       public java.lang.String getKeys(int index) {
         return keys_.get(index);
       }
-
       /**
        * 
        * Dictionary encoding for keys
        * 

        *
        * repeated string keys = 3;
-       *
        * @param index The index of the value to return.
        * @return The bytes of the keys at the given index.
        */
       public com.google.protobuf.ByteString
-      getKeysBytes(int index) {
+          getKeysBytes(int index) {
         return keys_.getByteString(index);
       }
 
       public static final int VALUES_FIELD_NUMBER = 4;
       private java.util.List values_;
-
       /**
        * 
        * Dictionary encoding for values
@@ -3756,7 +3339,6 @@ public final class VectorTile {
       public java.util.List getValuesList() {
         return values_;
       }
-
       /**
        * 
        * Dictionary encoding for values
@@ -3765,11 +3347,10 @@ public final class VectorTile {
        * repeated .vector_tile.Tile.Value values = 4;
        */
       @java.lang.Override
-      public java.util.List
-      getValuesOrBuilderList() {
+      public java.util.List 
+          getValuesOrBuilderList() {
         return values_;
       }
-
       /**
        * 
        * Dictionary encoding for values
@@ -3781,7 +3362,6 @@ public final class VectorTile {
       public int getValuesCount() {
         return values_.size();
       }
-
       /**
        * 
        * Dictionary encoding for values
@@ -3793,7 +3373,6 @@ public final class VectorTile {
       public vector_tile.VectorTile.Tile.Value getValues(int index) {
         return values_.get(index);
       }
-
       /**
        * 
        * Dictionary encoding for values
@@ -3803,13 +3382,12 @@ public final class VectorTile {
        */
       @java.lang.Override
       public vector_tile.VectorTile.Tile.ValueOrBuilder getValuesOrBuilder(
-        int index) {
+          int index) {
         return values_.get(index);
       }
 
       public static final int EXTENT_FIELD_NUMBER = 5;
       private int extent_;
-
       /**
        * 
        * Although this is an "optional" field it is required by the specification.
@@ -3817,14 +3395,12 @@ public final class VectorTile {
        * 

        *
        * optional uint32 extent = 5 [default = 4096];
-       *
        * @return Whether the extent field is set.
        */
       @java.lang.Override
       public boolean hasExtent() {
         return ((bitField0_ & 0x00000004) != 0);
       }
-
       /**
        * 
        * Although this is an "optional" field it is required by the specification.
@@ -3832,7 +3408,6 @@ public final class VectorTile {
        * 

        *
        * optional uint32 extent = 5 [default = 4096];
-       *
        * @return The extent.
        */
       @java.lang.Override
@@ -3841,16 +3416,11 @@ public final class VectorTile {
       }
 
       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 (isInitialized == 1) return true;
+        if (isInitialized == 0) return false;
 
         if (!hasVersion()) {
           memoizedIsInitialized = 0;
@@ -3876,10 +3446,10 @@ public final class VectorTile {
 
       @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
-        throws java.io.IOException {
+                          throws java.io.IOException {
         com.google.protobuf.GeneratedMessageV3
           .ExtendableMessage.ExtensionWriter
-          extensionWriter = newExtensionWriter();
+            extensionWriter = newExtensionWriter();
         if (((bitField0_ & 0x00000002) != 0)) {
           com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
         }
@@ -3905,9 +3475,7 @@ public final class VectorTile {
       @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
-        if (size != -1) {
-          return size;
-        }
+        if (size != -1) return size;
 
         size = 0;
         if (((bitField0_ & 0x00000002) != 0)) {
@@ -3946,58 +3514,37 @@ public final class VectorTile {
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
-          return true;
+         return true;
         }
         if (!(obj instanceof vector_tile.VectorTile.Tile.Layer)) {
           return super.equals(obj);
         }
         vector_tile.VectorTile.Tile.Layer other = (vector_tile.VectorTile.Tile.Layer) obj;
 
-        if (hasVersion() != other.hasVersion()) {
-          return false;
-        }
+        if (hasVersion() != other.hasVersion()) return false;
         if (hasVersion()) {
           if (getVersion()
-            != other.getVersion()) {
-            return false;
-          }
-        }
-        if (hasName() != other.hasName()) {
-          return false;
+              != other.getVersion()) return false;
         }
+        if (hasName() != other.hasName()) return false;
         if (hasName()) {
           if (!getName()
-            .equals(other.getName())) {
-            return false;
-          }
+              .equals(other.getName())) return false;
         }
         if (!getFeaturesList()
-          .equals(other.getFeaturesList())) {
-          return false;
-        }
+            .equals(other.getFeaturesList())) return false;
         if (!getKeysList()
-          .equals(other.getKeysList())) {
-          return false;
-        }
+            .equals(other.getKeysList())) return false;
         if (!getValuesList()
-          .equals(other.getValuesList())) {
-          return false;
-        }
-        if (hasExtent() != other.hasExtent()) {
-          return false;
-        }
+            .equals(other.getValuesList())) return false;
+        if (hasExtent() != other.hasExtent()) return false;
         if (hasExtent()) {
           if (getExtent()
-            != other.getExtent()) {
-            return false;
-          }
+              != other.getExtent()) return false;
         }
-        if (!unknownFields.equals(other.unknownFields)) {
+        if (!unknownFields.equals(other.unknownFields)) return false;
+        if (!getExtensionFields().equals(other.getExtensionFields()))
           return false;
-        }
-        if (!getExtensionFields().equals(other.getExtensionFields())) {
-          return false;
-        }
         return true;
       }
 
@@ -4039,136 +3586,118 @@ public final class VectorTile {
       }
 
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        java.nio.ByteBuffer data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        java.nio.ByteBuffer data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          java.nio.ByteBuffer data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          com.google.protobuf.ByteString data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          byte[] data,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+            .parseWithIOException(PARSER, input);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input);
+            .parseDelimitedWithIOException(PARSER, input);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
+          java.io.InputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
+          com.google.protobuf.CodedInputStream input)
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input);
+            .parseWithIOException(PARSER, input);
       }
-
       public static vector_tile.VectorTile.Tile.Layer parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
         return com.google.protobuf.GeneratedMessageV3
-          .parseWithIOException(PARSER, input, extensionRegistry);
+            .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
       @java.lang.Override
-      public Builder newBuilderForType() {
-        return newBuilder();
-      }
-
+      public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
-
       public static Builder newBuilder(vector_tile.VectorTile.Tile.Layer prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-
       @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
-          ? new Builder() : new Builder().mergeFrom(this);
+            ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
       protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         Builder builder = new Builder(parent);
         return builder;
       }
-
       /**
        * 
        * Layers are described in section 4.1 of the specification
        * 

-       * 

+       *
        * Protobuf type {@code vector_tile.Tile.Layer}
        */
       public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<
-          vector_tile.VectorTile.Tile.Layer, Builder> implements
-        // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Layer)
-        vector_tile.VectorTile.Tile.LayerOrBuilder {
-
+          com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<
+            vector_tile.VectorTile.Tile.Layer, Builder> implements
+          // @@protoc_insertion_point(builder_implements:vector_tile.Tile.Layer)
+          vector_tile.VectorTile.Tile.LayerOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
+            getDescriptor() {
           return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_descriptor;
         }
 
         @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
+            internalGetFieldAccessorTable() {
           return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-              vector_tile.VectorTile.Tile.Layer.class, vector_tile.VectorTile.Tile.Layer.Builder.class);
+              .ensureFieldAccessorsInitialized(
+                  vector_tile.VectorTile.Tile.Layer.class, vector_tile.VectorTile.Tile.Layer.Builder.class);
         }
 
         // Construct using vector_tile.VectorTile.Tile.Layer.newBuilder()
@@ -4177,19 +3706,17 @@ public final class VectorTile {
         }
 
         private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
           super(parent);
           maybeForceBuilderInitialization();
         }
-
         private void maybeForceBuilderInitialization() {
           if (com.google.protobuf.GeneratedMessageV3
-            .alwaysUseFieldBuilders) {
+                  .alwaysUseFieldBuilders) {
             getFeaturesFieldBuilder();
             getValuesFieldBuilder();
           }
         }
-
         @java.lang.Override
         public Builder clear() {
           super.clear();
@@ -4218,7 +3745,7 @@ public final class VectorTile {
 
         @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
+            getDescriptorForType() {
           return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_descriptor;
         }
 
@@ -4285,75 +3812,65 @@ public final class VectorTile {
         public Builder clone() {
           return super.clone();
         }
-
         @java.lang.Override
         public Builder setField(
-          com.google.protobuf.Descriptors.FieldDescriptor field,
-          java.lang.Object value) {
+            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) {
+            com.google.protobuf.Descriptors.FieldDescriptor field) {
           return super.clearField(field);
         }
-
         @java.lang.Override
         public Builder clearOneof(
-          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+            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) {
+            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) {
+            com.google.protobuf.Descriptors.FieldDescriptor field,
+            java.lang.Object value) {
           return super.addRepeatedField(field, value);
         }
-
         @java.lang.Override
         public  Builder setExtension(
-          com.google.protobuf.GeneratedMessage.GeneratedExtension<
-            vector_tile.VectorTile.Tile.Layer, Type> extension,
-          Type value) {
+            com.google.protobuf.GeneratedMessage.GeneratedExtension<
+                vector_tile.VectorTile.Tile.Layer, Type> extension,
+            Type value) {
           return super.setExtension(extension, value);
         }
-
         @java.lang.Override
         public  Builder setExtension(
-          com.google.protobuf.GeneratedMessage.GeneratedExtension<
-            vector_tile.VectorTile.Tile.Layer, java.util.List> extension,
-          int index, Type value) {
+            com.google.protobuf.GeneratedMessage.GeneratedExtension<
+                vector_tile.VectorTile.Tile.Layer, java.util.List> extension,
+            int index, Type value) {
           return super.setExtension(extension, index, value);
         }
-
         @java.lang.Override
         public  Builder addExtension(
-          com.google.protobuf.GeneratedMessage.GeneratedExtension<
-            vector_tile.VectorTile.Tile.Layer, java.util.List> extension,
-          Type value) {
+            com.google.protobuf.GeneratedMessage.GeneratedExtension<
+                vector_tile.VectorTile.Tile.Layer, java.util.List> extension,
+            Type value) {
           return super.addExtension(extension, value);
         }
-
         @java.lang.Override
         public  Builder clearExtension(
-          com.google.protobuf.GeneratedMessage.GeneratedExtension<
-            vector_tile.VectorTile.Tile.Layer, ?> extension) {
+            com.google.protobuf.GeneratedMessage.GeneratedExtension<
+                vector_tile.VectorTile.Tile.Layer, ?> extension) {
           return super.clearExtension(extension);
         }
-
         @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof vector_tile.VectorTile.Tile.Layer) {
-            return mergeFrom((vector_tile.VectorTile.Tile.Layer) other);
+            return mergeFrom((vector_tile.VectorTile.Tile.Layer)other);
           } else {
             super.mergeFrom(other);
             return this;
@@ -4361,9 +3878,7 @@ public final class VectorTile {
         }
 
         public Builder mergeFrom(vector_tile.VectorTile.Tile.Layer other) {
-          if (other == vector_tile.VectorTile.Tile.Layer.getDefaultInstance()) {
-            return this;
-          }
+          if (other == vector_tile.VectorTile.Tile.Layer.getDefaultInstance()) return this;
           if (other.hasVersion()) {
             setVersion(other.getVersion());
           }
@@ -4390,9 +3905,9 @@ public final class VectorTile {
                 featuresBuilder_ = null;
                 features_ = other.features_;
                 bitField0_ = (bitField0_ & ~0x00000004);
-                featuresBuilder_ =
+                featuresBuilder_ = 
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                    getFeaturesFieldBuilder() : null;
+                     getFeaturesFieldBuilder() : null;
               } else {
                 featuresBuilder_.addAllMessages(other.features_);
               }
@@ -4426,9 +3941,9 @@ public final class VectorTile {
                 valuesBuilder_ = null;
                 values_ = other.values_;
                 bitField0_ = (bitField0_ & ~0x00000010);
-                valuesBuilder_ =
+                valuesBuilder_ = 
                   com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                    getValuesFieldBuilder() : null;
+                     getValuesFieldBuilder() : null;
               } else {
                 valuesBuilder_.addAllMessages(other.values_);
               }
@@ -4464,9 +3979,9 @@ public final class VectorTile {
 
         @java.lang.Override
         public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws java.io.IOException {
           vector_tile.VectorTile.Tile.Layer parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
@@ -4480,11 +3995,9 @@ public final class VectorTile {
           }
           return this;
         }
-
         private int bitField0_;
 
         private int version_ = 1;
-
         /**
          * 
          * Any compliant implementation must first read the version
@@ -4494,14 +4007,12 @@ public final class VectorTile {
          * 

          *
          * required uint32 version = 15 [default = 1];
-         *
          * @return Whether the version field is set.
          */
         @java.lang.Override
         public boolean hasVersion() {
           return ((bitField0_ & 0x00000001) != 0);
         }
-
         /**
          * 
          * Any compliant implementation must first read the version
@@ -4511,14 +4022,12 @@ public final class VectorTile {
          * 

          *
          * required uint32 version = 15 [default = 1];
-         *
          * @return The version.
          */
         @java.lang.Override
         public int getVersion() {
           return version_;
         }
-
         /**
          * 
          * Any compliant implementation must first read the version
@@ -4528,7 +4037,6 @@ public final class VectorTile {
          * 

          *
          * required uint32 version = 15 [default = 1];
-         *
          * @param value The version to set.
          * @return This builder for chaining.
          */
@@ -4538,7 +4046,6 @@ public final class VectorTile {
           onChanged();
           return this;
         }
-
         /**
          * 
          * Any compliant implementation must first read the version
@@ -4548,7 +4055,6 @@ public final class VectorTile {
          * 

          *
          * required uint32 version = 15 [default = 1];
-         *
          * @return This builder for chaining.
          */
         public Builder clearVersion() {
@@ -4559,26 +4065,22 @@ public final class VectorTile {
         }
 
         private java.lang.Object name_ = "";
-
         /**
          * required string name = 1;
-         *
          * @return Whether the name field is set.
          */
         public boolean hasName() {
           return ((bitField0_ & 0x00000002) != 0);
         }
-
         /**
          * required string name = 1;
-         *
          * @return The name.
          */
         public java.lang.String getName() {
           java.lang.Object ref = name_;
           if (!(ref instanceof java.lang.String)) {
             com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
+                (com.google.protobuf.ByteString) ref;
             java.lang.String s = bs.toStringUtf8();
             if (bs.isValidUtf8()) {
               name_ = s;
@@ -4588,46 +4090,40 @@ public final class VectorTile {
             return (java.lang.String) ref;
           }
         }
-
         /**
          * required string name = 1;
-         *
          * @return The bytes for name.
          */
         public com.google.protobuf.ByteString
-        getNameBytes() {
+            getNameBytes() {
           java.lang.Object ref = name_;
           if (ref instanceof String) {
-            com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
+            com.google.protobuf.ByteString b = 
+                com.google.protobuf.ByteString.copyFromUtf8(
+                    (java.lang.String) ref);
             name_ = b;
             return b;
           } else {
             return (com.google.protobuf.ByteString) ref;
           }
         }
-
         /**
          * required string name = 1;
-         *
          * @param value The name to set.
          * @return This builder for chaining.
          */
         public Builder setName(
-          java.lang.String value) {
+            java.lang.String value) {
           if (value == null) {
-            throw new NullPointerException();
-          }
-          bitField0_ |= 0x00000002;
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
           name_ = value;
           onChanged();
           return this;
         }
-
         /**
          * required string name = 1;
-         *
          * @return This builder for chaining.
          */
         public Builder clearName() {
@@ -4636,19 +4132,17 @@ public final class VectorTile {
           onChanged();
           return this;
         }
-
         /**
          * required string name = 1;
-         *
          * @param value The bytes for name to set.
          * @return This builder for chaining.
          */
         public Builder setNameBytes(
-          com.google.protobuf.ByteString value) {
+            com.google.protobuf.ByteString value) {
           if (value == null) {
-            throw new NullPointerException();
-          }
-          bitField0_ |= 0x00000002;
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
           name_ = value;
           onChanged();
           return this;
@@ -4656,16 +4150,15 @@ public final class VectorTile {
 
         private java.util.List features_ =
           java.util.Collections.emptyList();
-
         private void ensureFeaturesIsMutable() {
           if (!((bitField0_ & 0x00000004) != 0)) {
             features_ = new java.util.ArrayList(features_);
             bitField0_ |= 0x00000004;
-          }
+           }
         }
 
         private com.google.protobuf.RepeatedFieldBuilderV3<
-          vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder> featuresBuilder_;
+            vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder> featuresBuilder_;
 
         /**
          * 
@@ -4681,7 +4174,6 @@ public final class VectorTile {
             return featuresBuilder_.getMessageList();
           }
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4696,7 +4188,6 @@ public final class VectorTile {
             return featuresBuilder_.getCount();
           }
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4711,7 +4202,6 @@ public final class VectorTile {
             return featuresBuilder_.getMessage(index);
           }
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4720,7 +4210,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder setFeatures(
-          int index, vector_tile.VectorTile.Tile.Feature value) {
+            int index, vector_tile.VectorTile.Tile.Feature value) {
           if (featuresBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4733,7 +4223,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4742,7 +4231,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder setFeatures(
-          int index, vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
+            int index, vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
           if (featuresBuilder_ == null) {
             ensureFeaturesIsMutable();
             features_.set(index, builderForValue.build());
@@ -4752,7 +4241,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4773,7 +4261,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4782,7 +4269,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder addFeatures(
-          int index, vector_tile.VectorTile.Tile.Feature value) {
+            int index, vector_tile.VectorTile.Tile.Feature value) {
           if (featuresBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4795,7 +4282,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4804,7 +4290,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder addFeatures(
-          vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
+            vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
           if (featuresBuilder_ == null) {
             ensureFeaturesIsMutable();
             features_.add(builderForValue.build());
@@ -4814,7 +4300,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4823,7 +4308,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder addFeatures(
-          int index, vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
+            int index, vector_tile.VectorTile.Tile.Feature.Builder builderForValue) {
           if (featuresBuilder_ == null) {
             ensureFeaturesIsMutable();
             features_.add(index, builderForValue.build());
@@ -4833,7 +4318,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4842,18 +4326,17 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public Builder addAllFeatures(
-          java.lang.Iterable values) {
+            java.lang.Iterable values) {
           if (featuresBuilder_ == null) {
             ensureFeaturesIsMutable();
             com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, features_);
+                values, features_);
             onChanged();
           } else {
             featuresBuilder_.addAllMessages(values);
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4871,7 +4354,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4889,7 +4371,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4898,10 +4379,9 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public vector_tile.VectorTile.Tile.Feature.Builder getFeaturesBuilder(
-          int index) {
+            int index) {
           return getFeaturesFieldBuilder().getBuilder(index);
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4910,14 +4390,12 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public vector_tile.VectorTile.Tile.FeatureOrBuilder getFeaturesOrBuilder(
-          int index) {
+            int index) {
           if (featuresBuilder_ == null) {
-            return features_.get(index);
-          } else {
+            return features_.get(index);  } else {
             return featuresBuilder_.getMessageOrBuilder(index);
           }
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4925,15 +4403,14 @@ public final class VectorTile {
          *
          * repeated .vector_tile.Tile.Feature features = 2;
          */
-        public java.util.List
-        getFeaturesOrBuilderList() {
+        public java.util.List 
+             getFeaturesOrBuilderList() {
           if (featuresBuilder_ != null) {
             return featuresBuilder_.getMessageOrBuilderList();
           } else {
             return java.util.Collections.unmodifiableList(features_);
           }
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4943,9 +4420,8 @@ public final class VectorTile {
          */
         public vector_tile.VectorTile.Tile.Feature.Builder addFeaturesBuilder() {
           return getFeaturesFieldBuilder().addBuilder(
-            vector_tile.VectorTile.Tile.Feature.getDefaultInstance());
+              vector_tile.VectorTile.Tile.Feature.getDefaultInstance());
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4954,11 +4430,10 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Feature features = 2;
          */
         public vector_tile.VectorTile.Tile.Feature.Builder addFeaturesBuilder(
-          int index) {
+            int index) {
           return getFeaturesFieldBuilder().addBuilder(
-            index, vector_tile.VectorTile.Tile.Feature.getDefaultInstance());
+              index, vector_tile.VectorTile.Tile.Feature.getDefaultInstance());
         }
-
         /**
          * 
          * The actual features in this tile.
@@ -4966,160 +4441,142 @@ public final class VectorTile {
          *
          * repeated .vector_tile.Tile.Feature features = 2;
          */
-        public java.util.List
-        getFeaturesBuilderList() {
+        public java.util.List 
+             getFeaturesBuilderList() {
           return getFeaturesFieldBuilder().getBuilderList();
         }
-
         private com.google.protobuf.RepeatedFieldBuilderV3<
-          vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder>
-        getFeaturesFieldBuilder() {
+            vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder> 
+            getFeaturesFieldBuilder() {
           if (featuresBuilder_ == null) {
             featuresBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder>(
-              features_,
-              ((bitField0_ & 0x00000004) != 0),
-              getParentForChildren(),
-              isClean());
+                vector_tile.VectorTile.Tile.Feature, vector_tile.VectorTile.Tile.Feature.Builder, vector_tile.VectorTile.Tile.FeatureOrBuilder>(
+                    features_,
+                    ((bitField0_ & 0x00000004) != 0),
+                    getParentForChildren(),
+                    isClean());
             features_ = null;
           }
           return featuresBuilder_;
         }
 
         private com.google.protobuf.LazyStringList keys_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-
         private void ensureKeysIsMutable() {
           if (!((bitField0_ & 0x00000008) != 0)) {
             keys_ = new com.google.protobuf.LazyStringArrayList(keys_);
             bitField0_ |= 0x00000008;
-          }
+           }
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @return A list containing the keys.
          */
         public com.google.protobuf.ProtocolStringList
-        getKeysList() {
+            getKeysList() {
           return keys_.getUnmodifiableView();
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @return The count of keys.
          */
         public int getKeysCount() {
           return keys_.size();
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param index The index of the element to return.
          * @return The keys at the given index.
          */
         public java.lang.String getKeys(int index) {
           return keys_.get(index);
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param index The index of the value to return.
          * @return The bytes of the keys at the given index.
          */
         public com.google.protobuf.ByteString
-        getKeysBytes(int index) {
+            getKeysBytes(int index) {
           return keys_.getByteString(index);
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param index The index to set the value at.
          * @param value The keys to set.
          * @return This builder for chaining.
          */
         public Builder setKeys(
-          int index, java.lang.String value) {
+            int index, java.lang.String value) {
           if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureKeysIsMutable();
+    throw new NullPointerException();
+  }
+  ensureKeysIsMutable();
           keys_.set(index, value);
           onChanged();
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param value The keys to add.
          * @return This builder for chaining.
          */
         public Builder addKeys(
-          java.lang.String value) {
+            java.lang.String value) {
           if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureKeysIsMutable();
+    throw new NullPointerException();
+  }
+  ensureKeysIsMutable();
           keys_.add(value);
           onChanged();
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param values The keys to add.
          * @return This builder for chaining.
          */
         public Builder addAllKeys(
-          java.lang.Iterable values) {
+            java.lang.Iterable values) {
           ensureKeysIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, keys_);
+              values, keys_);
           onChanged();
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @return This builder for chaining.
          */
         public Builder clearKeys() {
@@ -5128,23 +4585,21 @@ public final class VectorTile {
           onChanged();
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for keys
          * 

          *
          * repeated string keys = 3;
-         *
          * @param value The bytes of the keys to add.
          * @return This builder for chaining.
          */
         public Builder addKeysBytes(
-          com.google.protobuf.ByteString value) {
+            com.google.protobuf.ByteString value) {
           if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureKeysIsMutable();
+    throw new NullPointerException();
+  }
+  ensureKeysIsMutable();
           keys_.add(value);
           onChanged();
           return this;
@@ -5152,16 +4607,15 @@ public final class VectorTile {
 
         private java.util.List values_ =
           java.util.Collections.emptyList();
-
         private void ensureValuesIsMutable() {
           if (!((bitField0_ & 0x00000010) != 0)) {
             values_ = new java.util.ArrayList(values_);
             bitField0_ |= 0x00000010;
-          }
+           }
         }
 
         private com.google.protobuf.RepeatedFieldBuilderV3<
-          vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder> valuesBuilder_;
+            vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder> valuesBuilder_;
 
         /**
          * 
@@ -5177,7 +4631,6 @@ public final class VectorTile {
             return valuesBuilder_.getMessageList();
           }
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5192,7 +4645,6 @@ public final class VectorTile {
             return valuesBuilder_.getCount();
           }
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5207,7 +4659,6 @@ public final class VectorTile {
             return valuesBuilder_.getMessage(index);
           }
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5216,7 +4667,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder setValues(
-          int index, vector_tile.VectorTile.Tile.Value value) {
+            int index, vector_tile.VectorTile.Tile.Value value) {
           if (valuesBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -5229,7 +4680,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5238,7 +4688,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder setValues(
-          int index, vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
+            int index, vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
           if (valuesBuilder_ == null) {
             ensureValuesIsMutable();
             values_.set(index, builderForValue.build());
@@ -5248,7 +4698,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5269,7 +4718,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5278,7 +4726,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder addValues(
-          int index, vector_tile.VectorTile.Tile.Value value) {
+            int index, vector_tile.VectorTile.Tile.Value value) {
           if (valuesBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -5291,7 +4739,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5300,7 +4747,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder addValues(
-          vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
+            vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
           if (valuesBuilder_ == null) {
             ensureValuesIsMutable();
             values_.add(builderForValue.build());
@@ -5310,7 +4757,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5319,7 +4765,7 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder addValues(
-          int index, vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
+            int index, vector_tile.VectorTile.Tile.Value.Builder builderForValue) {
           if (valuesBuilder_ == null) {
             ensureValuesIsMutable();
             values_.add(index, builderForValue.build());
@@ -5329,7 +4775,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5338,18 +4783,17 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public Builder addAllValues(
-          java.lang.Iterable values) {
+            java.lang.Iterable values) {
           if (valuesBuilder_ == null) {
             ensureValuesIsMutable();
             com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, values_);
+                values, values_);
             onChanged();
           } else {
             valuesBuilder_.addAllMessages(values);
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5367,7 +4811,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5385,7 +4828,6 @@ public final class VectorTile {
           }
           return this;
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5394,10 +4836,9 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public vector_tile.VectorTile.Tile.Value.Builder getValuesBuilder(
-          int index) {
+            int index) {
           return getValuesFieldBuilder().getBuilder(index);
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5406,14 +4847,12 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public vector_tile.VectorTile.Tile.ValueOrBuilder getValuesOrBuilder(
-          int index) {
+            int index) {
           if (valuesBuilder_ == null) {
-            return values_.get(index);
-          } else {
+            return values_.get(index);  } else {
             return valuesBuilder_.getMessageOrBuilder(index);
           }
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5421,15 +4860,14 @@ public final class VectorTile {
          *
          * repeated .vector_tile.Tile.Value values = 4;
          */
-        public java.util.List
-        getValuesOrBuilderList() {
+        public java.util.List 
+             getValuesOrBuilderList() {
           if (valuesBuilder_ != null) {
             return valuesBuilder_.getMessageOrBuilderList();
           } else {
             return java.util.Collections.unmodifiableList(values_);
           }
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5439,9 +4877,8 @@ public final class VectorTile {
          */
         public vector_tile.VectorTile.Tile.Value.Builder addValuesBuilder() {
           return getValuesFieldBuilder().addBuilder(
-            vector_tile.VectorTile.Tile.Value.getDefaultInstance());
+              vector_tile.VectorTile.Tile.Value.getDefaultInstance());
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5450,11 +4887,10 @@ public final class VectorTile {
          * repeated .vector_tile.Tile.Value values = 4;
          */
         public vector_tile.VectorTile.Tile.Value.Builder addValuesBuilder(
-          int index) {
+            int index) {
           return getValuesFieldBuilder().addBuilder(
-            index, vector_tile.VectorTile.Tile.Value.getDefaultInstance());
+              index, vector_tile.VectorTile.Tile.Value.getDefaultInstance());
         }
-
         /**
          * 
          * Dictionary encoding for values
@@ -5462,28 +4898,26 @@ public final class VectorTile {
          *
          * repeated .vector_tile.Tile.Value values = 4;
          */
-        public java.util.List
-        getValuesBuilderList() {
+        public java.util.List 
+             getValuesBuilderList() {
           return getValuesFieldBuilder().getBuilderList();
         }
-
         private com.google.protobuf.RepeatedFieldBuilderV3<
-          vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder>
-        getValuesFieldBuilder() {
+            vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder> 
+            getValuesFieldBuilder() {
           if (valuesBuilder_ == null) {
             valuesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder>(
-              values_,
-              ((bitField0_ & 0x00000010) != 0),
-              getParentForChildren(),
-              isClean());
+                vector_tile.VectorTile.Tile.Value, vector_tile.VectorTile.Tile.Value.Builder, vector_tile.VectorTile.Tile.ValueOrBuilder>(
+                    values_,
+                    ((bitField0_ & 0x00000010) != 0),
+                    getParentForChildren(),
+                    isClean());
             values_ = null;
           }
           return valuesBuilder_;
         }
 
         private int extent_ = 4096;
-
         /**
          * 
          * Although this is an "optional" field it is required by the specification.
@@ -5491,14 +4925,12 @@ public final class VectorTile {
          * 

          *
          * optional uint32 extent = 5 [default = 4096];
-         *
          * @return Whether the extent field is set.
          */
         @java.lang.Override
         public boolean hasExtent() {
           return ((bitField0_ & 0x00000020) != 0);
         }
-
         /**
          * 
          * Although this is an "optional" field it is required by the specification.
@@ -5506,14 +4938,12 @@ public final class VectorTile {
          * 

          *
          * optional uint32 extent = 5 [default = 4096];
-         *
          * @return The extent.
          */
         @java.lang.Override
         public int getExtent() {
           return extent_;
         }
-
         /**
          * 
          * Although this is an "optional" field it is required by the specification.
@@ -5521,7 +4951,6 @@ public final class VectorTile {
          * 

          *
          * optional uint32 extent = 5 [default = 4096];
-         *
          * @param value The extent to set.
          * @return This builder for chaining.
          */
@@ -5531,7 +4960,6 @@ public final class VectorTile {
           onChanged();
           return this;
         }
-
         /**
          * 
          * Although this is an "optional" field it is required by the specification.
@@ -5539,7 +4967,6 @@ public final class VectorTile {
          * 

          *
          * optional uint32 extent = 5 [default = 4096];
-         *
          * @return This builder for chaining.
          */
         public Builder clearExtent() {
@@ -5548,25 +4975,24 @@ public final class VectorTile {
           onChanged();
           return this;
         }
-
         @java.lang.Override
         public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFields(unknownFields);
         }
 
         @java.lang.Override
         public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
+            final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
         }
 
+
         // @@protoc_insertion_point(builder_scope:vector_tile.Tile.Layer)
       }
 
       // @@protoc_insertion_point(class_scope:vector_tile.Tile.Layer)
       private static final vector_tile.VectorTile.Tile.Layer DEFAULT_INSTANCE;
-
       static {
         DEFAULT_INSTANCE = new vector_tile.VectorTile.Tile.Layer();
       }
@@ -5575,14 +5001,13 @@ public final class VectorTile {
         return DEFAULT_INSTANCE;
       }
 
-      @java.lang.Deprecated
-      public static final com.google.protobuf.Parser
-        PARSER = new com.google.protobuf.AbstractParser() {
+      @java.lang.Deprecated public static final com.google.protobuf.Parser
+          PARSER = new com.google.protobuf.AbstractParser() {
         @java.lang.Override
         public Layer parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
           return new Layer(input, extensionRegistry);
         }
       };
@@ -5605,7 +5030,6 @@ public final class VectorTile {
 
     public static final int LAYERS_FIELD_NUMBER = 3;
     private java.util.List layers_;
-
     /**
      * repeated .vector_tile.Tile.Layer layers = 3;
      */
@@ -5613,16 +5037,14 @@ public final class VectorTile {
     public java.util.List getLayersList() {
       return layers_;
     }
-
     /**
      * repeated .vector_tile.Tile.Layer layers = 3;
      */
     @java.lang.Override
-    public java.util.List
-    getLayersOrBuilderList() {
+    public java.util.List 
+        getLayersOrBuilderList() {
       return layers_;
     }
-
     /**
      * repeated .vector_tile.Tile.Layer layers = 3;
      */
@@ -5630,7 +5052,6 @@ public final class VectorTile {
     public int getLayersCount() {
       return layers_.size();
     }
-
     /**
      * repeated .vector_tile.Tile.Layer layers = 3;
      */
@@ -5638,27 +5059,21 @@ public final class VectorTile {
     public vector_tile.VectorTile.Tile.Layer getLayers(int index) {
       return layers_.get(index);
     }
-
     /**
      * repeated .vector_tile.Tile.Layer layers = 3;
      */
     @java.lang.Override
     public vector_tile.VectorTile.Tile.LayerOrBuilder getLayersOrBuilder(
-      int index) {
+        int index) {
       return layers_.get(index);
     }
 
     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 (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       for (int i = 0; i < getLayersCount(); i++) {
         if (!getLayers(i).isInitialized()) {
@@ -5676,10 +5091,10 @@ public final class VectorTile {
 
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
-      throws java.io.IOException {
+                        throws java.io.IOException {
       com.google.protobuf.GeneratedMessageV3
         .ExtendableMessage.ExtensionWriter
-        extensionWriter = newExtensionWriter();
+          extensionWriter = newExtensionWriter();
       for (int i = 0; i < layers_.size(); i++) {
         output.writeMessage(3, layers_.get(i));
       }
@@ -5690,9 +5105,7 @@ public final class VectorTile {
     @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
-      if (size != -1) {
-        return size;
-      }
+      if (size != -1) return size;
 
       size = 0;
       for (int i = 0; i < layers_.size(); i++) {
@@ -5708,7 +5121,7 @@ public final class VectorTile {
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
-        return true;
+       return true;
       }
       if (!(obj instanceof vector_tile.VectorTile.Tile)) {
         return super.equals(obj);
@@ -5716,15 +5129,10 @@ public final class VectorTile {
       vector_tile.VectorTile.Tile other = (vector_tile.VectorTile.Tile) obj;
 
       if (!getLayersList()
-        .equals(other.getLayersList())) {
+          .equals(other.getLayersList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (!getExtensionFields().equals(other.getExtensionFields()))
         return false;
-      }
-      if (!unknownFields.equals(other.unknownFields)) {
-        return false;
-      }
-      if (!getExtensionFields().equals(other.getExtensionFields())) {
-        return false;
-      }
       return true;
     }
 
@@ -5746,132 +5154,114 @@ public final class VectorTile {
     }
 
     public static vector_tile.VectorTile.Tile parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+          .parseWithIOException(PARSER, input);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static vector_tile.VectorTile.Tile parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
+          .parseDelimitedWithIOException(PARSER, input);
     }
-
     public static vector_tile.VectorTile.Tile parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
+          .parseWithIOException(PARSER, input);
     }
-
     public static vector_tile.VectorTile.Tile parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
       return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     @java.lang.Override
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-
     public static Builder newBuilder(vector_tile.VectorTile.Tile prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-
     @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
+          ? new Builder() : new Builder().mergeFrom(this);
     }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
-
     /**
      * Protobuf type {@code vector_tile.Tile}
      */
     public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<
-        vector_tile.VectorTile.Tile, Builder> implements
-      // @@protoc_insertion_point(builder_implements:vector_tile.Tile)
-      vector_tile.VectorTile.TileOrBuilder {
-
+        com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<
+          vector_tile.VectorTile.Tile, Builder> implements
+        // @@protoc_insertion_point(builder_implements:vector_tile.Tile)
+        vector_tile.VectorTile.TileOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
+          getDescriptor() {
         return vector_tile.VectorTile.internal_static_vector_tile_Tile_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
+          internalGetFieldAccessorTable() {
         return vector_tile.VectorTile.internal_static_vector_tile_Tile_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-            vector_tile.VectorTile.Tile.class, vector_tile.VectorTile.Tile.Builder.class);
+            .ensureFieldAccessorsInitialized(
+                vector_tile.VectorTile.Tile.class, vector_tile.VectorTile.Tile.Builder.class);
       }
 
       // Construct using vector_tile.VectorTile.Tile.newBuilder()
@@ -5880,18 +5270,16 @@ public final class VectorTile {
       }
 
       private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
-
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
-          .alwaysUseFieldBuilders) {
+                .alwaysUseFieldBuilders) {
           getLayersFieldBuilder();
         }
       }
-
       @java.lang.Override
       public Builder clear() {
         super.clear();
@@ -5906,7 +5294,7 @@ public final class VectorTile {
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
-      getDescriptorForType() {
+          getDescriptorForType() {
         return vector_tile.VectorTile.internal_static_vector_tile_Tile_descriptor;
       }
 
@@ -5945,75 +5333,65 @@ public final class VectorTile {
       public Builder clone() {
         return super.clone();
       }
-
       @java.lang.Override
       public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
+          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) {
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
         return super.clearField(field);
       }
-
       @java.lang.Override
       public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+          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) {
+          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) {
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
         return super.addRepeatedField(field, value);
       }
-
       @java.lang.Override
       public  Builder setExtension(
-        com.google.protobuf.GeneratedMessage.GeneratedExtension<
-          vector_tile.VectorTile.Tile, Type> extension,
-        Type value) {
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              vector_tile.VectorTile.Tile, Type> extension,
+          Type value) {
         return super.setExtension(extension, value);
       }
-
       @java.lang.Override
       public  Builder setExtension(
-        com.google.protobuf.GeneratedMessage.GeneratedExtension<
-          vector_tile.VectorTile.Tile, java.util.List> extension,
-        int index, Type value) {
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              vector_tile.VectorTile.Tile, java.util.List> extension,
+          int index, Type value) {
         return super.setExtension(extension, index, value);
       }
-
       @java.lang.Override
       public  Builder addExtension(
-        com.google.protobuf.GeneratedMessage.GeneratedExtension<
-          vector_tile.VectorTile.Tile, java.util.List> extension,
-        Type value) {
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              vector_tile.VectorTile.Tile, java.util.List> extension,
+          Type value) {
         return super.addExtension(extension, value);
       }
-
       @java.lang.Override
       public  Builder clearExtension(
-        com.google.protobuf.GeneratedMessage.GeneratedExtension<
-          vector_tile.VectorTile.Tile, ?> extension) {
+          com.google.protobuf.GeneratedMessage.GeneratedExtension<
+              vector_tile.VectorTile.Tile, ?> extension) {
         return super.clearExtension(extension);
       }
-
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof vector_tile.VectorTile.Tile) {
-          return mergeFrom((vector_tile.VectorTile.Tile) other);
+          return mergeFrom((vector_tile.VectorTile.Tile)other);
         } else {
           super.mergeFrom(other);
           return this;
@@ -6021,9 +5399,7 @@ public final class VectorTile {
       }
 
       public Builder mergeFrom(vector_tile.VectorTile.Tile other) {
-        if (other == vector_tile.VectorTile.Tile.getDefaultInstance()) {
-          return this;
-        }
+        if (other == vector_tile.VectorTile.Tile.getDefaultInstance()) return this;
         if (layersBuilder_ == null) {
           if (!other.layers_.isEmpty()) {
             if (layers_.isEmpty()) {
@@ -6042,9 +5418,9 @@ public final class VectorTile {
               layersBuilder_ = null;
               layers_ = other.layers_;
               bitField0_ = (bitField0_ & ~0x00000001);
-              layersBuilder_ =
+              layersBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                  getLayersFieldBuilder() : null;
+                   getLayersFieldBuilder() : null;
             } else {
               layersBuilder_.addAllMessages(other.layers_);
             }
@@ -6071,9 +5447,9 @@ public final class VectorTile {
 
       @java.lang.Override
       public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
         vector_tile.VectorTile.Tile parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
@@ -6087,21 +5463,19 @@ public final class VectorTile {
         }
         return this;
       }
-
       private int bitField0_;
 
       private java.util.List layers_ =
         java.util.Collections.emptyList();
-
       private void ensureLayersIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
           layers_ = new java.util.ArrayList(layers_);
           bitField0_ |= 0x00000001;
-        }
+         }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-        vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder> layersBuilder_;
+          vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder> layersBuilder_;
 
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
@@ -6113,7 +5487,6 @@ public final class VectorTile {
           return layersBuilder_.getMessageList();
         }
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
@@ -6124,7 +5497,6 @@ public final class VectorTile {
           return layersBuilder_.getCount();
         }
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
@@ -6135,12 +5507,11 @@ public final class VectorTile {
           return layersBuilder_.getMessage(index);
         }
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder setLayers(
-        int index, vector_tile.VectorTile.Tile.Layer value) {
+          int index, vector_tile.VectorTile.Tile.Layer value) {
         if (layersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6153,12 +5524,11 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder setLayers(
-        int index, vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
+          int index, vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
         if (layersBuilder_ == null) {
           ensureLayersIsMutable();
           layers_.set(index, builderForValue.build());
@@ -6168,7 +5538,6 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
@@ -6185,12 +5554,11 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder addLayers(
-        int index, vector_tile.VectorTile.Tile.Layer value) {
+          int index, vector_tile.VectorTile.Tile.Layer value) {
         if (layersBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -6203,12 +5571,11 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder addLayers(
-        vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
+          vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
         if (layersBuilder_ == null) {
           ensureLayersIsMutable();
           layers_.add(builderForValue.build());
@@ -6218,12 +5585,11 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder addLayers(
-        int index, vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
+          int index, vector_tile.VectorTile.Tile.Layer.Builder builderForValue) {
         if (layersBuilder_ == null) {
           ensureLayersIsMutable();
           layers_.add(index, builderForValue.build());
@@ -6233,23 +5599,21 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public Builder addAllLayers(
-        java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (layersBuilder_ == null) {
           ensureLayersIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, layers_);
+              values, layers_);
           onChanged();
         } else {
           layersBuilder_.addAllMessages(values);
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
@@ -6263,7 +5627,6 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
@@ -6277,97 +5640,88 @@ public final class VectorTile {
         }
         return this;
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public vector_tile.VectorTile.Tile.Layer.Builder getLayersBuilder(
-        int index) {
+          int index) {
         return getLayersFieldBuilder().getBuilder(index);
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public vector_tile.VectorTile.Tile.LayerOrBuilder getLayersOrBuilder(
-        int index) {
+          int index) {
         if (layersBuilder_ == null) {
-          return layers_.get(index);
-        } else {
+          return layers_.get(index);  } else {
           return layersBuilder_.getMessageOrBuilder(index);
         }
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
-      public java.util.List
-      getLayersOrBuilderList() {
+      public java.util.List 
+           getLayersOrBuilderList() {
         if (layersBuilder_ != null) {
           return layersBuilder_.getMessageOrBuilderList();
         } else {
           return java.util.Collections.unmodifiableList(layers_);
         }
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public vector_tile.VectorTile.Tile.Layer.Builder addLayersBuilder() {
         return getLayersFieldBuilder().addBuilder(
-          vector_tile.VectorTile.Tile.Layer.getDefaultInstance());
+            vector_tile.VectorTile.Tile.Layer.getDefaultInstance());
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
       public vector_tile.VectorTile.Tile.Layer.Builder addLayersBuilder(
-        int index) {
+          int index) {
         return getLayersFieldBuilder().addBuilder(
-          index, vector_tile.VectorTile.Tile.Layer.getDefaultInstance());
+            index, vector_tile.VectorTile.Tile.Layer.getDefaultInstance());
       }
-
       /**
        * repeated .vector_tile.Tile.Layer layers = 3;
        */
-      public java.util.List
-      getLayersBuilderList() {
+      public java.util.List 
+           getLayersBuilderList() {
         return getLayersFieldBuilder().getBuilderList();
       }
-
       private com.google.protobuf.RepeatedFieldBuilderV3<
-        vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder>
-      getLayersFieldBuilder() {
+          vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder> 
+          getLayersFieldBuilder() {
         if (layersBuilder_ == null) {
           layersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-            vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder>(
-            layers_,
-            ((bitField0_ & 0x00000001) != 0),
-            getParentForChildren(),
-            isClean());
+              vector_tile.VectorTile.Tile.Layer, vector_tile.VectorTile.Tile.Layer.Builder, vector_tile.VectorTile.Tile.LayerOrBuilder>(
+                  layers_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
           layers_ = null;
         }
         return layersBuilder_;
       }
-
       @java.lang.Override
       public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFields(unknownFields);
       }
 
       @java.lang.Override
       public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
       }
 
+
       // @@protoc_insertion_point(builder_scope:vector_tile.Tile)
     }
 
     // @@protoc_insertion_point(class_scope:vector_tile.Tile)
     private static final vector_tile.VectorTile.Tile DEFAULT_INSTANCE;
-
     static {
       DEFAULT_INSTANCE = new vector_tile.VectorTile.Tile();
     }
@@ -6376,14 +5730,13 @@ public final class VectorTile {
       return DEFAULT_INSTANCE;
     }
 
-    @java.lang.Deprecated
-    public static final com.google.protobuf.Parser
-      PARSER = new com.google.protobuf.AbstractParser() {
+    @java.lang.Deprecated public static final com.google.protobuf.Parser
+        PARSER = new com.google.protobuf.AbstractParser() {
       @java.lang.Override
       public Tile parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
         return new Tile(input, extensionRegistry);
       }
     };
@@ -6406,81 +5759,79 @@ public final class VectorTile {
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_vector_tile_Tile_descriptor;
-  private static final
-  com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internal_static_vector_tile_Tile_fieldAccessorTable;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_vector_tile_Tile_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_vector_tile_Tile_Value_descriptor;
-  private static final
-  com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internal_static_vector_tile_Tile_Value_fieldAccessorTable;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_vector_tile_Tile_Value_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_vector_tile_Tile_Feature_descriptor;
-  private static final
-  com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internal_static_vector_tile_Tile_Feature_fieldAccessorTable;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_vector_tile_Tile_Feature_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_vector_tile_Tile_Layer_descriptor;
-  private static final
-  com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-    internal_static_vector_tile_Tile_Layer_fieldAccessorTable;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_vector_tile_Tile_Layer_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
-  getDescriptor() {
+      getDescriptor() {
     return descriptor;
   }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor
-    descriptor;
-
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n)core/src/main/resources/vector_tile.pr" +
-        "oto\022\013vector_tile\"\300\004\n\004Tile\022\'\n\006layers\030\003 \003(" +
-        "\0132\027.vector_tile.Tile.Layer\032\241\001\n\005Value\022\024\n\014" +
-        "string_value\030\001 \001(\t\022\023\n\013float_value\030\002 \001(\002\022" +
-        "\024\n\014double_value\030\003 \001(\001\022\021\n\tint_value\030\004 \001(\003" +
-        "\022\022\n\nuint_value\030\005 \001(\004\022\022\n\nsint_value\030\006 \001(\022" +
-        "\022\022\n\nbool_value\030\007 \001(\010*\010\010\010\020\200\200\200\200\002\032s\n\007Featur" +
-        "e\022\r\n\002id\030\001 \001(\004:\0010\022\020\n\004tags\030\002 \003(\rB\002\020\001\0221\n\004ty" +
-        "pe\030\003 \001(\0162\032.vector_tile.Tile.GeomType:\007UN" +
-        "KNOWN\022\024\n\010geometry\030\004 \003(\rB\002\020\001\032\255\001\n\005Layer\022\022\n" +
-        "\007version\030\017 \002(\r:\0011\022\014\n\004name\030\001 \002(\t\022+\n\010featu" +
-        "res\030\002 \003(\0132\031.vector_tile.Tile.Feature\022\014\n\004" +
-        "keys\030\003 \003(\t\022\'\n\006values\030\004 \003(\0132\027.vector_tile" +
-        ".Tile.Value\022\024\n\006extent\030\005 \001(\r:\0044096*\010\010\020\020\200\200" +
-        "\200\200\002\"?\n\010GeomType\022\013\n\007UNKNOWN\020\000\022\t\n\005POINT\020\001\022" +
-        "\016\n\nLINESTRING\020\002\022\013\n\007POLYGON\020\003*\005\010\020\020\200@B\002H\001"
+      "\n1flatmap-core/src/main/resources/vector" +
+      "_tile.proto\022\013vector_tile\"\300\004\n\004Tile\022\'\n\006lay" +
+      "ers\030\003 \003(\0132\027.vector_tile.Tile.Layer\032\241\001\n\005V" +
+      "alue\022\024\n\014string_value\030\001 \001(\t\022\023\n\013float_valu" +
+      "e\030\002 \001(\002\022\024\n\014double_value\030\003 \001(\001\022\021\n\tint_val" +
+      "ue\030\004 \001(\003\022\022\n\nuint_value\030\005 \001(\004\022\022\n\nsint_val" +
+      "ue\030\006 \001(\022\022\022\n\nbool_value\030\007 \001(\010*\010\010\010\020\200\200\200\200\002\032s" +
+      "\n\007Feature\022\r\n\002id\030\001 \001(\004:\0010\022\020\n\004tags\030\002 \003(\rB\002" +
+      "\020\001\0221\n\004type\030\003 \001(\0162\032.vector_tile.Tile.Geom" +
+      "Type:\007UNKNOWN\022\024\n\010geometry\030\004 \003(\rB\002\020\001\032\255\001\n\005" +
+      "Layer\022\022\n\007version\030\017 \002(\r:\0011\022\014\n\004name\030\001 \002(\t\022" +
+      "+\n\010features\030\002 \003(\0132\031.vector_tile.Tile.Fea" +
+      "ture\022\014\n\004keys\030\003 \003(\t\022\'\n\006values\030\004 \003(\0132\027.vec" +
+      "tor_tile.Tile.Value\022\024\n\006extent\030\005 \001(\r:\004409" +
+      "6*\010\010\020\020\200\200\200\200\002\"?\n\010GeomType\022\013\n\007UNKNOWN\020\000\022\t\n\005" +
+      "POINT\020\001\022\016\n\nLINESTRING\020\002\022\013\n\007POLYGON\020\003*\005\010\020" +
+      "\020\200@B\002H\001"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[]{
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
         });
     internal_static_vector_tile_Tile_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_vector_tile_Tile_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-      internal_static_vector_tile_Tile_descriptor,
-      new java.lang.String[]{"Layers",});
+        internal_static_vector_tile_Tile_descriptor,
+        new java.lang.String[] { "Layers", });
     internal_static_vector_tile_Tile_Value_descriptor =
       internal_static_vector_tile_Tile_descriptor.getNestedTypes().get(0);
     internal_static_vector_tile_Tile_Value_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-      internal_static_vector_tile_Tile_Value_descriptor,
-      new java.lang.String[]{"StringValue", "FloatValue", "DoubleValue", "IntValue", "UintValue", "SintValue",
-        "BoolValue",});
+        internal_static_vector_tile_Tile_Value_descriptor,
+        new java.lang.String[] { "StringValue", "FloatValue", "DoubleValue", "IntValue", "UintValue", "SintValue", "BoolValue", });
     internal_static_vector_tile_Tile_Feature_descriptor =
       internal_static_vector_tile_Tile_descriptor.getNestedTypes().get(1);
     internal_static_vector_tile_Tile_Feature_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-      internal_static_vector_tile_Tile_Feature_descriptor,
-      new java.lang.String[]{"Id", "Tags", "Type", "Geometry",});
+        internal_static_vector_tile_Tile_Feature_descriptor,
+        new java.lang.String[] { "Id", "Tags", "Type", "Geometry", });
     internal_static_vector_tile_Tile_Layer_descriptor =
       internal_static_vector_tile_Tile_descriptor.getNestedTypes().get(2);
     internal_static_vector_tile_Tile_Layer_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-      internal_static_vector_tile_Tile_Layer_descriptor,
-      new java.lang.String[]{"Version", "Name", "Features", "Keys", "Values", "Extent",});
+        internal_static_vector_tile_Tile_Layer_descriptor,
+        new java.lang.String[] { "Version", "Name", "Features", "Keys", "Values", "Extent", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/core/src/main/resources/assemblies/fatjar.xml b/flatmap-core/src/main/resources/assemblies/fatjar.xml
similarity index 100%
rename from core/src/main/resources/assemblies/fatjar.xml
rename to flatmap-core/src/main/resources/assemblies/fatjar.xml
diff --git a/core/src/main/resources/log4j2.properties b/flatmap-core/src/main/resources/log4j2.properties
similarity index 100%
rename from core/src/main/resources/log4j2.properties
rename to flatmap-core/src/main/resources/log4j2.properties
diff --git a/core/src/main/resources/vector_tile.proto b/flatmap-core/src/main/resources/vector_tile.proto
similarity index 100%
rename from core/src/main/resources/vector_tile.proto
rename to flatmap-core/src/main/resources/vector_tile.proto
diff --git a/core/src/test/java/com/onthegomap/flatmap/FeatureCollectorTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/FeatureCollectorTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/FeatureCollectorTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/FeatureCollectorTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/FeatureMergeTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/FeatureMergeTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/FeatureMergeTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/FeatureMergeTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/FlatMapTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/FlatMapTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/FlatMapTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/FlatMapTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/FormatTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/FormatTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/FormatTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/FormatTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/LayerStatsTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/LayerStatsTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/LayerStatsTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/LayerStatsTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/ParseTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/ParseTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/ParseTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/ParseTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/TestUtils.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/TestUtils.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/TestUtils.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/TestUtils.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/TileExtentsTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/TileExtentsTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/TileExtentsTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/TileExtentsTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/TranslationsTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/TranslationsTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/TranslationsTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/TranslationsTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/VectorTileEncoderTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/VectorTileEncoderTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/VectorTileEncoderTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/VectorTileEncoderTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/WikidataTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/WikidataTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/WikidataTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/WikidataTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/ZoomFunctionTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/ZoomFunctionTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/ZoomFunctionTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/ZoomFunctionTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/CacheByZoomTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/CacheByZoomTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/CacheByZoomTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/CacheByZoomTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/CommonStringEncoderTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/CommonStringEncoderTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/CommonStringEncoderTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/CommonStringEncoderTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/FeatureGroupTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/FeatureGroupTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/FeatureGroupTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/FeatureGroupTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/FeatureSortTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/FeatureSortTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/FeatureSortTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/FeatureSortTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/IntRangeTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/IntRangeTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/IntRangeTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/IntRangeTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/LongLongMapTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/LongLongMapTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/LongLongMapTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/LongLongMapTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/LongLongMultimapTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/LongLongMultimapTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/LongLongMultimapTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/LongLongMultimapTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/collections/MutableCoordinateSequenceTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/collections/MutableCoordinateSequenceTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/collections/MutableCoordinateSequenceTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/collections/MutableCoordinateSequenceTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifierTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifierTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifierTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/geo/DouglasPeuckerSimplifierTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/geo/GeoUtilsTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/geo/GeoUtilsTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/geo/GeoUtilsTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/geo/GeoUtilsTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/geo/PointIndexTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/geo/PointIndexTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/geo/PointIndexTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/geo/PointIndexTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/geo/PolygonIndexTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/geo/PolygonIndexTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/geo/PolygonIndexTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/geo/PolygonIndexTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/geo/TileCoordTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/geo/TileCoordTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/geo/TileCoordTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/geo/TileCoordTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/CounterTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/CounterTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/CounterTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/CounterTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/ProcessInfoTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/ProcessInfoTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/ProcessInfoTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/ProcessInfoTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/ProgressLoggersTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/ProgressLoggersTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/ProgressLoggersTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/ProgressLoggersTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/PrometheusStatsTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/PrometheusStatsTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/PrometheusStatsTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/PrometheusStatsTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/TimerTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/TimerTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/TimerTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/TimerTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/monitoring/TimersTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/TimersTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/monitoring/TimersTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/monitoring/TimersTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/NaturalEarthReaderTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/NaturalEarthReaderTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/NaturalEarthReaderTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/NaturalEarthReaderTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/OpenStreetMapReaderTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/OpenStreetMapReaderTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/OpenStreetMapReaderTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/OpenStreetMapReaderTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/OsmInputFileTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/OsmInputFileTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/OsmInputFileTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/OsmInputFileTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/OsmMultipolygonTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/OsmMultipolygonTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/OsmMultipolygonTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/OsmMultipolygonTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/ReaderFeatureTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/ReaderFeatureTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/ReaderFeatureTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/ReaderFeatureTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/read/ShapefileReaderTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/read/ShapefileReaderTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/read/ShapefileReaderTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/read/ShapefileReaderTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/render/FeatureRendererTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/render/FeatureRendererTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/render/FeatureRendererTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/render/FeatureRendererTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/worker/TopologyTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/worker/WorkQueueTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/worker/WorkQueueTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/worker/WorkQueueTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/worker/WorkQueueTest.java
diff --git a/core/src/test/java/com/onthegomap/flatmap/write/MbtilesTest.java b/flatmap-core/src/test/java/com/onthegomap/flatmap/write/MbtilesTest.java
similarity index 100%
rename from core/src/test/java/com/onthegomap/flatmap/write/MbtilesTest.java
rename to flatmap-core/src/test/java/com/onthegomap/flatmap/write/MbtilesTest.java
diff --git a/core/src/test/resources/bad_spain_relation.xml b/flatmap-core/src/test/resources/bad_spain_relation.xml
similarity index 100%
rename from core/src/test/resources/bad_spain_relation.xml
rename to flatmap-core/src/test/resources/bad_spain_relation.xml
diff --git a/core/src/test/resources/bostonbuildings.mbtiles b/flatmap-core/src/test/resources/bostonbuildings.mbtiles
similarity index 100%
rename from core/src/test/resources/bostonbuildings.mbtiles
rename to flatmap-core/src/test/resources/bostonbuildings.mbtiles
diff --git a/core/src/test/resources/chesapeake.wkb b/flatmap-core/src/test/resources/chesapeake.wkb
similarity index 100%
rename from core/src/test/resources/chesapeake.wkb
rename to flatmap-core/src/test/resources/chesapeake.wkb
diff --git a/core/src/test/resources/jakartabuildings.mbtiles b/flatmap-core/src/test/resources/jakartabuildings.mbtiles
similarity index 100%
rename from core/src/test/resources/jakartabuildings.mbtiles
rename to flatmap-core/src/test/resources/jakartabuildings.mbtiles
diff --git a/core/src/test/resources/log4j2.properties b/flatmap-core/src/test/resources/log4j2.properties
similarity index 100%
rename from core/src/test/resources/log4j2.properties
rename to flatmap-core/src/test/resources/log4j2.properties
diff --git a/core/src/test/resources/mdshore.wkb b/flatmap-core/src/test/resources/mdshore.wkb
similarity index 100%
rename from core/src/test/resources/mdshore.wkb
rename to flatmap-core/src/test/resources/mdshore.wkb
diff --git a/core/src/test/resources/monaco-latest.osm.pbf b/flatmap-core/src/test/resources/monaco-latest.osm.pbf
similarity index 100%
rename from core/src/test/resources/monaco-latest.osm.pbf
rename to flatmap-core/src/test/resources/monaco-latest.osm.pbf
diff --git a/core/src/test/resources/natural_earth_vector.sqlite b/flatmap-core/src/test/resources/natural_earth_vector.sqlite
similarity index 100%
rename from core/src/test/resources/natural_earth_vector.sqlite
rename to flatmap-core/src/test/resources/natural_earth_vector.sqlite
diff --git a/core/src/test/resources/natural_earth_vector.sqlite.zip b/flatmap-core/src/test/resources/natural_earth_vector.sqlite.zip
similarity index 100%
rename from core/src/test/resources/natural_earth_vector.sqlite.zip
rename to flatmap-core/src/test/resources/natural_earth_vector.sqlite.zip
diff --git a/core/src/test/resources/njshore.wkb b/flatmap-core/src/test/resources/njshore.wkb
similarity index 100%
rename from core/src/test/resources/njshore.wkb
rename to flatmap-core/src/test/resources/njshore.wkb
diff --git a/core/src/test/resources/shapefile.zip b/flatmap-core/src/test/resources/shapefile.zip
similarity index 100%
rename from core/src/test/resources/shapefile.zip
rename to flatmap-core/src/test/resources/shapefile.zip
diff --git a/examples/pom.xml b/flatmap-examples/pom.xml
similarity index 100%
rename from examples/pom.xml
rename to flatmap-examples/pom.xml
diff --git a/examples/src/main/java/com/onthegomap/flatmap/examples/BikeRouteOverlay.java b/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/BikeRouteOverlay.java
similarity index 100%
rename from examples/src/main/java/com/onthegomap/flatmap/examples/BikeRouteOverlay.java
rename to flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/BikeRouteOverlay.java
diff --git a/examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java b/flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java
similarity index 100%
rename from examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java
rename to flatmap-examples/src/main/java/com/onthegomap/flatmap/examples/ToiletsOverlay.java
diff --git a/openmaptiles/pom.xml b/flatmap-openmaptiles/pom.xml
similarity index 100%
rename from openmaptiles/pom.xml
rename to flatmap-openmaptiles/pom.xml
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/BenchmarkMapping.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/BenchmarkMapping.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/BenchmarkMapping.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/BenchmarkMapping.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Expression.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Expression.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Expression.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Expression.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Generate.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Generate.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Generate.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Generate.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/LanguageUtils.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/LanguageUtils.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/LanguageUtils.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/LanguageUtils.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Layer.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Layer.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Layer.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Layer.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/MultiExpression.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/MultiExpression.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/MultiExpression.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/MultiExpression.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesMain.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesMain.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesMain.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesMain.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesProfile.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesProfile.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesProfile.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/OpenMapTilesProfile.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Utils.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Utils.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Utils.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/Utils.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/OpenMapTilesSchema.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/OpenMapTilesSchema.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/OpenMapTilesSchema.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/OpenMapTilesSchema.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/Tables.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/Tables.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/Tables.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/generated/Tables.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabel.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabel.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabel.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabel.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Aeroway.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Aeroway.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Aeroway.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Aeroway.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Boundary.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Boundary.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Boundary.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Boundary.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Building.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Building.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Building.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Building.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Housenumber.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Housenumber.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Housenumber.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Housenumber.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landcover.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landcover.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landcover.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landcover.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landuse.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landuse.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landuse.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Landuse.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeak.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeak.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeak.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeak.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Park.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Park.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Park.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Park.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Place.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Place.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Place.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Place.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Poi.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Poi.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Poi.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Poi.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Transportation.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Transportation.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Transportation.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Transportation.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationName.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationName.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationName.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationName.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Water.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Water.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Water.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Water.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/WaterName.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/WaterName.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/WaterName.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/WaterName.java
diff --git a/openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Waterway.java b/flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Waterway.java
similarity index 100%
rename from openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Waterway.java
rename to flatmap-openmaptiles/src/main/java/com/onthegomap/flatmap/openmaptiles/layers/Waterway.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/ExpressionTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/ExpressionTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/ExpressionTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/ExpressionTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/GenerateTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/GenerateTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/GenerateTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/GenerateTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/LanguageUtilsTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/LanguageUtilsTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/LanguageUtilsTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/LanguageUtilsTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/MultiExpressionTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/MultiExpressionTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/MultiExpressionTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/MultiExpressionTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/OpenMaptilesProfileTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/OpenMaptilesProfileTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/OpenMaptilesProfileTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/OpenMaptilesProfileTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AbstractLayerTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AbstractLayerTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AbstractLayerTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AbstractLayerTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabelTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabelTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabelTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerodromeLabelTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerowayTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerowayTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerowayTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/AerowayTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BoundaryTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BoundaryTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BoundaryTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BoundaryTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BuildingTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BuildingTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BuildingTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/BuildingTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/HousenumberTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/HousenumberTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/HousenumberTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/HousenumberTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LandcoverTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LandcoverTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LandcoverTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LandcoverTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LanduseTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LanduseTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LanduseTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/LanduseTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeakTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeakTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeakTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/MountainPeakTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/ParkTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/ParkTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/ParkTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/ParkTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PlaceTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PlaceTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PlaceTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PlaceTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PoiTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PoiTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PoiTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/PoiTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/TransportationTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterNameTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterNameTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterNameTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterNameTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterTest.java
diff --git a/openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterwayTest.java b/flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterwayTest.java
similarity index 100%
rename from openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterwayTest.java
rename to flatmap-openmaptiles/src/test/java/com/onthegomap/flatmap/openmaptiles/layers/WaterwayTest.java
diff --git a/openmaptiles/src/test/resources/log4j2.properties b/flatmap-openmaptiles/src/test/resources/log4j2.properties
similarity index 100%
rename from openmaptiles/src/test/resources/log4j2.properties
rename to flatmap-openmaptiles/src/test/resources/log4j2.properties
diff --git a/pom.xml b/pom.xml
index 012edb31..313c85bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@
   
 
   
-    core
-    examples
-    openmaptiles
+    flatmap-core
+    flatmap-examples
+    flatmap-openmaptiles
   
 
   
diff --git a/quickstart.sh b/quickstart.sh
index f50c16b0..0c3692ca 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -4,7 +4,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-JAR="openmaptiles/target/flatmap-openmaptiles-0.1-SNAPSHOT-fatjar.jar"
+JAR="flatmap-openmaptiles/target/flatmap-openmaptiles-0.1-SNAPSHOT-fatjar.jar"
 
 echo "Downloading data..."
 AREA="${1:-north-america_us_massachusetts}"
diff --git a/scripts/generate-protobuf.sh b/scripts/generate-protobuf.sh
index 97f3e6fd..afef3c83 100755
--- a/scripts/generate-protobuf.sh
+++ b/scripts/generate-protobuf.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 
-protoc --java_out=core/src/main/java/ core/src/main/resources/vector_tile.proto
+protoc --java_out=flatmap-core/src/main/java/ flatmap-core/src/main/resources/vector_tile.proto
diff --git a/scripts/ubuntu_vm_setup.sh b/scripts/ubuntu_vm_setup.sh
index 9fecbce6..ac4959f2 100755
--- a/scripts/ubuntu_vm_setup.sh
+++ b/scripts/ubuntu_vm_setup.sh
@@ -12,7 +12,7 @@ fi
 
 "$(dirname "$0")"/build.sh
 
-rsync -avzP openmaptiles/target/flatmap-openmaptiles-0.1-SNAPSHOT-fatjar.jar "${1}":flatmap.jar
+rsync -avzP flatmap-openmaptiles/target/flatmap-openmaptiles-0.1-SNAPSHOT-fatjar.jar "${1}":flatmap.jar
 scp scripts/download-other-sources.sh "${1}":download-other-sources.sh
 scp scripts/download-osm.sh "${1}":download-osm.sh
 ssh -t "${1}" "bash -s" <