Merge 8897c6a into db0af42

onthegomap · Mar 15, 2023 · c7085f9 · c7085f9
2 parents db0af42 + 8897c6a
commit c7085f9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/FeatureCollector.java
@@ -201,7 +201,7 @@ public final class Feature {
     private final Geometry geom;
     private final Map<String, Object> attrs = new TreeMap<>();
     private final GeometryType geometryType;
-    private final long sourceId;
+    private long id;
 
     private int sortKey = 0;
 
@@ -228,16 +228,21 @@ public final class Feature {
 
     private String numPointsAttr = null;
 
-    private Feature(String layer, Geometry geom, long sourceId) {
+    private Feature(String layer, Geometry geom, long id) {
       this.layer = layer;
       this.geom = geom;
       this.geometryType = GeometryType.typeOf(geom);
-      this.sourceId = sourceId;
+      this.id = id;
     }
 
     /** Returns the original ID of the source feature that this feature came from (i.e. OSM node/way ID). */
-    public long getSourceId() {
-      return sourceId;
+    public long getId() {
+      return id;
+    }
+
+    public Feature setId(long id) {
+      this.id = id;
+      return this;
     }
 
     GeometryType getGeometryType() {

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/render/FeatureRenderer.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/render/FeatureRenderer.java
@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.CoordinateSequence;
@@ -39,9 +38,6 @@
  * profile (like zoom range, min pixel size, output attributes and their zoom ranges).
  */
 public class FeatureRenderer implements Consumer<FeatureCollector.Feature>, Closeable {
-
-  // generate globally-unique IDs shared by all vector tile features representing the same source feature
-  private static final AtomicLong idGenerator = new AtomicLong(0);
   private static final Logger LOGGER = LoggerFactory.getLogger(FeatureRenderer.class);
   private static final VectorTile.VectorGeometry FILL = VectorTile.encodeGeometry(GeoUtils.JTS_FACTORY
     .createPolygon(GeoUtils.JTS_FACTORY.createLinearRing(new PackedCoordinateSequence.Double(new double[]{
@@ -95,7 +91,6 @@ private void renderGeometry(Geometry geom, FeatureCollector.Feature feature) {
   }
 
   private void renderPoint(FeatureCollector.Feature feature, Coordinate... origCoords) {
-    long id = idGenerator.incrementAndGet();
     boolean hasLabelGrid = feature.hasLabelGrid();
     Coordinate[] coords = new Coordinate[origCoords.length];
     for (int i = 0; i < origCoords.length; i++) {
@@ -132,7 +127,7 @@ private void renderPoint(FeatureCollector.Feature feature, Coordinate... origCoo
         TileCoord tile = entry.getKey();
         List<List<CoordinateSequence>> result = entry.getValue();
         Geometry geom = GeometryCoordinateSequences.reassemblePoints(result);
-        encodeAndEmitFeature(feature, id, attrs, tile, geom, groupInfo, 0);
+        encodeAndEmitFeature(feature, feature.getId(), attrs, tile, geom, groupInfo, 0);
         emitted++;
       }
       stats.emittedFeatures(zoom, feature.getLayer(), emitted);
@@ -173,7 +168,6 @@ private void renderPoint(FeatureCollector.Feature feature, MultiPoint points) {
   }
 
   private void renderLineOrPolygon(FeatureCollector.Feature feature, Geometry input) {
-    long id = idGenerator.incrementAndGet();
     boolean area = input instanceof Polygonal;
     double worldLength = (area || input.getNumGeometries() > 1) ? 0 : input.getLength();
     String numPointsAttr = feature.getNumPointsAttr();
@@ -217,7 +211,7 @@ private void renderLineOrPolygon(FeatureCollector.Feature feature, Geometry inpu
         attrs = new HashMap<>(attrs);
         attrs.put(numPointsAttr, geom.getNumPoints());
       }
-      writeTileFeatures(z, id, feature, sliced, attrs);
+      writeTileFeatures(z, feature.getId(), feature, sliced, attrs);
     }
 
     stats.processedElement(area ? "polygon" : "line", feature.getLayer());

diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/FeatureCollectorTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/FeatureCollectorTest.java
@@ -58,7 +58,8 @@ void testPoint() {
       .setAttr("attr1", 2)
       .setBufferPixels(10d)
       .setBufferPixelOverrides(ZoomFunction.maxZoom(12, 100d))
-      .setPointLabelGridSizeAndLimit(12, 100, 10);
+      .setPointLabelGridSizeAndLimit(12, 100, 10)
+      .setId(123456789);
     assertFeatures(14, List.of(
       Map.of(
         "_layer", "layername",
@@ -69,16 +70,19 @@ void testPoint() {
         "_labelgrid_limit", 0,
         "attr1", 2,
         "_type", "point",
-        "_buffer", 10d
+        "_buffer", 10d,
+        "_id", 123456789L
       )
     ), collector);
     assertFeatures(12, List.of(
       Map.of(
         "_labelgrid_size", 100d,
         "_labelgrid_limit", 10,
-        "_buffer", 100d
+        "_buffer", 100d,
+        "_id", 123456789L
       )
     ), collector);
+
   }
 
   @Test

diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/TestUtils.java
@@ -414,6 +414,7 @@ public static ComparableFeature feature(Geometry geom, Map<String, Object> attrs
   public static Map<String, Object> toMap(FeatureCollector.Feature feature, int zoom) {
     TreeMap<String, Object> result = new TreeMap<>(feature.getAttrsAtZoom(zoom));
     Geometry geom = feature.getGeometry();
+    result.put("_id", feature.getId());
     result.put("_minzoom", feature.getMinZoom());
     result.put("_maxzoom", feature.getMaxZoom());
     result.put("_buffer", feature.getBufferPixelsAtZoom(zoom));