Themes: improvements to BBQ, different icons, add some questions, remove 'unknown'-options

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",
+          "icon": "circle",
-          "color": "#66332B"
+          "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"
+            "en": "Access only for authorized persons"
-          }
-        },
-        {
-          "if": "access=unknown",
-          "then": {
-            "de": "unbekannt",
-            "en": "Unknown"
           }
         }
       ]
@@ -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
 }

assets/layers/bbq/bbq.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="bbq" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M9.32,7.655C10.8782,7.108,11.9471,5.6506,12,4H3c0.053,1.6299,1.0978,3.0728,2.63,3.631L4.923,9.044&#xA;&#x9;c-1.3571-0.2355-2.6482,0.6737-2.8837,2.0308s0.6737,2.6482,2.0308,2.8837C4.9927,14.1187,5.9273,13.7485,6.49,13h4.223l0.335,0.717&#xA;&#x9;c0.0836,0.1735,0.2594,0.2836,0.452,0.283c0.0733,0.0003,0.1457-0.0158,0.212-0.047c0.2497-0.117,0.3575-0.4141,0.241-0.664&#xA;&#x9;L9.32,7.655z M4.5,12.75c-0.6904,0-1.25-0.5596-1.25-1.25s0.5596-1.25,1.25-1.25s1.25,0.5596,1.25,1.25&#xA;&#x9;C5.7484,12.1897,5.1897,12.7484,4.5,12.75z M6.95,12c0.2066-1.007-0.2268-2.0374-1.091-2.594L6.6,7.923&#xA;&#x9;c0.577,0.1042,1.168,0.1042,1.745,0l1.9,4.07L6.95,12z M4.75,1C4.6119,1,4.5,1.1119,4.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1&#xA;&#x9;C3,2.8881,3.1119,3,3.25,3S3.5,2.8881,3.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C5,1.1119,4.8881,1,4.75,1z M6.75,1&#xA;&#x9;C6.6119,1,6.5,1.1119,6.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C5,2.8881,5.1119,3,5.25,3S5.5,2.8881,5.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C7,1.1119,6.8881,1,6.75,1z M8.75,1C8.6119,1,8.5,1.1119,8.5,1.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C7,2.8881,7.1119,3,7.25,3S7.5,2.8881,7.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C9,1.1119,8.8881,1,8.75,1z M10.75,1&#xA;&#x9;c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C9,2.8881,9.1119,3,9.25,3S9.5,2.8881,9.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C11,1.1119,10.8881,1,10.75,1z M12.75,1c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C11,2.8881,11.1119,3,11.25,3s0.25-0.1119,0.25-0.25c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C13,1.1119,12.8881,1,12.75,1z"/>
+</svg>

assets/layers/bbq/bbq.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Maki
+SPDX-License-Identifier: CC0-1.0

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/"
+    ]
+  }
+]

assets/layers/drinking_water/drinking_water.json

@@ -329,41 +329,16 @@
       ]
     },
     {
-      "id": "seasonal",
+      "builtin":  "seasonal",
-      "question": {
+      "override": {
-        "en": "Is this drinking water point available all year round?",
+        "question": {
-        "nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
+          "en": "Is this drinking water point available all year round?",
-        "de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
+          "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": "opening_hours_24_7",
       "override": {
         "questionHint": {

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",
+          "icon": "circle",
-          "color": "#f00000"
+          "color": "white"
         },
         {
           "icon": "./assets/layers/assembly_point/fire.svg"
@@ -116,39 +116,17 @@
       ]
     },
     {
-      "id": "seasonal",
+      "builtin": "seasonal",
-      "question": {
+      "override": {
-        "en": "Is the firepit seasonal?",
+        "question": {
-        "de": "Ist die Feuerstelle saisonal?"
+          "en": "Is the firepit available all around the year?",
-      },
+          "nl": "Is deze kampvuurplaats heel het jaar door beschikbaar?"
-      "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"
-          }
         }
-      ]
+      }
     }
   ],
   "allowMove": {
     "enableRelocation": false,
     "enableImproveAccuracy": true
-  },
+  }
-  "passAllFeatures": false
 }

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"
+          }
+        }
+      ]
     }
   ]
 }

assets/themes/mapcomplete-changes/mapcomplete-changes.json

@@ -1,20 +1,13 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete",
+    "en": "Changes made with MapComplete"
-    "da": "Ændringer lavet med MapComplete",
-    "de": "Änderungen mit MapComplete"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete",
+    "en": "Shows changes made by MapComplete"
-    "da": "Vis ændringer lavet med MapComplete",
-    "de": "Änderungen von MapComplete anzeigen"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete",
+    "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"
   },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
@@ -25,9 +18,7 @@
     {
       "id": "mapcomplete-changes",
       "name": {
-        "en": "Changeset centers",
+        "en": "Changeset centers"
-        "de": "Zentrum der Änderungssätze",
-        "zh_Hant": "變更集中心"
       },
       "minzoom": 0,
       "source": {
@@ -37,51 +28,41 @@
       },
       "title": {
         "render": {
-          "en": "Changeset for {theme}",
+          "en": "Changeset for {theme}"
-          "de": "Änderungssatz für {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes",
+        "en": "Shows all MapComplete changes"
-        "da": "Vis alle MapComplete-ændringer",
-        "de": "Alle MapComplete-Änderungen anzeigen"
       },
       "tagRenderings": [
         {
           "id": "show_changeset_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
-            "de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "question": {
-            "en": "What contributor did make this change?",
+            "en": "What contributor did make this change?"
-            "da": "Hvilke bidragsydere lavede denne ændring?",
-            "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "user"
           },
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
+            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
-            "da": "Ændring lavet af <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
-            "de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
           }
         },
         {
           "id": "theme-id",
           "question": {
-            "en": "What theme was used to make this change?",
+            "en": "What theme was used to make this change?"
-            "de": "Welches Thema wurde für die Änderung verwendet?"
           },
           "freeform": {
             "key": "theme"
           },
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>",
+            "en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>"
-            "de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           }
         },
         {
@@ -90,23 +71,19 @@
             "key": "locale"
           },
           "question": {
-            "en": "What locale (language) was this change made in?",
+            "en": "What locale (language) was this change made in?"
-            "de": "In welcher Benutzersprache wurde die Änderung vorgenommen?"
           },
           "render": {
-            "en": "User locale is {locale}",
+            "en": "User locale is {locale}"
-            "de": "Benutzersprache {locale}"
           }
         },
         {
           "id": "host",
           "render": {
-            "en": "Change with with <a href='{host}'>{host}</a>",
+            "en": "Change with with <a href='{host}'>{host}</a>"
-            "de": "Änderung über <a href='{host}'>{host}</a>"
           },
           "question": {
-            "en": "What host (website) was this change made with?",
+            "en": "What host (website) was this change made with?"
-            "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
           },
           "freeform": {
             "key": "host"
@@ -127,13 +104,10 @@
         {
           "id": "version",
           "question": {
-            "en": "What version of MapComplete was used to make this change?",
+            "en": "What version of MapComplete was used to make this change?"
-            "de": "Mit welcher MapComplete Version wurde die Änderung vorgenommen?"
           },
           "render": {
-            "en": "Made with {editor}",
+            "en": "Made with {editor}"
-            "da": "Lavet med {editor}",
-            "de": "Erstellt mit {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}",
+                "en": "Themename contains {search}"
-                "da": "Temanavn indeholder {search}",
-                "de": "Themenname enthält {search}",
-                "pl": "Nazwa tematu zawiera {search}"
               }
             }
           ]
@@ -538,9 +513,7 @@
                 }
               ],
               "question": {
-                "en": "Themename does <b>not</b> contain {search}",
+                "en": "Themename does <b>not</b> contain {search}"
-                "da": "Temanavn indeholder <b>ikke</b> {search}",
-                "de": "Themename enthält <b>not</b> {search}"
               }
             }
           ]
@@ -556,9 +529,7 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}",
+                "en": "Made by contributor {search}"
-                "da": "Lavet af bidragsyder {search}",
-                "de": "Erstellt vom Mitwirkenden {search}"
               }
             }
           ]
@@ -574,9 +545,7 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}",
+                "en": "<b>Not</b> made by contributor {search}"
-                "da": "<b>Ikke</b> lavet af bidragsyder {search}",
-                "de": "<b>Nicht</b> erstellt von Mitwirkendem {search}"
               }
             }
           ]
@@ -593,9 +562,7 @@
                 }
               ],
               "question": {
-                "en": "Made before {search}",
+                "en": "Made before {search}"
-                "da": "Lavet før {search}",
-                "de": "Erstellt vor {search}"
               }
             }
           ]
@@ -612,9 +579,7 @@
                 }
               ],
               "question": {
-                "en": "Made after {search}",
+                "en": "Made after {search}"
-                "da": "Lavet efter {search}",
-                "de": "Erstellt nach {search}"
               }
             }
           ]
@@ -630,8 +595,7 @@
                 }
               ],
               "question": {
-                "en": "User language (iso-code) {search}",
+                "en": "User language (iso-code) {search}"
-                "de": "Benutzersprache (ISO-Code) {search}"
               }
             }
           ]
@@ -647,8 +611,7 @@
                 }
               ],
               "question": {
-                "en": "Made with host {search}",
+                "en": "Made with host {search}"
-                "de": "Erstellt mit Host {search}"
               }
             }
           ]
@@ -659,8 +622,7 @@
             {
               "osmTags": "add-image>0",
               "question": {
-                "en": "Changeset added at least one image",
+                "en": "Changeset added at least one image"
-                "de": "Änderungssatz hat mindestens ein Bild hinzugefügt"
               }
             }
           ]
@@ -671,8 +633,7 @@
             {
               "osmTags": "theme!=grb",
               "question": {
-                "en": "Exclude GRB theme",
+                "en": "Exclude GRB theme"
-                "de": "GRB-Thema ausschließen"
               }
             }
           ]
@@ -683,8 +644,7 @@
             {
               "osmTags": "theme!=etymology",
               "question": {
-                "en": "Exclude etymology theme",
+                "en": "Exclude etymology theme"
-                "de": "Etymologie-Thema ausschließen"
               }
             }
           ]
@@ -699,8 +659,7 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
-              "de": "Weitere Statistiken gibt es <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
             }
           },
           {