Include the layer's geometry name when using Filter.intersects

Author: jericks

src/main/groovy/geoscript/layer/Layer.groovy

@@ -1497,7 +1497,7 @@ class Layer implements Renderable {
 
         // Iterate through all of the Features in the input Layer
         clippedLayer.withWriter { w ->
-            this.eachFeature(Filter.intersects(clipLayer.bounds.geometry), { f ->
+            this.eachFeature(Filter.intersects(this.schema.geom.name, clipLayer.bounds.geometry), { f ->
                 // See if the Feature intersects with the Bounds of any Feature in the spatial index
                 index.query(f.bounds).each { clipFeature ->
                     // Make sure it actually intersects the Geometry of a Feature in the spatial index

src/main/groovy/geoscript/layer/VectorTileRenderer.groovy

@@ -50,7 +50,7 @@ class VectorTileRenderer implements TileRenderer {
         Layer outLayer = new Layer(layer.name, layer.schema.includeFields(fields, layer.name))
         Bounds projectedBounds = b.reproject(layer.proj)
         Geometry boundsGeom = projectedBounds.geometry
-        layer.eachFeature(Filter.intersects(boundsGeom), { Feature f ->
+        layer.eachFeature(Filter.intersects(layer.schema.geom.name, boundsGeom), { Feature f ->
             // Crop the Geometry to the Bounds
             Geometry geom = f.geom.intersection(boundsGeom)
             // Collect the attributes

src/main/groovy/geoscript/layer/io/Pbf.groovy

@@ -144,7 +144,7 @@ class Pbf {
             VectorTile.Tile.Layer.Builder layerBuilder = MvtLayerBuild.newLayerBuilder(layer.name, mvtParams)
             MvtLayerProps layerProps = new MvtLayerProps()
             List<JtsGeometry> geometries = []
-            layer.eachFeature(Filter.intersects(boundsGeom), { Feature f ->
+            layer.eachFeature(Filter.intersects(layer.schema.geom.name, boundsGeom), { Feature f ->
                 Geometry geom = isPoint ? f.geom : f.geom.intersection(boundsGeom)
                 if (!geom.empty) {
                     ProjectionHandler projectionHandler = ProjectionHandlerFinder.getHandler(b.env, layer.proj.crs, true)

src/test/groovy/geoscript/layer/io/PbfTestCase.groovy

@@ -1,13 +1,19 @@
 package geoscript.layer.io
 
+import geoscript.feature.Field
+import geoscript.feature.Schema
 import geoscript.geom.Bounds
+import geoscript.geom.Geometry
+import geoscript.geom.Point
 import geoscript.layer.Layer
 import geoscript.layer.Pyramid
 import geoscript.layer.Shapefile
 import geoscript.layer.Tile
+import geoscript.workspace.Memory
+import geoscript.workspace.Workspace
 import org.junit.Test
 
-import static org.junit.Assert.assertTrue
+import static org.junit.Assert.*
 
 /**
  * The Pbf Unit Test
@@ -29,4 +35,37 @@ class PbfTestCase {
         assertTrue pbfLayer.count > 0
     }
 
+    @Test void test() {
+
+        Workspace workspace = new Memory()
+        Schema schema = new Schema("cities", [
+                new Field("geom", "Point", "EPSG:4326"),
+                new Field("id", "Integer"),
+                new Field("name", "String")
+        ])
+        Layer layer = workspace.create(schema)
+        layer.add([
+                geom: new Point(-122.3204, 47.6024),
+                id: 1,
+                name: "Seattle"
+        ])
+        layer.add([
+                geom: new Point(-122.48416, 47.2619),
+                id: 2,
+                name: "Tacoma"
+        ])
+
+        Pyramid pyramid = Pyramid.createGlobalMercatorPyramid(origin: Pyramid.Origin.TOP_LEFT)
+        Tile tile = new Tile(4,2,5)
+        Bounds bounds = pyramid.bounds(tile)
+        Bounds projectedBounds = bounds.reproject("EPSG:4326")
+        Geometry projecteBoundsGeom = projectedBounds.geometry
+
+        byte[] bytes = Pbf.write([layer], bounds)
+
+        List<Layer> layers = Pbf.read(bytes, bounds)
+        assertEquals(1, layers.size())
+        assertEquals(2, layers[0].count)
+    }
+
 }