Merge pull request #56 from geoscript/ecc-vector-tile

jericks · web-flow · commit de7b42662cf5 · 2020-07-26T11:18:03.000-07:00
Switch pbf vector tile libraries and fix build for JTS 1.17.0
diff --git a/examples/vectortiles_generate_world_pbf.groovy b/examples/vectortiles_generate_world_pbf.groovy
@@ -12,9 +12,10 @@ import static geoscript.GeoScript.unzip
 
 // Download data from natural earth
 File dataDir = new File("naturalearth")
+dataDir.mkdir()
 [
-        [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
-        [name: "ocean",     url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
+        [name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],
+        [name: "ocean",     url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]
 ].each { Map item ->
     unzip(download(new URL(item.url), new File(dataDir, "${item.name}.zip"), overwrite: false))
 }
diff --git a/examples/vectortiles_world_pbf.html b/examples/vectortiles_world_pbf.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <html lang="en">
   <head>
-    <link rel="stylesheet" href="https://openlayers.org/en/v4.5.0/css/ol.css" type="text/css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v4.6.5/css/ol.css" type="text/css">
     <style>
       .map {
         height: 400px;
         width: 100%;
       }
     </style>
-    <script src="https://openlayers.org/en/v4.5.0/build/ol.js" type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v4.6.5/build/ol.js" type="text/javascript"></script>
     <title>GeoScript Vector Tiles</title>
   </head>
   <body>
diff --git a/pom.xml b/pom.xml
@@ -32,16 +32,10 @@
     </repositories>
     <dependencies>
         <dependency>
-            <groupId>com.wdtinc</groupId>
-            <artifactId>mapbox-vector-tile</artifactId>
-            <version>3.0.0</version>
+            <groupId>no.ecc.vectortile</groupId>
+            <artifactId>java-vector-tile</artifactId>
+            <version>1.3.10</version>
             <exclusions>
-                <!-- Exclude JTS so geotools can pull in it's version -->
-                <exclusion>
-                    <groupId>org.locationtech.jts</groupId>
-                    <artifactId>jts-core</artifactId>
-                </exclusion>
-                <!-- Exclude protobuf here so gt-geobuf can pull in a more recent version -->
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
diff --git a/src/main/groovy/geoscript/layer/io/Pbf.groovy b/src/main/groovy/geoscript/layer/io/Pbf.groovy
@@ -1,24 +1,14 @@
 package geoscript.layer.io
 
-import org.locationtech.jts.algorithm.CGAlgorithms
+import no.ecc.vectortile.VectorTileDecoder
+import no.ecc.vectortile.VectorTileEncoder
+import org.geotools.geometry.jts.JTS
+import org.geotools.referencing.operation.transform.ProjectiveTransform
+import org.geotools.renderer.lite.RendererUtilities
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.Envelope
 import org.locationtech.jts.geom.Geometry as JtsGeometry
 import org.locationtech.jts.geom.GeometryFactory
-import org.locationtech.jts.geom.LinearRing
-import org.locationtech.jts.geom.Polygon
-import com.wdtinc.mapbox_vector_tile.VectorTile
-import com.wdtinc.mapbox_vector_tile.adapt.jts.IGeometryFilter
-import com.wdtinc.mapbox_vector_tile.adapt.jts.JtsAdapter
-import com.wdtinc.mapbox_vector_tile.adapt.jts.TagKeyValueMapConverter
-import com.wdtinc.mapbox_vector_tile.adapt.jts.TileGeomResult
-import com.wdtinc.mapbox_vector_tile.adapt.jts.UserDataKeyValueMapConverter
-import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsLayer
-import com.wdtinc.mapbox_vector_tile.adapt.jts.model.JtsMvt
-import com.wdtinc.mapbox_vector_tile.adapt.jts.MvtReader as JtsMvtReader
-import com.wdtinc.mapbox_vector_tile.build.MvtLayerBuild
-import com.wdtinc.mapbox_vector_tile.build.MvtLayerParams
-import com.wdtinc.mapbox_vector_tile.build.MvtLayerProps
 import geoscript.feature.Feature
 import geoscript.feature.Field
 import geoscript.feature.Schema
@@ -30,6 +20,9 @@ import geoscript.proj.Projection
 import geoscript.workspace.Memory
 import org.geotools.renderer.crs.ProjectionHandler
 import org.geotools.renderer.crs.ProjectionHandlerFinder
+import org.opengis.referencing.operation.MathTransform
+
+import java.awt.Rectangle
 
 /**
  * A MapBox Vector Tile Reader and Writer
@@ -47,42 +40,39 @@ class Pbf {
      * @param b The Bounds
      */
     static List<Layer> read(Map options = [:], byte[] bytes, Bounds b) {
+
+        ProjectionHandler projectionHandler = ProjectionHandlerFinder.getHandler(b.env, b.proj.crs, true)
         Projection proj = options.get("proj", new Projection("EPSG:3857"))
         int tileSize = options.get("tileSize", 256)
         int extent = options.get("extent", 4096)
-        List<Layer> layers = []
-        GeometryFactory geometryFactory = new GeometryFactory()
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)
-        JtsMvt jtsMvt = JtsMvtReader.loadMvt(inputStream, geometryFactory, new TagKeyValueMapConverter(), new NonValidatingRingClassifier())
 
-        jtsMvt.layers.each { JtsLayer jtsLayer ->
-            String name = jtsLayer.name
-            Layer layer
-            Schema schema
-            jtsLayer.geometries.eachWithIndex { JtsGeometry jtsGeometry, int i ->
-                Geometry geometry = fromPixel(Geometry.wrap(jtsGeometry), b, tileSize, extent)
-                ProjectionHandler projectionHandler = ProjectionHandlerFinder.getHandler(b.env, b.proj.crs, true)
+        Map<String, Layer> layers = [:]
+        VectorTileDecoder vectorTileDecoder = new VectorTileDecoder()
+        VectorTileDecoder.FeatureIterable  features = vectorTileDecoder.decode(bytes)
+        features.iterator().each { VectorTileDecoder.Feature vectorTileFeature ->
+            String layerName = vectorTileFeature.layerName
+            Geometry geometry = fromPixel(Geometry.wrap(vectorTileFeature.geometry), b, tileSize, extent)
+            if (!geometry.isEmpty()) {
                 if (projectionHandler) {
                     JtsGeometry processedGeom = projectionHandler.preProcess(geometry.g)
                     if (processedGeom) {
                         geometry = Geometry.wrap(processedGeom)
                     }
                 }
-                Map properties = jtsGeometry.userData as Map
-                properties.put("geometry", geometry)
-                Feature feature
-                if (!schema) {
-                    feature = new Feature(properties, "1")
-                    schema = new Schema(name, feature.schema.fields).reproject(proj)
-                    layer = new Memory().create(schema)
-                } else {
-                    feature = schema.feature(properties)
+                Map<String, Object> attributes = [geometry: geometry]
+                attributes.putAll(vectorTileFeature.attributes)
+                if (!layers.containsKey(layerName)) {
+                    Feature feature = new Feature(attributes, "1")
+                    Schema schema = new Schema(layerName, feature.schema.fields).reproject(proj)
+                    layers[layerName] = new Memory().create(schema)
                 }
+                Layer layer = layers[layerName]
+                Feature feature = layer.schema.feature(attributes)
                 layer.add(feature)
             }
-            layers.add(layer)
         }
-        layers
+
+        layers.values().toList()
     }
 
     /**
@@ -126,34 +116,27 @@ class Pbf {
         final double bufferHeight = b.env.height * 0.1f
         clipEnvelope.expandBy(bufferWidth, bufferHeight)
 
-        VectorTile.Tile.Builder tileBuilder = VectorTile.Tile.newBuilder()
-        MvtLayerParams mvtParams = MvtLayerParams.DEFAULT
-        GeometryFactory geometryFactory = new GeometryFactory()
-        IGeometryFilter geometryFilter = new IGeometryFilter() {
-            @Override
-            boolean accept(org.locationtech.jts.geom.Geometry geometry) {
-                true
-            }
-        }
-
+        VectorTileEncoder encoder = new VectorTileEncoder()
         layers.each { Layer layer ->
             Bounds projectedBounds = b.reproject(layer.proj)
             projectedBounds.expandBy(projectedBounds.width * 0.1f)
             Geometry boundsGeom = projectedBounds.geometry
             boolean isPoint = layer.schema.geom.typ.equalsIgnoreCase("point")
-            VectorTile.Tile.Layer.Builder layerBuilder = MvtLayerBuild.newLayerBuilder(layer.name, mvtParams)
-            MvtLayerProps layerProps = new MvtLayerProps()
+            // Intersects
             List<JtsGeometry> geometries = []
             layer.eachFeature(Filter.intersects(layer.schema.geom.name, boundsGeom), { Feature f ->
+                // Clip
                 Geometry geom = isPoint ? f.geom : f.geom.intersection(boundsGeom)
                 if (!geom.empty) {
+                    // Process
                     ProjectionHandler projectionHandler = ProjectionHandlerFinder.getHandler(b.env, layer.proj.crs, true)
                     if (projectionHandler) {
                         JtsGeometry processedGeom = projectionHandler.preProcess(geom.g)
                         if (processedGeom) {
                             geom = Geometry.wrap(processedGeom)
                         }
                     }
+                    // Reproject
                     JtsGeometry geometry = Projection.transform(geom, layer.proj, b.proj).g
                     Map attributes = [:]
                     layer.schema.fields.each { Field fld ->
@@ -168,72 +151,16 @@ class Pbf {
                         }
                     }
                     geometry.userData = attributes
-
-                    TileGeomResult tileGeom = JtsAdapter.createTileGeom([geometry], b.env, clipEnvelope, geometryFactory, mvtParams, geometryFilter);
-                    geometries.addAll(tileGeom.mvtGeoms)
+                    // To Screen
+                    MathTransform worldToScreenTransform = ProjectiveTransform.create(RendererUtilities.worldToScreenTransform(b.env, new Rectangle(0,0, tileSize, tileSize)))
+                    geometry = JTS.transform(geometry, worldToScreenTransform)
+                    //Encode
+                    encoder.addFeature(layer.name, attributes, geometry)
                 }
             })
-
-            List<VectorTile.Tile.Feature> features = JtsAdapter.toFeatures(geometries, layerProps, new UserDataKeyValueMapConverter())
-            layerBuilder.addAllFeatures(features);
-            MvtLayerBuild.writeProps(layerBuilder, layerProps);
-
-            VectorTile.Tile.Layer vtLayer = layerBuilder.build()
-            tileBuilder.addLayers(vtLayer)
-        }
-
-        VectorTile.Tile tile = tileBuilder.build()
-        byte[] bytes = tile.toByteArray()
-        bytes
-    }
-
-    private static final class NonValidatingRingClassifier implements com.wdtinc.mapbox_vector_tile.adapt.jts.MvtReader.RingClassifier {
-
-        @Override
-        public List<Polygon> classifyRings(List<LinearRing> rings, GeometryFactory geomFactory) {
-
-            final List<Polygon> polygons = new ArrayList<>();
-            final List<LinearRing> holes = new ArrayList<>();
-
-            double outerArea = 0d;
-            LinearRing outerPoly = null;
-
-            for(LinearRing r : rings) {
-
-                double area = CGAlgorithms.signedArea(r.getCoordinates());
-
-                if(area == 0d) {
-                    continue; // zero-area
-                }
-
-                if(area > 0d) {
-                    if(outerPoly != null) {
-                        polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
-                        holes.clear();
-                    }
-
-                    // Pos --> CCW, Outer
-                    outerPoly = r;
-                    outerArea = area;
-                } else {
-
-                    if(Math.abs(outerArea) < Math.abs(area)) {
-                        continue; // Holes must have less area, could probably be handled in a isSimple() check
-                    }
-
-                    // Neg --> CW, Hole
-                    holes.add(r);
-                }
-            }
-
-            if(outerPoly != null) {
-                holes.toArray();
-                polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
-            }
-
-            return polygons;
         }
 
+        encoder.encode()
     }
 
 }
diff --git a/src/test/groovy/geoscript/geom/GeometryTestCase.groovy b/src/test/groovy/geoscript/geom/GeometryTestCase.groovy
@@ -28,10 +28,18 @@ class GeometryTestCase {
     }
 
     @Test void singleSidedBuffer() {
-       String wkt = "LINESTRING (0.693359375 46.591796875, 5.703125 51.337890625, 9.306640625 48.0419921875, 12.03125 53.0078125, 19.2822265625 45.80078125)"
+       String wkt = "LINESTRING (0.693359375 46.591796875, 5.703125 51.337890625, 9.306640625 48.0419921875, " +
+               "12.03125 53.0078125, 19.2822265625 45.80078125)"
        Geometry g = Geometry.fromWKT(wkt)
        Geometry buffer = g.singleSidedBuffer(-2)
-       assertEquals "POLYGON ((0.693359375 46.591796875, 5.703125 51.337890625, 9.306640625 48.0419921875, 12.03125 53.0078125, 19.2822265625 45.80078125, 17.8723180343991 44.38227571867897, 12.506275490911024 49.71579679220651, 11.060054369792876 47.07994216823311, 10.832564011572027 46.749104791663626, 10.543576944652168 46.470372468507726, 10.20473972588441 46.25497847602753, 9.82970793845354 46.11160347389942, 9.43359585401137 46.04602566227302, 9.032367307756616 46.06088791274607, 8.642192334992414 46.155591257181634, 8.278795497549897 46.32631902690761, 7.9568221633754534 46.566190669457164, 5.727082494228705 48.605586708310895, 2.0688486708215663 45.139891507188345, 0.693359375 46.591796875))", buffer.wkt
+       assertEquals "POLYGON ((0.693359375 46.591796875, 5.703125 51.337890625, 9.306640625 48.0419921875, " +
+               "12.03125 53.0078125, 19.2822265625 45.80078125, 17.8723180343991 44.38227571867897, 12.506275490911024 " +
+               "49.71579679220651, 11.060054369792876 47.07994216823311, 10.832564011572027 46.749104791663626, " +
+               "10.543576944652168 46.470372468507726, 10.20473972588441 46.25497847602753, 9.82970793845354 " +
+               "46.11160347389942, 9.43359585401137 46.04602566227302, 9.032367307756616 46.06088791274607, " +
+               "8.642192334992412 46.155591257181634, 8.278795497549897 46.32631902690761, 7.9568221633754534 " +
+               "46.566190669457164, 5.727082494228705 48.605586708310895, 2.0688486708215663 45.139891507188345, " +
+               "0.693359375 46.591796875))", buffer.wkt
     }
 
     @Test void equals() {
diff --git a/src/test/groovy/geoscript/geom/MultiLineStringTestCase.groovy b/src/test/groovy/geoscript/geom/MultiLineStringTestCase.groovy
@@ -36,12 +36,10 @@ class MultiLineStringTestCase {
         def lines = new MultiLineString(Geometry.fromWKT(wkt))
         def noded = lines.node(5)
         assertEquals "MULTILINESTRING ((5.19775390625 51.07421875, 5.6 51.6), (5.6 51.6, 6.4 52.6), " +
-            "(6.4 52.6, 7.52685546875 53.7548828125), (7.52685546875 53.7548828125, 8.2 53.2), " +
-            "(8.2 53.2, 9 52.4), (9 52.4, 11.65771484375 49.931640625), (11.65771484375 49.931640625, " +
-            "7.52685546875 47.20703125), (7.52685546875 47.20703125, 9 52.4), (9 52.4, 9.50439453125 " +
-            "54.501953125), (9.50439453125 54.501953125, 8.2 53.2), (8.2 53.2, 7.35107421875 52.4365234375), " +
-            "(7.35107421875 52.4365234375, 6.4 52.6), (6.4 52.6, 4.53857421875 52.65625), (4.53857421875 " +
-            "52.65625, 5.6 51.6), (5.6 51.6, 6.38427734375 50.634765625))", noded.wkt
+                "(6.4 52.6, 7.52685546875 53.7548828125, 8.2 53.2), (8.2 53.2, 9 52.4), " +
+                "(9 52.4, 11.65771484375 49.931640625, 7.52685546875 47.20703125, 9 52.4), " +
+                "(9 52.4, 9.50439453125 54.501953125, 8.2 53.2), (8.2 53.2, 7.35107421875 52.4365234375, 6.4 52.6), " +
+                "(6.4 52.6, 4.53857421875 52.65625, 5.6 51.6), (5.6 51.6, 6.38427734375 50.634765625))", noded.wkt
     }
     
     @Test void merge() {
diff --git a/src/test/groovy/geoscript/layer/io/PbfTestCase.groovy b/src/test/groovy/geoscript/layer/io/PbfTestCase.groovy
@@ -1,5 +1,6 @@
 package geoscript.layer.io
 
+import geoscript.feature.Feature
 import geoscript.feature.Field
 import geoscript.feature.Schema
 import geoscript.geom.Bounds
@@ -21,6 +22,16 @@ import static org.junit.Assert.*
  */
 class PbfTestCase {
 
+    @Test void read() {
+        URL url = getClass().getClassLoader().getResource("pbf/1/1/0.pbf")
+
+        Pyramid pyramid = Pyramid.createGlobalMercatorPyramid()
+        Bounds bounds = pyramid.bounds(new Tile(1, 1, 0))
+
+        List<Layer> layers = Pbf.read(url.bytes, bounds)
+        assertTrue layers.size() > 0
+    }
+
     @Test void writeRead() {
         URL url = getClass().getClassLoader().getResource("states.shp")
         Layer layer = new Shapefile(new File(url.toURI()))

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,10 @@ import static geoscript.GeoScript.unzip`
`12`	`12`
`13`	`13`	`// Download data from natural earth`
`14`	`14`	`File dataDir = new File("naturalearth")`
	`15`	`+dataDir.mkdir()`
`15`	`16`	`[`
`16`		`- [name: "countries", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],`
`17`		`- [name: "ocean", url: "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]`
	`17`	`+ [name: "countries", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_countries.zip"],`
	`18`	`+ [name: "ocean", url: "https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/ne_110m_ocean.zip"]`
`18`	`19`	`].each { Map item ->`
`19`	`20`	`unzip(download(new URL(item.url), new File(dataDir, "${item.name}.zip"), overwrite: false))`
`20`	`21`	`}`