diff --git a/assets/layers/bbq/bbq.json b/assets/layers/bbq/bbq.json
index 59cab667c..a7ed0f5d6 100644
--- a/assets/layers/bbq/bbq.json
+++ b/assets/layers/bbq/bbq.json
@@ -11,16 +11,13 @@
"source": {
"osmTags": "amenity=bbq"
},
- "minzoom": 12,
+ "minzoom": 8,
"title": {
"render": {
"en": "BBQ",
"de": "Grillstelle"
}
},
- "titleIcons": [
- "icons.defaults"
- ],
"pointRendering": [
{
"iconSize": "40,40",
@@ -31,11 +28,11 @@
"anchor": "bottom",
"marker": [
{
- "icon": "square_rounded",
- "color": "#66332B"
+ "icon": "circle",
+ "color": "white"
},
{
- "icon": "./assets/layers/assembly_point/fire.svg"
+ "icon": "./assets/layers/bbq/bbq.svg"
}
]
}
@@ -103,14 +100,7 @@
"if": "access=permit",
"then": {
"de": "Zugang nur für Berechtigte",
- "en": "Access only for authorized"
- }
- },
- {
- "if": "access=unknown",
- "then": {
- "de": "unbekannt",
- "en": "Unknown"
+ "en": "Access only for authorized persons"
}
}
]
@@ -135,13 +125,6 @@
"de": "Die Grillstelle ist überdacht",
"en": "The grill is covered"
}
- },
- {
- "if": "covered=unknown",
- "then": {
- "de": "unbekannt",
- "en": "Unknown"
- }
}
]
},
@@ -186,6 +169,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
- },
- "passAllFeatures": false
+ }
}
diff --git a/assets/layers/bbq/bbq.svg b/assets/layers/bbq/bbq.svg
new file mode 100644
index 000000000..c540b7d69
--- /dev/null
+++ b/assets/layers/bbq/bbq.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/assets/layers/bbq/bbq.svg.license b/assets/layers/bbq/bbq.svg.license
new file mode 100644
index 000000000..0cf6926f1
--- /dev/null
+++ b/assets/layers/bbq/bbq.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Maki
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/bbq/license_info.json b/assets/layers/bbq/license_info.json
new file mode 100644
index 000000000..51d95c947
--- /dev/null
+++ b/assets/layers/bbq/license_info.json
@@ -0,0 +1,12 @@
+[
+ {
+ "path": "bbq.svg",
+ "license": "CC0-1.0",
+ "authors": [
+ "Maki"
+ ],
+ "sources": [
+ "https://labs.mapbox.com/maki-icons/"
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 8862186ee..296004db3 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -329,41 +329,16 @@
]
},
{
- "id": "seasonal",
- "question": {
- "en": "Is this drinking water point available all year round?",
- "nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
- "de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
- },
- "mappings": [
- {
- "if": "seasonal=no",
- "then": {
- "en": "This drinking water point is available all around the year",
- "nl": "Dit drinkwaterpunt is heel het jaar door beschikbaar",
- "de": "Die Trinkwasserstelle ist ganzjährig in Betrieb"
- }
- },
- {
- "if": "seasonal=summer",
- "then": {
- "en": "This drinking water point is only available in summer",
- "nl": "Dit drinkwaterpunt is enkel in de zomer beschikbaar",
- "de": "Die Trinkwasserstelle ist nur im Sommer in Betrieb"
- }
- },
- {
- "if": "seasonal=spring;summer;autumn",
- "icon": "./assets/layers/drinking_water/no_winter.svg",
- "then": {
- "en": "This drinking water point is closed during the winter",
- "nl": "Dit drinkwaterpunt is gesloten in de winter",
- "de": "Die Trinkwasserstelle ist im Winter nicht in Betrieb"
- }
+ "builtin": "seasonal",
+ "override": {
+ "question": {
+ "en": "Is this drinking water point available all year round?",
+ "nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
+ "de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
}
- ]
+ }
},
- {
+ {
"builtin": "opening_hours_24_7",
"override": {
"questionHint": {
diff --git a/assets/layers/firepit/firepit.json b/assets/layers/firepit/firepit.json
index 79f8d28fc..9f046a18e 100644
--- a/assets/layers/firepit/firepit.json
+++ b/assets/layers/firepit/firepit.json
@@ -11,7 +11,7 @@
"source": {
"osmTags": "leisure=firepit"
},
- "minzoom": 12,
+ "minzoom": 8,
"title": {
"render": {
"en": "Firepit",
@@ -31,8 +31,8 @@
"anchor": "bottom",
"marker": [
{
- "icon": "square_rounded",
- "color": "#f00000"
+ "icon": "circle",
+ "color": "white"
},
{
"icon": "./assets/layers/assembly_point/fire.svg"
@@ -116,39 +116,17 @@
]
},
{
- "id": "seasonal",
- "question": {
- "en": "Is the firepit seasonal?",
- "de": "Ist die Feuerstelle saisonal?"
- },
- "mappings": [
- {
- "if": "seasonal=no",
- "then": {
- "de": "Die Feuerstelle ist nicht saisonal",
- "en": "The firepit is not seasonal"
- }
- },
- {
- "if": "seasonal=yes",
- "then": {
- "de": "Die Feuerstelle ist saisonal",
- "en": "The firepit is seasonal"
- }
- },
- {
- "if": "seasonal=unknown",
- "then": {
- "de": "unbekannt",
- "en": "Unknown"
- }
+ "builtin": "seasonal",
+ "override": {
+ "question": {
+ "en": "Is the firepit available all around the year?",
+ "nl": "Is deze kampvuurplaats heel het jaar door beschikbaar?"
}
- ]
+ }
}
],
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
- },
- "passAllFeatures": false
+ }
}
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 30febaed0..48e4eb258 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2755,6 +2755,40 @@
"cssClasses": "subtle m-4 italic flex items-center justify-center"
}
}
+ },
+ {
+ "id": "seasonal",
+ "question": {
+ "en": "Is {title()} available all around the year?",
+ "nl": "Is {title()} heel het jaar beschikbaar?"
+ },
+ "mappings": [
+ {
+ "if": "seasonal=no",
+ "then": {
+ "en": "Available all around the year",
+ "nl": "Heel het jaar door beschikbaar",
+ "de": "Ganzjährig in Betrieb"
+ }
+ },
+ {
+ "if": "seasonal=summer",
+ "then": {
+ "en": "Only available in summer",
+ "nl": "Enkel in de zomer beschikbaar",
+ "de": "Nur im Sommer in Betrieb"
+ }
+ },
+ {
+ "if": "seasonal=spring;summer;autumn",
+ "icon": "./assets/layers/drinking_water/no_winter.svg",
+ "then": {
+ "en": "Closed during the winter",
+ "nl": "Gesloten in de winter",
+ "de": "Im Winter nicht in Betrieb"
+ }
+ }
+ ]
}
]
}
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 609aa246a..99de2cacb 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,20 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
- "en": "Changes made with MapComplete",
- "da": "Ændringer lavet med MapComplete",
- "de": "Änderungen mit MapComplete"
+ "en": "Changes made with MapComplete"
},
"shortDescription": {
- "en": "Shows changes made by MapComplete",
- "da": "Vis ændringer lavet med MapComplete",
- "de": "Änderungen von MapComplete anzeigen"
+ "en": "Shows changes made by MapComplete"
},
"description": {
- "en": "This maps shows all the changes made with MapComplete",
- "da": "Dette kort viser alle ændringer foretaget med MapComplete",
- "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
- "pl": "Ta mapa pokazuje wszystkie zmiany wprowadzone za pomocą MapComplete"
+ "en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
@@ -25,9 +18,7 @@
{
"id": "mapcomplete-changes",
"name": {
- "en": "Changeset centers",
- "de": "Zentrum der Änderungssätze",
- "zh_Hant": "變更集中心"
+ "en": "Changeset centers"
},
"minzoom": 0,
"source": {
@@ -37,51 +28,41 @@
},
"title": {
"render": {
- "en": "Changeset for {theme}",
- "de": "Änderungssatz für {theme}"
+ "en": "Changeset for {theme}"
}
},
"description": {
- "en": "Shows all MapComplete changes",
- "da": "Vis alle MapComplete-ændringer",
- "de": "Alle MapComplete-Änderungen anzeigen"
+ "en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "show_changeset_id",
"render": {
- "en": "Changeset {id}",
- "de": "Änderungssatz {id}"
+ "en": "Changeset {id}"
}
},
{
"id": "contributor",
"question": {
- "en": "What contributor did make this change?",
- "da": "Hvilke bidragsydere lavede denne ændring?",
- "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
+ "en": "What contributor did make this change?"
},
"freeform": {
"key": "user"
},
"render": {
- "en": "Change made by {user}",
- "da": "Ændring lavet af {user}",
- "de": "Änderung vorgenommen von {user}"
+ "en": "Change made by {user}"
}
},
{
"id": "theme-id",
"question": {
- "en": "What theme was used to make this change?",
- "de": "Welches Thema wurde für die Änderung verwendet?"
+ "en": "What theme was used to make this change?"
},
"freeform": {
"key": "theme"
},
"render": {
- "en": "Change with theme {theme}",
- "de": "Geändert mit Thema {theme}"
+ "en": "Change with theme {theme}"
}
},
{
@@ -90,23 +71,19 @@
"key": "locale"
},
"question": {
- "en": "What locale (language) was this change made in?",
- "de": "In welcher Benutzersprache wurde die Änderung vorgenommen?"
+ "en": "What locale (language) was this change made in?"
},
"render": {
- "en": "User locale is {locale}",
- "de": "Benutzersprache {locale}"
+ "en": "User locale is {locale}"
}
},
{
"id": "host",
"render": {
- "en": "Change with with {host}",
- "de": "Änderung über {host}"
+ "en": "Change with with {host}"
},
"question": {
- "en": "What host (website) was this change made with?",
- "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
+ "en": "What host (website) was this change made with?"
},
"freeform": {
"key": "host"
@@ -127,13 +104,10 @@
{
"id": "version",
"question": {
- "en": "What version of MapComplete was used to make this change?",
- "de": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?"
+ "en": "What version of MapComplete was used to make this change?"
},
"render": {
- "en": "Made with {editor}",
- "da": "Lavet med {editor}",
- "de": "Erstellt mit {editor}"
+ "en": "Made with {editor}"
},
"freeform": {
"key": "editor"
@@ -267,6 +241,10 @@
"if": "theme=facadegardens",
"then": "./assets/themes/facadegardens/geveltuin.svg"
},
+ {
+ "if": "theme=fireplace",
+ "then": "./assets/layers/assembly_point/fire.svg"
+ },
{
"if": "theme=food",
"then": "./assets/layers/food/restaurant.svg"
@@ -519,10 +497,7 @@
}
],
"question": {
- "en": "Themename contains {search}",
- "da": "Temanavn indeholder {search}",
- "de": "Themenname enthält {search}",
- "pl": "Nazwa tematu zawiera {search}"
+ "en": "Themename contains {search}"
}
}
]
@@ -538,9 +513,7 @@
}
],
"question": {
- "en": "Themename does not contain {search}",
- "da": "Temanavn indeholder ikke {search}",
- "de": "Themename enthält not {search}"
+ "en": "Themename does not contain {search}"
}
}
]
@@ -556,9 +529,7 @@
}
],
"question": {
- "en": "Made by contributor {search}",
- "da": "Lavet af bidragsyder {search}",
- "de": "Erstellt vom Mitwirkenden {search}"
+ "en": "Made by contributor {search}"
}
}
]
@@ -574,9 +545,7 @@
}
],
"question": {
- "en": "Not made by contributor {search}",
- "da": "Ikke lavet af bidragsyder {search}",
- "de": "Nicht erstellt von Mitwirkendem {search}"
+ "en": "Not made by contributor {search}"
}
}
]
@@ -593,9 +562,7 @@
}
],
"question": {
- "en": "Made before {search}",
- "da": "Lavet før {search}",
- "de": "Erstellt vor {search}"
+ "en": "Made before {search}"
}
}
]
@@ -612,9 +579,7 @@
}
],
"question": {
- "en": "Made after {search}",
- "da": "Lavet efter {search}",
- "de": "Erstellt nach {search}"
+ "en": "Made after {search}"
}
}
]
@@ -630,8 +595,7 @@
}
],
"question": {
- "en": "User language (iso-code) {search}",
- "de": "Benutzersprache (ISO-Code) {search}"
+ "en": "User language (iso-code) {search}"
}
}
]
@@ -647,8 +611,7 @@
}
],
"question": {
- "en": "Made with host {search}",
- "de": "Erstellt mit Host {search}"
+ "en": "Made with host {search}"
}
}
]
@@ -659,8 +622,7 @@
{
"osmTags": "add-image>0",
"question": {
- "en": "Changeset added at least one image",
- "de": "Änderungssatz hat mindestens ein Bild hinzugefügt"
+ "en": "Changeset added at least one image"
}
}
]
@@ -671,8 +633,7 @@
{
"osmTags": "theme!=grb",
"question": {
- "en": "Exclude GRB theme",
- "de": "GRB-Thema ausschließen"
+ "en": "Exclude GRB theme"
}
}
]
@@ -683,8 +644,7 @@
{
"osmTags": "theme!=etymology",
"question": {
- "en": "Exclude etymology theme",
- "de": "Etymologie-Thema ausschließen"
+ "en": "Exclude etymology theme"
}
}
]
@@ -699,8 +659,7 @@
{
"id": "link_to_more",
"render": {
- "en": "More statistics can be found here",
- "de": "Weitere Statistiken gibt es hier"
+ "en": "More statistics can be found here"
}
},
{