From 80ea090397916d485b654213dc475bf8d79d8841 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 5 Sep 2018 19:07:41 -0700 Subject: [PATCH] Adds presets: Seamark (unsearchable generic), Channel Buoy, Green Buoy, Red Buoy, Channel Beacon, Danger Beacon, Mooring Adds universal Seamark type field to Seamark preset Adds Category, Colour, Shape, and System fields to buoy and Channel Beacon presets Adds Shape field to Danger Beacon preset Adds Category field to Mooring preset --- data/presets.yaml | 142 ++++++++++++ data/presets/fields.json | 11 + .../seamark/beacon_isolated_danger/shape.json | 5 + .../seamark/beacon_lateral/category.json | 15 ++ .../fields/seamark/beacon_lateral/colour.json | 12 + .../fields/seamark/beacon_lateral/shape.json | 5 + .../fields/seamark/beacon_lateral/system.json | 13 ++ .../fields/seamark/buoy_lateral/category.json | 19 ++ .../fields/seamark/buoy_lateral/colour.json | 17 ++ .../fields/seamark/buoy_lateral/shape.json | 5 + .../fields/seamark/buoy_lateral/system.json | 13 ++ .../fields/seamark/mooring/category.json | 5 + data/presets/fields/seamark/type.json | 6 + data/presets/presets.json | 7 + data/presets/presets/_seamark.json | 17 ++ .../seamark/beacon_isolated_danger.json | 20 ++ .../presets/seamark/beacon_lateral.json | 26 +++ .../presets/presets/seamark/buoy_lateral.json | 26 +++ .../presets/seamark/buoy_lateral/green.json | 27 +++ .../presets/seamark/buoy_lateral/red.json | 27 +++ data/presets/presets/seamark/mooring.json | 21 ++ data/taginfo.json | 211 ++++++++++++++++++ dist/locales/en.json | 108 +++++++++ 23 files changed, 758 insertions(+) create mode 100644 data/presets/fields/seamark/beacon_isolated_danger/shape.json create mode 100644 data/presets/fields/seamark/beacon_lateral/category.json create mode 100644 data/presets/fields/seamark/beacon_lateral/colour.json create mode 100644 data/presets/fields/seamark/beacon_lateral/shape.json create mode 100644 data/presets/fields/seamark/beacon_lateral/system.json create mode 100644 data/presets/fields/seamark/buoy_lateral/category.json create mode 100644 data/presets/fields/seamark/buoy_lateral/colour.json create mode 100644 data/presets/fields/seamark/buoy_lateral/shape.json create mode 100644 data/presets/fields/seamark/buoy_lateral/system.json create mode 100644 data/presets/fields/seamark/mooring/category.json create mode 100644 data/presets/fields/seamark/type.json create mode 100644 data/presets/presets/_seamark.json create mode 100644 data/presets/presets/seamark/beacon_isolated_danger.json create mode 100644 data/presets/presets/seamark/beacon_lateral.json create mode 100644 data/presets/presets/seamark/buoy_lateral.json create mode 100644 data/presets/presets/seamark/buoy_lateral/green.json create mode 100644 data/presets/presets/seamark/buoy_lateral/red.json create mode 100644 data/presets/presets/seamark/mooring.json diff --git a/data/presets.yaml b/data/presets.yaml index 7b483b096e..22fe82b83b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1303,6 +1303,115 @@ en: sanitary_dump_station: # sanitary_dump_station=* label: Toilet Disposal + seamark/beacon_isolated_danger/shape: + # 'seamark:beacon_isolated_danger:shape=*' + label: Shape + seamark/beacon_lateral/category: + # 'seamark:beacon_lateral:category=*' + label: Category + options: + # 'seamark:beacon_lateral:category=danger_left' + danger_left: Danger Left + # 'seamark:beacon_lateral:category=danger_right' + danger_right: Danger Right + # 'seamark:beacon_lateral:category=port' + port: Port + # 'seamark:beacon_lateral:category=starboard' + starboard: Starboard + # 'seamark:beacon_lateral:category=waterway_left' + waterway_left: Waterway Left + # 'seamark:beacon_lateral:category=waterway_right' + waterway_right: Waterway Right + seamark/beacon_lateral/colour: + # 'seamark:beacon_lateral:colour=*' + label: Colour + options: + # 'seamark:beacon_lateral:colour=green' + green: Green + # 'seamark:beacon_lateral:colour=grey' + grey: Grey + # 'seamark:beacon_lateral:colour=red' + red: Red + seamark/beacon_lateral/shape: + # 'seamark:beacon_lateral:shape=*' + label: Shape + seamark/beacon_lateral/system: + # 'seamark:beacon_lateral:system=*' + label: System + options: + # 'seamark:beacon_lateral:system=cevni' + cevni: CEVNI + # 'seamark:beacon_lateral:system=iala-a' + iala-a: IALA A + # 'seamark:beacon_lateral:system=iala-b' + iala-b: IALA B + # 'seamark:beacon_lateral:system=other' + other: Other + seamark/buoy_lateral/category: + # 'seamark:buoy_lateral:category=*' + label: Category + options: + # 'seamark:buoy_lateral:category=channel_left' + channel_left: Channel Left + # 'seamark:buoy_lateral:category=channel_right' + channel_right: Channel Right + # 'seamark:buoy_lateral:category=danger_left' + danger_left: Danger Left + # 'seamark:buoy_lateral:category=danger_right' + danger_right: Danger Right + # 'seamark:buoy_lateral:category=port' + port: Port + # 'seamark:buoy_lateral:category=preferred_channel_port' + preferred_channel_port: Preferred Channel Port + # 'seamark:buoy_lateral:category=preferred_channel_starboard' + preferred_channel_starboard: Preferred Channel Starboard + # 'seamark:buoy_lateral:category=starboard' + starboard: Starboard + # 'seamark:buoy_lateral:category=waterway_left' + waterway_left: Waterway Left + # 'seamark:buoy_lateral:category=waterway_right' + waterway_right: Waterway Right + seamark/buoy_lateral/colour: + # 'seamark:buoy_lateral:colour=*' + label: Colour + options: + # 'seamark:buoy_lateral:colour=green' + green: Green + # 'seamark:buoy_lateral:colour=green;red;green' + green;red;green: Green-Red-Green + # 'seamark:buoy_lateral:colour=green;white;green;white' + green;white;green;white: Green-White-Green-White + # 'seamark:buoy_lateral:colour=red' + red: Red + # 'seamark:buoy_lateral:colour=red;green;red' + red;green;red: Red-Green-Red + # 'seamark:buoy_lateral:colour=red;white;red;white' + red;white;red;white: Red-White-Red-White + # 'seamark:buoy_lateral:colour=white' + white: White + # 'seamark:buoy_lateral:colour=yellow' + yellow: Yellow + seamark/buoy_lateral/shape: + # 'seamark:buoy_lateral:shape=*' + label: Shape + seamark/buoy_lateral/system: + # 'seamark:buoy_lateral:system=*' + label: System + options: + # 'seamark:buoy_lateral:system=cevni' + cevni: CEVNI + # 'seamark:buoy_lateral:system=iala-a' + iala-a: IALA A + # 'seamark:buoy_lateral:system=iala-b' + iala-b: IALA B + # 'seamark:buoy_lateral:system=other' + other: Other + seamark/mooring/category: + # 'seamark:mooring:category=*' + label: Category + seamark/type: + # 'seamark:type=*' + label: Seamark seasonal: # seasonal=* label: Seasonal @@ -5128,6 +5237,39 @@ en: # route=ferry name: Ferry Route terms: '' + seamark: + # 'seamark:type=*' + name: Seamark + seamark/beacon_isolated_danger: + # 'seamark:type=beacon_isolated_danger' + name: Danger Beacon + # 'terms: beacon isolated danger,isolated danger beacon,iala' + terms: '' + seamark/beacon_lateral: + # 'seamark:type=beacon_lateral' + name: Channel Beacon + # 'terms: lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark' + terms: '' + seamark/buoy_lateral: + # 'seamark:type=buoy_lateral' + name: Channel Buoy + # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark' + terms: '' + seamark/buoy_lateral/green: + # 'seamark:type=buoy_lateral, seamark:buoy_lateral:colour=green' + name: Green Buoy + # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark' + terms: '' + seamark/buoy_lateral/red: + # 'seamark:type=buoy_lateral, seamark:buoy_lateral:colour=red' + name: Red Buoy + # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark' + terms: '' + seamark/mooring: + # 'seamark:type=mooring' + name: Mooring + # 'terms: dolphin,pile,bollard,buoy,post' + terms: '' shop: # shop=* name: Shop diff --git a/data/presets/fields.json b/data/presets/fields.json index c7a35225fa..93a53d864b 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -230,6 +230,17 @@ "route": {"key": "route", "type": "combo", "label": "Type"}, "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}}, "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"}, + "seamark/beacon_isolated_danger/shape": {"key": "seamark:beacon_isolated_danger:shape", "type": "combo", "label": "Shape"}, + "seamark/beacon_lateral/category": {"key": "seamark:beacon_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right"}}}, + "seamark/beacon_lateral/colour": {"key": "seamark:beacon_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "grey": "Grey"}}}, + "seamark/beacon_lateral/shape": {"key": "seamark:beacon_lateral:shape", "type": "combo", "label": "Shape"}, + "seamark/beacon_lateral/system": {"key": "seamark:beacon_lateral:system", "type": "combo", "label": "System", "strings": {"options": {"iala-a": "IALA A", "iala-b": "IALA B", "cevni": "CEVNI", "other": "Other"}}}, + "seamark/buoy_lateral/category": {"key": "seamark:buoy_lateral:category", "type": "combo", "label": "Category", "strings": {"options": {"port": "Port", "starboard": "Starboard", "channel_left": "Channel Left", "channel_right": "Channel Right", "waterway_left": "Waterway Left", "waterway_right": "Waterway Right", "danger_left": "Danger Left", "danger_right": "Danger Right", "preferred_channel_port": "Preferred Channel Port", "preferred_channel_starboard": "Preferred Channel Starboard"}}}, + "seamark/buoy_lateral/colour": {"key": "seamark:buoy_lateral:colour", "type": "combo", "label": "Colour", "strings": {"options": {"red": "Red", "green": "Green", "red;white;red;white": "Red-White-Red-White", "green;white;green;white": "Green-White-Green-White", "red;green;red": "Red-Green-Red", "green;red;green": "Green-Red-Green", "white": "White", "yellow": "Yellow"}}}, + "seamark/buoy_lateral/shape": {"key": "seamark:buoy_lateral:shape", "type": "combo", "label": "Shape"}, + "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"}, "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/seamark/beacon_isolated_danger/shape.json b/data/presets/fields/seamark/beacon_isolated_danger/shape.json new file mode 100644 index 0000000000..b62f65467b --- /dev/null +++ b/data/presets/fields/seamark/beacon_isolated_danger/shape.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:beacon_isolated_danger:shape", + "type": "combo", + "label": "Shape" +} diff --git a/data/presets/fields/seamark/beacon_lateral/category.json b/data/presets/fields/seamark/beacon_lateral/category.json new file mode 100644 index 0000000000..9974827dc9 --- /dev/null +++ b/data/presets/fields/seamark/beacon_lateral/category.json @@ -0,0 +1,15 @@ +{ + "key": "seamark:beacon_lateral:category", + "type": "combo", + "label": "Category", + "strings": { + "options": { + "port": "Port", + "starboard": "Starboard", + "waterway_left":"Waterway Left", + "waterway_right":"Waterway Right", + "danger_left":"Danger Left", + "danger_right":"Danger Right" + } + } +} diff --git a/data/presets/fields/seamark/beacon_lateral/colour.json b/data/presets/fields/seamark/beacon_lateral/colour.json new file mode 100644 index 0000000000..2af53b30ed --- /dev/null +++ b/data/presets/fields/seamark/beacon_lateral/colour.json @@ -0,0 +1,12 @@ +{ + "key": "seamark:beacon_lateral:colour", + "type": "combo", + "label": "Colour", + "strings": { + "options": { + "red": "Red", + "green": "Green", + "grey": "Grey" + } + } +} diff --git a/data/presets/fields/seamark/beacon_lateral/shape.json b/data/presets/fields/seamark/beacon_lateral/shape.json new file mode 100644 index 0000000000..1ee070cbca --- /dev/null +++ b/data/presets/fields/seamark/beacon_lateral/shape.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:beacon_lateral:shape", + "type": "combo", + "label": "Shape" +} diff --git a/data/presets/fields/seamark/beacon_lateral/system.json b/data/presets/fields/seamark/beacon_lateral/system.json new file mode 100644 index 0000000000..3b0046ac01 --- /dev/null +++ b/data/presets/fields/seamark/beacon_lateral/system.json @@ -0,0 +1,13 @@ +{ + "key": "seamark:beacon_lateral:system", + "type": "combo", + "label": "System", + "strings": { + "options": { + "iala-a": "IALA A", + "iala-b": "IALA B", + "cevni": "CEVNI", + "other": "Other" + } + } +} diff --git a/data/presets/fields/seamark/buoy_lateral/category.json b/data/presets/fields/seamark/buoy_lateral/category.json new file mode 100644 index 0000000000..f13a12cbe3 --- /dev/null +++ b/data/presets/fields/seamark/buoy_lateral/category.json @@ -0,0 +1,19 @@ +{ + "key": "seamark:buoy_lateral:category", + "type": "combo", + "label": "Category", + "strings": { + "options": { + "port": "Port", + "starboard": "Starboard", + "channel_left":"Channel Left", + "channel_right":"Channel Right", + "waterway_left":"Waterway Left", + "waterway_right":"Waterway Right", + "danger_left":"Danger Left", + "danger_right":"Danger Right", + "preferred_channel_port":"Preferred Channel Port", + "preferred_channel_starboard":"Preferred Channel Starboard" + } + } +} diff --git a/data/presets/fields/seamark/buoy_lateral/colour.json b/data/presets/fields/seamark/buoy_lateral/colour.json new file mode 100644 index 0000000000..abe96b0492 --- /dev/null +++ b/data/presets/fields/seamark/buoy_lateral/colour.json @@ -0,0 +1,17 @@ +{ + "key": "seamark:buoy_lateral:colour", + "type": "combo", + "label": "Colour", + "strings": { + "options": { + "red": "Red", + "green": "Green", + "red;white;red;white": "Red-White-Red-White", + "green;white;green;white":"Green-White-Green-White", + "red;green;red":"Red-Green-Red", + "green;red;green":"Green-Red-Green", + "white":"White", + "yellow":"Yellow" + } + } +} diff --git a/data/presets/fields/seamark/buoy_lateral/shape.json b/data/presets/fields/seamark/buoy_lateral/shape.json new file mode 100644 index 0000000000..c33ff92600 --- /dev/null +++ b/data/presets/fields/seamark/buoy_lateral/shape.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:buoy_lateral:shape", + "type": "combo", + "label": "Shape" +} diff --git a/data/presets/fields/seamark/buoy_lateral/system.json b/data/presets/fields/seamark/buoy_lateral/system.json new file mode 100644 index 0000000000..c99107c523 --- /dev/null +++ b/data/presets/fields/seamark/buoy_lateral/system.json @@ -0,0 +1,13 @@ +{ + "key": "seamark:buoy_lateral:system", + "type": "combo", + "label": "System", + "strings": { + "options": { + "iala-a": "IALA A", + "iala-b": "IALA B", + "cevni": "CEVNI", + "other": "Other" + } + } +} diff --git a/data/presets/fields/seamark/mooring/category.json b/data/presets/fields/seamark/mooring/category.json new file mode 100644 index 0000000000..b5ed220173 --- /dev/null +++ b/data/presets/fields/seamark/mooring/category.json @@ -0,0 +1,5 @@ +{ + "key": "seamark:mooring:category", + "type": "combo", + "label": "Category" +} diff --git a/data/presets/fields/seamark/type.json b/data/presets/fields/seamark/type.json new file mode 100644 index 0000000000..1ee2a64bd2 --- /dev/null +++ b/data/presets/fields/seamark/type.json @@ -0,0 +1,6 @@ +{ + "key": "seamark:type", + "type": "combo", + "universal": true, + "label": "Seamark" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 6b34e9e71e..b6f43cc056 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -9,6 +9,7 @@ "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "searchable": false, "name": "Power"}, "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"}, "roundabout": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "roundabout"}, "name": "Roundabout", "searchable": false}, + "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway"}, "address": {"fields": ["address"], "geometry": ["point", "vertex", "area"], "tags": {"addr:*": "*"}, "addTags": {}, "removeTags": {}, "reference": {"key": "addr"}, "name": "Address", "matchScore": 0.15}, "advertising/billboard": {"fields": ["direction", "lit"], "geometry": ["point", "vertex", "line"], "tags": {"advertising": "billboard"}, "name": "Billboard"}, @@ -747,6 +748,12 @@ "railway/tram": {"icon": "iD-railway-light-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail", "usage_rail", "voltage", "frequency"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"}, "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"}, "route/ferry": {"icon": "iD-ferry-line", "geometry": ["line"], "fields": ["name", "operator", "duration", "access"], "tags": {"route": "ferry"}, "name": "Ferry Route"}, + "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"}, + "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"}, + "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"}, + "seamark/buoy_lateral/green": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, + "seamark/buoy_lateral/red": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, + "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, "shop/fishmonger": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false}, "shop/furnace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false}, diff --git a/data/presets/presets/_seamark.json b/data/presets/presets/_seamark.json new file mode 100644 index 0000000000..0648bc8b91 --- /dev/null +++ b/data/presets/presets/_seamark.json @@ -0,0 +1,17 @@ +{ + "icon": "maki-harbor", + "fields": [ + "seamark/type" + ], + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "seamark:type": "*" + }, + "searchable": false, + "name": "Seamark" +} diff --git a/data/presets/presets/seamark/beacon_isolated_danger.json b/data/presets/presets/seamark/beacon_isolated_danger.json new file mode 100644 index 0000000000..6647a61f38 --- /dev/null +++ b/data/presets/presets/seamark/beacon_isolated_danger.json @@ -0,0 +1,20 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/beacon_isolated_danger/shape" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "beacon isolated danger", + "isolated danger beacon", + "iala" + ], + "tags": { + "seamark:type": "beacon_isolated_danger" + }, + "name": "Danger Beacon" +} diff --git a/data/presets/presets/seamark/beacon_lateral.json b/data/presets/presets/seamark/beacon_lateral.json new file mode 100644 index 0000000000..7a35e89ff2 --- /dev/null +++ b/data/presets/presets/seamark/beacon_lateral.json @@ -0,0 +1,26 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/beacon_lateral/colour", + "seamark/beacon_lateral/category", + "seamark/beacon_lateral/shape", + "seamark/beacon_lateral/system" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "lateral beacon", + "beacon lateral", + "cevni", + "channel marker", + "iala", + "lateral mark" + ], + "tags": { + "seamark:type": "beacon_lateral" + }, + "name": "Channel Beacon" +} diff --git a/data/presets/presets/seamark/buoy_lateral.json b/data/presets/presets/seamark/buoy_lateral.json new file mode 100644 index 0000000000..5121d4a723 --- /dev/null +++ b/data/presets/presets/seamark/buoy_lateral.json @@ -0,0 +1,26 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/buoy_lateral/colour", + "seamark/buoy_lateral/category", + "seamark/buoy_lateral/shape", + "seamark/buoy_lateral/system" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "lateral buoy", + "buoy lateral", + "cevni", + "channel marker", + "iala", + "lateral mark" + ], + "tags": { + "seamark:type": "buoy_lateral" + }, + "name": "Channel Buoy" +} diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json new file mode 100644 index 0000000000..11670c94d8 --- /dev/null +++ b/data/presets/presets/seamark/buoy_lateral/green.json @@ -0,0 +1,27 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/buoy_lateral/colour", + "seamark/buoy_lateral/category", + "seamark/buoy_lateral/shape", + "seamark/buoy_lateral/system" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "lateral buoy", + "buoy lateral", + "cevni", + "channel marker", + "iala", + "lateral mark" + ], + "tags": { + "seamark:type": "buoy_lateral", + "seamark:buoy_lateral:colour": "green" + }, + "name": "Green Buoy" +} diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json new file mode 100644 index 0000000000..73facf15ec --- /dev/null +++ b/data/presets/presets/seamark/buoy_lateral/red.json @@ -0,0 +1,27 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/buoy_lateral/colour", + "seamark/buoy_lateral/category", + "seamark/buoy_lateral/shape", + "seamark/buoy_lateral/system" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "lateral buoy", + "buoy lateral", + "cevni", + "channel marker", + "iala", + "lateral mark" + ], + "tags": { + "seamark:type": "buoy_lateral", + "seamark:buoy_lateral:colour": "red" + }, + "name": "Red Buoy" +} diff --git a/data/presets/presets/seamark/mooring.json b/data/presets/presets/seamark/mooring.json new file mode 100644 index 0000000000..c5d831f2cb --- /dev/null +++ b/data/presets/presets/seamark/mooring.json @@ -0,0 +1,21 @@ +{ + "fields": [ + "ref", + "operator", + "seamark/mooring/category" + ], + "geometry": [ + "point" + ], + "terms": [ + "dolphin", + "pile", + "bollard", + "buoy", + "post" + ], + "tags": { + "seamark:type": "mooring" + }, + "name": "Mooring" +} diff --git a/data/taginfo.json b/data/taginfo.json index a850ee93ae..2a2af69882 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -58,6 +58,12 @@ "description": "Roundabout", "object_types": ["node", "way"] }, + { + "key": "seamark:type", + "description": "Seamark", + "object_types": ["node", "way", "area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true" + }, { "key": "waterway", "description": "Waterway, Type", @@ -4833,6 +4839,42 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/ferry-line.svg?sanitize=true" }, + { + "key": "seamark:type", + "value": "beacon_isolated_danger", + "description": "Danger Beacon", + "object_types": ["node"] + }, + { + "key": "seamark:type", + "value": "beacon_lateral", + "description": "Channel Beacon", + "object_types": ["node"] + }, + { + "key": "seamark:type", + "value": "buoy_lateral", + "description": "Channel Buoy", + "object_types": ["node"] + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "green", + "description": "Green Buoy, Colour", + "object_types": ["node"] + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "red", + "description": "Red Buoy, Colour", + "object_types": ["node"] + }, + { + "key": "seamark:type", + "value": "mooring", + "description": "Mooring", + "object_types": ["node"] + }, { "key": "shop", "description": "Shop, Type", @@ -6942,6 +6984,175 @@ "description": "Hiking Difficulty" }, {"key": "sanitary_dump_station", "description": "Toilet Disposal"}, + {"key": "seamark:beacon_isolated_danger:shape", "description": "Shape"}, + { + "key": "seamark:beacon_lateral:category", + "value": "port", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:category", + "value": "starboard", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:category", + "value": "waterway_left", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:category", + "value": "waterway_right", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:category", + "value": "danger_left", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:category", + "value": "danger_right", + "description": "Category" + }, + { + "key": "seamark:beacon_lateral:colour", + "value": "red", + "description": "Colour" + }, + { + "key": "seamark:beacon_lateral:colour", + "value": "green", + "description": "Colour" + }, + { + "key": "seamark:beacon_lateral:colour", + "value": "grey", + "description": "Colour" + }, + {"key": "seamark:beacon_lateral:shape", "description": "Shape"}, + { + "key": "seamark:beacon_lateral:system", + "value": "iala-a", + "description": "System" + }, + { + "key": "seamark:beacon_lateral:system", + "value": "iala-b", + "description": "System" + }, + { + "key": "seamark:beacon_lateral:system", + "value": "cevni", + "description": "System" + }, + { + "key": "seamark:beacon_lateral:system", + "value": "other", + "description": "System" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "port", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "starboard", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "channel_left", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "channel_right", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "waterway_left", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "waterway_right", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "danger_left", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "danger_right", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "preferred_channel_port", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:category", + "value": "preferred_channel_starboard", + "description": "Category" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "red;white;red;white", + "description": "Colour" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "green;white;green;white", + "description": "Colour" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "red;green;red", + "description": "Colour" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "green;red;green", + "description": "Colour" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "white", + "description": "Colour" + }, + { + "key": "seamark:buoy_lateral:colour", + "value": "yellow", + "description": "Colour" + }, + {"key": "seamark:buoy_lateral:shape", "description": "Shape"}, + { + "key": "seamark:buoy_lateral:system", + "value": "iala-a", + "description": "System" + }, + { + "key": "seamark:buoy_lateral:system", + "value": "iala-b", + "description": "System" + }, + { + "key": "seamark:buoy_lateral:system", + "value": "cevni", + "description": "System" + }, + { + "key": "seamark:buoy_lateral:system", + "value": "other", + "description": "System" + }, + {"key": "seamark:mooring: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 94c6f0d970..91155c2b7a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2553,6 +2553,86 @@ "sanitary_dump_station": { "label": "Toilet Disposal" }, + "seamark/beacon_isolated_danger/shape": { + "label": "Shape" + }, + "seamark/beacon_lateral/category": { + "label": "Category", + "options": { + "port": "Port", + "starboard": "Starboard", + "waterway_left": "Waterway Left", + "waterway_right": "Waterway Right", + "danger_left": "Danger Left", + "danger_right": "Danger Right" + } + }, + "seamark/beacon_lateral/colour": { + "label": "Colour", + "options": { + "red": "Red", + "green": "Green", + "grey": "Grey" + } + }, + "seamark/beacon_lateral/shape": { + "label": "Shape" + }, + "seamark/beacon_lateral/system": { + "label": "System", + "options": { + "iala-a": "IALA A", + "iala-b": "IALA B", + "cevni": "CEVNI", + "other": "Other" + } + }, + "seamark/buoy_lateral/category": { + "label": "Category", + "options": { + "port": "Port", + "starboard": "Starboard", + "channel_left": "Channel Left", + "channel_right": "Channel Right", + "waterway_left": "Waterway Left", + "waterway_right": "Waterway Right", + "danger_left": "Danger Left", + "danger_right": "Danger Right", + "preferred_channel_port": "Preferred Channel Port", + "preferred_channel_starboard": "Preferred Channel Starboard" + } + }, + "seamark/buoy_lateral/colour": { + "label": "Colour", + "options": { + "red": "Red", + "green": "Green", + "red;white;red;white": "Red-White-Red-White", + "green;white;green;white": "Green-White-Green-White", + "red;green;red": "Red-Green-Red", + "green;red;green": "Green-Red-Green", + "white": "White", + "yellow": "Yellow" + } + }, + "seamark/buoy_lateral/shape": { + "label": "Shape" + }, + "seamark/buoy_lateral/system": { + "label": "System", + "options": { + "iala-a": "IALA A", + "iala-b": "IALA B", + "cevni": "CEVNI", + "other": "Other" + } + }, + "seamark/mooring/category": { + "label": "Category" + }, + "seamark/type": { + "label": "Seamark" + }, "seasonal": { "label": "Seasonal" }, @@ -2969,6 +3049,10 @@ "name": "Roundabout", "terms": "" }, + "seamark": { + "name": "Seamark", + "terms": "" + }, "waterway": { "name": "Waterway", "terms": "" @@ -5921,6 +6005,30 @@ "name": "Ferry Route", "terms": "" }, + "seamark/beacon_isolated_danger": { + "name": "Danger Beacon", + "terms": "beacon isolated danger,isolated danger beacon,iala" + }, + "seamark/beacon_lateral": { + "name": "Channel Beacon", + "terms": "lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark" + }, + "seamark/buoy_lateral": { + "name": "Channel Buoy", + "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark" + }, + "seamark/buoy_lateral/green": { + "name": "Green Buoy", + "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark" + }, + "seamark/buoy_lateral/red": { + "name": "Red Buoy", + "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark" + }, + "seamark/mooring": { + "name": "Mooring", + "terms": "dolphin,pile,bollard,buoy,post" + }, "shop": { "name": "Shop", "terms": ""