diff --git a/Logic/Actors/AvailableBaseLayersImplementation.ts b/Logic/Actors/AvailableBaseLayersImplementation.ts
index 27ec0ea71..0e9a29ad0 100644
--- a/Logic/Actors/AvailableBaseLayersImplementation.ts
+++ b/Logic/Actors/AvailableBaseLayersImplementation.ts
@@ -102,7 +102,9 @@ export default class AvailableBaseLayersImplementation implements AvailableBaseL
feature: null,
id: id,
name: name,
- layer: () => L.tileLayer.provider(id, undefined),
+ layer: () => L.tileLayer.provider(id, {
+ maxNativeZoom: layer.opttions.maxZoom
+ }),
min_zoom: 1,
max_zoom: layer.options.maxZoom,
category: "osmbasedmap",
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 1486f7a84..2083cc9cb 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -1,8 +1,8 @@
{
"id": "bike_repair_station",
"name": {
- "en": "Bike stations (repair, pump or both)",
- "nl": "Fietspunten (herstel, pomp of allebei)",
+ "en": "Bicycle pump and repair",
+ "nl": "Fietspomp and fietsherstel",
"fr": "Station velo (réparation, pompe à vélo)",
"gl": "Estación de bicicletas (arranxo, bomba de ar ou ambos)",
"de": "Fahrradstationen (Reparatur, Pumpe oder beides)",
@@ -138,8 +138,8 @@
{
"id": "bike_repair_station-available-services",
"question": {
- "en": "Which services are available at this bike station?",
- "nl": "Welke functies biedt dit fietspunt?",
+ "en": "Which services are available at this location?",
+ "nl": "Welke functies biedt locatie?",
"fr": "Quels services sont valables à cette station vélo ?",
"gl": "Que servizos están dispoñíbeis nesta estación de bicicletas?",
"de": "Welche Einrichtungen stehen an dieser Fahrradstation zur Verfügung?",
@@ -204,6 +204,81 @@
}
]
},
+ {
+ "question": {
+ "en": "Is the bike pump still operational?",
+ "nl": "Werkt de fietspomp nog?",
+ "fr": "La pompe à vélo fonctionne-t-elle toujours ?",
+ "gl": "Segue a funcionar a bomba de ar?",
+ "de": "Ist die Fahrradpumpe noch funktionstüchtig?",
+ "it": "La pompa per bici è sempre funzionante?",
+ "ru": "Велосипедный насос все еще работает?",
+ "pl": "Czy pompka rowerowa jest nadal sprawna?"
+ },
+ "condition": "service:bicycle:pump=yes",
+ "mappings": [
+ {
+ "if": "service:bicycle:pump:operational_status=broken",
+ "then": {
+ "en": "The bike pump is broken",
+ "nl": "De fietspomp is kapot",
+ "fr": "La pompe à vélo est cassée",
+ "gl": "A bomba de ar está estragada",
+ "de": "Die Fahrradpumpe ist kaputt",
+ "it": "La pompa per bici è guasta",
+ "ru": "Велосипедный насос сломан",
+ "pl": "Pompka rowerowa jest zepsuta"
+ }
+ },
+ {
+ "if": "service:bicycle:pump:operational_status=operational",
+ "then": {
+ "en": "The bike pump is operational",
+ "nl": "De fietspomp werkt nog",
+ "fr": "La pompe est opérationnelle",
+ "gl": "A bomba de ar está operativa",
+ "de": "Die Fahrradpumpe ist betriebsbereit",
+ "it": "La pompa per bici funziona",
+ "ru": "Велосипедный насос работает",
+ "pl": "Pompka rowerowa jest sprawna"
+ }
+ }
+ ],
+ "id": "Operational status"
+ },
+ {
+ "question": {
+ "nl": "Wanneer is dit fietsherstelpunt open?",
+ "en": "When is this bicycle repair point open?",
+ "fr": "Quand ce point de réparation de vélo est-il ouvert ?",
+ "it": "Quando è aperto questo punto riparazione bici?",
+ "de": "Wann ist diese Fahrradreparaturstelle geöffnet?",
+ "ru": "Когда работает эта точка обслуживания велосипедов?"
+ },
+ "render": "{opening_hours_table()}",
+ "freeform": {
+ "key": "opening_hours",
+ "type": "opening_hours"
+ },
+ "mappings": [
+ {
+ "if": "opening_hours=24/7",
+ "then": {
+ "nl": "Dag en nacht open",
+ "en": "Always open",
+ "fr": "Ouvert en permanence",
+ "it": "Sempre aperto",
+ "de": "Immer geöffnet",
+ "ru": "Всегда открыто",
+ "pt_BR": "Sempre aberto",
+ "pt": "Sempre aberto"
+ }
+ }
+ ],
+ "id": "bike_repair_station-opening_hours"
+ },
+
+
{
"question": {
"en": "Who maintains this cycle pump?",
@@ -226,13 +301,6 @@
"freeform": {
"key": "operator"
},
- "mappings": [
- {
- "if": "operator=De Fietsambassade Gent",
- "then": "De Fietsambassade Gent",
- "hideInAnswer": "_country!=be"
- }
- ],
"id": "bike_repair_station-operator"
},
{
@@ -263,50 +331,7 @@
"render": "{phone}",
"id": "bike_repair_station-phone"
},
- {
- "question": {
- "nl": "Wanneer is dit fietsherstelpunt open?",
- "en": "When is this bicycle repair point open?",
- "fr": "Quand ce point de réparation de vélo est-il ouvert ?",
- "it": "Quando è aperto questo punto riparazione bici?",
- "de": "Wann ist diese Fahrradreparaturstelle geöffnet?",
- "ru": "Когда работает эта точка обслуживания велосипедов?"
- },
- "render": "{opening_hours_table()}",
- "freeform": {
- "key": "opening_hours",
- "type": "opening_hours"
- },
- "mappings": [
- {
- "if": "opening_hours=24/7",
- "then": {
- "nl": "Dag en nacht open",
- "en": "Always open",
- "fr": "Ouvert en permanence",
- "it": "Sempre aperto",
- "de": "Immer geöffnet",
- "ru": "Всегда открыто",
- "pt_BR": "Sempre aberto",
- "pt": "Sempre aberto"
- }
- },
- {
- "if": "opening_hours=",
- "then": {
- "nl": "Dag en nacht open",
- "en": "Always open",
- "fr": "Ouvert en permanence",
- "it": "Sempre aperto",
- "de": "Immer geöffnet",
- "pt_BR": "Sempre aberto",
- "pt": "Sempre aberto"
- },
- "hideInAnswer": true
- }
- ],
- "id": "bike_repair_station-opening_hours"
- },
+
{
"id": "bike_repair_station-bike-chain-tool",
"question": {
@@ -387,48 +412,6 @@
}
]
},
- {
- "question": {
- "en": "Is the bike pump still operational?",
- "nl": "Werkt de fietspomp nog?",
- "fr": "La pompe à vélo fonctionne-t-elle toujours ?",
- "gl": "Segue a funcionar a bomba de ar?",
- "de": "Ist die Fahrradpumpe noch funktionstüchtig?",
- "it": "La pompa per bici è sempre funzionante?",
- "ru": "Велосипедный насос все еще работает?",
- "pl": "Czy pompka rowerowa jest nadal sprawna?"
- },
- "condition": "service:bicycle:pump=yes",
- "mappings": [
- {
- "if": "service:bicycle:pump:operational_status=broken",
- "then": {
- "en": "The bike pump is broken",
- "nl": "De fietspomp is kapot",
- "fr": "La pompe à vélo est cassée",
- "gl": "A bomba de ar está estragada",
- "de": "Die Fahrradpumpe ist kaputt",
- "it": "La pompa per bici è guasta",
- "ru": "Велосипедный насос сломан",
- "pl": "Pompka rowerowa jest zepsuta"
- }
- },
- {
- "if": "service:bicycle:pump:operational_status=",
- "then": {
- "en": "The bike pump is operational",
- "nl": "De fietspomp werkt nog",
- "fr": "La pompe est opérationnelle",
- "gl": "A bomba de ar está operativa",
- "de": "Die Fahrradpumpe ist betriebsbereit",
- "it": "La pompa per bici funziona",
- "ru": "Велосипедный насос работает",
- "pl": "Pompka rowerowa jest sprawna"
- }
- }
- ],
- "id": "Operational status"
- },
{
"condition": {
"and": [
@@ -513,7 +496,7 @@
"id": "bike_repair_station-electrical_pump",
"question": {
"en": "Is this an electric bike pump?",
- "nl": "Is dit een electrische fietspomp?",
+ "nl": "Is dit een elektrische fietspomp?",
"fr": "Est-ce que cette pompe est électrique ?",
"gl": "Esta é unha bomba de ar eléctrica?",
"de": "Ist dies eine elektrische Fahrradpumpe?",
@@ -542,7 +525,7 @@
"if": "manual=no",
"then": {
"en": "Electrical pump",
- "nl": "Electrische pomp",
+ "nl": "Elektrische pomp",
"fr": "Pompe électrique",
"gl": "Bomba de ar eléctrica",
"de": "Elektrische Pumpe",
diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 800b9aed3..e74afb089 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -28,7 +28,7 @@
"en": "public toilet",
"de": "öffentlich zugängliche Toilette",
"fr": "toilette publique",
- "nl": "publieke toilet",
+ "nl": "publiek toilet",
"ru": "общественный туалет ",
"it": "servizi igienici aperti al pubblico"
},
@@ -41,7 +41,7 @@
"en": "toilets with wheelchair accessible toilet",
"de": "toiletten mit rollstuhlgerechter Toilette",
"fr": "toilettes accessible aux personnes à mobilité réduite",
- "nl": "rolstoeltoegankelijke, publieke toilet",
+ "nl": "rolstoeltoegankelijke, publiek toilet",
"it": "servizi igienici accessibili per persone in sedia a rotelle",
"ru": "tуалет с доступом для пользователей кресел-колясок"
},
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 5e56c7cb8..4b11be1a3 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -812,6 +812,13 @@
"ca": "Situat a primera planta",
"ja": "1階にあります"
}
+ },
+ {
+ "if": "level=-1",
+ "then": {
+ "en": "Located on the first basement level",
+ "nl": "Bevindt zich in de eerste kelderverdieping"
+ }
}
]
}
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 6ab656938..64da0af6e 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -757,9 +757,6 @@
"mappings": {
"0": {
"then": "Immer geöffnet"
- },
- "1": {
- "then": "Immer geöffnet"
}
},
"question": "Wann ist diese Fahrradreparaturstelle geöffnet?"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 55690878d..f4607a3c8 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -765,7 +765,7 @@
},
"bike_repair_station": {
"description": "A layer showing bicycle pumps and bicycle repair tool stands",
- "name": "Bike stations (repair, pump or both)",
+ "name": "Bicycle pump and repair",
"presets": {
"0": {
"description": "A device to inflate your tires on a fixed location in the public space.Examples of bicycle pumps
",
@@ -806,7 +806,7 @@
"then": "There are both tools and a pump present"
}
},
- "question": "Which services are available at this bike station?"
+ "question": "Which services are available at this location?"
},
"bike_repair_station-bike-chain-tool": {
"mappings": {
@@ -862,9 +862,6 @@
"mappings": {
"0": {
"then": "Always open"
- },
- "1": {
- "then": "Always open"
}
},
"question": "When is this bicycle repair point open?"
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index f5fed3035..238bd4176 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -719,9 +719,6 @@
"mappings": {
"0": {
"then": "Ouvert en permanence"
- },
- "1": {
- "then": "Ouvert en permanence"
}
},
"question": "Quand ce point de réparation de vélo est-il ouvert ?"
diff --git a/langs/layers/it.json b/langs/layers/it.json
index a89eeb222..fd28ed335 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -596,9 +596,6 @@
"mappings": {
"0": {
"then": "Sempre aperto"
- },
- "1": {
- "then": "Sempre aperto"
}
},
"question": "Quando è aperto questo punto riparazione bici?"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 568bc236d..97b7115c7 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -675,7 +675,7 @@
},
"bike_repair_station": {
"description": "Deze laag toont fietspompen en herstelpunten voor fietsen",
- "name": "Fietspunten (herstel, pomp of allebei)",
+ "name": "Fietspomp and fietsherstel",
"presets": {
"0": {
"description": "Een apparaat waar je je fietsbanden kan oppompen, beschikbaar in de publieke ruimte. De fietspomp in je kelder telt dus niet.Voorbeelden
Examples of bicycle pumps
",
@@ -716,7 +716,7 @@
"then": "Er is zowel een pomp als gereedschap aanwezig"
}
},
- "question": "Welke functies biedt dit fietspunt?"
+ "question": "Welke functies biedt locatie?"
},
"bike_repair_station-bike-chain-tool": {
"mappings": {
@@ -746,10 +746,10 @@
"then": "Manuele pomp"
},
"1": {
- "then": "Electrische pomp"
+ "then": "Elektrische pomp"
}
},
- "question": "Is dit een electrische fietspomp?"
+ "question": "Is dit een elektrische fietspomp?"
},
"bike_repair_station-email": {
"question": "Wat is het email-adres van de beheerder?"
@@ -772,9 +772,6 @@
"mappings": {
"0": {
"then": "Dag en nacht open"
- },
- "1": {
- "then": "Dag en nacht open"
}
},
"question": "Wanneer is dit fietsherstelpunt open?"
@@ -4263,11 +4260,11 @@
"name": "Toiletten",
"presets": {
"0": {
- "title": "publieke toilet"
+ "title": "publiek toilet"
},
"1": {
"description": "Deze toiletten hebben op zijn minst één rolstoeltoegankelijke WC",
- "title": "rolstoeltoegankelijke, publieke toilet"
+ "title": "rolstoeltoegankelijke, publiek toilet"
}
},
"tagRenderings": {
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index 4c5b84d47..27b29d3ad 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -477,9 +477,6 @@
"mappings": {
"0": {
"then": "Sempre aberto"
- },
- "1": {
- "then": "Sempre aberto"
}
}
},
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index 03d43821d..b833d6bc8 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -421,9 +421,6 @@
"mappings": {
"0": {
"then": "Sempre aberto"
- },
- "1": {
- "then": "Sempre aberto"
}
}
},
diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json
index 68d77f1f4..18e186246 100644
--- a/langs/shared-questions/en.json
+++ b/langs/shared-questions/en.json
@@ -36,6 +36,9 @@
},
"3": {
"then": "Located on the first floor"
+ },
+ "4": {
+ "then": "Located on the first basement level"
}
},
"question": "On what level is this feature located?",
diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json
index 475f01d4c..843d3b82e 100644
--- a/langs/shared-questions/nl.json
+++ b/langs/shared-questions/nl.json
@@ -36,6 +36,9 @@
},
"3": {
"then": "Bevindt zich op de eerste verdieping"
+ },
+ "4": {
+ "then": "Bevindt zich in de eerste kelderverdieping"
}
},
"question": "Op welke verdieping bevindt dit punt zich?",
