Add more bicycle options to cycle rental; add deletion and images to cycle rental, fix #703

assets/layers/bicycle_rental/bicycle_rental.json

@@ -146,10 +146,11 @@
       },
       "render": {
         "en": "{rental} is rented here",
-        "nl": "{rental} wordt hier uitgeleend"
+        "nl": "{rental} kunnen hier uitgeleend worden"
       },
       "freeform": {
-        "key": "rental"
+        "key": "rental",
+        "inline": true
       },
       "multiAnswer": true,
       "mappings": [
@@ -194,6 +195,13 @@
             "en": "Tandem bicycles can be rented here",
             "nl": "Tandems kunnen hier gehuurd worden"
           }
+        },
+        {
+          "if": "rental=racebike",
+          "then": {
+            "en": "Race bicycles can be rented here",
+            "nl": "Wielerfietsen (sportfietsen) kunnen hier gehuurd worden"
+          }
         }
       ]
     },
@@ -222,7 +230,7 @@
             "kid_bike",
             {
               "en": "bikes for children",
-              "nl": "Kinderfietsen"
+              "nl": "kinderfietsen"
             }
           ],
           [
@@ -249,7 +257,7 @@
           [
             "tandem_bicycle",
             {
-              "en": "tandem bicycle",
+              "en": "tandem",
               "nl": "tandem"
             }
           ]
@@ -320,5 +328,33 @@
         "render": "2"
       }
     }
-  ]
+  ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": true
+  },
+  "deletion": {
+    "softDeletionTags": {
+      "and": ["disused:amenity=bicycle_rental", "bicycle_rental=", "rental="]
+    },
+    "neededChangesets": 10,
+    "extraDeleteReasons": [{
+      "explanation": {
+        "nl": "{title()} is permanent gestopt",
+        "en": "{title()} has closed down permanently"
+      },
+      "changesetMessage": "shop_closed"
+    }],
+    "nonDeleteMappings": [{
+      "if": {
+        "and": [
+        "service:bicycle:rental=no"
+        ]
+      },
+      "then": {
+        "en": "This bicycle shop used to rent out bikes but doesn't rent out bikes anymore",
+        "nl": "Deze fietszaak verhuurde vroeger fietsen, maar nu niet meer"
+      }
+    }]
+  }
 }

assets/layers/cafe_pub/cafe_pub.json

@@ -199,7 +199,14 @@
         "amenity=",
         "disused:amenity:={amenity}"
       ]
-    }
+    },
+    "extraDeleteReasons": [{
+      "explanation": {
+        "nl": "{title()} is permanent gestopt",
+        "en": "{title()} has closed down permanently"
+      },
+      "changesetMessage": "shop_closed"
+    }]
   },
   "allowMove": true,
   "mapRendering": [

assets/layers/food/food.json

@@ -671,7 +671,14 @@
         "amenity=",
         "disused:amenity:={amenity}"
       ]
-    }
+    }, 
+    "extraDeleteReasons": [{
+      "explanation": {
+        "nl": "{title()} is permanent gestopt",
+        "en": "{title()} has closed down permanently"
+      },
+      "changesetMessage": "shop_closed"
+    }]
   },
   "allowMove": true,
   "mapRendering": [

assets/layers/shops/shops.json

@@ -356,7 +356,14 @@
         "amenity=",
         "disused:amenity:={amenity}"
       ]
-    }
+    },
+    "extraDeleteReasons": [{
+      "explanation": {
+        "nl": "{title()} is permanent gestopt",
+        "en": "{title()} has closed down permanently"
+      },
+      "changesetMessage": "shop_closed"
+    }]
   },
   "allowMove": true,
   "mapRendering": [