From e7c57f9e6f69c0d55e5f9fd4ac5c4bea00170906 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Sat, 8 Sep 2018 10:38:09 -0700 Subject: [PATCH] Adds a Shipwreck preset for the historic=wreck tag Adds wreck Category, Date Sunk, and Visible at High/Low Tide fields --- data/presets.yaml | 17 +++++++++ data/presets/fields.json | 4 +++ .../fields/historic/wreck/date_sunk.json | 5 +++ .../historic/wreck/visible_at_high_tide.json | 5 +++ .../historic/wreck/visible_at_low_tide.json | 5 +++ .../fields/seamark/wreck/category.json | 5 +++ data/presets/presets.json | 1 + data/presets/presets/historic/wreck.json | 35 +++++++++++++++++++ data/taginfo.json | 14 ++++++++ dist/locales/en.json | 16 +++++++++ 10 files changed, 107 insertions(+) create mode 100644 data/presets/fields/historic/wreck/date_sunk.json create mode 100644 data/presets/fields/historic/wreck/visible_at_high_tide.json create mode 100644 data/presets/fields/historic/wreck/visible_at_low_tide.json create mode 100644 data/presets/fields/seamark/wreck/category.json create mode 100644 data/presets/presets/historic/wreck.json diff --git a/data/presets.yaml b/data/presets.yaml index e26d7c53f..20a74d3cd 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -681,6 +681,15 @@ en: historic/civilization: # 'historic:civilization=*' label: Historic Civilization + historic/wreck/date_sunk: + # 'wreck:date_sunk=*' + label: Date Sunk + historic/wreck/visible_at_high_tide: + # 'wreck:visible_at_high_tide=*' + label: Visible At High Tide + historic/wreck/visible_at_low_tide: + # 'wreck:visible_at_low_tide=*' + label: Visible At Low Tide hoops: # hoops=* label: Hoops @@ -1425,6 +1434,9 @@ en: seamark/type: # 'seamark:type=*' label: Seamark + seamark/wreck/category: + # 'seamark:wreck:category=*' + label: Category seasonal: # seasonal=* label: Seasonal @@ -3738,6 +3750,11 @@ en: # historic=wayside_shrine name: Wayside Shrine terms: '' + historic/wreck: + # historic=wreck + name: Shipwreck + # 'terms: hull,mast,maritime,remains,ship,boat' + terms: '' internet_access/wlan: # internet_access=wlan name: Wi-Fi Hotspot diff --git a/data/presets/fields.json b/data/presets/fields.json index dbba6487e..4935a015a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -123,6 +123,9 @@ "highway": {"key": "highway", "type": "typeCombo", "label": "Type"}, "historic": {"key": "historic", "type": "typeCombo", "label": "Type"}, "historic/civilization": {"key": "historic:civilization", "type": "combo", "label": "Historic Civilization"}, + "historic/wreck/date_sunk": {"key": "wreck:date_sunk", "type": "text", "label": "Date Sunk"}, + "historic/wreck/visible_at_high_tide": {"key": "wreck:visible_at_high_tide", "type": "check", "label": "Visible At High Tide"}, + "historic/wreck/visible_at_low_tide": {"key": "wreck:visible_at_low_tide", "type": "check", "label": "Visible At Low Tide"}, "hoops": {"key": "hoops", "type": "number", "minValue": 0, "label": "Hoops", "placeholder": "1, 2, 4..."}, "horse_dressage": {"key": "sport", "type": "check", "label": "Dressage Riding", "strings": {"options": {"undefined": "No", "equestrian": "Yes"}}, "reference": {"key": "sport", "value": "equestrian"}}, "horse_riding": {"key": "leisure", "type": "check", "label": "Horseback Riding", "strings": {"options": {"undefined": "No", "horse_riding": "Yes"}}, "reference": {"key": "leisure", "value": "horse_riding"}}, @@ -243,6 +246,7 @@ "seamark/buoy_lateral/system": {"key": "seamark:buoy_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}}, "seamark/mooring/category": {"key": "seamark:mooring:category", "type": "combo", "label": "Category"}, "seamark/type": {"key": "seamark:type", "type": "combo", "universal": true, "label": "Seamark"}, + "seamark/wreck/category": {"key": "seamark:wreck:category", "type": "combo", "label": "Category"}, "seasonal": {"key": "seasonal", "type": "check", "label": "Seasonal"}, "second_hand": {"key": "second_hand", "type": "combo", "label": "Sells Used", "placeholder": "Yes, No, Only", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Only"}}}, "service_rail": {"key": "service", "type": "combo", "label": "Service Type", "strings": {"options": {"spur": "Spur", "yard": "Yard", "siding": "Siding", "crossover": "Crossover"}}}, diff --git a/data/presets/fields/historic/wreck/date_sunk.json b/data/presets/fields/historic/wreck/date_sunk.json new file mode 100644 index 000000000..6c923c9b0 --- /dev/null +++ b/data/presets/fields/historic/wreck/date_sunk.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:date_sunk", + "type": "text", + "label": "Date Sunk" +} diff --git a/data/presets/fields/historic/wreck/visible_at_high_tide.json b/data/presets/fields/historic/wreck/visible_at_high_tide.json new file mode 100644 index 000000000..c08287fef --- /dev/null +++ b/data/presets/fields/historic/wreck/visible_at_high_tide.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:visible_at_high_tide", + "type": "check", + "label": "Visible At High Tide" +} diff --git a/data/presets/fields/historic/wreck/visible_at_low_tide.json b/data/presets/fields/historic/wreck/visible_at_low_tide.json new file mode 100644 index 000000000..2013fe6e3 --- /dev/null +++ b/data/presets/fields/historic/wreck/visible_at_low_tide.json @@ -0,0 +1,5 @@ +{ + "key": "wreck:visible_at_low_tide", + "type": "check", + "label": "Visible At Low Tide" +} diff --git a/data/presets/fields/seamark/wreck/category.json b/data/presets/fields/seamark/wreck/category.json new file mode 100644 index 000000000..6977bfa4d --- /dev/null +++ b/data/presets/fields/seamark/wreck/category.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:wreck:category", + "type": "combo", + "label": "Category" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 303469479..4d8497406 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -420,6 +420,7 @@ "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"}, "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"}, "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"}, + "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "removeTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"}, "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"}, diff --git a/data/presets/presets/historic/wreck.json b/data/presets/presets/historic/wreck.json new file mode 100644 index 000000000..3038b2a94 --- /dev/null +++ b/data/presets/presets/historic/wreck.json @@ -0,0 +1,35 @@ +{ + "icon": "temaki-ruins", + "fields": [ + "name", + "access_simple", + "seamark/wreck/category", + "historic/wreck/date_sunk", + "historic/wreck/visible_at_low_tide", + "historic/wreck/visible_at_high_tide" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "historic": "wreck" + }, + "addTags": { + "historic": "wreck", + "seamark:type": "wreck" + }, + "removeTags": { + "historic": "wreck", + "seamark:type": "wreck" + }, + "terms": [ + "hull", + "mast", + "maritime", + "remains", + "ship", + "boat" + ], + "name": "Shipwreck" +} diff --git a/data/taginfo.json b/data/taginfo.json index 166e9e314..8bb8e44c2 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2823,6 +2823,13 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/landmark-15.svg?sanitize=true" }, + { + "key": "historic", + "value": "wreck", + "description": "Shipwreck", + "object_types": ["node", "area"], + "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/ruins.svg?sanitize=true" + }, { "key": "internet_access", "value": "wlan", @@ -6673,6 +6680,12 @@ {"key": "healthcare:speciality", "description": "Specialties"}, {"key": "height", "description": "Height (Meters)"}, {"key": "historic:civilization", "description": "Historic Civilization"}, + {"key": "wreck:date_sunk", "description": "Date Sunk"}, + { + "key": "wreck:visible_at_high_tide", + "description": "Visible At High Tide" + }, + {"key": "wreck:visible_at_low_tide", "description": "Visible At Low Tide"}, {"key": "hoops", "description": "Hoops"}, { "key": "horse_scale", @@ -7182,6 +7195,7 @@ "description": "System" }, {"key": "seamark:mooring:category", "description": "Category"}, + {"key": "seamark:wreck:category", "description": "Category"}, {"key": "seasonal", "description": "Seasonal"}, {"key": "second_hand", "value": "yes", "description": "Sells Used"}, {"key": "second_hand", "value": "no", "description": "Sells Used"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 61a0c74ed..e88194a78 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2045,6 +2045,15 @@ "historic/civilization": { "label": "Historic Civilization" }, + "historic/wreck/date_sunk": { + "label": "Date Sunk" + }, + "historic/wreck/visible_at_high_tide": { + "label": "Visible At High Tide" + }, + "historic/wreck/visible_at_low_tide": { + "label": "Visible At Low Tide" + }, "hoops": { "label": "Hoops", "placeholder": "1, 2, 4..." @@ -2644,6 +2653,9 @@ "seamark/type": { "label": "Seamark" }, + "seamark/wreck/category": { + "label": "Category" + }, "seasonal": { "label": "Seasonal" }, @@ -4707,6 +4719,10 @@ "name": "Wayside Shrine", "terms": "" }, + "historic/wreck": { + "name": "Shipwreck", + "terms": "hull,mast,maritime,remains,ship,boat" + }, "internet_access/wlan": { "name": "Wi-Fi Hotspot", "terms": "wi-fi,wifi,hotspot"