ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: use 'isCounted' instead of 'doCount', add check for this

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-19 17:29:55 +02:00
parent a6598fd52d
commit 3a8fc4248b
6 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/layers/climbing_opportunity/climbing_opportunity.json
View file

@ -153,5 +153,5 @@
"en": "a wall, cliff or rock", "en": "a wall, cliff or rock",
"de": "eine Wand, eine Klippe oder einen Felsen" "de": "eine Wand, eine Klippe oder einen Felsen"
}, },
"doCount": false "isCounted": false
} }

2
assets/themes/atm/atm.json
View file

@ -63,7 +63,7 @@
"filter": { "filter": {
"sameAs": "banks_with_atm" "sameAs": "banks_with_atm"
}, },
"doCount": false "isCounted": false
} }
}, },
{ {

9
assets/themes/bag/bag.json
View file

@ -56,7 +56,7 @@
"osmTags": "building~*" "osmTags": "building~*"
}, },
"minzoom": 18, "minzoom": 18,
"doCount": false, "isCounted": false,
"calculatedTags": [ "calculatedTags": [
"_surface:strict:=feat(get)('_surface')" "_surface:strict:=feat(get)('_surface')"
], ],
@ -152,7 +152,8 @@
} }
} }
], ],
"allowMove": false "allowMove": false,
"isCounted": false
}, },
{ {
"id": "osm_adresses", "id": "osm_adresses",
@ -171,7 +172,6 @@
} }
}, },
"minzoom": 18, "minzoom": 18,
"doCount": false,
"pointRendering": [ "pointRendering": [
{ {
"label": { "label": {
@ -191,7 +191,8 @@
} }
} }
], ],
"allowMove": false "allowMove": false,
"isCounted": false
}, },
{ {
"id": "bag_pand", "id": "bag_pand",

4
assets/themes/climbing/climbing.json
View file

@ -395,7 +395,7 @@
}, },
"minzoom": 16, "minzoom": 16,
"name": null, "name": null,
"doCount": false, "isCounted": false,
"+tagRenderings": [ "+tagRenderings": [
{ {
"id": "repairs_climbing_shoes", "id": "repairs_climbing_shoes",
@ -470,7 +470,7 @@
], ],
"override": { "override": {
"minzoom": 15, "minzoom": 15,
"doCount": false, "isCounted": false,
"pointRendering": [ "pointRendering": [
{ {
"iconSize": "30,30" "iconSize": "30,30"

6
assets/themes/grb/grb.json
View file

@ -275,7 +275,8 @@
} }
} }
], ],
"allowMove": false "allowMove": false,
"isCounted": false
}, },
{ {
"id": "grb", "id": "grb",
@ -606,7 +607,8 @@
"fill": "no" "fill": "no"
} }
], ],
"allowMove": false "allowMove": false,
"isCounted": false
}, },
"address", "address",
{ {

4
src/Models/ThemeConfig/Conversion/PrevalidateLayer.ts
View file

@ -88,6 +88,10 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
} }
} }
if(json["doCount"] !== undefined){
context.err("Detected 'doCount'. did you mean: isCounted ?")
}
if ( if (
json.syncSelection !== undefined && json.syncSelection !== undefined &&
LayerConfig.syncSelectionAllowed.indexOf(json.syncSelection) < 0 LayerConfig.syncSelectionAllowed.indexOf(json.syncSelection) < 0