From 7e46e25943892811f13be7afc636037f8715e5ba Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Mon, 13 Dec 2021 20:59:38 +0100 Subject: [PATCH] Translation sync --- assets/layers/bike_shop/bike_shop.json | 2 +- assets/themes/grb_import/grb.json | 18 ++-- assets/themes/postal_codes/postal_codes.json | 89 +++++++++++++++++++- assets/themes/uk_addresses/uk_addresses.json | 2 +- langs/themes/nl.json | 5 ++ 5 files changed, 104 insertions(+), 12 deletions(-) diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json index e7837f3dc..9a2680d80 100644 --- a/assets/layers/bike_shop/bike_shop.json +++ b/assets/layers/bike_shop/bike_shop.json @@ -735,4 +735,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/themes/grb_import/grb.json b/assets/themes/grb_import/grb.json index 6f499615e..f4b2d80d3 100644 --- a/assets/themes/grb_import/grb.json +++ b/assets/themes/grb_import/grb.json @@ -34,7 +34,9 @@ "override": { "+mapRendering": [ { - "location": ["point"], + "location": [ + "point" + ], "icon": { "render": "./assets/themes/grb_import/robot.svg" }, @@ -55,12 +57,14 @@ "then": "Zoom in more..." }, { - "if": "_embedded_crab_addresses=", - "then": "Loading..." - },{ - "if": "_embedded_crab_addresses=0", - "then": "No CRAB addresses in view. Zoom in more to see them" - }] + "if": "_embedded_crab_addresses=", + "then": "Loading..." + }, + { + "if": "_embedded_crab_addresses=0", + "then": "No CRAB addresses in view. Zoom in more to see them" + } + ] } ] } diff --git a/assets/themes/postal_codes/postal_codes.json b/assets/themes/postal_codes/postal_codes.json index 8eebda0cb..ba9fff50e 100644 --- a/assets/themes/postal_codes/postal_codes.json +++ b/assets/themes/postal_codes/postal_codes.json @@ -24,10 +24,90 @@ "clustering": false, "overpassTimeout": 180, "layers": [ + { + "id": "postal_code_boundary", + "name": { + "en": "postal codes" + }, + "minzoom": 8, + "title": { + "render": { + "en": "Postal code {postal_code}" + } + }, + "description": {}, + "tagRenderings": [ + { + "id": "postal_code", + "render": { + "en": "The postal code is {postal_code}" + } + } + ], + "source": { + "osmTags": { + "or": [ + "boundary=postal_code", + { + "and": [ + "bounary=administrative", + "postal_code~*" + ] + } + ] + } + }, + "mapRendering": [ + { + "label": "
{postal_code}
", + "location": [ + "point", + "centroid" + ] + }, + { + "color": { + "render": "#00f" + }, + "width": { + "render": "4" + }, + "fill": "no", + "dashArray": "8 8" + } + ], + "isShown": { + "render": "yes", + "mappings": [ + { + "if": "_country!=be", + "then": "no" + } + ] + } + }, + { + "id": "wrong_postal_code", + "source": { + "osmTags": { + "and": [ + "boundary~*", + "addr:postcode~*" + ] + } + }, + "title": "Boundary relation with addr:postcode={addr:postcode}", + "mapRendering": [ + { + "color": "#f00", + "width": 1 + } + ] + }, { "id": "town_hall", "name": { - "en": "town halls and churches" + "en": "town halls" }, "minzoom": 12, "title": { @@ -35,7 +115,7 @@ "en": "Town hall {name}" } }, - "#calculatedTags": [ + "calculatedTags": [ "_postal_code_properties=(() => { const f = feat.overlapWith('postal_code_boundary'); if(f.length===0){return {};}; const p = f[0]?.feat?.properties; return {id:p.id, postal_code: p.postal_code, _closest_town_hall: p._closest_town_hall}; })()", "_postal_code=feat.get('_postal_code_properties')?.postal_code", "_postal_code_center_distance=feat.distanceTo(feat.get('_postal_code_properties').id)" @@ -45,7 +125,10 @@ "presets": [], "source": { "osmTags": { - "or": ["amenity=townhall","building=church"] + "or": [ + "amenity=townhall", + "building=church" + ] } }, "mapRendering": [ diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index 1b4faa5be..31d4ab465 100644 --- a/assets/themes/uk_addresses/uk_addresses.json +++ b/assets/themes/uk_addresses/uk_addresses.json @@ -326,7 +326,7 @@ } ] }, -"named_streets" + "named_streets" ], "enableShareScreen": false, "enableMoreQuests": false diff --git a/langs/themes/nl.json b/langs/themes/nl.json index be5284bd1..78f9277d0 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -835,6 +835,11 @@ "shortDescription": "Een kaart met alle kaarten die OpenStreetMap kent", "title": "Een kaart met Kaarten" }, + "missing_streets": { + "description": "Dit thema voegt automatisch straatnamen toe aan gebouwen met huisnummer en overeenkomstig CRAB-adres.", + "shortDescription": "Voegt ontbrekende straten toe aan gebouwen met huisnumer adhv CRAB", + "title": "Fix ontbrekende straten" + }, "nature": { "description": "Op deze kaart vind je informatie voor natuurliefhebbers, zoals info over het natuurgebied waar je inzit, vogelkijkhutten, informatieborden, ...", "shortDescription": "Deze kaart bevat informatie voor natuurliefhebbers",