Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop

Models/ThemeConfig/TagRenderingConfig.ts

@@ -62,6 +62,9 @@ export default class TagRenderingConfig {
         this.render = Translations.T(json.render, context + ".render");
         this.question = Translations.T(json.question, context + ".question");
         this.roaming = json.roaming ?? false;
+        if(this.roaming){
+            console.warn("Deprecation notice: roaming renderings will be scrapped.", this.id, context)
+        }
         const condition = TagUtils.Tag(json.condition ?? {"and": []}, `${context}.condition`);
         if (this.roaming && conditionIfRoaming !== undefined) {
             this.condition = new And([condition, conditionIfRoaming]);

assets/layers/bike_cleaning/bike_cleaning.json

@@ -79,16 +79,13 @@
                 ]
             },
             "then": {
-                "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
+                "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
-                "roaming": true
+            }
-            },
-            "badge": true
         }
     ],
     "titleIcons": [
         {
-            "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>",
+            "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>"
-            "roaming": true
         }
     ],
     "tagRenderings": [
@@ -118,7 +115,6 @@
                     "then": "The cleaning service has a fee"
                 }
             ],
-            "roaming": true,
             "id": "bike_cleaning-service:bicycle:cleaning:charge"
         },
         {
@@ -146,7 +142,6 @@
                     "then": "The cleaning service has a fee"
                 }
             ],
-            "roaming": false,
             "id": "bike_cleaning-charge"
         }
     ],

assets/layers/bike_repair_station/bike_repair_station.json

@@ -129,8 +129,7 @@
     "titleIcons": [
         {
             "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
-            "condition": "operator=De Fietsambassade Gent",
+            "condition": "operator=De Fietsambassade Gent"
-            "roaming": true
         },
         "defaults"
     ],

assets/layers/bike_shop/bike_shop.json

@@ -174,6 +174,10 @@
             "condition": "service:bicycle:diy=yes",
             "render": "<img src='./assets/layers/bike_shop/tools.svg'/>"
         },
+        {   "condition": "service:bicycle:cleaning=yes",
+
+            "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>"
+        },
         "defaults"
     ],
     "description": {
@@ -659,6 +663,32 @@
                     }
                 }
             ]
+        },
+        {
+            "question": "How much does it cost to use the cleaning service?",
+            "render": "Using the cleaning service costs {charge}",
+            "freeform": {
+                "key": "service:bicycle:cleaning:charge",
+                "addExtraTags": [
+                    "service:bicycle:cleaning:fee=yes"
+                ]
+            },
+            "mappings": [
+                {
+                    "if": "service:bicycle:cleaning:fee=no&service:bicycle:cleaning:charge=",
+                    "then": "The cleaning service is free to use"
+                },
+                {
+                    "if": "service:bicycle:cleaning:fee=no&",
+                    "then": "Free to use",
+                    "hideInAnswer": true
+                },
+                {
+                    "if": "service:bicycle:cleaning:fee=yes",
+                    "then": "The cleaning service has a fee"
+                }
+            ],
+            "id": "bike_cleaning-service:bicycle:cleaning:charge"
         }
     ],
     "presets": [
@@ -700,6 +730,17 @@
             "if": "service:bicycle:pump=yes",
             "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg",
             "badge": true
+        },
+        {
+            "if": {
+                "and": [
+                    "service:bicycle:cleaning~*"
+                ]
+            },
+            "then": {
+                "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
+            },
+            "badge": true
         }
     ],
     "width": {

assets/themes/benches/benches.json

@@ -58,6 +58,5 @@
     "bench",
     "bench_at_pt",
     "picnic_table"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/bicyclelib/bicyclelib.json

@@ -42,7 +42,6 @@
   "startLon": 0,
   "startZoom": 1,
   "widenFactor": 1.5,
-  "roamingRenderings": [],
   "layers": [
     {
       "builtin": "bicycle_library",

assets/themes/bookcases/bookcases.json

@@ -40,7 +40,6 @@
   "startLon": 0,
   "startZoom": 1,
   "widenFactor": 1,
-  "roamingRenderings": [],
   "layers": [
     "public_bookcase"
   ]

assets/themes/buurtnatuur/buurtnatuur.json

@@ -343,9 +343,10 @@
     },
     "viewpoint"
   ],
-  "roamingRenderings": [
+  "overrideAll": {
+    "tagRenderings+": [
       {
-      "#": "Access tag",
+        "id": "Access tag",
         "condition": {
           "and": [
             "tourism!~viewpoint"
@@ -452,7 +453,7 @@
         ]
       },
       {
-      "#": "Operator tag",
+        "id": "Operator tag",
         "render": {
           "nl": "Beheer door {operator}"
         },
@@ -531,7 +532,7 @@
         }
       },
       {
-      "#": "Non-editable description {description}",
+        "id": "Non-editable description {description}",
         "render": {
           "nl": "Extra info: <i>{description}</i>"
         },
@@ -540,7 +541,7 @@
         }
       },
       {
-      "#": "Editable description {description:0}",
+        "id": "Editable description {description:0}",
         "question": "Is er extra info die je kwijt wil?<br/><span class='subtle'>De <i>naam</i> van het gebied wordt in de volgende vraag gesteld</span>",
         "render": {
           "nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
@@ -550,7 +551,7 @@
         }
       },
       {
-      "#": "Name:nl-tag",
+        "id": "Name:nl-tag",
         "render": {
           "nl": "Dit gebied heet {name:nl}"
         },
@@ -568,7 +569,7 @@
         }
       },
       {
-      "#": "Name tag",
+        "id": "Name tag",
         "render": {
           "nl": "Dit gebied heet {name}"
         },
@@ -603,3 +604,4 @@
       }
     ]
   }
+}

assets/themes/campersite/campersite.json

@@ -1078,8 +1078,10 @@
       ]
     }
   ],
-  "roamingRenderings": [
+  "overrideAll": {
+    "tagRenderings+": [
       {
+        "id": "operator",
         "render": {
           "en": "This place is operated by {operator}",
           "ja": "この場所は{operator}によって運営されます",
@@ -1099,6 +1101,7 @@
         }
       },
       {
+        "id": "power_supply",
         "question": {
           "en": "Does this place have a power supply?",
           "ja": "この場所に電源はありますか?",
@@ -1141,3 +1144,4 @@
       }
     ]
   }
+}

assets/themes/charging_stations/charging_stations.json

@@ -46,6 +46,5 @@
   "defaultBackgroundId": "CartoDB.Voyager",
   "layers": [
     "charging_station"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/cyclestreets/cyclestreets.json

@@ -43,105 +43,6 @@
     "maxZoom": 12,
     "minNeededElements": 200
   },
-  "roamingRenderings": [
-    {
-      "question": {
-        "nl": "Is deze straat een fietsstraat?",
-        "en": "Is this street a cyclestreet?",
-        "ja": "この通りはcyclestreetですか?",
-        "nb_NO": "Er denne gaten en sykkelvei?",
-        "de": "Ist diese Straße eine Fahrradstraße?"
-      },
-      "mappings": [
-        {
-          "if": {
-            "and": [
-              "cyclestreet=yes",
-              "maxspeed=30",
-              "overtaking:motor_vehicle=no",
-              "proposed:cyclestreet="
-            ]
-          },
-          "then": {
-            "nl": "Deze straat is een fietsstraat (en dus zone 30)",
-            "en": "This street is a cyclestreet (and has a speed limit of 30 km/h)",
-            "ja": "cyclestreet(最高速度は30km/h)",
-            "nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)",
-            "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
-          }
-        },
-        {
-          "if": {
-            "and": [
-              "cyclestreet=yes",
-              "proposed:cyclestreet="
-            ]
-          },
-          "then": {
-            "nl": "Deze straat i een fietsstraat",
-            "en": "This street is a cyclestreet",
-            "ja": "この通りはcyclestreetだ",
-            "nb_NO": "Denne gaten er en sykkelvei",
-            "de": "Diese Straße ist eine Fahrradstraße"
-          },
-          "hideInAnswer": true
-        },
-        {
-          "if": {
-            "and": [
-              "cyclestreet=",
-              "proposed:cyclestreet=yes"
-            ]
-          },
-          "then": {
-            "nl": "Deze straat wordt binnenkort een fietsstraat",
-            "en": "This street will become a cyclstreet soon",
-            "ja": "この通りはまもなくcyclstreetになるだろう",
-            "nb_NO": "Denne gaten vil bli sykkelvei ganske snart",
-            "de": "Diese Straße wird bald eine Fahrradstraße sein"
-          }
-        },
-        {
-          "if": {
-            "and": [
-              "cyclestreet=",
-              "proposed:cyclestreet=",
-              "overtaking:motor_vehicle="
-            ]
-          },
-          "then": {
-            "nl": "Deze straat is geen fietsstraat",
-            "en": "This street is not a cyclestreet",
-            "ja": "この通りはcyclestreetではない",
-            "nb_NO": "Denne gaten er ikke en sykkelvei",
-            "it": "Questa strada non è una strada ciclabile",
-            "de": "Diese Straße ist keine Fahrradstraße"
-          }
-        }
-      ]
-    },
-    {
-      "question": {
-        "nl": "Wanneer wordt deze straat een fietsstraat?",
-        "en": "When will this street become a cyclestreet?",
-        "ja": "この通りはいつcyclestreetになるんですか?",
-        "it": "Questa strada diventerà una strada ciclabile quando?",
-        "de": "Wann wird diese Straße eine Fahrradstraße?"
-      },
-      "render": {
-        "nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}",
-        "en": "This street will become a cyclestreet at {cyclestreet:start_date}",
-        "ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります",
-        "it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}",
-        "de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße"
-      },
-      "condition": "proposed:cyclestreet=yes",
-      "freeform": {
-        "type": "date",
-        "key": "cyclestreet:start_date"
-      }
-    }
-  ],
   "layers": [
     {
       "id": "fietsstraat",
@@ -304,6 +205,105 @@
     }
   ],
   "overrideAll": {
-    "allowSplit": true
+    "allowSplit": true,
+    "tagRenderings+": [
+      {"id": "is_cyclestreet",
+        "question": {
+          "nl": "Is deze straat een fietsstraat?",
+          "en": "Is this street a cyclestreet?",
+          "ja": "この通りはcyclestreetですか?",
+          "nb_NO": "Er denne gaten en sykkelvei?",
+          "de": "Ist diese Straße eine Fahrradstraße?"
+        },
+        "mappings": [
+          {
+            "if": {
+              "and": [
+                "cyclestreet=yes",
+                "maxspeed=30",
+                "overtaking:motor_vehicle=no",
+                "proposed:cyclestreet="
+              ]
+            },
+            "then": {
+              "nl": "Deze straat is een fietsstraat (en dus zone 30)",
+              "en": "This street is a cyclestreet (and has a speed limit of 30 km/h)",
+              "ja": "cyclestreet(最高速度は30km/h)",
+              "nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)",
+              "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "cyclestreet=yes",
+                "proposed:cyclestreet="
+              ]
+            },
+            "then": {
+              "nl": "Deze straat i een fietsstraat",
+              "en": "This street is a cyclestreet",
+              "ja": "この通りはcyclestreetだ",
+              "nb_NO": "Denne gaten er en sykkelvei",
+              "de": "Diese Straße ist eine Fahrradstraße"
+            },
+            "hideInAnswer": true
+          },
+          {
+            "if": {
+              "and": [
+                "cyclestreet=",
+                "proposed:cyclestreet=yes"
+              ]
+            },
+            "then": {
+              "nl": "Deze straat wordt binnenkort een fietsstraat",
+              "en": "This street will become a cyclstreet soon",
+              "ja": "この通りはまもなくcyclstreetになるだろう",
+              "nb_NO": "Denne gaten vil bli sykkelvei ganske snart",
+              "de": "Diese Straße wird bald eine Fahrradstraße sein"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "cyclestreet=",
+                "proposed:cyclestreet=",
+                "overtaking:motor_vehicle="
+              ]
+            },
+            "then": {
+              "nl": "Deze straat is geen fietsstraat",
+              "en": "This street is not a cyclestreet",
+              "ja": "この通りはcyclestreetではない",
+              "nb_NO": "Denne gaten er ikke en sykkelvei",
+              "it": "Questa strada non è una strada ciclabile",
+              "de": "Diese Straße ist keine Fahrradstraße"
+            }
+          }
+        ]
+      },
+      {"id": "future_cyclestreet",
+        "question": {
+          "nl": "Wanneer wordt deze straat een fietsstraat?",
+          "en": "When will this street become a cyclestreet?",
+          "ja": "この通りはいつcyclestreetになるんですか?",
+          "it": "Questa strada diventerà una strada ciclabile quando?",
+          "de": "Wann wird diese Straße eine Fahrradstraße?"
+        },
+        "render": {
+          "nl": "Deze straat wordt fietsstraat op {cyclestreet:start_date}",
+          "en": "This street will become a cyclestreet at {cyclestreet:start_date}",
+          "ja": "この通りは{cyclestreet:start_date}に、cyclestreetになります",
+          "it": "Questa strada diventerà una strada ciclabile dal {cyclestreet:start_date}",
+          "de": "Diese Straße wird am {cyclestreet:start_date} zu einer Fahrradstraße"
+        },
+        "condition": "proposed:cyclestreet=yes",
+        "freeform": {
+          "type": "date",
+          "key": "cyclestreet:start_date"
+        }
+      }
+    ]
   }
 }

assets/themes/cyclofix/cyclofix.json

@@ -57,6 +57,5 @@
     "bike_themed_object",
     "bike_cleaning",
     "bike_parking"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/drinking_water/drinking_water.json

@@ -40,6 +40,5 @@
   "widenFactor": 2,
   "layers": [
     "drinking_water"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/facadegardens/facadegardens.json

@@ -456,6 +456,5 @@
       ],
       "wayHandling": 1
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/fritures/fritures.json

@@ -54,6 +54,5 @@
         "filter": null
       }
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/fruit_trees/fruit_trees.json

@@ -172,6 +172,5 @@
         }
       ]
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/grb.json

@@ -201,6 +201,5 @@
     }
   ],
   "hideFromOverview": true,
-  "roamingRenderings": [],
   "defaultBackgroundId": "AGIVFlandersGRB"
 }

assets/themes/maps/maps.json

@@ -40,6 +40,5 @@
   "socialImage": "",
   "layers": [
     "map"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/nature/nature.json

@@ -26,6 +26,5 @@
     "map",
     "information_board",
     "nature_reserve"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/parkings/parkings.json

@@ -26,6 +26,5 @@
   "socialImage": "",
   "layers": [
     "parking"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/personal/personal.json

@@ -46,6 +46,5 @@
   "startZoom": 16,
   "widenFactor": 1.2,
   "overpassMaxZoom": 0,
-  "layers": [],
+  "layers": []
-  "roamingRenderings": []
 }

assets/themes/play_forests/play_forests.json

@@ -23,6 +23,5 @@
   "socialImage": "",
   "layers": [
     "play_forest"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/playgrounds/playgrounds.json

@@ -42,6 +42,5 @@
   "socialImage": "",
   "layers": [
     "playground"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/sport_pitches/sport_pitches.json

@@ -41,6 +41,5 @@
   "socialImage": "",
   "layers": [
     "sport_pitch"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/surveillance/surveillance.json

@@ -43,6 +43,5 @@
   "layers": [
     "direction",
     "surveillance_camera"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/trees/trees.json

@@ -55,6 +55,5 @@
   "layers": [
     "tree_node"
   ],
-  "roamingRenderings": [],
   "defaultBackgroundId": "AGIV"
 }

assets/themes/uk_addresses/uk_addresses.json

@@ -274,6 +274,5 @@
         "render": "0"
       }
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/waste_basket/waste_basket.json

@@ -33,6 +33,5 @@
         "minzoom": 12
       }
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

scripts/generateLayerOverview.ts

@@ -118,6 +118,9 @@ class LayerOverviewUtils {
             if (themeFile["units"] !== undefined) {
                 themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ")
             }
+            if (themeFile["roamingRenderings"] !== undefined) {
+                themeErrorCount.push("Theme " + themeFile.id + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead")    
+            }
             for (const layer of themeFile.layers) {
                 if (typeof layer === "string") {
                     if (!knownLayerIds.has(layer)) {

scripts/lint.ts

@@ -46,6 +46,11 @@ for (const themeFile of themeFiles) {
         // @ts-ignore
         fixLayerConfig(layerConfig)
     }
+    
+    if(themeFile.parsed["roamingRenderings"] !== undefined && themeFile.parsed["roamingRenderings"].length == 0){
+        delete themeFile.parsed["roamingRenderings"]
+    }
+    
     writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, "  "))
 }
 //*/