From a6b0072eca40828d33b544f3bae58fe35badf783 Mon Sep 17 00:00:00 2001 From: Michael Barry Date: Mon, 7 Feb 2022 20:41:02 -0500 Subject: [PATCH] Fix service/man_made npe (#72) --- .../basemap/layers/Transportation.java | 2 +- .../basemap/layers/TransportationTest.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java b/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java index d1c8b1b8..2648b71b 100644 --- a/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java +++ b/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/layers/Transportation.java @@ -222,7 +222,7 @@ public class Transportation implements "highway", coalesce(highway, ""), "public_transport", coalesce(publicTransport, ""), "construction", coalesce(construction, "") - ), null) : manMade; + ), null) : isBridgeOrPier(manMade) ? manMade : null; } static String highwaySubclass(String highwayClass, String publicTransport, String highway) { diff --git a/planetiler-basemap/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java b/planetiler-basemap/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java index 0b307cdc..0cf325c4 100644 --- a/planetiler-basemap/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java +++ b/planetiler-basemap/src/test/java/com/onthegomap/planetiler/basemap/layers/TransportationTest.java @@ -497,6 +497,24 @@ public class TransportationTest extends AbstractLayerTest { )))); } + @Test + public void testIgnoreManMadeWhenNotBridgeOrPier() { + // https://github.com/onthegomap/planetiler/issues/69 + assertFeatures(14, List.of(), process(lineFeature(Map.of( + "man_made", "storage_tank", + "service", "driveway" + )))); + assertFeatures(14, List.of(), process(lineFeature(Map.of( + "man_made", "courtyard", + "service", "driveway" + )))); + assertFeatures(14, List.of(), process(lineFeature(Map.of( + "man_made", "courtyard", + "service", "driveway", + "name", "Named Driveway" + )))); + } + @Test public void testRaceway() { assertFeatures(13, List.of(Map.of(