Deprecate camp_site=camp_pitch, prefer tourism=camp_pitch

(closes #6591)

data/deprecated.json

@@ -208,6 +208,10 @@
       "old": {"building:type": "*"},
       "replace": {"building": "$1"}
     },
+    {
+      "old": {"camp_site": "camp_pitch"},
+      "replace": {"tourism": "camp_pitch"}
+    },
     {
       "old": {"color": "*"},
       "replace": {"colour": "$1"}

data/presets.yaml

@@ -3818,11 +3818,6 @@ en:
       building_point:
         # building=*
         name: Building
-      camp_site/camp_pitch:
-        # camp_site=camp_pitch
-        name: Camp Pitch
-        # 'terms: tent,rv'
-        terms: '<translate with synonyms or related terms for ''Camp Pitch'', separated by commas>'
       club:
         # club=*
         name: Club
@@ -7419,6 +7414,11 @@ en:
         # tourism=attraction
         name: Tourist Attraction
         terms: '<translate with synonyms or related terms for ''Tourist Attraction'', separated by commas>'
+      tourism/camp_pitch:
+        # torism=camp_pitch
+        name: Camp Pitch
+        # 'terms: tent,rv'
+        terms: '<translate with synonyms or related terms for ''Camp Pitch'', separated by commas>'
       tourism/camp_site:
         # tourism=camp_site
         name: Campground

data/presets/presets.json

@@ -349,7 +349,6 @@
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
     "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
     "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
-    "camp_site/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"camp_site": "camp_pitch"}, "name": "Camp Pitch"},
     "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
     "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
@@ -1125,6 +1124,7 @@
     "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
     "tourism/artwork/statue": {"icon": "fas-female", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
+    "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"torism": "camp_pitch"}, "name": "Camp Pitch"},
     "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
     "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["operator", "fee", "payment_multi_fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
     "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},

data/presets/presets/camp_site/camp_pitch.json → data/presets/presets/tourism/camp_pitch.json

@@ -13,7 +13,7 @@
         "rv"
     ],
     "tags": {
-        "camp_site": "camp_pitch"
+        "torism": "camp_pitch"
     },
     "name": "Camp Pitch"
 }

data/taginfo.json

@@ -345,7 +345,6 @@
     {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"},
     {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/building-15.svg?sanitize=true"},
     {"key": "building", "value": "warehouse", "description": "🄿 Warehouse", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/warehouse-15.svg?sanitize=true"},
-    {"key": "camp_site", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/campsite-15.svg?sanitize=true"},
     {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-handshake.svg?sanitize=true"},
     {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "craft", "description": "🄿 Craft, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},
@@ -1062,6 +1061,7 @@
     {"key": "artwork_type", "value": "sculpture", "description": "🄿 Sculpture", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/art-gallery-15.svg?sanitize=true"},
     {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-female.svg?sanitize=true"},
     {"key": "tourism", "value": "attraction", "description": "🄿 Tourist Attraction", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/star-15.svg?sanitize=true"},
+    {"key": "torism", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/campsite-15.svg?sanitize=true"},
     {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/campsite-15.svg?sanitize=true"},
     {"key": "tourism", "value": "caravan_site", "description": "🄿 RV Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/rv_park.svg?sanitize=true"},
     {"key": "tourism", "value": "chalet", "description": "🄿 Holiday Cottage", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
@@ -1818,6 +1818,7 @@
     {"key": "building:color", "description": "🄳 ➜ building:colour=*"},
     {"key": "building:roof:colour", "description": "🄳 ➜ roof:colour=*"},
     {"key": "building:type", "description": "🄳 ➜ building=*"},
+    {"key": "camp_site", "value": "camp_pitch", "description": "🄳 ➜ tourism=camp_pitch"},
     {"key": "color", "description": "🄳 ➜ colour=*"},
     {"key": "craft", "value": "glass", "description": "🄳 ➜ craft=glaziery"},
     {"key": "craft", "value": "catering", "description": "🄳 ➜ craft=caterer"},

dist/locales/en.json

@@ -5733,10 +5733,6 @@
                     "name": "Warehouse",
                     "terms": ""
                 },
-                "camp_site/camp_pitch": {
-                    "name": "Camp Pitch",
-                    "terms": "tent,rv"
-                },
                 "club": {
                     "name": "Club",
                     "terms": "social"
@@ -8837,6 +8833,10 @@
                     "name": "Tourist Attraction",
                     "terms": ""
                 },
+                "tourism/camp_pitch": {
+                    "name": "Camp Pitch",
+                    "terms": "tent,rv"
+                },
                 "tourism/camp_site": {
                     "name": "Campground",
                     "terms": "tent,rv"