diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json index 32e08ad0af..f3f0e7277a 100644 --- a/assets/layers/artwork/artwork.json +++ b/assets/layers/artwork/artwork.json @@ -558,4 +558,4 @@ } } ] -} +} \ No newline at end of file diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json index 665dc666c8..282330165c 100644 --- a/assets/layers/charging_station/charging_station.json +++ b/assets/layers/charging_station/charging_station.json @@ -3,8 +3,8 @@ "name": { "en": "Charging stations", "nl": "Oplaadpunten", - "de": "Ladestationen", - "ca": "Estacions de càrrega" + "ca": "Estacions de càrrega", + "de": "Ladestationen" }, "minzoom": 10, "source": { @@ -67,8 +67,8 @@ "description": { "en": "A charging station", "nl": "Oplaadpunten", - "de": "Eine Ladestation", - "da": "En ladestation" + "da": "En ladestation", + "de": "Eine Ladestation" }, "tagRenderings": [ "images", @@ -1504,7 +1504,7 @@ }, "mappings": [ { - "if": "socket:schuko:output=3.6 kw", + "if": "socket:schuko:output=3.6 kW", "then": { "en": "Schuko wall plug without ground pin (CEE7/4 type F) outputs at most 3.6 kw A", "nl": "Schuko stekker zonder aardingspin (CEE7/4 type F) levert een vermogen van maximaal 3.6 kw A" @@ -1609,7 +1609,7 @@ }, "mappings": [ { - "if": "socket:typee:output=3 kw", + "if": "socket:typee:output=3 kW", "then": { "en": "European wall plug with ground pin (CEE7/4 type E) outputs at most 3 kw A", "nl": "Europese stekker met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 3 kw A" @@ -1620,7 +1620,7 @@ } }, { - "if": "socket:typee:output=22 kw", + "if": "socket:typee:output=22 kW", "then": { "en": "European wall plug with ground pin (CEE7/4 type E) outputs at most 22 kw A", "nl": "Europese stekker met aardingspin (CEE7/4 type E) levert een vermogen van maximaal 22 kw A" @@ -1725,7 +1725,7 @@ }, "mappings": [ { - "if": "socket:chademo:output=50 kw", + "if": "socket:chademo:output=50 kW", "then": { "en": "Chademo outputs at most 50 kw A", "nl": "Chademo levert een vermogen van maximaal 50 kw A" @@ -1841,7 +1841,7 @@ }, "mappings": [ { - "if": "socket:type1_cable:output=3.7 kw", + "if": "socket:type1_cable:output=3.7 kW", "then": { "en": "Type 1 with cable (J1772) outputs at most 3.7 kw A", "nl": "Type 1 met kabel (J1772) levert een vermogen van maximaal 3.7 kw A" @@ -1852,7 +1852,7 @@ } }, { - "if": "socket:type1_cable:output=7 kw", + "if": "socket:type1_cable:output=7 kW", "then": { "en": "Type 1 with cable (J1772) outputs at most 7 kw A", "nl": "Type 1 met kabel (J1772) levert een vermogen van maximaal 7 kw A" @@ -1968,7 +1968,7 @@ }, "mappings": [ { - "if": "socket:type1:output=3.7 kw", + "if": "socket:type1:output=3.7 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 3.7 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 3.7 kw A" @@ -1979,7 +1979,7 @@ } }, { - "if": "socket:type1:output=6.6 kw", + "if": "socket:type1:output=6.6 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 6.6 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 6.6 kw A" @@ -1990,7 +1990,7 @@ } }, { - "if": "socket:type1:output=7 kw", + "if": "socket:type1:output=7 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 7 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 7 kw A" @@ -2001,7 +2001,7 @@ } }, { - "if": "socket:type1:output=7.2 kw", + "if": "socket:type1:output=7.2 kW", "then": { "en": "Type 1 without cable (J1772) outputs at most 7.2 kw A", "nl": "Type 1 zonder kabel (J1772) levert een vermogen van maximaal 7.2 kw A" @@ -2128,7 +2128,7 @@ }, "mappings": [ { - "if": "socket:type1_combo:output=50 kw", + "if": "socket:type1_combo:output=50 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 50 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 50 kw A" @@ -2139,7 +2139,7 @@ } }, { - "if": "socket:type1_combo:output=62.5 kw", + "if": "socket:type1_combo:output=62.5 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 62.5 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 62.5 kw A" @@ -2150,7 +2150,7 @@ } }, { - "if": "socket:type1_combo:output=150 kw", + "if": "socket:type1_combo:output=150 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 150 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 150 kw A" @@ -2161,7 +2161,7 @@ } }, { - "if": "socket:type1_combo:output=350 kw", + "if": "socket:type1_combo:output=350 kW", "then": { "en": "Type 1 CCS (aka Type 1 Combo) outputs at most 350 kw A", "nl": "Type 1 CCS (ook gekend als Type 1 Combo) levert een vermogen van maximaal 350 kw A" @@ -2277,7 +2277,7 @@ }, "mappings": [ { - "if": "socket:tesla_supercharger:output=120 kw", + "if": "socket:tesla_supercharger:output=120 kW", "then": { "en": "Tesla Supercharger outputs at most 120 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 120 kw A" @@ -2288,7 +2288,7 @@ } }, { - "if": "socket:tesla_supercharger:output=150 kw", + "if": "socket:tesla_supercharger:output=150 kW", "then": { "en": "Tesla Supercharger outputs at most 150 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 150 kw A" @@ -2299,7 +2299,7 @@ } }, { - "if": "socket:tesla_supercharger:output=250 kw", + "if": "socket:tesla_supercharger:output=250 kW", "then": { "en": "Tesla Supercharger outputs at most 250 kw A", "nl": "Tesla Supercharger levert een vermogen van maximaal 250 kw A" @@ -2426,7 +2426,7 @@ }, "mappings": [ { - "if": "socket:type2:output=11 kw", + "if": "socket:type2:output=11 kW", "then": { "en": "Type 2 (mennekes) outputs at most 11 kw A", "nl": "Type 2 (mennekes) levert een vermogen van maximaal 11 kw A" @@ -2437,7 +2437,7 @@ } }, { - "if": "socket:type2:output=22 kw", + "if": "socket:type2:output=22 kW", "then": { "en": "Type 2 (mennekes) outputs at most 22 kw A", "nl": "Type 2 (mennekes) levert een vermogen van maximaal 22 kw A" @@ -2564,7 +2564,7 @@ }, "mappings": [ { - "if": "socket:type2_combo:output=50 kw", + "if": "socket:type2_combo:output=50 kW", "then": { "en": "Type 2 CCS (mennekes) outputs at most 50 kw A", "nl": "Type 2 CCS (mennekes) levert een vermogen van maximaal 50 kw A" @@ -2691,7 +2691,7 @@ }, "mappings": [ { - "if": "socket:type2_cable:output=11 kw", + "if": "socket:type2_cable:output=11 kW", "then": { "en": "Type 2 with cable (mennekes) outputs at most 11 kw A", "nl": "Type 2 met kabel (J1772) levert een vermogen van maximaal 11 kw A" @@ -2702,7 +2702,7 @@ } }, { - "if": "socket:type2_cable:output=22 kw", + "if": "socket:type2_cable:output=22 kW", "then": { "en": "Type 2 with cable (mennekes) outputs at most 22 kw A", "nl": "Type 2 met kabel (J1772) levert een vermogen van maximaal 22 kw A" @@ -2829,7 +2829,7 @@ }, "mappings": [ { - "if": "socket:tesla_supercharger_ccs:output=50 kw", + "if": "socket:tesla_supercharger_ccs:output=50 kW", "then": { "en": "Tesla Supercharger CCS (a branded type2_css) outputs at most 50 kw A", "nl": "Tesla Supercharger CCS (een type2 CCS met Tesla-logo) levert een vermogen van maximaal 50 kw A" @@ -2945,7 +2945,7 @@ }, "mappings": [ { - "if": "socket:tesla_destination:output=120 kw", + "if": "socket:tesla_destination:output=120 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 120 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 120 kw A" @@ -2956,7 +2956,7 @@ } }, { - "if": "socket:tesla_destination:output=150 kw", + "if": "socket:tesla_destination:output=150 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 150 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 150 kw A" @@ -2967,7 +2967,7 @@ } }, { - "if": "socket:tesla_destination:output=250 kw", + "if": "socket:tesla_destination:output=250 kW", "then": { "en": "Tesla Supercharger (destination) outputs at most 250 kw A", "nl": "Tesla Supercharger (destination) levert een vermogen van maximaal 250 kw A" @@ -3095,7 +3095,7 @@ }, "mappings": [ { - "if": "socket:tesla_destination:output=11 kw", + "if": "socket:tesla_destination:output=11 kW", "then": { "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 11 kw A", "nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 11 kw A" @@ -3106,7 +3106,7 @@ } }, { - "if": "socket:tesla_destination:output=22 kw", + "if": "socket:tesla_destination:output=22 kW", "then": { "en": "Tesla supercharger (destination) (A Type 2 with cable branded as tesla) outputs at most 22 kw A", "nl": "Tesla supercharger (destination (Een Type 2 met kabel en Tesla-logo) levert een vermogen van maximaal 22 kw A" @@ -3225,7 +3225,7 @@ }, "mappings": [ { - "if": "socket:USB-A:output=5w", + "if": "socket:USB-A:output=5W", "then": { "en": "USB to charge phones and small electronics outputs at most 5w A", "nl": "USB om GSMs en kleine electronica op te laden levert een vermogen van maximaal 5w A" @@ -3236,7 +3236,7 @@ } }, { - "if": "socket:USB-A:output=10w", + "if": "socket:USB-A:output=10W", "then": { "en": "USB to charge phones and small electronics outputs at most 10w A", "nl": "USB om GSMs en kleine electronica op te laden levert een vermogen van maximaal 10w A" @@ -4104,18 +4104,18 @@ "question": { "en": "All vehicle types", "nl": "Alle voertuigen", + "da": "Alle køretøjstyper", "de": "Ladestationen für alle Fahrzeugtypen", - "fr": "Tout type de véhicule", - "da": "Alle køretøjstyper" + "fr": "Tout type de véhicule" } }, { "question": { "en": "Charging station for bicycles", "nl": "Oplaadpunten voor fietsen", + "da": "Ladestation til cykler", "de": "Ladestationen für Fahrräder", - "fr": "Station de charge pour vélos", - "da": "Ladestation til cykler" + "fr": "Station de charge pour vélos" }, "osmTags": "bicycle=yes" }, @@ -4123,9 +4123,9 @@ "question": { "en": "Charging station for cars", "nl": "Oplaadpunten voor auto's", + "da": "Ladestation til biler", "de": "Ladestationen für Autos", - "fr": "Station de charge pour automobiles", - "da": "Ladestation til biler" + "fr": "Station de charge pour automobiles" }, "osmTags": { "or": [ @@ -4143,8 +4143,8 @@ "question": { "en": "Only working charging stations", "nl": "Enkel werkende oplaadpunten", - "de": "Nur Ladestationen in Betrieb", - "da": "Kun fungerende ladestationer" + "da": "Kun fungerende ladestationer", + "de": "Nur Ladestationen in Betrieb" }, "osmTags": { "and": [ @@ -4162,8 +4162,8 @@ "question": { "en": "All connectors", "nl": "Alle types", - "de": "Alle Anschlüsse", - "ca": "Tots els connectors" + "ca": "Tots els connectors", + "de": "Alle Anschlüsse" } }, { @@ -4306,14 +4306,14 @@ "human": { "en": " minutes", "nl": " minuten", - "ru": " минут", - "ca": " minuts" + "ca": " minuts", + "ru": " минут" }, "humanSingular": { "en": " minute", "nl": " minuut", - "ru": " минута", - "ca": " minut" + "ca": " minut", + "ru": " минута" } }, { @@ -4330,14 +4330,14 @@ "human": { "en": " hours", "nl": " uren", - "ru": " часов", - "ca": " hores" + "ca": " hores", + "ru": " часов" }, "humanSingular": { "en": " hour", "nl": " uur", - "ru": " час", - "ca": " hora" + "ca": " hora", + "ru": " час" } }, { @@ -4351,14 +4351,14 @@ "human": { "en": " days", "nl": " day", - "ru": " дней", - "ca": " dies" + "ca": " dies", + "ru": " дней" }, "humanSingular": { "en": " day", "nl": " dag", - "ru": " день", - "ca": " dia" + "ca": " dia", + "ru": " день" } } ] @@ -4395,8 +4395,8 @@ "human": { "en": "Volts", "nl": "volt", - "ru": "Вольт", - "ca": "Volts" + "ca": "Volts", + "ru": "Вольт" } } ], @@ -4467,8 +4467,8 @@ "human": { "en": "kilowatt", "nl": "kilowatt", - "ru": "киловатт", - "ca": "quilovats" + "ca": "quilovats", + "ru": "киловатт" } }, { @@ -4479,8 +4479,8 @@ "human": { "en": "megawatt", "nl": "megawatt", - "ru": "мегаватт", - "ca": "megavats" + "ca": "megavats", + "ru": "мегаватт" } } ], diff --git a/assets/layers/kerbs/flush.svg b/assets/layers/kerbs/flush.svg new file mode 100644 index 0000000000..43068b3901 --- /dev/null +++ b/assets/layers/kerbs/flush.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json index bd007dcc8f..ebf631c7f1 100644 --- a/assets/layers/kerbs/kerbs.json +++ b/assets/layers/kerbs/kerbs.json @@ -23,22 +23,27 @@ "location": [ "point" ], - "icon": "./assets/layers/kerbs/KerbIcon.svg", - "iconSize": "25,23,center", - "iconBadges": [ - { - "if": "kerb=raised", - "then": "square:#f44e42" - }, - { - "if": "kerb=lowered", - "then": "triangle:#11ff00" - }, - { - "if": "kerb=flush", - "then": "circle:#11ff00" - } - ] + "icon": { + "render": "./assets/layers/kerbs/KerbIcon.svg", + "mappings": [ + { + "if": "kerb=raised", + "then": "./assets/layers/kerbs/raised.svg" + }, + { + "if": "kerb=lowered", + "then": "./assets/layers/kerbs/lowered.svg" + }, + { + "if": "kerb=flush", + "then": "./assets/layers/kerbs/flush.svg" + }, + { + "if": "kerb=no", + "then": "./assets/layers/kerbs/no.svg" + } + ] + } }, { "color": "#f44e42", @@ -91,6 +96,33 @@ "hideInAnswer": true } ] + }, + { + "id": "tactile-paving", + "question": { + "en": "Is there tactile paving at this kerb?" + }, + "mappings": [ + { + "if": "tactile_paving=yes", + "then": { + "en": "This kerb has tactile paving." + } + }, + { + "if": "tactile_paving=no", + "then": { + "en": "This kerb does not have tactile paving." + } + }, + { + "if": "tactile_paving=incorrect", + "then": { + "en": "This kerb has tactile paving, but it is incorrect" + }, + "hideInAnswer": true + } + ] } ], "presets": [ @@ -109,7 +141,10 @@ "preciseInput": { "maxSnapDistance": 10, "preferredBackground": "photo", - "snapToLayer": ["cycleways_and_roads", "kerbs"] + "snapToLayer": [ + "cycleways_and_roads", + "kerbs" + ] } } ] diff --git a/assets/layers/kerbs/license_info.json b/assets/layers/kerbs/license_info.json index 8fc0aa4fe3..61687d8335 100644 --- a/assets/layers/kerbs/license_info.json +++ b/assets/layers/kerbs/license_info.json @@ -8,5 +8,45 @@ "sources": [ "https://commons.wikimedia.org/wiki/File:KerbIcon.svg" ] + }, + { + "path": "flush.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dflush.svg" + ] + }, + { + "path": "lowered.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dlowered.svg" + ] + }, + { + "path": "no.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Dno.svg" + ] + }, + { + "path": "raised.svg", + "license": "CC0", + "authors": [ + "Jeroen Hoek" + ], + "sources": [ + "https://wiki.openstreetmap.org/wiki/File:Icon_kerb%3Draised.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/kerbs/lowered.svg b/assets/layers/kerbs/lowered.svg new file mode 100644 index 0000000000..13737e5822 --- /dev/null +++ b/assets/layers/kerbs/lowered.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/layers/kerbs/no.svg b/assets/layers/kerbs/no.svg new file mode 100644 index 0000000000..e7cc817ff6 --- /dev/null +++ b/assets/layers/kerbs/no.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/kerbs/raised.svg b/assets/layers/kerbs/raised.svg new file mode 100644 index 0000000000..629a326062 --- /dev/null +++ b/assets/layers/kerbs/raised.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json index ad908d604f..c1179ce957 100644 --- a/assets/layers/note/note.json +++ b/assets/layers/note/note.json @@ -293,7 +293,7 @@ { "id": "no_imports", "options": [ - { + { "question": { "en": "All Notes", "nl": "Alle Notes" @@ -317,4 +317,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json index cea34d79c8..835cb7e6c4 100644 --- a/assets/layers/surveillance_camera/surveillance_camera.json +++ b/assets/layers/surveillance_camera/surveillance_camera.json @@ -570,4 +570,4 @@ "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen", "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen" } -} +} \ No newline at end of file diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json index d5b7687d0d..f45efb6781 100644 --- a/assets/layers/tree_node/tree_node.json +++ b/assets/layers/tree_node/tree_node.json @@ -743,4 +743,4 @@ "es": "Una capa que muestra árboles", "de": "Eine Ebene, die Bäume zeigt" } -} +} \ No newline at end of file diff --git a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json index 721a000ac4..ba23176410 100644 --- a/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json +++ b/assets/themes/kerbs_and_crossings/kerbs_and_crossings.json @@ -15,7 +15,15 @@ "startLat": 53.23776, "startLon": 6.53812, "layers": [ - "crossings", + { + "builtin": "crossings", + "override": { + "=presets": [], + "source": { + "osmTags": "highway=crossing" + } + } + }, "kerbs" ] } \ No newline at end of file diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 14f91d45e1..924a272e9e 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Änderungen mit MapComplete", - "es": "Cambios hechos con MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt Änderungen von MapComplete", - "es": "Muestra los cambios hechos por MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", - "es": "Este mapa muestra todos los cambios hechos con MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -28,9 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Schwerpunkte von Änderungssätzen", - "es": "Centros de conjuntos de cambios" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -44,45 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungen für {theme}", - "es": "Conjunto de cambios para {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete Änderungen", - "es": "Muestra todos los cambios de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "de": "Änderung {id}", - "es": "Conjunto de cambios {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "de": "Änderung wurde von {_last_edit:contributor} gemacht", - "es": "Cambio hecho por {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -354,8 +336,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themenname enthält {search}" + "en": "Themename contains {search}" } } ] @@ -371,9 +352,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "es": "Hecho por contributor/a {search}" + "en": "Made by contributor {search}" } } ] @@ -389,9 +368,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "es": "No hecho por contributor/a {search}" + "en": "Not made by contributor {search}" } } ] @@ -406,9 +383,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken finden Sie hier", - "es": "Se pueden encontrar más estadísticas aquí" + "en": "More statistics can be found here" } }, { diff --git a/langs/layers/en.json b/langs/layers/en.json index 09a9376d25..bf75f1a668 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -4003,6 +4003,12 @@ "kerbs": { "description": "A layer showing kerbs.", "name": "Kerbs", + "presets": { + "0": { + "description": "Kerb in a footway", + "title": "a kerb" + } + }, "tagRenderings": { "kerb-type": { "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index a82105e4a5..952d2b13f5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3852,6 +3852,12 @@ "kerbs": { "description": "Een laag met stoepranden.", "name": "Stoepranden", + "presets": { + "0": { + "description": "Stoeprand in een voetpad", + "title": "een stoeprand" + } + }, "tagRenderings": { "kerb-type": { "mappings": { diff --git a/langs/shared-questions/ca.json b/langs/shared-questions/ca.json index b69f0decf5..18468023ea 100644 --- a/langs/shared-questions/ca.json +++ b/langs/shared-questions/ca.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "No hi ha cap enllaça a Viquipèdia encara" + }, "1": { "then": "No hi ha cap enllaça a Viquipèdia encara" } diff --git a/langs/shared-questions/da.json b/langs/shared-questions/da.json index 390bc0d818..db62dfd4f1 100644 --- a/langs/shared-questions/da.json +++ b/langs/shared-questions/da.json @@ -94,6 +94,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Der er endnu ikke linket til nogen Wikipedia-side" + }, "1": { "then": "Der er endnu ikke linket til nogen Wikipedia-side" } diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json index b752664b92..2c736c0d1d 100644 --- a/langs/shared-questions/de.json +++ b/langs/shared-questions/de.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Es wurde noch keine Wikipedia-Seite verlinkt" + }, "1": { "then": "Es wurde noch keine Wikipedia-Seite verlinkt" } diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json index 42858b62ae..fce4c92175 100644 --- a/langs/shared-questions/en.json +++ b/langs/shared-questions/en.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "No Wikipedia page has been linked yet" + }, "1": { "then": "No Wikipedia page has been linked yet" } diff --git a/langs/shared-questions/es.json b/langs/shared-questions/es.json index 438ee688a7..91619211ba 100644 --- a/langs/shared-questions/es.json +++ b/langs/shared-questions/es.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Todavía no se ha enlazado una página de wikipedia" + }, "1": { "then": "Todavía no se ha enlazado una página de wikipedia" } diff --git a/langs/shared-questions/fil.json b/langs/shared-questions/fil.json index 9b505b25d8..80f5ab9a50 100644 --- a/langs/shared-questions/fil.json +++ b/langs/shared-questions/fil.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Wala pang kawing ng Wikipedia page" + }, "1": { "then": "Wala pang kawing ng Wikipedia page" } diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json index b14771839f..4e7d5bcc89 100644 --- a/langs/shared-questions/fr.json +++ b/langs/shared-questions/fr.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Pas encore de lien vers une page Wikipedia" + }, "1": { "then": "Pas encore de lien vers une page Wikipedia" } diff --git a/langs/shared-questions/hu.json b/langs/shared-questions/hu.json index 5e2572c139..e9a7dd6391 100644 --- a/langs/shared-questions/hu.json +++ b/langs/shared-questions/hu.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Még nincs Wikipédia-oldal belinkelve" + }, "1": { "then": "Még nincs Wikipédia-oldal belinkelve" } diff --git a/langs/shared-questions/it.json b/langs/shared-questions/it.json index af3118fb33..dfb6cd01ea 100644 --- a/langs/shared-questions/it.json +++ b/langs/shared-questions/it.json @@ -81,6 +81,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Nessuna pagina Wikipedia è ancora stata collegata" + }, "1": { "then": "Nessuna pagina Wikipedia è ancora stata collegata" } diff --git a/langs/shared-questions/ja.json b/langs/shared-questions/ja.json index b8f22df6a8..db7fbb13f6 100644 --- a/langs/shared-questions/ja.json +++ b/langs/shared-questions/ja.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "ウィキペディアのページはまだリンクされていません" + }, "1": { "then": "ウィキペディアのページはまだリンクされていません" } diff --git a/langs/shared-questions/nb_NO.json b/langs/shared-questions/nb_NO.json index d1491cb836..abcfa6e180 100644 --- a/langs/shared-questions/nb_NO.json +++ b/langs/shared-questions/nb_NO.json @@ -96,6 +96,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ingen Wikipedia-side lenket enda" + }, "1": { "then": "Ingen Wikipedia-side lenket enda" } diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json index 4370fb3a21..c5bd2085e4 100644 --- a/langs/shared-questions/nl.json +++ b/langs/shared-questions/nl.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Er werd nog geen Wikipedia-pagina gekoppeld" + }, "1": { "then": "Er werd nog geen Wikipedia-pagina gekoppeld" } diff --git a/langs/shared-questions/pl.json b/langs/shared-questions/pl.json index da5e6d2fc7..a2a4184de5 100644 --- a/langs/shared-questions/pl.json +++ b/langs/shared-questions/pl.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Link do strony Wikipedii nie został jeszcze określony" + }, "1": { "then": "Link do strony Wikipedii nie został jeszcze określony" } diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json index e942b68862..aedacdb06d 100644 --- a/langs/shared-questions/pt.json +++ b/langs/shared-questions/pt.json @@ -110,6 +110,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ainda não foi vinculada nenhuma página da Wikipédia" + }, "1": { "then": "Ainda não foi vinculada nenhuma página da Wikipédia" } diff --git a/langs/shared-questions/ru.json b/langs/shared-questions/ru.json index 7dbe2be7c2..5e920eabcf 100644 --- a/langs/shared-questions/ru.json +++ b/langs/shared-questions/ru.json @@ -77,6 +77,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Никакой страницы на Википедии не было прикреплено" + }, "1": { "then": "Никакой страницы на Википедии не было прикреплено" } diff --git a/langs/shared-questions/sv.json b/langs/shared-questions/sv.json index 54dd3fbe58..26e6e4a886 100644 --- a/langs/shared-questions/sv.json +++ b/langs/shared-questions/sv.json @@ -98,6 +98,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "Ingen Wikipedia-sida har länkats än" + }, "1": { "then": "Ingen Wikipedia-sida har länkats än" } diff --git a/langs/shared-questions/zh_Hans.json b/langs/shared-questions/zh_Hans.json index 083e7bc4be..111e964e9b 100644 --- a/langs/shared-questions/zh_Hans.json +++ b/langs/shared-questions/zh_Hans.json @@ -55,6 +55,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "尚未有连接到的维基百科页面" + }, "1": { "then": "尚未有连接到的维基百科页面" } diff --git a/langs/shared-questions/zh_Hant.json b/langs/shared-questions/zh_Hant.json index 7e6fa861c0..e25c7d16f1 100644 --- a/langs/shared-questions/zh_Hant.json +++ b/langs/shared-questions/zh_Hant.json @@ -113,6 +113,9 @@ }, "wikipedia": { "mappings": { + "0": { + "then": "還沒有連結到維基百科頁面" + }, "1": { "then": "還沒有連結到維基百科頁面" } diff --git a/langs/themes/de.json b/langs/themes/de.json index 5ccf252a98..785b281962 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -640,6 +640,68 @@ "shortDescription": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.", "title": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen" }, + "mapcomplete-changes": { + "description": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", + "layers": { + "0": { + "description": "Zeigt alle MapComplete Änderungen", + "filter": { + "0": { + "options": { + "0": { + "question": "Themenname enthält {search}" + } + } + }, + "1": { + "options": { + "0": { + "question": "Erstellt von {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "Nicht erstellt von {search}" + } + } + } + }, + "name": "Schwerpunkte von Änderungssätzen", + "tagRenderings": { + "contributor": { + "render": "Änderung wurde von {_last_edit:contributor} gemacht" + }, + "render_id": { + "render": "Änderung {id}" + }, + "theme": { + "mappings": { + "0": { + "then": "Änderung mit inoffiziellem Thema {theme}" + } + }, + "render": "Änderung mit Thema {theme}" + } + }, + "title": { + "render": "Änderungen für {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Weitere Statistiken finden Sie hier" + } + } + } + } + }, + "shortDescription": "Zeigt Änderungen von MapComplete", + "title": "Änderungen mit MapComplete" + }, "maps": { "description": "Auf dieser Karte findest du alle Karten, die OpenStreetMap kennt - typischerweise eine große Karte auf einer Informationstafel, die das Gebiet, die Stadt oder die Region zeigt, z.B. eine touristische Karte auf der Rückseite einer Plakatwand, eine Karte eines Naturschutzgebietes, eine Karte der Radwegenetze in der Region, ...)

Wenn eine Karte fehlt, können Sie diese leicht auf OpenStreetMap kartieren.", "shortDescription": "Dieses Thema zeigt alle (touristischen) Karten, die OpenStreetMap kennt", diff --git a/langs/themes/es.json b/langs/themes/es.json index f78451cfb7..a5f1913799 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -317,6 +317,53 @@ "shortDescription": "Mapa para mostrar hidrantes, extintores, parques de bomberos y parques de ambulancias.", "title": "Hidrantes, Extintores, Parques de bomberos y Parques de ambulancias" }, + "mapcomplete-changes": { + "description": "Este mapa muestra todos los cambios hechos con MapComplete", + "layers": { + "0": { + "description": "Muestra todos los cambios de MapComplete", + "filter": { + "1": { + "options": { + "0": { + "question": "Hecho por contributor/a {search}" + } + } + }, + "2": { + "options": { + "0": { + "question": "No hecho por contributor/a {search}" + } + } + } + }, + "name": "Centros de conjuntos de cambios", + "tagRenderings": { + "contributor": { + "render": "Cambio hecho por {_last_edit:contributor}" + }, + "render_id": { + "render": "Conjunto de cambios {id}" + } + }, + "title": { + "render": "Conjunto de cambios para {theme}" + } + }, + "1": { + "override": { + "tagRenderings": { + "link_to_more": { + "render": "Se pueden encontrar más estadísticas aquí" + } + } + } + } + }, + "shortDescription": "Muestra los cambios hechos por MapComplete", + "title": "Cambios hechos con MapComplete" + }, "maps": { "description": "En este mapa puedes encontrar todos los mapas que OpenStreetMap conoce - típicamente un mapa grande con un tablero que muestra el área, la ciudad o la región, ej. un mapa turista detrás de una vaya publicitaria, un mapa de una reserva natura, un mapa de redes ciclistas en la región, ...)

Si falta un mapa, puedes mapear este mapa fácilmente en OpenStreetMap.", "shortDescription": "Este tema muestra todos los mapas (turísticos) que OpenStreetMap conoce",