From beef9947c823ddf0baf35a6b0063e8a934650a37 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 22 Feb 2024 02:04:49 +0100 Subject: [PATCH] Disable counting of some layers, use metric counts --- .../layers/climbing_opportunity/climbing_opportunity.json | 1 + assets/layers/summary/summary.json | 2 +- assets/themes/atm/atm.json | 3 ++- assets/themes/bag/bag.json | 2 ++ assets/themes/climbing/climbing.json | 2 ++ assets/themes/fritures/fritures.json | 3 ++- assets/themes/grb/grb.json | 8 +++----- assets/themes/healthcare/healthcare.json | 1 + assets/themes/icecream/icecream.json | 3 +-- assets/themes/openlovemap/openlovemap.json | 4 ++++ assets/themes/velopark/velopark.json | 2 ++ assets/themes/vending_machine/vending_machine.json | 6 +++++- 12 files changed, 26 insertions(+), 11 deletions(-) diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json index 11d7727910..974d1fe65c 100644 --- a/assets/layers/climbing_opportunity/climbing_opportunity.json +++ b/assets/layers/climbing_opportunity/climbing_opportunity.json @@ -35,6 +35,7 @@ } }, "minzoom": 19, + "doCount": false, "title": { "render": { "en": "Climbing opportunity?", diff --git a/assets/layers/summary/summary.json b/assets/layers/summary/summary.json index 40e139f58f..2e57a5e706 100644 --- a/assets/layers/summary/summary.json +++ b/assets/layers/summary/summary.json @@ -16,7 +16,7 @@ ], "iconSize": "40,40", "label": { - "render": "{total}" + "render": "{total_metric}" }, "labelCss": "background: #ffffffbb", "labelCssClasses": "w-12 text-lg rounded-xl p-1 px-2" diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json index fc6f4e7073..2a625cd041 100644 --- a/assets/themes/atm/atm.json +++ b/assets/themes/atm/atm.json @@ -58,7 +58,8 @@ "name": null, "filter": { "sameAs": "bank_with_atm" - } + }, + "doCount": false } }, { diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json index 05ddd4e4a0..d9a70c5906 100644 --- a/assets/themes/bag/bag.json +++ b/assets/themes/bag/bag.json @@ -54,6 +54,7 @@ "maxCacheAge": 0 }, "minzoom": 18, + "doCount": false, "calculatedTags": [ "_surface:strict:=feat(get)('_surface')" ], @@ -164,6 +165,7 @@ "maxCacheAge": 0 }, "minzoom": 18, + "doCount": false, "pointRendering": [ { "label": { diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index f080d16fa7..31b513d861 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -394,6 +394,7 @@ }, "minzoom": 16, "name": null, + "doCount": false, "+tagRenderings": [ { "id": "repairs_climbing_shoes", @@ -460,6 +461,7 @@ ], "override": { "minzoom": 15, + "doCount": false, "pointRendering": [ { "iconSize": "30,30" diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json index 1543f2b9a3..4e7df1f969 100644 --- a/assets/themes/fritures/fritures.json +++ b/assets/themes/fritures/fritures.json @@ -96,7 +96,8 @@ "override": { "minzoom": 18, "filter": null, - "name": null + "name": null, + "doCount": false } } ], diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json index c2b64f77c6..89461b7acf 100644 --- a/assets/themes/grb/grb.json +++ b/assets/themes/grb/grb.json @@ -785,12 +785,10 @@ } ], "overrideAll": { - "minzoom": 17 + "minzoom": 17, + "doCount": false }, "widenFactor": 2, "overpassMaxZoom": 15, - "osmApiTileSize": 17, - "clustering": { - "maxZoom": 15 - } + "osmApiTileSize": 17 } diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json index 4376618135..cd2c8d874e 100644 --- a/assets/themes/healthcare/healthcare.json +++ b/assets/themes/healthcare/healthcare.json @@ -113,6 +113,7 @@ "override": { "=presets": [], "name": null, + "doCount": false, "minzoom": 18 } } diff --git a/assets/themes/icecream/icecream.json b/assets/themes/icecream/icecream.json index 483b5a9917..509fd9e86b 100644 --- a/assets/themes/icecream/icecream.json +++ b/assets/themes/icecream/icecream.json @@ -17,6 +17,5 @@ "icon": "./assets/layers/ice_cream/ice_cream.svg", "layers": [ "ice_cream" - ], - "minzoom": "14" + ] } diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json index a5db8799e3..b065d55f84 100644 --- a/assets/themes/openlovemap/openlovemap.json +++ b/assets/themes/openlovemap/openlovemap.json @@ -51,6 +51,7 @@ "minzoom": 18, "=presets": [], "=name": null, + "doCount": false, "=filter": { "sameAs": "erotic-shop" } @@ -125,6 +126,7 @@ "override": { "minzoom": 18, "=presets": [], + "doCount": false, "=name": null } }, @@ -203,6 +205,7 @@ "override": { "minzoom": 18, "=presets": [], + "doCount": false, "=name": null } }, @@ -237,6 +240,7 @@ ] } ], + "doCount": false, "=presets": [] } } diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json index 2d43fdcbb7..2beb583057 100644 --- a/assets/themes/velopark/velopark.json +++ b/assets/themes/velopark/velopark.json @@ -284,6 +284,7 @@ "bike_parking" ], "override": { + "doCount": false, "minzoom": 14 } }, @@ -294,6 +295,7 @@ "bicycle_rental" ], "override": { + "doCount": false, "minzoom": 18 } } diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json index 55e92092b1..1847ae7119 100644 --- a/assets/themes/vending_machine/vending_machine.json +++ b/assets/themes/vending_machine/vending_machine.json @@ -31,6 +31,7 @@ "override": { "id": "all_vending_machine", "name": null, + "doCount": false, "filter": { "sameAs": "vending_machine" }, @@ -49,6 +50,7 @@ { "builtin": "parking_ticket_machine", "override": { + "doCount": false, "name": null, "minzoom": 18 } @@ -56,6 +58,7 @@ { "builtin": "elongated_coin", "override": { + "doCount": false, "name": null, "minzoom": 18 } @@ -63,9 +66,10 @@ { "builtin": "ticket_machine", "override": { + "doCount": false, "name": null, "minzoom": 18 } } ] -} \ No newline at end of file +}