From bde5878fedae0eac20db8bb4c6eca81f904e20fd Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 9 Oct 2023 02:52:22 +0200 Subject: [PATCH] Fix: correct minzoom on all themes --- .../layers/ticket_machine/ticket_machine.json | 2 +- .../ticket_validator/ticket_validator.json | 2 +- assets/themes/bag/bag.json | 10 +++---- assets/themes/blind_osm/blind_osm.json | 4 +-- assets/themes/climbing/climbing.json | 5 +++- assets/themes/healthcare/healthcare.json | 4 +-- assets/themes/onwheels/onwheels.json | 16 ++++++------ assets/themes/pets/pets.json | 6 ++--- assets/themes/stations/stations.json | 26 +++++++++---------- .../street_lighting/street_lighting.json | 4 +-- assets/themes/transit/transit.json | 11 +++----- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/assets/layers/ticket_machine/ticket_machine.json b/assets/layers/ticket_machine/ticket_machine.json index 6292fc6f92..8f60ae2345 100644 --- a/assets/layers/ticket_machine/ticket_machine.json +++ b/assets/layers/ticket_machine/ticket_machine.json @@ -20,7 +20,7 @@ ] } }, - "minzoom": 19, + "minzoom": 18, "title": { "render": { "en": "Ticket Machine", diff --git a/assets/layers/ticket_validator/ticket_validator.json b/assets/layers/ticket_validator/ticket_validator.json index b0b93552a5..16520ec3a1 100644 --- a/assets/layers/ticket_validator/ticket_validator.json +++ b/assets/layers/ticket_validator/ticket_validator.json @@ -13,7 +13,7 @@ "source": { "osmTags": "amenity=ticket_validator" }, - "minzoom": 19, + "minzoom": 18, "title": { "render": { "en": "Ticket Validator", diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 8f33320cbf..204226ed31 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -47,7 +47,7 @@ "osmTags": "building~*", "maxCacheAge": 0 }, - "minzoom": 19, + "minzoom": 18, "calculatedTags": [ "_surface:strict:=feat(get)('_surface')" ], @@ -154,7 +154,7 @@ }, "maxCacheAge": 0 }, - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "label": { @@ -194,7 +194,7 @@ "osmTags": "identificatie~*", "maxCacheAge": 0 }, - "minzoom": 19, + "minzoom": 18, "calculatedTags": [ "_overlaps_with_buildings=overlapWith(feat)('osm:buildings').filter(f => f.feat.properties.id.indexOf('-') < 0)", "_overlaps_with=feat(get)('_overlaps_with_buildings').find(f => f.overlap > 1 /* square meter */ )", @@ -379,7 +379,7 @@ "osmTags": "identificatie~*", "maxCacheAge": 0 }, - "minzoom": 19, + "minzoom": 18, "calculatedTags": [ "_closed_osm_addr:=closest(feat)('osm:adresses').properties", "_bag_obj:addr:housenumber=`${feat.properties.huisnummer}${feat.properties.huisletter}${(feat.properties.toevoeging != '') ? '-' : ''}${feat.properties.toevoeging}`", @@ -427,4 +427,4 @@ } ], "hideFromOverview": true -} \ No newline at end of file +} diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json index 9532bd0cf2..29acc68352 100644 --- a/assets/themes/blind_osm/blind_osm.json +++ b/assets/themes/blind_osm/blind_osm.json @@ -68,7 +68,7 @@ { "builtin": "kerbs", "override": { - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "iconBadges": [ @@ -112,4 +112,4 @@ }, "stairs" ] -} \ No newline at end of file +} diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 90f4dc383b..f34d3e69c4 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -468,7 +468,10 @@ "guidepost" ], "override": { - "minzoom": 15 + "minzoom": 15, + "mapRendering": [{ + "iconSize": "30,30" + }] } } ], diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json index 488a88fe3c..bcc2c2d96b 100644 --- a/assets/themes/healthcare/healthcare.json +++ b/assets/themes/healthcare/healthcare.json @@ -111,8 +111,8 @@ "=presets": [], "=name": null, "override": { - "minzoom": 19 + "minzoom": 18 } } ] -} \ No newline at end of file +} diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json index 38544e0b7b..047ade494c 100644 --- a/assets/themes/onwheels/onwheels.json +++ b/assets/themes/onwheels/onwheels.json @@ -32,7 +32,7 @@ { "builtin": "indoors", "override": { - "minzoom": 19, + "minzoom": 18, "name": null, "passAllFeatures": true } @@ -43,7 +43,7 @@ "name": null, "tagRendering": null, "title": "null", - "minzoom": 19, + "minzoom": 18, "shownByDefault": false } }, @@ -71,7 +71,7 @@ { "builtin": "entrance", "override": { - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "icon": "circle:white;./assets/themes/onwheels/entrance.svg" @@ -131,7 +131,7 @@ { "builtin": "kerbs", "override": { - "minzoom": 19, + "minzoom": 18, "syncSelection": "theme-only", "mapRendering": [ { @@ -289,7 +289,7 @@ { "builtin": "toilet", "override": { - "minzoom": 19, + "minzoom": 18, "syncSelection": "theme-only", "mapRendering": [ { @@ -349,7 +349,7 @@ { "builtin": "reception_desk", "override": { - "minzoom": 19, + "minzoom": 18, "syncSelection": "theme-only" } }, @@ -357,7 +357,7 @@ { "builtin": "elevator", "override": { - "minzoom": 19, + "minzoom": 18, "syncSelection": "theme-only", "mapRendering": [ { @@ -524,4 +524,4 @@ ] }, "enableDownload": true -} \ No newline at end of file +} diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json index 650095516c..d9eaa8963d 100644 --- a/assets/themes/pets/pets.json +++ b/assets/themes/pets/pets.json @@ -165,7 +165,7 @@ { "builtin": "food", "override": { - "minzoom": 19, + "minzoom": 18, "filter": null, "name": null } @@ -181,7 +181,7 @@ { "builtin": "shops", "override": { - "minzoom": 19, + "minzoom": 18, "filter": null, "presets": [ { @@ -220,4 +220,4 @@ } ], "credits": "Niels Elgaard Larsen" -} \ No newline at end of file +} diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json index 8b242d1af4..c358d0a3be 100644 --- a/assets/themes/stations/stations.json +++ b/assets/themes/stations/stations.json @@ -32,7 +32,7 @@ { "builtin": "indoors", "override": { - "minzoom": 19, + "minzoom": 18, "passAllFeatures": true, "mapRendering": [ {}, @@ -50,7 +50,7 @@ { "builtin": "stairs", "override": { - "minzoom": 19 + "minzoom": 18 } }, { @@ -130,7 +130,7 @@ ] }, "presets": null, - "minzoom": 19 + "minzoom": 18 } }, { @@ -143,7 +143,7 @@ ] }, "presets": null, - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "icon": "circle:white;./assets/themes/stations/bicycle_parking.svg" @@ -161,7 +161,7 @@ ] }, "presets": null, - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "icon": "circle:white;./assets/themes/stations/rental_bicycle.svg" @@ -179,7 +179,7 @@ ] }, "presets": null, - "minzoom": 19 + "minzoom": 18 } }, { @@ -195,7 +195,7 @@ ] }, "presets": null, - "minzoom": 19, + "minzoom": 18, "mapRendering+": [ { "color": "#00f", @@ -214,7 +214,7 @@ ] }, "presets": null, - "minzoom": 19, + "minzoom": 18, "mapRendering+": [ { "color": "yellow", @@ -235,13 +235,13 @@ "clock" ], "override": { - "minzoom": 19 + "minzoom": 18 } }, { "builtin": "bench", "override": { - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "icon": "./assets/themes/stations/bench.svg" @@ -252,7 +252,7 @@ { "builtin": "drinking_water", "override": { - "minzoom": 19, + "minzoom": 18, "mapRendering": [ { "icon": "circle:white;./assets/themes/stations/drinking_water.svg" @@ -293,7 +293,7 @@ "zh_Hant": "時刻表" } }, - "minzoom": 19, + "minzoom": 18, "source": { "osmTags": { "and": [ @@ -412,4 +412,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/themes/street_lighting/street_lighting.json b/assets/themes/street_lighting/street_lighting.json index 0ba9c2ab49..7d1c8da7fc 100644 --- a/assets/themes/street_lighting/street_lighting.json +++ b/assets/themes/street_lighting/street_lighting.json @@ -221,7 +221,7 @@ ] } }, - "minzoom": 19, + "minzoom": 18, "title": { "render": { "en": "Street", @@ -361,4 +361,4 @@ } ], "credits": "Robin van der Linde" -} \ No newline at end of file +} diff --git a/assets/themes/transit/transit.json b/assets/themes/transit/transit.json index f2d2af6650..3f98526768 100644 --- a/assets/themes/transit/transit.json +++ b/assets/themes/transit/transit.json @@ -36,22 +36,19 @@ { "builtin": "bike_parking", "override": { - "minzoom": 19, - "minzoomVisible": 19 + "minzoom": 18 } }, { "builtin": "parking", "override": { - "minzoom": 19, - "minzoomVisible": 19 + "minzoom": 18 } }, { "builtin": "shelter", "override": { - "minzoom": 19, - "minzoomVisible": 19, + "minzoom": 18, "source": { "osmTags": { "and": [ @@ -67,4 +64,4 @@ } ], "credits": "Robin van der Linde" -} \ No newline at end of file +}