Fix point equality (#1161)

onthegomap · Jan 29, 2025 · 0e161cd · 0e161cd
1 parent 11fd6b8
commit 0e161cd
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/WithGeometry.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/geo/WithGeometry.java
@@ -340,5 +340,15 @@ public boolean canBePolygon() {
     public boolean canBeLine() {
       return worldGeometry instanceof Lineal;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj == this || (obj instanceof FromWorld other && other.worldGeometry.equals(worldGeometry));
+    }
+
+    @Override
+    public int hashCode() {
+      return worldGeometry.hashCode();
+    }
   }
 }
diff --git a/...er-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java b/...er-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java
@@ -1561,6 +1561,35 @@ void testGeometryAttributesLine(String expression, double expected) {
       any -> assertEquals(expected, (Double) any.getAttrsAtZoom(14).get("attr"), expected / 1e3), 1);
   }
 
+  @ParameterizedTest
+  @CsvSource(value = {
+    "feature.point_along_line(0) == feature.point_along_line(0); true",
+    "feature.point_along_line(0) == feature.point_along_line(0); true",
+    "feature.point_along_line(0) == feature.point_along_line(1); true",
+    "feature.point_along_line(0) == feature.point_along_line(0.5); false",
+  }, delimiter = ';')
+  void testGeometryAttributesLineBoolean(String expression, boolean expected) {
+    var config = """
+      sources:
+        osm:
+          type: osm
+          url: geofabrik:rhode-island
+          local_path: data/rhode-island.osm.pbf
+      layers:
+      - id: testLayer
+        features:
+        - source: osm
+          attributes:
+          - key: attr
+            value: ${%s}
+      """.formatted(expression);
+    var sfMatch =
+      SimpleFeature.createFakeOsmFeature(newLineString(1, 2, 3, 4, 1, 2), Map.of(), "osm", "layer", 1, emptyList(),
+        new OsmElement.Info(2, 3, 4, 5, "user"));
+    testFeature(config, sfMatch,
+      any -> assertEquals(expected, any.getAttrsAtZoom(14).get("attr")), 1);
+  }
+
   @ParameterizedTest
   @CsvSource(value = {
     "feature.area('z0 px2'); 1.17743E-10",