Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds basic seamark presets #5297

Merged
merged 1 commit into from
Sep 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 142 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -5128,6 +5237,39 @@ en:
# route=ferry
name: Ferry Route
terms: '<translate with synonyms or related terms for ''Ferry Route'', separated by commas>'
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: '<translate with synonyms or related terms for ''Danger Beacon'', separated by commas>'
seamark/beacon_lateral:
# 'seamark:type=beacon_lateral'
name: Channel Beacon
# 'terms: lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark'
terms: '<translate with synonyms or related terms for ''Channel Beacon'', separated by commas>'
seamark/buoy_lateral:
# 'seamark:type=buoy_lateral'
name: Channel Buoy
# 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark'
terms: '<translate with synonyms or related terms for ''Channel Buoy'', separated by commas>'
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: '<translate with synonyms or related terms for ''Green Buoy'', separated by commas>'
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: '<translate with synonyms or related terms for ''Red Buoy'', separated by commas>'
seamark/mooring:
# 'seamark:type=mooring'
name: Mooring
# 'terms: dolphin,pile,bollard,buoy,post'
terms: '<translate with synonyms or related terms for ''Mooring'', separated by commas>'
shop:
# shop=*
name: Shop
Expand Down
11 changes: 11 additions & 0 deletions data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}},
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/seamark/beacon_isolated_danger/shape.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "seamark:beacon_isolated_danger:shape",
"type": "combo",
"label": "Shape"
}
15 changes: 15 additions & 0 deletions data/presets/fields/seamark/beacon_lateral/category.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
12 changes: 12 additions & 0 deletions data/presets/fields/seamark/beacon_lateral/colour.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"key": "seamark:beacon_lateral:colour",
"type": "combo",
"label": "Colour",
"strings": {
"options": {
"red": "Red",
"green": "Green",
"grey": "Grey"
}
}
}
5 changes: 5 additions & 0 deletions data/presets/fields/seamark/beacon_lateral/shape.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "seamark:beacon_lateral:shape",
"type": "combo",
"label": "Shape"
}
13 changes: 13 additions & 0 deletions data/presets/fields/seamark/beacon_lateral/system.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
19 changes: 19 additions & 0 deletions data/presets/fields/seamark/buoy_lateral/category.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
17 changes: 17 additions & 0 deletions data/presets/fields/seamark/buoy_lateral/colour.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
5 changes: 5 additions & 0 deletions data/presets/fields/seamark/buoy_lateral/shape.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "seamark:buoy_lateral:shape",
"type": "combo",
"label": "Shape"
}
13 changes: 13 additions & 0 deletions data/presets/fields/seamark/buoy_lateral/system.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
5 changes: 5 additions & 0 deletions data/presets/fields/seamark/mooring/category.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "seamark:mooring:category",
"type": "combo",
"label": "Category"
}
6 changes: 6 additions & 0 deletions data/presets/fields/seamark/type.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"key": "seamark:type",
"type": "combo",
"universal": true,
"label": "Seamark"
}
7 changes: 7 additions & 0 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down Expand Up @@ -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},
Expand Down
17 changes: 17 additions & 0 deletions data/presets/presets/_seamark.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"icon": "maki-harbor",
"fields": [
"seamark/type"
],
"geometry": [
"point",
"vertex",
"line",
"area"
],
"tags": {
"seamark:type": "*"
},
"searchable": false,
"name": "Seamark"
}
20 changes: 20 additions & 0 deletions data/presets/presets/seamark/beacon_isolated_danger.json
Original file line number Diff line number Diff line change
@@ -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"
}
26 changes: 26 additions & 0 deletions data/presets/presets/seamark/beacon_lateral.json
Original file line number Diff line number Diff line change
@@ -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"
}
Loading