From ee0a160b83da0adb409d30b0bdc2b4dead58ab37 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 3 Jun 2024 15:31:17 +0200 Subject: [PATCH] Merge branches --- assets/layers/advertising/advertising.json | 4 +- assets/layers/atm/atm.json | 2 +- assets/layers/brothel/brothel.json | 4 +- .../charging_station/charging_station.json | 252 +++++++++--------- assets/layers/love_hotel/love_hotel.json | 2 +- .../layers/parcel_lockers/parcel_lockers.json | 2 +- assets/layers/postoffices/postoffices.json | 2 +- assets/layers/stripclub/stripclub.json | 4 +- .../surveillance_camera.json | 4 +- .../mapcomplete-changes.json | 11 +- assets/themes/openlovemap/openlovemap.json | 4 +- assets/themes/surveillance/surveillance.json | 4 +- assets/themes/velopark/velopark.json | 2 +- 13 files changed, 149 insertions(+), 148 deletions(-) diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json index 3cf2f50c8a..d078da9330 100644 --- a/assets/layers/advertising/advertising.json +++ b/assets/layers/advertising/advertising.json @@ -31,7 +31,6 @@ "it": "Completeremo i dati da caratteristiche pubblicitarie, con referenza, operatore e illuminazione", "fr": "Nous allons compléter les information sur la publicité avec la référence, l'opérateur et l'éclairage" }, - "enableMorePrivacy": true, "source": { "osmTags": { "and": [ @@ -1643,5 +1642,6 @@ "allowMove": { "enableImproveAccuracy": true, "enableRelocation": false - } + }, + "enableMorePrivacy": true } diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json index 168f09e145..212c63df4b 100644 --- a/assets/layers/atm/atm.json +++ b/assets/layers/atm/atm.json @@ -644,4 +644,4 @@ "enableImproveAccuracy": true, "enableRelocation": false } -} \ No newline at end of file +} diff --git a/assets/layers/brothel/brothel.json b/assets/layers/brothel/brothel.json index 780171d752..dd0a60d40b 100644 --- a/assets/layers/brothel/brothel.json +++ b/assets/layers/brothel/brothel.json @@ -11,7 +11,6 @@ "source": { "osmTags": "amenity=brothel" }, - "enableMorePrivacy": true, "minzoom": 6, "title": { "render": { @@ -95,5 +94,6 @@ "omitDefaultDeleteReasons": false }, "allowMove": true, - "allowSplit": false + "allowSplit": false, + "enableMorePrivacy": true } diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 6e3945713d..84b5b2f3a8 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -5,7 +5,13 @@ "nl": "Oplaadpunten", "de": "Ladestationen" }, - "minzoom": 10, + "description": { + "en": "A charging station", + "nl": "Oplaadpunten", + "ca": "Una estació de càrrega", + "de": "Eine Ladestation", + "fr": "Une station de recharge" + }, "source": { "osmTags": { "and": [ @@ -20,6 +26,7 @@ ] } }, + "minzoom": 10, "title": { "render": { "en": "Charging station", @@ -65,14 +72,109 @@ } ] }, - "description": { - "en": "A charging station", - "nl": "Oplaadpunten", - "ca": "Una estació de càrrega", - "de": "Eine Ladestation", - "fr": "Une station de recharge" - }, - "#": "no-question-hint-check", + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "marker": [ + { + "icon": "pin", + "color": "#fff" + }, + { + "icon": { + "render": "./assets/themes/charging_stations/plug.svg", + "mappings": [ + { + "if": "bicycle=yes", + "then": "./assets/themes/charging_stations/bicycle.svg" + }, + { + "if": { + "or": [ + "car=yes", + "motorcar=yes" + ] + }, + "then": "./assets/themes/charging_stations/car.svg" + } + ] + } + } + ], + "iconBadges": [ + { + "if": { + "or": [ + "disused:amenity=charging_station", + "operational_status=broken" + ] + }, + "then": "close:#c22;" + }, + { + "if": { + "or": [ + "proposed:amenity=charging_station", + "planned:amenity=charging_station" + ] + }, + "then": "./assets/layers/charging_station/under_construction.svg" + }, + { + "if": { + "and": [ + "bicycle=yes", + { + "or": [ + "motorcar=yes", + "car=yes" + ] + } + ] + }, + "then": "circle:#fff;./assets/themes/charging_stations/car.svg" + } + ], + "anchor": "bottom", + "iconSize": "50,50" + } + ], + "lineRendering": [ + { + "color": "black", + "width": 2, + "fillColor": "#80808080" + } + ], + "presets": [ + { + "tags": [ + "amenity=charging_station", + "motorcar=no", + "bicycle=yes" + ], + "title": { + "en": "charging station for electrical bikes", + "nl": "oplaadpunt voor elektrische fietsen", + "de": "Ladestation für Elektrofahrräder" + } + }, + { + "tags": [ + "amenity=charging_station", + "motorcar=yes", + "bicycle=no" + ], + "title": { + "en": "charging station for cars", + "nl": "oplaadstation voor elektrische auto's", + "de": "Ladestation für Autos" + } + } + ], "tagRenderings": [ "images", { @@ -2747,109 +2849,6 @@ } } ], - "lineRendering": [ - { - "color": "black", - "width": 2, - "fillColor": "#80808080" - } - ], - "pointRendering": [ - { - "location": [ - "point", - "centroid" - ], - "marker": [ - { - "icon": "pin", - "color": "#fff" - }, - { - "icon": { - "render": "./assets/themes/charging_stations/plug.svg", - "mappings": [ - { - "if": "bicycle=yes", - "then": "./assets/themes/charging_stations/bicycle.svg" - }, - { - "if": { - "or": [ - "car=yes", - "motorcar=yes" - ] - }, - "then": "./assets/themes/charging_stations/car.svg" - } - ] - } - } - ], - "iconBadges": [ - { - "if": { - "or": [ - "disused:amenity=charging_station", - "operational_status=broken" - ] - }, - "then": "close:#c22;" - }, - { - "if": { - "or": [ - "proposed:amenity=charging_station", - "planned:amenity=charging_station" - ] - }, - "then": "./assets/layers/charging_station/under_construction.svg" - }, - { - "if": { - "and": [ - "bicycle=yes", - { - "or": [ - "motorcar=yes", - "car=yes" - ] - } - ] - }, - "then": "circle:#fff;./assets/themes/charging_stations/car.svg" - } - ], - "anchor": "bottom", - "iconSize": "50,50" - } - ], - "presets": [ - { - "tags": [ - "amenity=charging_station", - "motorcar=no", - "bicycle=yes" - ], - "title": { - "en": "charging station for electrical bikes", - "nl": "oplaadpunt voor elektrische fietsen", - "de": "Ladestation für Elektrofahrräder" - } - }, - { - "tags": [ - "amenity=charging_station", - "motorcar=yes", - "bicycle=no" - ], - "title": { - "en": "charging station for cars", - "nl": "oplaadstation voor elektrische auto's", - "de": "Ladestation für Autos" - } - } - ], "filter": [ { "id": "vehicle-type", @@ -3097,6 +3096,19 @@ ] } ], + "deletion": { + "softDeletionTags": { + "and": [ + "amenity=", + "disused:amenity=charging_station" + ] + }, + "neededChangesets": 10 + }, + "allowMove": { + "enableRelocation": false, + "enableImproveAccuracy": true + }, "units": [ { "maxstay": { @@ -3291,17 +3303,5 @@ } } ], - "allowMove": { - "enableRelocation": false, - "enableImproveAccuracy": true - }, - "deletion": { - "softDeletionTags": { - "and": [ - "amenity=", - "disused:amenity=charging_station" - ] - }, - "neededChangesets": 10 - } -} \ No newline at end of file + "#": "no-question-hint-check" +} diff --git a/assets/layers/love_hotel/love_hotel.json b/assets/layers/love_hotel/love_hotel.json index 15f63255c9..884506c6d3 100644 --- a/assets/layers/love_hotel/love_hotel.json +++ b/assets/layers/love_hotel/love_hotel.json @@ -8,7 +8,6 @@ "en": "A love hotel is a type of short-stay hotel found around the world operated primarily for the purpose of allowing guests privacy for sexual activities", "de": "Ein Love Hotel ist eine Art Kurzzeithotel, das in erster Linie zu dem Zweck betrieben wird, den Gästen Privatsphäre für sexuelle Aktivitäten zu bieten" }, - "enableMorePrivacy": true, "source": { "osmTags": "amenity=love_hotel" }, @@ -84,5 +83,6 @@ }, "contact" ], + "enableMorePrivacy": true, "credits": "Asteliks" } diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json index 6377cbb2f9..108a7f5d57 100644 --- a/assets/layers/parcel_lockers/parcel_lockers.json +++ b/assets/layers/parcel_lockers/parcel_lockers.json @@ -290,4 +290,4 @@ "allowMove": { "enableImproveAccuracy": true } -} \ No newline at end of file +} diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json index 36bebaf3dd..adbe4965e3 100644 --- a/assets/layers/postoffices/postoffices.json +++ b/assets/layers/postoffices/postoffices.json @@ -658,4 +658,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/assets/layers/stripclub/stripclub.json b/assets/layers/stripclub/stripclub.json index af62d7b65a..1fdfad8816 100644 --- a/assets/layers/stripclub/stripclub.json +++ b/assets/layers/stripclub/stripclub.json @@ -8,7 +8,6 @@ "en": "A venue where erotic dance, striptease, or lap dances are performed commercially. ", "de": "Ein Ort, an dem erotische Tanz-, Striptease- oder Lapdances kommerziell durchgeführt werden. " }, - "enableMorePrivacy": true, "source": { "osmTags": "amenity=stripclub" }, @@ -88,5 +87,6 @@ }, "opening_hours", "contact" - ] + ], + "enableMorePrivacy": true } diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index e3045170f8..0b7230bad2 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -22,7 +22,6 @@ "cs": "Tato vrstva zobrazuje sledovací kamery a umožňuje přispěvateli aktualizovat informace a přidávat nové kamery", "sl": "Ta sloj prikazuje nadzorne kamere in urednikom omogoča posodabljanje informacij obstoječih in dodajanje novih kamer" }, - "enableMorePrivacy": true, "source": { "osmTags": { "and": [ @@ -856,5 +855,6 @@ "id": "camera:mount" } ], - "deletion": true + "deletion": true, + "enableMorePrivacy": true } diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 9e119e077d..364995aeec 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,4 +1,4 @@ -{ +²{ "id": "mapcomplete-changes", "title": { "en": "Changes made with MapComplete" @@ -9,11 +9,12 @@ "description": { "en": "This maps shows all the changes made with MapComplete" }, + "shortDescription": { + "en": "Shows changes made by MapComplete", + "de": "Änderungen von MapComplete anzeigen" + }, "icon": "./assets/svg/logo.svg", "hideFromOverview": true, - "startLat": 0, - "startLon": 0, - "startZoom": 1, "layers": [ { "id": "mapcomplete-changes", @@ -685,4 +686,4 @@ } } ] -} \ No newline at end of file +} diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json index 8de16546c9..70c15f504b 100644 --- a/assets/themes/openlovemap/openlovemap.json +++ b/assets/themes/openlovemap/openlovemap.json @@ -12,7 +12,6 @@ }, "icon": "./assets/layers/stripclub/stripclub.svg", "hideFromOverview": true, - "enableMorePrivacy": true, "layers": [ "brothel", "stripclub", @@ -272,5 +271,6 @@ ] } ] - } + }, + "enableMorePrivacy": true } diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json index 455a252042..684c366605 100644 --- a/assets/themes/surveillance/surveillance.json +++ b/assets/themes/surveillance/surveillance.json @@ -52,7 +52,6 @@ }, "icon": "./assets/themes/surveillance/logo.svg", "defaultBackgroundId": "maptiler.carto", - "enableMorePrivacy": true, "layers": [ "surveillance_camera", { @@ -61,5 +60,6 @@ "minzoom": 12 } } - ] + ], + "enableMorePrivacy": true } diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json index 270e5e4ca1..11d5c0cabf 100644 --- a/assets/themes/velopark/velopark.json +++ b/assets/themes/velopark/velopark.json @@ -4,7 +4,6 @@ "en": "Velopark to OpenStreetMap synchronisation tool", "nl": "Velopark naar OpenStreetMap sync tool" }, - "customCss": "./assets/themes/velopark/velopark.css", "mustHaveLanguage": [ "nl", "en" @@ -534,6 +533,7 @@ } ] }, + "customCss": "./assets/themes/velopark/velopark.css", "lockLocation": [ [ 2.51357303225,