data/fields/bath/sand_bath-JP.json

@@ -1,10 +0,0 @@
-{
-    "key": "bath:sand_bath",
-    "label": "Sand Bath",
-    "type": "check",
-    "locationSet": {
-        "include": [
-            "JP"
-        ]
-    }
-}

data/fields/bath/sand_bath.json

@@ -0,0 +1,5 @@
+{
+    "key": "bath:sand_bath",
+    "label": "Sand Bath",
+    "type": "check"
+}

data/fields/cabins.json

@@ -1,5 +0,0 @@
-{
-    "key": "cabins",
-    "type": "check",
-    "label": "Cabins"
-}

data/presets/aerialway/j-bar.json

@@ -13,11 +13,11 @@
     },
     "terms": [
         "drag lift",
-        "jaybar",
-        "jbar",
         "skiing",
         "snowboarding",
-        "surface cable"
+        "surface cable",
+        "jaybar",
+        "jbar"
     ],
     "name": "J-Bar Lift"
 }

data/presets/aerialway/pylon.json

@@ -12,9 +12,9 @@
     },
     "terms": [
         "chair lift pole",
-        "lift tower",
         "skiing",
-        "snowboarding"
+        "snowboarding",
+        "lift tower"
     ],
     "name": "Aerialway Pylon"
 }

data/presets/aerialway/zip_line.json

@@ -18,7 +18,7 @@
         "flying fox",
         "foefie slide",
         "gravity propelled aerial ropeslide",
-        "tyrolean traverse",
+        "Tyrolean traverse",
         "zip wire",
         "zip-line",
         "zipline",

data/presets/amenity/fast_food.json

@@ -26,11 +26,8 @@
         "organic",
         "outdoor_seating",
         "smoking",
-        "stroller",
         "takeaway",
         "toilets",
-        "toilets/wheelchair",
-        "toilets/menstrual_products_poi",
         "fhrs/id-GB",
         "website/menu"
     ],

data/presets/amenity/public_bath.json

@@ -4,6 +4,7 @@
         "name",
         "bath/type",
         "bath/open_air",
+        "bath/sand_bath",
         "address",
         "building_area",
         "fee",
@@ -11,8 +12,7 @@
     ],
     "moreFields": [
         "{@templates/internet_access}",
-        "{@templates/poi}",
-        "bath/sand_bath-JP"
+        "{@templates/poi}"
     ],
     "geometry": [
         "point",

data/presets/shop/bakery.json

@@ -13,7 +13,6 @@
         "rolls"
     ],
     "moreFields": [
-        "{shop}",
         "fhrs/id-GB"
     ],
     "name": "Bakery"

data/presets/tourism/camp_site.json

@@ -24,7 +24,6 @@
         "drinking_water_available",
         "gnis/feature_id-US",
         "group_only",
-        "cabins",
         "nudism",
         "openfire",
         "opening_hours",