From 58fc2889023978965ad6ab9e77c0b1f3cde538b1 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Tue, 27 May 2025 19:47:03 +0200 Subject: [PATCH 1/5] Fix natural parks --- styles/src/base_layers.ts | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index 6bc629bd..c424295b 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -66,19 +66,15 @@ export function nolabels_layers( filter: [ "in", "kind", - "national_park", "park", "cemetery", - "protected_area", - "nature_reserve", - "forest", "golf_course", "wood", - "nature_reserve", "forest", "scrub", "grassland", "grass", + "glacier", "military", "naval_base", "airfield", @@ -93,23 +89,15 @@ export function nolabels_layers( [ "literal", [ - "national_park", "park", "cemetery", - "protected_area", - "nature_reserve", - "forest", "golf_course", + "wood", + "forest", ], ], ], t.park_b, - [ - "in", - ["get", "kind"], - ["literal", ["wood", "nature_reserve", "forest"]], - ], - t.wood_b, ["in", ["get", "kind"], ["literal", ["scrub", "grassland", "grass"]]], t.scrub_b, ["in", ["get", "kind"], ["literal", ["glacier"]]], From 59fc7c0eaaf8130880244685cf149a0096e45de9 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Tue, 27 May 2025 19:48:26 +0200 Subject: [PATCH 2/5] Format --- styles/src/base_layers.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index c424295b..d77afd4d 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -86,16 +86,7 @@ export function nolabels_layers( [ "in", ["get", "kind"], - [ - "literal", - [ - "park", - "cemetery", - "golf_course", - "wood", - "forest", - ], - ], + ["literal", ["park", "cemetery", "golf_course", "wood", "forest"]], ], t.park_b, ["in", ["get", "kind"], ["literal", ["scrub", "grassland", "grass"]]], From cfd5444c74911366d14d5c5e5901ebb73e8f3a28 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Mon, 2 Jun 2025 08:30:39 +0200 Subject: [PATCH 3/5] Add glacier render test --- .../tests/landuse/glacier/expected.png | Bin 0 -> 755 bytes .../tests/landuse/glacier/input.osm.pbf | Bin 0 -> 3122 bytes render-tests/tests/landuse/glacier/style.json | 17 +++++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 render-tests/tests/landuse/glacier/expected.png create mode 100644 render-tests/tests/landuse/glacier/input.osm.pbf create mode 100644 render-tests/tests/landuse/glacier/style.json diff --git a/render-tests/tests/landuse/glacier/expected.png b/render-tests/tests/landuse/glacier/expected.png new file mode 100644 index 0000000000000000000000000000000000000000..349e36d034aa2b6635a2fc5d3a0328b2a10be01a GIT binary patch literal 755 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJEyU7jwEAr*{o4>B?ya1dZp zNdKR4{iV3egWbEu6M~q}WHm(c8mwkaGd-||ZN^oG%~A{HE7FPfO literal 0 HcmV?d00001 diff --git a/render-tests/tests/landuse/glacier/input.osm.pbf b/render-tests/tests/landuse/glacier/input.osm.pbf new file mode 100644 index 0000000000000000000000000000000000000000..7a7dde2af39c2eacb481980d1af7636b31021c9f GIT binary patch literal 3122 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 MJ&z&(0LI$aQx@X^=Kufz literal 0 HcmV?d00001 diff --git a/render-tests/tests/landuse/glacier/style.json b/render-tests/tests/landuse/glacier/style.json new file mode 100644 index 00000000..0551b511 --- /dev/null +++ b/render-tests/tests/landuse/glacier/style.json @@ -0,0 +1,17 @@ +{ + "version": 8, + "metadata": { + "test": { + "width": 256, + "height": 256, + "flavor": "light", + "lang": "en" + }, + "link": "https://github.com/protomaps/basemaps/pull/490" + }, + "center": [ + 8.2716, + 46.59517 + ], + "zoom": 14 +} \ No newline at end of file From 9f969fcdc3e561add1b0c3ca3eb3f0b1c1939336 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Mon, 2 Jun 2025 08:31:13 +0200 Subject: [PATCH 4/5] Update --- .../tests/landuse/glacier/expected.png | Bin 755 -> 1956 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/render-tests/tests/landuse/glacier/expected.png b/render-tests/tests/landuse/glacier/expected.png index 349e36d034aa2b6635a2fc5d3a0328b2a10be01a..9ca4bfdb79431cd46caa063e4c387e04b237de9b 100644 GIT binary patch literal 1956 zcmeHI`BPI@6b_2i27?tv7(^6h7-D595(I0Efe=X8UkD-)6+{G0)CNI@gi>i`L_`oX zGJvchL?0yql~6=LWaz6bLJSx&EE5rUF>Jxe4)zs)Yo~uf`_sAio^$Va&i%eQC(Ym2 z1A{h2qfjUe#ghb}P&&v`2enZTF=6ccQ7F_`=P4v&V1mv>vjW(0cKc6KaczhV(bmks z;qK~Oa{g1Ymmbc)&LY6A2V35j8~J-R=H303O8Ux7yWRS10BtES@}z#7#S7Yvtvm{Z zTrGRNjuNvW`xWA#^Uua{xg80IqZ~~G=td_GY+9e+ncCj&RhARTFW}BkU)3adGvqhP zd(HXazH%8>ux%34@+|6+a%RR*<tTwWbmGUDI^=m< z@qqc#Db8y(uC3B44L~o7%VVqs)9yoazsk?^yt1Bgk9Z8dcEkv_QL)yUr@9IX3bt&4 zp``g~osnqPfTPdP zv!PXxL}8P?%BX^ZDvaLR357yfrOUbSsIM6M9*-ZXv=-RsdON$g5dHSPiDk%3p!0dD za!K%hq>R?fhur=4dKR-nwa#?9CgkPIm(~J*y3uDf3~!teS*1#$9Vy8t%Tpc) zD?#vG9d~*DHh`wnOLB}YWfGgjB!m_ofG|EDQ5{?i=^L7+>fk#xn(zDsyyr@#grX zkaQ5Uw8iq^ru9G&k&S?3D~@WDGI;^J5d{F`tE+rgXc=?e${7>AGH=Axh3z?G2=7{K z^l01DO+X}3wtwA9k%T2((m=bC5n$;tOv_O^9cG!PUL9el#nbrW5ZfFCMKPne*z`kO z+_ge-#%eE;*RaNPTr7uGz3@p!SeQSRXs4c?y_=q{uU$T;^I&)R7{%Sz2qJMyEwL&t1Sr_Jz z-x-~!m&91pul7g}OhgKsqhdEsPEI-#2p&_k408c1l!}e4>0`oA3>q%t5+6%gxm{x< z-Q)fJ{g)8_XWcU5ABI#q^z7f;a}$0HBv5>jw~b_bMp8gX99B zr;t2$j*X2)f9{1THLP}_Uy(@$`RPHVLx|M==D0+55g~c>i^e#YVq;rAeZsW~$zAVe zX0kbgZG)xZCc(Bj*0rYi3JD7<<(Fx z?9N?X&K({;ZD3%KKv_e{YAh$)jehuW19`7d(b)wx#-;_p^==AZ3wPLc&L9%#sdD%>b`_l0KwG;mD_{VVgFMi3&*S&7} U;!%S14KjUE6n9^e$n{jppRjeII{*Lx literal 755 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJEyU7jwEAr*{o4>B?ya1dZp zNdKR4{iV3egWbEu6M~q}WHm(c8mwkaGd-||ZN^oG%~A{HE7FPfO From b43affcc7a9f0f09b5bd7e972162edabd697da62 Mon Sep 17 00:00:00 2001 From: Oliver Wipfli Date: Mon, 2 Jun 2025 08:33:11 +0200 Subject: [PATCH 5/5] Merge --- render-tests/run_render_tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render-tests/run_render_tests.ts b/render-tests/run_render_tests.ts index 09fe00b5..7c380439 100644 --- a/render-tests/run_render_tests.ts +++ b/render-tests/run_render_tests.ts @@ -225,7 +225,7 @@ function getTestStyles(options: RenderOptions, directory: string): StyleWithTest lang: 'en', recycleMap: options.recycleMap || false, allowed: 0.00025, - threshold: 0.1285, + threshold: 0.05, ...style.metadata.test };