From f761ca1f919d461a254500d8124d31c179e13242 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 27 May 2015 17:38:12 -0400 Subject: [PATCH] Add RV/Marine toilet disposal presets and related fields (closes #2623) --- data/presets.yaml | 12 +++ data/presets/fields.json | 15 ++++ data/presets/fields/power_supply.json | 5 ++ .../presets/fields/sanitary_dump_station.json | 5 ++ data/presets/fields/water_point.json | 5 ++ data/presets/presets.json | 83 ++++++++++++++++++- .../amenity/sanitary_dump_station.json | 27 ++++++ data/presets/presets/leisure/marina.json | 9 ++ data/presets/presets/tourism/camp_site.json | 7 +- .../presets/presets/tourism/caravan_site.json | 11 ++- .../waterway/sanitary_dump_station.json | 29 +++++++ data/taginfo.json | 8 ++ dist/locales/en.json | 21 ++++- 13 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/power_supply.json create mode 100644 data/presets/fields/sanitary_dump_station.json create mode 100644 data/presets/fields/water_point.json create mode 100644 data/presets/presets/amenity/sanitary_dump_station.json create mode 100644 data/presets/presets/waterway/sanitary_dump_station.json diff --git a/data/presets.yaml b/data/presets.yaml index 76cea7e83..9bc11704f 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -431,6 +431,8 @@ en: label: Population power: label: Type + power_supply: + label: Power Supply railway: label: Type recycling/cans: @@ -465,6 +467,8 @@ en: alpine_hiking: "T4: Alpine Hiking" demanding_alpine_hiking: "T5: Demanding Alpine Hiking" difficult_alpine_hiking: "T6: Difficult Alpine Hiking" + sanitary_dump_station: + label: Toilet Disposal seasonal: label: Seasonal service: @@ -593,6 +597,8 @@ en: label: Type of Goods water: label: Type + water_point: + label: Water Point waterway: label: Type website: @@ -847,6 +853,9 @@ en: amenity/restaurant: name: Restaurant terms: "" + amenity/sanitary_dump_station: + name: RV Toilet Disposal + terms: "" amenity/school: name: School Grounds terms: "" @@ -2350,6 +2359,9 @@ en: waterway/riverbank: name: Riverbank terms: "" + waterway/sanitary_dump_station: + name: Marine Toilet Disposal + terms: "" waterway/stream: name: Stream terms: "" diff --git a/data/presets/fields.json b/data/presets/fields.json index 120c29856..1eef09dcf 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -861,6 +861,11 @@ "type": "typeCombo", "label": "Type" }, + "power_supply": { + "key": "power_supply", + "type": "check", + "label": "Power Supply" + }, "railway": { "key": "railway", "type": "typeCombo", @@ -941,6 +946,11 @@ } } }, + "sanitary_dump_station": { + "key": "sanitary_dump_station", + "type": "check", + "label": "Toilet Disposal" + }, "seasonal": { "key": "seasonal", "type": "check", @@ -1246,6 +1256,11 @@ "type": "combo", "label": "Type" }, + "water_point": { + "key": "water_point", + "type": "check", + "label": "Water Point" + }, "waterway": { "key": "waterway", "type": "typeCombo", diff --git a/data/presets/fields/power_supply.json b/data/presets/fields/power_supply.json new file mode 100644 index 000000000..79666c006 --- /dev/null +++ b/data/presets/fields/power_supply.json @@ -0,0 +1,5 @@ +{ + "key": "power_supply", + "type": "check", + "label": "Power Supply" +} diff --git a/data/presets/fields/sanitary_dump_station.json b/data/presets/fields/sanitary_dump_station.json new file mode 100644 index 000000000..419e6ee3b --- /dev/null +++ b/data/presets/fields/sanitary_dump_station.json @@ -0,0 +1,5 @@ +{ + "key": "sanitary_dump_station", + "type": "check", + "label": "Toilet Disposal" +} diff --git a/data/presets/fields/water_point.json b/data/presets/fields/water_point.json new file mode 100644 index 000000000..e3b2f56c7 --- /dev/null +++ b/data/presets/fields/water_point.json @@ -0,0 +1,5 @@ +{ + "key": "water_point", + "type": "check", + "label": "Water Point" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index c5e37f68f..3156c3484 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1558,6 +1558,33 @@ }, "name": "Restaurant" }, + "amenity/sanitary_dump_station": { + "fields": [ + "operator", + "access_toilets", + "fee", + "water_point" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "Motor Home", + "Camper", + "Sanitary", + "Dump Station", + "Elsan", + "CDP", + "CTDP", + "Chemical Toilet" + ], + "tags": { + "amenity": "sanitary_dump_station" + }, + "name": "RV Toilet Disposal" + }, "amenity/school": { "icon": "school", "fields": [ @@ -5018,6 +5045,15 @@ }, "leisure/marina": { "icon": "harbor", + "fields": [ + "operator", + "address", + "capacity", + "fee", + "sanitary_dump_station", + "power_supply", + "internet_access" + ], "geometry": [ "point", "vertex", @@ -9012,29 +9048,43 @@ "icon": "campsite", "fields": [ "operator", - "address" + "address", + "capacity", + "fee" ], "geometry": [ "point", "vertex", "area" ], + "terms": [ + "Tent" + ], "tags": { "tourism": "camp_site" }, "name": "Camp Site" }, "tourism/caravan_site": { + "icon": "bus", "fields": [ "operator", "address", - "smoking" + "capacity", + "fee", + "sanitary_dump_station", + "power_supply", + "internet_access" ], "geometry": [ "point", "vertex", "area" ], + "terms": [ + "Motor Home", + "Camper" + ], "tags": { "tourism": "caravan_site" }, @@ -9780,6 +9830,35 @@ }, "name": "Riverbank" }, + "waterway/sanitary_dump_station": { + "fields": [ + "operator", + "access_toilets", + "fee", + "water_point" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "Boat", + "Watercraft", + "Sanitary", + "Dump Station", + "Pumpout", + "Pump out", + "Elsan", + "CDP", + "CTDP", + "Chemical Toilet" + ], + "tags": { + "waterway": "sanitary_dump_station" + }, + "name": "Marine Toilet Disposal" + }, "waterway/stream": { "icon": "waterway-stream", "fields": [ diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json new file mode 100644 index 000000000..3263b8d9b --- /dev/null +++ b/data/presets/presets/amenity/sanitary_dump_station.json @@ -0,0 +1,27 @@ +{ + "fields": [ + "operator", + "access_toilets", + "fee", + "water_point" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "Motor Home", + "Camper", + "Sanitary", + "Dump Station", + "Elsan", + "CDP", + "CTDP", + "Chemical Toilet" + ], + "tags": { + "amenity": "sanitary_dump_station" + }, + "name": "RV Toilet Disposal" +} diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json index 9d4e284fb..9ed65bac3 100644 --- a/data/presets/presets/leisure/marina.json +++ b/data/presets/presets/leisure/marina.json @@ -1,5 +1,14 @@ { "icon": "harbor", + "fields": [ + "operator", + "address", + "capacity", + "fee", + "sanitary_dump_station", + "power_supply", + "internet_access" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json index a5390278d..2857d12b6 100644 --- a/data/presets/presets/tourism/camp_site.json +++ b/data/presets/presets/tourism/camp_site.json @@ -2,13 +2,18 @@ "icon": "campsite", "fields": [ "operator", - "address" + "address", + "capacity", + "fee" ], "geometry": [ "point", "vertex", "area" ], + "terms": [ + "Tent" + ], "tags": { "tourism": "camp_site" }, diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json index eab8789f2..c3216847c 100644 --- a/data/presets/presets/tourism/caravan_site.json +++ b/data/presets/presets/tourism/caravan_site.json @@ -1,14 +1,23 @@ { + "icon": "bus", "fields": [ "operator", "address", - "smoking" + "capacity", + "fee", + "sanitary_dump_station", + "power_supply", + "internet_access" ], "geometry": [ "point", "vertex", "area" ], + "terms": [ + "Motor Home", + "Camper" + ], "tags": { "tourism": "caravan_site" }, diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json new file mode 100644 index 000000000..5a715d8a1 --- /dev/null +++ b/data/presets/presets/waterway/sanitary_dump_station.json @@ -0,0 +1,29 @@ +{ + "fields": [ + "operator", + "access_toilets", + "fee", + "water_point" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "terms": [ + "Boat", + "Watercraft", + "Sanitary", + "Dump Station", + "Pumpout", + "Pump out", + "Elsan", + "CDP", + "CTDP", + "Chemical Toilet" + ], + "tags": { + "waterway": "sanitary_dump_station" + }, + "name": "Marine Toilet Disposal" +} diff --git a/data/taginfo.json b/data/taginfo.json index 51d11096d..d9a9e98b0 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -328,6 +328,10 @@ "key": "amenity", "value": "restaurant" }, + { + "key": "amenity", + "value": "sanitary_dump_station" + }, { "key": "amenity", "value": "school" @@ -2298,6 +2302,10 @@ "key": "waterway", "value": "riverbank" }, + { + "key": "waterway", + "value": "sanitary_dump_station" + }, { "key": "waterway", "value": "stream" diff --git a/dist/locales/en.json b/dist/locales/en.json index 267e67d7a..97a124ba8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1136,6 +1136,9 @@ "power": { "label": "Type" }, + "power_supply": { + "label": "Power Supply" + }, "railway": { "label": "Type" }, @@ -1184,6 +1187,9 @@ "difficult_alpine_hiking": "T6: Difficult Alpine Hiking" } }, + "sanitary_dump_station": { + "label": "Toilet Disposal" + }, "seasonal": { "label": "Seasonal" }, @@ -1354,6 +1360,9 @@ "water": { "label": "Type" }, + "water_point": { + "label": "Water Point" + }, "waterway": { "label": "Type" }, @@ -1695,6 +1704,10 @@ "name": "Restaurant", "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table" }, + "amenity/sanitary_dump_station": { + "name": "RV Toilet Disposal", + "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet" + }, "amenity/school": { "name": "School Grounds", "terms": "academy,elementary school,middle school,high school" @@ -3501,11 +3514,11 @@ }, "tourism/camp_site": { "name": "Camp Site", - "terms": "" + "terms": "Tent" }, "tourism/caravan_site": { "name": "RV Park", - "terms": "" + "terms": "Motor Home,Camper" }, "tourism/chalet": { "name": "Chalet", @@ -3699,6 +3712,10 @@ "name": "Riverbank", "terms": "" }, + "waterway/sanitary_dump_station": { + "name": "Marine Toilet Disposal", + "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet" + }, "waterway/stream": { "name": "Stream", "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"