From 300e954f7044652948ce51fd10caf2404bfe410e Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Tue, 24 Sep 2024 08:37:25 -0400 Subject: [PATCH] uncomment --- .../custommap/ConfiguredFeatureTest.java | 20 +++++++++---------- .../custommap/expression/ExpressionTests.java | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java b/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java index 13b42101a8..f38397f440 100644 --- a/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java +++ b/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/ConfiguredFeatureTest.java @@ -1306,16 +1306,16 @@ void testWikidataParse() { value: "${feature.tags.wikidata != null ? int(feature.tags.wikidata.replace('Q', '')) : 0}" """; this.planetilerConfig = PlanetilerConfig.from(Arguments.of(Map.of())); - // testPoint(config, Map.of( - // "wikidata", "Q235" - // ), feature -> { - // assertEquals(Map.of("wikidata", 235L), feature.getAttrsAtZoom(14)); - // }, 1); - // testPoint(config, Map.of( - // "wikidata", "235" - // ), feature -> { - // assertEquals(Map.of("wikidata", 235L), feature.getAttrsAtZoom(14)); - // }, 1); + testPoint(config, Map.of( + "wikidata", "Q235" + ), feature -> { + assertEquals(Map.of("wikidata", 235L), feature.getAttrsAtZoom(14)); + }, 1); + testPoint(config, Map.of( + "wikidata", "235" + ), feature -> { + assertEquals(Map.of("wikidata", 235L), feature.getAttrsAtZoom(14)); + }, 1); testPoint(config, Map.of( ), feature -> { assertEquals(Map.of("wikidata", 0L), feature.getAttrsAtZoom(14)); diff --git a/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/expression/ExpressionTests.java b/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/expression/ExpressionTests.java index 805b5663b7..3f25abef0b 100644 --- a/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/expression/ExpressionTests.java +++ b/planetiler-custommap/src/test/java/com/onthegomap/planetiler/custommap/expression/ExpressionTests.java @@ -44,7 +44,6 @@ class ExpressionTests { "{'a': 2}.has('a', 3)|false|boolean", "{'a': 1}.has('b')|false|boolean", "int({'tags': {'wikidata': 'Q1'}}.tags.wikidata.replace('Q', ''))|1|long", - "{'tags': {}}.tags.wikidata == null|true|boolean", "coalesce({'a': 1}.get('a'), 2)|1|long", "coalesce({'a': 1}.get('b'), 2)|2|long",