diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index 04e74522d..c7724e9fc 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -504,4 +504,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index d90821ded..ea86ad10a 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -363,5 +363,6 @@
"fr": "Un vélo café est un café à destination des cyclistes avec, par exemple, des services tels qu’une pompe, et de nombreuses décorations liées aux vélos, etc.",
"cs": "Cyklokavárna je kavárna zaměřená na cyklisty, například se službami, jako je pumpa, se spoustou výzdoby související s jízdními koly, …",
"ca": "Un cafè ciclista és un cafè enfocat a ciclistes, per exemple, amb serveis com una manxa, amb molta decoració relacionada amb el ciclisme, …"
- }
+ },
+ "deletion": true
}
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 174b24c58..62361dea1 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -5294,4 +5294,4 @@
},
"neededChangesets": 10
}
-}
\ No newline at end of file
+}
diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json
index ac773ac13..4a00a45ce 100644
--- a/assets/layers/elevator/elevator.json
+++ b/assets/layers/elevator/elevator.json
@@ -213,22 +213,26 @@
{
"id": "speech_output_available",
"question": {
- "en": "Has this elevator speech output?"
+ "en": "Has this elevator speech output?",
+ "de": "Verfügt der Aufzug über eine Sprachausgabe?"
},
"questionHint": {
- "en": "E.g. it announces the current floor"
+ "en": "E.g. it announces the current floor",
+ "de": "Z.B. werden Stockwerke angesagt"
},
"mappings": [
{
"if": "speech_output=yes",
"then": {
- "en": "This elevator has speech output"
+ "en": "This elevator has speech output",
+ "de": "Der Aufzug verfügt über eine Sprachausgabe"
}
},
{
"if": "speech_output=no",
"then": {
- "en": "This elevator does not have speech output"
+ "en": "This elevator does not have speech output",
+ "de": "Der Aufzug verfügt über keine Sprachausgabe"
}
}
]
diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json
index ac5d68e54..872bb92a3 100644
--- a/assets/layers/elongated_coin/elongated_coin.json
+++ b/assets/layers/elongated_coin/elongated_coin.json
@@ -386,4 +386,4 @@
"accepts_debit_cards",
"accepts_credit_cards"
]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 64b55a87d..5d2c36717 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -1012,13 +1012,7 @@
"options": [
{
"question": {
- "en": "Has a vegetarian menu",
- "de": "Vegetarische Gerichte im Angebot",
- "es": "Tiene menú vegetariano",
- "fr": "A un menu végétarien",
- "nl": "Heeft een vegetarisch menu",
- "pl": "Ma menu wegetariańskie",
- "ca": "Té menú vegetarià"
+ "en": "Restaurants and fast food businesses"
}
},
{
@@ -1048,13 +1042,8 @@
"options": [
{
"question": {
- "en": "Has a vegan menu",
- "nl": "Heeft een veganistisch menu",
- "de": "Vegane Gerichte im Angebot",
- "es": "Tiene menú vegano",
- "fr": "A un menu végétalien",
- "pl": "Ma menu wegańskie",
- "ca": "Té menú vegà"
+ "en": "Has a vegetarian menu",
+ "nl": "Heeft een vegetarisch menu"
},
"osmTags": {
"or": [
@@ -1072,13 +1061,13 @@
"options": [
{
"question": {
- "en": "Has a halal menu",
- "nl": "Heeft een halal menu",
- "de": "Halal Gerichte im Angebot",
- "es": "Tiene menú halah",
- "fr": "A un menu halal",
- "da": "Har en halalmenu",
- "ca": "Té menú halal"
+ "en": "Has a vegan menu",
+ "nl": "Heeft een veganistisch menu",
+ "de": "Vegane Gerichte im Angebot",
+ "es": "Tiene menú vegano",
+ "fr": "A un menu végétalien",
+ "pl": "Ma menu wegańskie",
+ "ca": "Té menú vegà"
},
"osmTags": {
"or": [
diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index 6bdc9dd29..41177739e 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -59,7 +59,8 @@
"if": "map_type=topo",
"then": {
"en": "Topographical map
The map contains contour lines.
",
- "de": "Topographische Katte
Die Karte enthält Höhenlinien.
"
+ "de": "Topographische Katte
Die Karte enthält Höhenlinien.
",
+ "ca": "Mapa topogràfic
El mapa conté línies de contorn.
"
}
},
{
@@ -75,7 +76,8 @@
"then": {
"en": "This is a schematic map.
A sketched map with only important ways and POIs. The angles, distances etc. are merely illustrative, not accurate.
",
"de": "Dies ist eine schematische Karte.
Eine skizzierte Karte mit nur wichtigen Wegen und POIs. Die Winkel, Entfernungen usw. sind lediglich illustrativ, nicht genau.
",
- "pl": "To jest mapa schematyczna.
Mapa-szkic z tylko ważnymi drogami i POI. Kąty, odległości itp. są tylko ilustratywne, niedokładne.
"
+ "pl": "To jest mapa schematyczna.
Mapa-szkic z tylko ważnymi drogami i POI. Kąty, odległości itp. są tylko ilustratywne, niedokładne.
",
+ "ca": "Això és un mapa esquemàtic.
Un mapa esbossat amb només camins importants i PDI. Els angles, els trajectes etc. són merament il·lustratius, no acurat.
"
}
},
{
@@ -92,7 +94,8 @@
"question": {
"en": "What is the size of the shown area on the map?",
"de": "Was wird von der Fläche abgedeckt?",
- "pl": "Jaki jest rozmiar obszaru pokazanego na tej mapie?"
+ "pl": "Jaki jest rozmiar obszaru pokazanego na tej mapie?",
+ "ca": "Quina és la mida de l'àrea mostrada en el mapa?"
},
"mappings": [
{
@@ -100,14 +103,16 @@
"then": {
"en": "A map of the rooms within a building",
"de": "Eine Karte der Räume innerhalb eines Gebäudes",
- "pl": "Plan pomieszczeń w budynku"
+ "pl": "Plan pomieszczeń w budynku",
+ "ca": "Un mapa de les habitacions dins d'un edifici"
}
},
{
"if": "map_size=site",
"then": {
"en": "A map of special site, like of a historical castle, a park, a campus, a forest, ....",
- "de": "Örtlichkeit (z.B. Burg)"
+ "de": "Örtlichkeit (z.B. Burg)",
+ "ca": "Un mapa d'un lloc especial, com un castell històric, un parc, un campus, un bosc, …"
}
},
{
@@ -115,7 +120,8 @@
"then": {
"en": "A map showing the village or town",
"de": "Eine Karte, die das Dorf oder die Stadt anzeigt",
- "pl": "Mapa pokazująca wieś lub niewielkie miasto"
+ "pl": "Mapa pokazująca wieś lub niewielkie miasto",
+ "ca": "Un mapa que mostra el poble o la ciutat"
}
},
{
@@ -123,7 +129,8 @@
"then": {
"en": " A map of a city",
"de": "Stadt",
- "pl": " Mapa miasta"
+ "pl": " Mapa miasta",
+ "ca": " Un mapa d'una ciutat"
}
},
{
@@ -131,7 +138,8 @@
"then": {
"en": "The map of an entire region, showing multiple cities and villages",
"de": "Region",
- "pl": "Mapa całego regionu, pokazująca wiele miast i wsi"
+ "pl": "Mapa całego regionu, pokazująca wiele miast i wsi",
+ "ca": "El mapa d'una regió sencera, mostrant múltiples ciutats i pobles"
}
}
]
diff --git a/assets/layers/note/note.json b/assets/layers/note/note.json
index 8509ed685..eb71c8c5e 100644
--- a/assets/layers/note/note.json
+++ b/assets/layers/note/note.json
@@ -4,7 +4,8 @@
"en": "OpenStreetMap notes",
"nl": "OpenStreetMap Notes",
"de": "OpenStreetMap-Hinweise",
- "es": "Notas de OpenStreetMap"
+ "es": "Notas de OpenStreetMap",
+ "ca": "Notes d'OpenStreetMap"
},
"description": "This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)",
"source": {
@@ -33,7 +34,8 @@
"nl": "Gesloten Note",
"de": "Geschlossene Notiz",
"es": "Nota cerrada",
- "pl": "Zamknięta notatka"
+ "pl": "Zamknięta notatka",
+ "ca": "Nota tancada"
}
}
]
@@ -72,7 +74,8 @@
"en": "
Nearby images
The pictures below are nearby geotagged images and might be helpful to handle this note.",
"de": "
Bilder aus der Nähe
Die folgenden Bilder sind mit Geotags versehene Bilder aus der Nähe und könnten für die Bearbeitung dieser Notiz hilfreich sein.",
"es": "
Imágenes cercanas
Las imágenes de debajo son imágenes geoetiquetadas cercanas y pueden ser útiles para encargarse de esta nota.",
- "nl": "
Afbeeldingen in de buurt
Onderstaande afbeeldingen zijn afbeeldingen met geo-referentie en die in de buurt genomen zijn. Mogelijks zijn ze nuttig om deze kaartnota af te handelen."
+ "nl": "
Afbeeldingen in de buurt
Onderstaande afbeeldingen zijn afbeeldingen met geo-referentie en die in de buurt genomen zijn. Mogelijks zijn ze nuttig om deze kaartnota af te handelen.",
+ "ca": "
Imatges properes
Les imatges de sota són imatges geoetiquetades properes i poden ser útils per a encarregar-se d'aquesta nota."
},
"special": {
"type": "nearby_images",
@@ -86,7 +89,8 @@
"en": "Report {_first_user} for spam or inappropriate messages",
"nl": "{_first_user} melden voor spam of ongepaste opmerkingen",
"de": "",
- "es": "Reportar {_first_user}"
+ "es": "Reportar {_first_user}",
+ "ca": "Reporta {_first_user} per spam o missatges inapropiats"
},
"condition": "_opened_by_anonymous_user=false"
},
@@ -96,7 +100,8 @@
"en": "Report this note as spam or inappropriate",
"nl": "Deze note melden als spam of ongepast",
"de": "Notiz als Spam oder unangemessen melden",
- "es": "Reporta esta nota como spam o inapropiada"
+ "es": "Reporta esta nota como spam o inapropiada",
+ "ca": "Reporta aquesta nota com spam o inapropiada"
}
}
],
@@ -330,7 +335,8 @@
"en": "Hide import notes",
"nl": "Verberg import Notes",
"de": "Importnotizen ausblenden",
- "es": "Ocultar las nostras de importación"
+ "es": "Ocultar las notas de importación",
+ "ca": "Oculta les notes d'importació"
}
},
{
@@ -339,7 +345,8 @@
"en": "Show only import Notes",
"nl": "Toon enkel import Notes",
"de": "Nur Importnotizen anzeigen",
- "es": "Solo mostrar las notas de importación"
+ "es": "Solo mostrar las notas de importación",
+ "ca": "Mostrar només les notes d'importació"
}
}
]
diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json
index d5446b2d0..bb8c0c59e 100644
--- a/assets/layers/observation_tower/observation_tower.json
+++ b/assets/layers/observation_tower/observation_tower.json
@@ -40,7 +40,8 @@
"nl": "Torens om van het uitzicht te genieten",
"de": "Türme zur Aussicht auf die umgebende Landschaft",
"es": "Torres con vista panorámica",
- "pl": "Wieże z panoramicznym widokiem"
+ "pl": "Wieże z panoramicznym widokiem",
+ "ca": "Torres amb vista panoràmica"
},
"tagRenderings": [
"images",
@@ -93,7 +94,8 @@
"nl": "Deze toren is {height} hoog",
"de": "Dieser Turm ist {height} hoch",
"es": "Esta torre mide {height}",
- "pl": "Ta wieża ma wysokość {height}"
+ "pl": "Ta wieża ma wysokość {height}",
+ "ca": "Aquesta torre fa {height}"
},
"freeform": {
"key": "height",
@@ -141,14 +143,16 @@
"nl": "Hoeveel moet men betalen om deze toren te bezoeken?",
"de": "Was kostet der Zugang zu diesem Turm?",
"es": "¿Cuánto hay que pagar para entrar en esta torre?",
- "pl": "Ile kosztuje wstęp na tę wieżę?"
+ "pl": "Ile kosztuje wstęp na tę wieżę?",
+ "ca": "Quant hi ha que pagar per entrar a aquesta torre?"
},
"render": {
"en": "Visiting this tower costs {charge}",
"nl": "Deze toren bezoeken kost {charge}",
"de": "Der Besuch des Turms kostet {charge}",
"es": "Visitar esta torre cuesta {charge}",
- "pl": "Wizyta na tej wieży kosztuje {charge}"
+ "pl": "Wizyta na tej wieży kosztuje {charge}",
+ "ca": "Visitar aquesta torre costa {charge}"
},
"freeform": {
"key": "charge",
@@ -228,8 +232,9 @@
"en": "Does this tower have an elevator?",
"nl": "Heeft deze toren een lift?",
"de": "Hat dieser Turm einen Aufzug?",
- "es": "¿Tiene ascensor esta torre?",
- "pl": "Czy ta wieża ma windę?"
+ "es": "¿Esta torre tiene ascensor?",
+ "pl": "Czy ta wieża ma windę?",
+ "ca": "Aquesta torre té ascensor?"
},
"mappings": [
{
@@ -239,7 +244,8 @@
"nl": "Deze toren heeft een lift die bezoekers naar de top van de toren brengt",
"de": "Dieser Turm verfügt über einen Aufzug, der die Besucher nach oben bringt",
"es": "Esta torre tiene un ascensor que lleva a los visitantes a la cima",
- "pl": "Ta wieża ma windę, która zabiera zwiedzających na górę"
+ "pl": "Ta wieża ma windę, która zabiera zwiedzających na górę",
+ "ca": "Aquesta torre té un ascensor que porta els visitants al cim"
}
},
{
@@ -249,7 +255,8 @@
"nl": "Deze toren heeft geen lift",
"de": "Dieser Turm hat keinen Aufzug",
"es": "Esta torre no tiene ascensor",
- "pl": "Ta wieża nie ma windy"
+ "pl": "Ta wieża nie ma windy",
+ "ca": "Aquesta torre no té ascensor"
}
}
],
@@ -274,7 +281,8 @@
"en": "Maintained by {operator}",
"de": "Betrieben von {operator}",
"es": "Mantenida por {operator}",
- "pl": "Obsługiwana przez {operator}"
+ "pl": "Obsługiwana przez {operator}",
+ "ca": "Mantés per {operator}"
},
"freeform": {
"key": "operator"
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index c61d92edb..a37c76317 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -21,7 +21,8 @@
"de": "Parkplatz",
"es": "aparcamiento de coches",
"fr": "Lieu de stationnement",
- "pl": "Parking samochodowy"
+ "pl": "Parking samochodowy",
+ "ca": "Aparcament de cotxes"
}
},
"description": {
@@ -55,7 +56,8 @@
"en": "This is a parking bay next to a street",
"nl": "Dit is een parkeerplek langs een weg",
"de": "Dies ist eine Parkbucht neben einer Straße",
- "fr": "C'est un lieu de stationnement à côté d'une route"
+ "fr": "C'est un lieu de stationnement à côté d'une route",
+ "ca": "Es tracta d'un aparcament al costat d'un carrer"
}
},
{
@@ -76,7 +78,8 @@
"nl": "Dit is een bovengrondse parkeergarage met meerdere verdiepingen",
"de": "Dies ist ein mehrstöckiges oberirdisches Parkhaus",
"fr": "C'est un parking à plusieurs étages",
- "pl": "To jest wielopiętrowy parking"
+ "pl": "To jest wielopiętrowy parking",
+ "ca": "Es tracta d'un garatge de diverses plantes"
}
},
{
@@ -95,7 +98,8 @@
"nl": "Dit is een strook voor parkeren op de weg",
"de": "Dies ist eine Fahrspur zum Parken auf der Straße",
"fr": "C'est une voie de stationnement sur la route",
- "pl": "To jest pas do parkowania na jezdni"
+ "pl": "To jest pas do parkowania na jezdni",
+ "ca": "Aquest és un carril per aparcar al carrer"
}
},
{
@@ -122,7 +126,8 @@
"en": "This is a parking on a layby",
"nl": "Dit is een parkeerplek op een layby",
"de": "Hier gibt es Parkmöglichkeiten auf einem kleinen Rastplatz",
- "fr": "C'est un parking sur une aire de stationnement"
+ "fr": "C'est un parking sur une aire de stationnement",
+ "ca": "Aquest és un aparcament en una zona de descans"
}
},
{
@@ -178,7 +183,8 @@
"nl": "Er zijn geen parkeerplaatsen voor gehandicapten",
"de": "Es gibt keine barrierefreien Stellplätze",
"fr": "Il n'y a pas de places de stationnement pour personnes à mobilité réduite",
- "pl": "Nie ma tutaj żadnych miejsc parkingowych dla niepełnosprawnych"
+ "pl": "Nie ma tutaj żadnych miejsc parkingowych dla niepełnosprawnych",
+ "ca": "No hi ha places d'aparcament per a minusvàlids"
},
"hideInAnswer": true
},
diff --git a/assets/layers/parking_spaces/parking_spaces.json b/assets/layers/parking_spaces/parking_spaces.json
index 4126a614c..69d9ae667 100644
--- a/assets/layers/parking_spaces/parking_spaces.json
+++ b/assets/layers/parking_spaces/parking_spaces.json
@@ -4,13 +4,15 @@
"en": "Parking Spaces",
"de": "Stellplätze",
"nl": "Parkeerplekken",
- "pl": "Miejsca parkingowe"
+ "pl": "Miejsca parkingowe",
+ "ca": "Places d'aparcament"
},
"description": {
"en": "Layer showing individual parking spaces.",
"de": "Ebene mit den einzelnen PKW Stellplätzen.",
"nl": "Laag met individuele parkeerplekken.",
- "pl": "Warstwa pokazująca pojedyncze miejsca parkingowe."
+ "pl": "Warstwa pokazująca pojedyncze miejsca parkingowe.",
+ "ca": "Capa que mostra aparcaments de cotxes individuals."
},
"minzoom": 19,
"source": {
@@ -43,7 +45,8 @@
"en": "This is a normal parking space.",
"de": "Dies ist ein normaler Stellplatz.",
"nl": "Dit is een normale parkeerplek.",
- "pl": "To jest zwykłe miejsce parkingowe."
+ "pl": "To jest zwykłe miejsce parkingowe.",
+ "ca": "Aquesta és una plaça d'aparcament normal."
}
},
{
@@ -52,7 +55,8 @@
"en": "This is a disabled parking space.",
"de": "Dies ist ein Behindertenstellplatz.",
"nl": "Dit is een gehandicaptenparkeerplaats.",
- "pl": "To jest miejsce parkingowe dla niepełnosprawnych."
+ "pl": "To jest miejsce parkingowe dla niepełnosprawnych.",
+ "ca": "Aquesta és una plaça d'aparcament per a minusvàlids."
}
},
{
@@ -61,7 +65,8 @@
"en": "This is a private parking space.",
"de": "Dies ist ein privater Stellplatz.",
"nl": "Dit is een privéparkeerplek.",
- "pl": "To jest prywatne miejsce parkingowe."
+ "pl": "To jest prywatne miejsce parkingowe.",
+ "ca": "Es tracta d'una plaça d'aparcament privada."
}
},
{
@@ -70,7 +75,8 @@
"en": "This is parking space reserved for charging vehicles.",
"de": "Dies ist ein Stellplatz, der für das Laden von Fahrzeugen reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor het opladen van voertuigen.",
- "pl": "To miejsce parkingowe jest zarezerwowane dla ładowania pojazdów."
+ "pl": "To miejsce parkingowe jest zarezerwowane dla ładowania pojazdów.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada per a la recàrrega de vehicles."
}
},
{
@@ -79,7 +85,8 @@
"en": "This is parking space reserved for deliveries.",
"de": "Dies ist ein Stellplatz, der für Lieferfahrzeuge reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor leveringen.",
- "pl": "To miejsce parkingowe jest przeznaczone dla dostaw."
+ "pl": "To miejsce parkingowe jest przeznaczone dla dostaw.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada per a repartidors."
}
},
{
@@ -104,7 +111,8 @@
"en": "This is parking space reserved for buses.",
"de": "Dies ist ein Stellplatz, der für Busse reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor bussen.",
- "pl": "To miejsce parkingowe jest przeznaczone dla busów."
+ "pl": "To miejsce parkingowe jest przeznaczone dla busów.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada per a autobusos."
}
},
{
@@ -113,7 +121,8 @@
"en": "This is parking space reserved for motorcycles.",
"de": "Dies ist ein Stellplatz, der für Motorräder reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor motoren.",
- "pl": "To miejsce parkingowe jest przeznaczone dla motocykli."
+ "pl": "To miejsce parkingowe jest przeznaczone dla motocykli.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada per a motos."
}
},
{
@@ -122,7 +131,8 @@
"en": "This is a parking space reserved for parents with children.",
"de": "Dies ist ein Stellplatz, der für Eltern mit Kindern reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor ouders met kinderen.",
- "pl": "To miejsce jest przeznaczone dla rodziców z dziećmi."
+ "pl": "To miejsce jest przeznaczone dla rodziców z dziećmi.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada per a pares amb fills."
}
},
{
@@ -131,7 +141,8 @@
"en": "This is a parking space reserved for staff.",
"de": "Dies ist ein Stellplatz, der für das Personal reserviert ist.",
"nl": "Deze parkeerplek is gereserveerd voor personeel.",
- "pl": "To jest miejsce parkingowe przeznaczone dla pracowników."
+ "pl": "To jest miejsce parkingowe przeznaczone dla pracowników.",
+ "ca": "Es tracta d'una plaça d'aparcament reservada al personal."
}
},
{
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index d61face7a..d463f9b4d 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -59,7 +59,8 @@
},
"then": {
"en": "Post partner at {name}",
- "de": "Postfiliale im {name}"
+ "de": "Postfiliale im {name}",
+ "ca": "Col·laborador postal a {name}"
}
}
]
@@ -415,7 +416,8 @@
"question": {
"en": "Does this post office have an ATM?",
"nl": "Heeft dit postkantoor een bankautomaat?",
- "de": "Verfügt die Postfiliale über einen Geldautomat?"
+ "de": "Verfügt die Postfiliale über einen Geldautomat?",
+ "ca": "Aquesta oficina postal té un caixer automàtic?"
},
"mappings": [
{
@@ -423,7 +425,8 @@
"then": {
"en": "This post office has an ATM",
"nl": "Dit postkantoor heeft een bankautomaat",
- "de": "Die Postfiliale verfügt über einen Geldautomat"
+ "de": "Die Postfiliale verfügt über einen Geldautomat",
+ "ca": "Aquesta oficina postal té un caixer automàtic"
}
},
{
@@ -431,7 +434,8 @@
"then": {
"en": "This post office does not have an ATM",
"nl": "Dit postkantoor heeft geen bankautomaaat",
- "de": "Die Postfiliale verfügt nicht über einen Geldautomat"
+ "de": "Die Postfiliale verfügt nicht über einen Geldautomat",
+ "ca": "Aquesta oficina postal no té un caixer automàtic"
}
},
{
@@ -439,7 +443,8 @@
"then": {
"en": "This post office does have an ATM, but it is mapped as a different icon",
"nl": "Dit postkantoor heeft een bankautomaat, maar deze staat apart op de kaart aangeduid",
- "de": "Die Postfiliale verfügt über einen Geldautomat, der aber bereits separat kartiert ist"
+ "de": "Die Postfiliale verfügt über einen Geldautomat, der aber bereits separat kartiert ist",
+ "ca": "Aquesta oficina postal té un caixer automàtic, però està mapejat com a un element diferent"
}
}
]
diff --git a/assets/layers/rainbow_crossings/rainbow_crossings.json b/assets/layers/rainbow_crossings/rainbow_crossings.json
index 4eb94edce..a24c729d7 100644
--- a/assets/layers/rainbow_crossings/rainbow_crossings.json
+++ b/assets/layers/rainbow_crossings/rainbow_crossings.json
@@ -134,4 +134,4 @@
"lineCap": "square"
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/shower/shower.json b/assets/layers/shower/shower.json
index cc1761692..5dc7a8aed 100644
--- a/assets/layers/shower/shower.json
+++ b/assets/layers/shower/shower.json
@@ -244,4 +244,4 @@
"fr": "Une couche affichant les douches (publiques)",
"ca": "Una capa que mostra dutxes (públiques)"
}
-}
\ No newline at end of file
+}
diff --git a/assets/layers/usersettings/usersettings.json b/assets/layers/usersettings/usersettings.json
index 13d583563..10d21c736 100644
--- a/assets/layers/usersettings/usersettings.json
+++ b/assets/layers/usersettings/usersettings.json
@@ -23,7 +23,8 @@
"_d=feat.properties._description?.replace(/</g,'<')?.replace(/>/g,'>') ?? ''",
"_mastodon_candidate_a=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.href.match(/mastodon|en.osm.town/) !== null)[0]?.href }) (feat) ",
"_mastodon_link=(feat => {const e = document.createElement('div');e.innerHTML = feat.properties._d;return Array.from(e.getElementsByTagName(\"a\")).filter(a => a.getAttribute(\"rel\")?.indexOf('me') >= 0)[0]?.href})(feat) ",
- "_mastodon_candidate=feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a"
+ "_mastodon_candidate=feat.properties._mastodon_candidate_md ?? feat.properties._mastodon_candidate_a",
+ "__current_background:='initial_value'"
],
"tagRenderings": [
{
@@ -103,6 +104,72 @@
"*": "{logout()}"
}
},
+ {
+ "id": "background-layer-readonly",
+ "condition": {
+ "and": [
+ "_theme:backgroundLayer~*",
+ "mapcomplete-preferred-background-layer~*",
+ "_theme:backgroundLayer!:={mapcomplete-preferred-background-layer}"
+ ]
+ },
+ "render": {
+ "en": "This thematic map has a predefined background layer set. Your default theme setting does not apply"
+ }
+ },
+ {
+ "id": "background-layer",
+ "question": {
+ "en": "What background layer should be shown by default?"
+ },
+ "condition": "_theme:backgroundLayer=",
+ "mappings": [
+ {
+ "if": "mapcomplete-preferred-background-layer=",
+ "then": {
+ "en": "Use the default background layer"
+ }
+ },
+ {
+ "if": "mapcomplete-preferred-background-layer=osm",
+ "then": {
+ "en": "Use OpenStreetMap-carto as default layer"
+ }
+ },
+ {
+ "if": "mapcomplete-preferred-background-layer=photo",
+ "then": {
+ "en": "Use aerial imagery as default background"
+ }
+ },
+ {
+ "if": "mapcomplete-preferred-background-layer=map",
+ "then": {
+ "en": "Use a non-openstreetmap based map as default background"
+ }
+ },
+ {
+ "if": "mapcomplete-preferred-background-layer:={__current_background}",
+ "then": {
+ "en": "Use the current background layer ({__current_background}) as default background"
+ },
+ "hideInAnswer": {
+ "or": [
+ "__current_background=",
+ "__current_background=osm",
+ "__current_background=initial_value"
+ ]
+ }
+ },
+ {
+ "if": "mapcomplete-preferred-background-layer~*",
+ "then": {
+ "en": "Use background layer {mapcomplete-preferred-background-layer} as default background"
+ },
+ "hideInAnswer": true
+ }
+ ]
+ },
{
"id": "picture-license",
"description": "This question is not meant to be placed on an OpenStreetMap-element; however it is used in the user information panel to ask which license the user wants",
diff --git a/assets/layers/vending_machine/condom.svg b/assets/layers/vending_machine/condom.svg
new file mode 100644
index 000000000..3d2c88a75
--- /dev/null
+++ b/assets/layers/vending_machine/condom.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/assets/layers/vending_machine/condom.svg.license b/assets/layers/vending_machine/condom.svg.license
new file mode 100644
index 000000000..7ac182ac7
--- /dev/null
+++ b/assets/layers/vending_machine/condom.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Jesus Jezzini De Anda
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/vending_machine/license_info.json b/assets/layers/vending_machine/license_info.json
index c1b450200..f910585c2 100644
--- a/assets/layers/vending_machine/license_info.json
+++ b/assets/layers/vending_machine/license_info.json
@@ -1,4 +1,14 @@
[
+ {
+ "path": "condom.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ " \tJesus Jezzini De Anda"
+ ],
+ "sources": [
+ "https://commons.wikimedia.org/wiki/File:Condom_-_The_Noun_Project.svg"
+ ]
+ },
{
"path": "cow.svg",
"license": "CC-BY-4.0",
diff --git a/assets/layers/vending_machine/vending_machine.json b/assets/layers/vending_machine/vending_machine.json
index bbfcf09d5..deb56d624 100644
--- a/assets/layers/vending_machine/vending_machine.json
+++ b/assets/layers/vending_machine/vending_machine.json
@@ -130,7 +130,8 @@
"de": "Kondome werden verkauft",
"fr": "Vent des préservatifs",
"ca": "Es venen preservatius"
- }
+ },
+ "icon": "./assets/layers/vending_machine/condom.svg"
},
{
"if": "vending=coffee",
@@ -287,6 +288,14 @@
"ca": "Es venen bitllets de transport públic"
},
"icon": "./assets/themes/stations/public_transport_tickets.svg"
+ },
+ {
+ "if": "vending=meat",
+ "then": {
+ "en": "Meat products are being sold",
+ "nl": "Vleesproducten worden verkocht"
+ },
+ "icon": "./assets/layers/id_presets/temaki-meat.svg"
}
],
"multiAnswer": true
@@ -365,7 +374,18 @@
}
]
},
- "level"
+ "level",
+ {
+ "builtin": "phone",
+ "override": {
+ "question": {
+ "en": "What is the phone number of the operator of this vending machine?"
+ },
+ "questionHint": {
+ "en": "This is the number you can call in case of problems with the vending machine"
+ }
+ }
+ }
],
"calculatedTags": [
"_vending_count=feat.properties.vending.split(';').length"
@@ -448,6 +468,10 @@
{
"if": "vending=flowers",
"then": "circle:white;./assets/layers/id_presets/maki-florist.svg"
+ },
+ {
+ "if": "vending=condoms",
+ "then": "circle:white;./assets/layers/vending_machine/condom.svg"
}
]
},
@@ -797,6 +821,24 @@
"ca": "Venda de flors"
},
"osmTags": "vending~i~.*flowers.*"
+ },
+ {
+ "osmTags": "vending~i~.*parking_tickets.*",
+ "question": {
+ "en": "Sale of parking tickets"
+ }
+ },
+ {
+ "osmTags": "vending=elongated_coin",
+ "question": {
+ "en": "Sale of pressed pennies"
+ }
+ },
+ {
+ "osmTags": "vending~i~.*public_transport_tickets.*",
+ "question": {
+ "en": "Sale of public transport tickets"
+ }
}
]
}
diff --git a/assets/themes/atm/atm.json b/assets/themes/atm/atm.json
index 0034cceb2..6d9e827ec 100644
--- a/assets/themes/atm/atm.json
+++ b/assets/themes/atm/atm.json
@@ -172,4 +172,4 @@
}
}
]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json
index 9095f965c..9532bd0cf 100644
--- a/assets/themes/blind_osm/blind_osm.json
+++ b/assets/themes/blind_osm/blind_osm.json
@@ -31,7 +31,7 @@
"startLat": 52.99238,
"startLon": 6.570614,
"startZoom": 20,
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"layers": [
{
"builtin": "cycleways_and_roads",
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index 43ed75b0f..def4b0124 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -1607,4 +1607,4 @@
]
},
"credits": "joost schouppe"
-}
+}
\ No newline at end of file
diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json
index 8697b901a..91137ad15 100644
--- a/assets/themes/charging_stations/charging_stations.json
+++ b/assets/themes/charging_stations/charging_stations.json
@@ -57,7 +57,6 @@
"startLon": 0,
"startZoom": 1,
"widenFactor": 1.5,
- "defaultBackgroundId": "CartoDB.Voyager",
"layers": [
"charging_station"
]
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index d89247da8..e139cc7e9 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -465,4 +465,4 @@
"toilet"
],
"credits": "Christian Neumann "
-}
+}
\ No newline at end of file
diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json
index 024b347ba..98df8a06c 100644
--- a/assets/themes/cycle_highways/cycle_highways.json
+++ b/assets/themes/cycle_highways/cycle_highways.json
@@ -265,6 +265,6 @@
]
}
],
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"credits": "L'imaginaire"
}
\ No newline at end of file
diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 02297eb73..66d5839a9 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -45,7 +45,6 @@
"cs": "Mapa, kde můžete prohlížet a upravovat věci související s cyklistickou infrastrukturou. Vytvořeno během #osoc21."
},
"hideFromOverview": false,
- "defaultBackgroundId": "CartoDB.Voyager",
"icon": "./assets/themes/cycle_infra/cycle-infra.svg",
"startLat": 51,
"startLon": 3.75,
diff --git a/assets/themes/cyclofix/cyclofix.json b/assets/themes/cyclofix/cyclofix.json
index 80d11b7e3..a99d009c7 100644
--- a/assets/themes/cyclofix/cyclofix.json
+++ b/assets/themes/cyclofix/cyclofix.json
@@ -36,7 +36,6 @@
"credits": "Originally created during Open Summer of Code by Pieter Fiers, Thibault Declercq, Pierre Barban, Joost Schouppe and Pieter Vander Vennet",
"icon": "./assets/themes/cyclofix/logo.svg",
"startLat": 0,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 0,
"startZoom": 1,
"widenFactor": 2,
diff --git a/assets/themes/drinking_water/drinking_water.json b/assets/themes/drinking_water/drinking_water.json
index 95432c6d6..eb6cd55de 100644
--- a/assets/themes/drinking_water/drinking_water.json
+++ b/assets/themes/drinking_water/drinking_water.json
@@ -37,7 +37,6 @@
},
"icon": "./assets/themes/drinking_water/logo.svg",
"startLat": 50.8465573,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
diff --git a/assets/themes/education/education.json b/assets/themes/education/education.json
index a5860ec19..fc8aa5260 100644
--- a/assets/themes/education/education.json
+++ b/assets/themes/education/education.json
@@ -24,7 +24,6 @@
"eu": "Hezkuntza",
"pl": "Edukacja"
},
- "defaultBackgroundId": "CartoDB.Voyager",
"startLat": 0,
"startLon": 0,
"startZoom": 0,
diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json
index 6cb1ca911..4ac8f93a1 100644
--- a/assets/themes/elongated_coin/elongated_coin.json
+++ b/assets/themes/elongated_coin/elongated_coin.json
@@ -19,4 +19,4 @@
"startLat": 53.0565,
"startLon": 8.7492,
"startZoom": 11
-}
+}
\ No newline at end of file
diff --git a/assets/themes/etymology/etymology.json b/assets/themes/etymology/etymology.json
index 074b624fe..e901d7153 100644
--- a/assets/themes/etymology/etymology.json
+++ b/assets/themes/etymology/etymology.json
@@ -288,4 +288,4 @@
}
],
"hideFromOverview": false
-}
+}
\ No newline at end of file
diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json
index 18804d332..64cf09969 100644
--- a/assets/themes/fritures/fritures.json
+++ b/assets/themes/fritures/fritures.json
@@ -69,4 +69,4 @@
}
}
]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/ghostbikes/ghostbikes.json b/assets/themes/ghostbikes/ghostbikes.json
index 3d80bbc44..74f25481a 100644
--- a/assets/themes/ghostbikes/ghostbikes.json
+++ b/assets/themes/ghostbikes/ghostbikes.json
@@ -44,7 +44,7 @@
"layers": [
"ghost_bike"
],
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"clustering": {
"maxZoom": 0
}
diff --git a/assets/themes/grb/grb.json b/assets/themes/grb/grb.json
index 1a35d878d..b3931dcb1 100644
--- a/assets/themes/grb/grb.json
+++ b/assets/themes/grb/grb.json
@@ -773,4 +773,4 @@
"overpassMaxZoom": 15,
"osmApiTileSize": 17,
"credits": "Pieter Vander Vennet"
-}
+}
\ No newline at end of file
diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json
index 70052f91e..488a88fe3 100644
--- a/assets/themes/healthcare/healthcare.json
+++ b/assets/themes/healthcare/healthcare.json
@@ -27,7 +27,6 @@
},
"icon": "./assets/layers/doctors/doctors.svg",
"startLat": 50.8465573,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json
index bef9d9bbe..60ae89052 100644
--- a/assets/themes/indoors/indoors.json
+++ b/assets/themes/indoors/indoors.json
@@ -27,7 +27,6 @@
},
"icon": "./assets/layers/entrance/entrance.svg",
"startLat": 51.17181,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.144383,
"startZoom": 14,
"widenFactor": 2,
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 2c38dae55..62d38abba 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -131,7 +131,7 @@
"render": {
"en": "Change made with {host}",
"ca": "Canviat fet amb {host}",
- "de": "Änderung über {host}",
+ "de": "Geändert über {host}",
"fr": "Modification faite avec {host}",
"nl": "Wijziging gemaakt met {host}"
},
diff --git a/assets/themes/maps/maps.json b/assets/themes/maps/maps.json
index c484a92c1..4d88672cd 100644
--- a/assets/themes/maps/maps.json
+++ b/assets/themes/maps/maps.json
@@ -47,7 +47,7 @@
"startLon": 0,
"startZoom": 1,
"widenFactor": 5,
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"layers": [
"map"
]
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 716632054..38544e0b7 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -24,7 +24,6 @@
},
"icon": "./assets/themes/onwheels/crest.svg",
"startLat": 50.86622,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.350103,
"startZoom": 17,
"widenFactor": 2,
@@ -525,4 +524,4 @@
]
},
"enableDownload": true
-}
+}
\ No newline at end of file
diff --git a/assets/themes/openwindpowermap/openwindpowermap.json b/assets/themes/openwindpowermap/openwindpowermap.json
index 2b21d36c9..a453698d5 100644
--- a/assets/themes/openwindpowermap/openwindpowermap.json
+++ b/assets/themes/openwindpowermap/openwindpowermap.json
@@ -41,6 +41,5 @@
"layers": [
"windturbine"
],
- "defaultBackgroundId": "CartoDB.Voyager",
"credits": "Seppe Santens"
}
\ No newline at end of file
diff --git a/assets/themes/osm_community_index/osm_community_index.json b/assets/themes/osm_community_index/osm_community_index.json
index 229f9aca4..16aa4e481 100644
--- a/assets/themes/osm_community_index/osm_community_index.json
+++ b/assets/themes/osm_community_index/osm_community_index.json
@@ -29,7 +29,6 @@
},
"icon": "./assets/themes/osm_community_index/osm.svg",
"startLat": 50.8465573,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"clustering": false,
diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json
index e63b216c6..650095516 100644
--- a/assets/themes/pets/pets.json
+++ b/assets/themes/pets/pets.json
@@ -144,14 +144,7 @@
"width": 5
}
],
- "presets": [
- {
- "tags": [
- "shop=yes",
- "dog=yes"
- ]
- }
- ],
+ "=presets": [],
"source": {
"=osmTags": {
"and": [
diff --git a/assets/themes/playgrounds/playgrounds.json b/assets/themes/playgrounds/playgrounds.json
index 50820e091..50fd8786d 100644
--- a/assets/themes/playgrounds/playgrounds.json
+++ b/assets/themes/playgrounds/playgrounds.json
@@ -71,4 +71,4 @@
}
}
]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 172977b86..de8889598 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -46,7 +46,6 @@
"startLon": 9.9937,
"startZoom": 13,
"widenFactor": 1.5,
- "defaultBackgroundId": "CartoDB.Voyager",
"clustering": {
"maxZoom": 14,
"minNeededElements": 100
diff --git a/assets/themes/rainbow_crossings/rainbow_crossings.json b/assets/themes/rainbow_crossings/rainbow_crossings.json
index 689c29df9..043c87e28 100644
--- a/assets/themes/rainbow_crossings/rainbow_crossings.json
+++ b/assets/themes/rainbow_crossings/rainbow_crossings.json
@@ -24,7 +24,6 @@
},
"icon": "./assets/themes/rainbow_crossings/logo.svg",
"startLat": 50.8465573,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json
index be57a32c6..3b382ed8b 100644
--- a/assets/themes/speelplekken/speelplekken.json
+++ b/assets/themes/speelplekken/speelplekken.json
@@ -27,7 +27,7 @@
"startZoom": 12,
"widenFactor": 1.2,
"socialImage": "./assets/themes/speelplekken/social_image.jpg",
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"layers": [
{
"id": "shadow",
diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json
index f24f1464a..8b242d1af 100644
--- a/assets/themes/stations/stations.json
+++ b/assets/themes/stations/stations.json
@@ -27,7 +27,7 @@
"startLon": 0,
"startZoom": 0,
"hideFromOverview": true,
- "defaultBackgroundId": "CartoDB.Positron",
+ "defaultBackgroundId": "maptiler.backdrop",
"layers": [
{
"builtin": "indoors",
@@ -412,4 +412,4 @@
]
}
]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json
index 54d568bf5..4e616eb45 100644
--- a/assets/themes/surveillance/surveillance.json
+++ b/assets/themes/surveillance/surveillance.json
@@ -54,8 +54,8 @@
"startLon": 0,
"startZoom": 1,
"widenFactor": 2,
- "defaultBackgroundId": "osm",
+ "defaultBackgroundId": "maptiler.carto",
"layers": [
"surveillance_camera"
]
-}
\ No newline at end of file
+}
diff --git a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
index 86621c491..6436b4362 100644
--- a/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
+++ b/assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json
@@ -239,4 +239,4 @@
"hideFromOverview": true,
"enableMoreQuests": false,
"enableShareScreen": false
-}
+}
\ No newline at end of file
diff --git a/assets/themes/vending_machine/vending_machine.json b/assets/themes/vending_machine/vending_machine.json
index d34a960bf..5257a2840 100644
--- a/assets/themes/vending_machine/vending_machine.json
+++ b/assets/themes/vending_machine/vending_machine.json
@@ -29,6 +29,7 @@
"sameAs": "vending_machine"
},
"minzoom": 18,
+ "=presets": [],
"source": {
"osmTags": {
"and": [
@@ -36,8 +37,7 @@
"vending!~(parking_tickets|elongated_coin|public_transport_tickets)"
]
}
- },
- "=presets": []
+ }
}
},
{
diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json
index 9175d774a..1c221af37 100644
--- a/assets/themes/walls_and_buildings/walls_and_buildings.json
+++ b/assets/themes/walls_and_buildings/walls_and_buildings.json
@@ -26,7 +26,6 @@
},
"icon": "./assets/layers/walls_and_buildings/walls_and_buildings.png",
"startLat": 50.8465573,
- "defaultBackgroundId": "CartoDB.Voyager",
"startLon": 4.351697,
"startZoom": 16,
"widenFactor": 2,
diff --git a/assets/themes/width/width.json b/assets/themes/width/width.json
index 6f16d225e..6d0bfb114 100644
--- a/assets/themes/width/width.json
+++ b/assets/themes/width/width.json
@@ -271,4 +271,4 @@
]
}
]
-}
+}
\ No newline at end of file
diff --git a/langs/ca.json b/langs/ca.json
index 772d01878..21c6d7381 100644
--- a/langs/ca.json
+++ b/langs/ca.json
@@ -405,6 +405,9 @@
"doDelete": "Esborrar imatge",
"dontDelete": "Cancel·lar",
"isDeleted": "Esborrada",
+ "nearby": {
+ "seeNearby": "Explora i vincula imatges properes"
+ },
"pleaseLogin": "Entrar per pujar una foto",
"respectPrivacy": "Respecta la privacitat. No fotografiïs gent o matrícules. No facis servir imatges de Google Maps, Google Streetview o altres fonts amb copyright.",
"toBig": "La teva imatge és massa gran ara que medeix {actual_size}. Usa imatges de com a molt {max_size}",
diff --git a/langs/de.json b/langs/de.json
index f4b2280f8..671f97a02 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -405,6 +405,11 @@
"doDelete": "Bild entfernen",
"dontDelete": "Abbrechen",
"isDeleted": "Gelöscht",
+ "nearby": {
+ "link": "Dieses Bild zeigt das Objekt",
+ "seeNearby": "Bilder in der Nähe durchsuchen und verlinken",
+ "title": "Straßenbilder in der Nähe"
+ },
"pleaseLogin": "Bitte anmelden, um ein Bild hinzuzufügen",
"respectPrivacy": "Bitte respektieren Sie die Privatsphäre. Fotografieren Sie weder Personen noch Nummernschilder. Benutzen Sie keine urheberrechtlich geschützten Quellen wie z.B. Google Maps oder Google Streetview.",
"toBig": "Ihr Bild ist mit {actual_size} zu groß. Die maximale Bildgröße ist {max_size}",
diff --git a/langs/en.json b/langs/en.json
index 7d75d0a7b..42432d12c 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -344,6 +344,8 @@
},
"useSearch": "Use the search above to see presets",
"useSearchForMore": "Use the search function to search within {total} more values…",
+ "waitingForGeopermission": "Waiting for your permission to use the geolocation…",
+ "waitingForLocation": "Searching your current location…",
"weekdays": {
"abbreviations": {
"friday": "Fri",
@@ -414,6 +416,22 @@
"pleaseLogin": "Please log in to add a picture",
"respectPrivacy": "Do not photograph people nor license plates. Do not upload Google Maps, Google Streetview or other copyrighted sources.",
"toBig": "Your image is too large as it is {actual_size}. Please use images of at most {max_size}",
+ "upload": {
+ "failReasons": "You might have lost connection to the internet",
+ "failReasonsAdvanced": "Alternatively, make sure your browser and extensions do not block third-party API's.",
+ "multiple": {
+ "done": "{count} images are successfully uploaded. Thank you!",
+ "partiallyDone": "{count} images are getting uploaded, {done} images are done…",
+ "someFailed": "Sorry, we could not upload {count} images",
+ "uploading": "{count} images are getting uploaded…"
+ },
+ "one": {
+ "done": "Your image was successfully uploaded. Thank you!",
+ "failed": "Sorry, we could not upload your image",
+ "retrying": "Your image is getting uploaded again…",
+ "uploading": "Your image is getting uploaded…"
+ }
+ },
"uploadDone": "Your picture has been added. Thanks for helping out!",
"uploadFailed": "Could not upload your picture. Are you connected to the Internet, and allow third party API's? The Brave browser or the uMatrix plugin might block them.",
"uploadMultipleDone": "{count} pictures have been added. Thanks for helping out!",
diff --git a/langs/fr.json b/langs/fr.json
index 19c56011b..7d9422991 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -279,7 +279,8 @@
"public": {
"name": "Publique"
}
- }
+ },
+ "title": "Envoyer votre trace sur OpenStreetMap.org"
},
"weekdays": {
"abbreviations": {
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index dee218cc2..7664e722d 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -3940,9 +3940,6 @@
},
"2": {
"options": {
- "0": {
- "question": "Té menú vegetarià"
- },
"1": {
"question": "Només negocis de menjar ràpid"
},
@@ -3951,17 +3948,10 @@
}
}
},
- "3": {
- "options": {
- "0": {
- "question": "Té menú vegà"
- }
- }
- },
"4": {
"options": {
"0": {
- "question": "Té menú halal"
+ "question": "Té menú vegà"
}
}
},
@@ -4795,6 +4785,36 @@
}
},
"question": "En quines dades es basa aquest mapa?"
+ },
+ "map_size": {
+ "mappings": {
+ "0": {
+ "then": "Un mapa de les habitacions dins d'un edifici"
+ },
+ "1": {
+ "then": "Un mapa d'un lloc especial, com un castell històric, un parc, un campus, un bosc, …"
+ },
+ "2": {
+ "then": "Un mapa que mostra el poble o la ciutat"
+ },
+ "3": {
+ "then": " Un mapa d'una ciutat"
+ },
+ "4": {
+ "then": "El mapa d'una regió sencera, mostrant múltiples ciutats i pobles"
+ }
+ },
+ "question": "Quina és la mida de l'àrea mostrada en el mapa?"
+ },
+ "map_type": {
+ "mappings": {
+ "0": {
+ "then": "Mapa topogràfic
El mapa conté línies de contorn.
"
+ },
+ "2": {
+ "then": "Això és un mapa esquemàtic.
Un mapa esbossat amb només camins importants i PDI. Els angles, els trajectes etc. són merament il·lustratius, no acurat.
+ {:else}
+