From 2cc4c32fea0faeb74d73b9ca88ea027c012ae3c8 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Fri, 14 Mar 2025 10:10:11 +0100 Subject: [PATCH 1/2] Promote / demote US roads --- .../main/java/com/protomaps/basemap/layers/Roads.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java b/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java index 57a7e537..24adb5f3 100644 --- a/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java +++ b/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java @@ -199,17 +199,20 @@ public Roads(CountryCoder countryCoder) { trunk trunk_link """), - use("minZoom", 7) + use("minZoom", 7), + use("kind", "major_road") ), rule( with("_country", "US"), with("_r_network_US:US"), - use("minZoom", 6) + use("minZoom", 6), + use("kind", "major_road") ), rule( with("_country", "US"), with("_r_network_US:I"), - use("minZoom", 3) + use("minZoom", 3), + use("kind", "highway") ) )).index(); From f24a74ad3701c81d4c50aa01e269dd513e3d12b7 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Mon, 17 Mar 2025 14:00:03 +0100 Subject: [PATCH 2/2] Adjust tests --- .../test/java/com/protomaps/basemap/layers/RoadsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java b/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java index 024a19f9..3cfb4445 100644 --- a/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java +++ b/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java @@ -201,7 +201,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin // US assertFeatures(12, - List.of(Map.of("kind", kind, + List.of(Map.of("kind", highway.startsWith("motorway") ? "major_road" : kind, "kind_detail", kindDetail, "_minzoom", usMinZoom )), @@ -213,7 +213,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin // US with relation US:US assertFeatures(12, - List.of(Map.of("kind", kind, + List.of(Map.of("kind", "major_road", "kind_detail", kindDetail, "_minzoom", 6 )), @@ -225,7 +225,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin // US with relation US:I assertFeatures(12, - List.of(Map.of("kind", kind, + List.of(Map.of("kind", "highway", "kind_detail", kindDetail, "_minzoom", 3 )),