Skip to content

Commit

Permalink
Add preset for military=trench (close #6474)
Browse files Browse the repository at this point in the history
  • Loading branch information
quincylvania committed Jun 2, 2019
1 parent 89cc4cd commit bd76f1f
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 0 deletions.
8 changes: 8 additions & 0 deletions data/presets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2143,6 +2143,9 @@ en:
trees:
# trees=*
label: Trees
trench:
# trench=*
label: Type
trolley_wire:
# trolley_wire=*
label: Overhead Trolley Wires
Expand Down Expand Up @@ -5581,6 +5584,11 @@ en:
name: Telecom Manhole
# 'terms: cover,phone,hole,telecom,telephone,bt'
terms: '<translate with synonyms or related terms for ''Telecom Manhole'', separated by commas>'
military/trench:
# military=trench
name: Military Trench
# 'terms: dugout,firestep,fox hole,infantry trench,war trench'
terms: '<translate with synonyms or related terms for ''Military Trench'', separated by commas>'
natural:
# natural=*
name: Natural
Expand Down
1 change: 1 addition & 0 deletions data/presets/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
"trail_visibility": {"key": "trail_visibility", "type": "combo", "label": "Trail Visibility", "placeholder": "Excellent, Good, Bad...", "strings": {"options": {"excellent": "Excellent: unambiguous path or markers everywhere", "good": "Good: markers visible, sometimes require searching", "intermediate": "Intermediate: few markers, path mostly visible", "bad": "Bad: no markers, path sometimes invisible/pathless", "horrible": "Horrible: often pathless, some orientation skills required", "no": "No: pathless, excellent orientation skills required"}}},
"transformer": {"key": "transformer", "type": "combo", "label": "Type", "strings": {"options": {"distribution": "Distribution", "generator": "Generator", "converter": "Converter", "traction": "Traction", "auto": "Autotransformer", "phase_angle_regulator": "Phase Angle Regulator", "auxiliary": "Auxiliary", "yes": "Unknown"}}},
"trees": {"key": "trees", "type": "semiCombo", "label": "Trees"},
"trench": {"key": "trench", "type": "combo", "label": "Type"},
"trolley_wire": {"key": "trolley_wire", "type": "check", "label": "Overhead Trolley Wires"},
"tunnel": {"key": "tunnel", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
"usage_rail": {"key": "usage", "type": "combo", "label": "Usage Type", "strings": {"options": {"main": "Main", "branch": "Branch", "industrial": "Industrial", "military": "Military", "test": "Test", "tourism": "Tourism"}}},
Expand Down
5 changes: 5 additions & 0 deletions data/presets/fields/trench.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "trench",
"type": "combo",
"label": "Type"
}
1 change: 1 addition & 0 deletions data/presets/presets.json
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@
"manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
"manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
"manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
"military/trench": {"icon": "temaki-military", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"},
"natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"},
"natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
"natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
Expand Down
22 changes: 22 additions & 0 deletions data/presets/presets/military/trench.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"icon": "temaki-military",
"fields": [
"name",
"trench"
],
"geometry": [
"point",
"line"
],
"tags": {
"military": "trench"
},
"terms": [
"dugout",
"firestep",
"fox hole",
"infantry trench",
"war trench"
],
"name": "Military Trench"
}
2 changes: 2 additions & 0 deletions data/taginfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@
{"key": "manhole", "description": "🄿 Manhole, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"},
{"key": "manhole", "value": "drain", "description": "🄿 Storm Drain", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
{"key": "manhole", "value": "telecom", "description": "🄿 Telecom Manhole", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/circle-stroked-15.svg?sanitize=true"},
{"key": "military", "value": "trench", "description": "🄿 Military Trench", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/military.svg?sanitize=true"},
{"key": "natural", "value": "bare_rock", "description": "🄿 Bare Rock", "object_types": ["area"]},
{"key": "natural", "value": "bay", "description": "🄿 Bay", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"},
{"key": "natural", "value": "beach", "description": "🄿 Beach", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/beach.svg?sanitize=true"},
Expand Down Expand Up @@ -1713,6 +1714,7 @@
{"key": "transformer", "value": "auxiliary", "description": "🄵 Type"},
{"key": "transformer", "value": "yes", "description": "🄵 Type"},
{"key": "trees", "description": "🄵 Trees"},
{"key": "trench", "description": "🄵 Type"},
{"key": "trolley_wire", "description": "🄵 Overhead Trolley Wires"},
{"key": "usage", "value": "main", "description": "🄵 Usage Type"},
{"key": "usage", "value": "branch", "description": "🄵 Usage Type"},
Expand Down
7 changes: 7 additions & 0 deletions dist/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4185,6 +4185,9 @@
"trees": {
"label": "Trees"
},
"trench": {
"label": "Type"
},
"trolley_wire": {
"label": "Overhead Trolley Wires"
},
Expand Down Expand Up @@ -7235,6 +7238,10 @@
"name": "Telecom Manhole",
"terms": "cover,phone,hole,telecom,telephone,bt"
},
"military/trench": {
"name": "Military Trench",
"terms": "dugout,firestep,fox hole,infantry trench,war trench"
},
"natural/bare_rock": {
"name": "Bare Rock",
"terms": "rock"
Expand Down

0 comments on commit bd76f1f

Please sign in to comment.