CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Marker, Utility Marker, and Power Marker presets (close #6978)

Browse Source 
Deprecate power=marker
This commit is contained in:
Quincy Morgan
2019-12-03 15:53:06 -05:00
parent aa0a4400ad
commit 6e28e704cf
10 changed files with 138 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/deprecated.json
+4
View File
@@ -769,6 +769,10 @@
"old": {"power": "line", "location": "underground"},
"replace": {"power": "cable", "location": "underground"}
},
{
"old": {"power": "marker"},
"replace": {"marker": "*", "utility": "power"}
},
{
"old": {"power": "sub_station"},
"replace": {"power": "substation"}
data/presets.yaml
+18
View File
@@ -1243,6 +1243,9 @@ en:
map_type:
# map_type=*
label: Type
marker:
# marker=*
label: Type
material:
# material=*
label: Material
@@ -6166,6 +6169,21 @@ en:
name: Factory
# 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery'
terms: '<translate with synonyms or related terms for ''Factory'', separated by commas>'
marker:
# marker=*
name: Marker
# 'terms: identifier,marking,plate,pole,post,sign'
terms: '<translate with synonyms or related terms for ''Marker'', separated by commas>'
marker/utility:
# 'marker=*, utility=*'
name: Utility Marker
# 'terms: gas line marker,identifier,marking,oil marker,pipline marker,plate,pole,post,sign'
terms: '<translate with synonyms or related terms for ''Utility Marker'', separated by commas>'
marker/utility/power:
# 'marker=*, utility=power'
name: Power Marker
# 'terms: electric line,identifier,marking,plate,pole,post,power cable,power line,sign'
terms: '<translate with synonyms or related terms for ''Power Marker'', separated by commas>'
military/bunker:
# military=bunker
name: Military Bunker
data/presets/fields.json
+1
View File
@@ -230,6 +230,7 @@
"manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
"map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
"map_type": {"key": "map_type", "type": "typeCombo", "label": "Type"},
"marker": {"key": "marker", "type": "typeCombo", "label": "Type"},
"material": {"key": "material", "type": "combo", "label": "Material"},
"max_age": {"key": "max_age", "type": "number", "minValue": 0, "label": "Maximum Age", "terms": ["upper age limit"]},
"maxheight": {"key": "maxheight", "type": "combo", "label": "Max Height", "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\"", "snake_case": false},
data/presets/fields/marker.json
+5
View File
@@ -0,0 +1,5 @@
{
"key": "marker",
"type": "typeCombo",
"label": "Type"
}
data/presets/presets.json
+3
View File
@@ -780,6 +780,9 @@
"man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
"man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
"man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
"marker": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "utility_semi", "inscription", "colour"], "moreFields": ["height", "location", "manufacturer", "material"], "geometry": ["point"], "terms": ["identifier", "marking", "plate", "pole", "post", "sign"], "tags": {"marker": "*"}, "name": "Marker"},
"marker/utility": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["gas line marker", "identifier", "marking", "oil marker", "pipline marker", "plate", "pole", "post", "sign"], "tags": {"marker": "*", "utility": "*"}, "name": "Utility Marker"},
"marker/utility/power": {"icon": "temaki-silo", "fields": ["ref", "operator", "marker", "{marker}"], "geometry": ["point"], "terms": ["electric line", "identifier", "marking", "plate", "pole", "post", "power cable", "power line", "sign"], "tags": {"marker": "*", "utility": "power"}, "name": "Power Marker"},
"military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
"military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"},
"military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"},
data/presets/presets/marker.json
+32
View File
@@ -0,0 +1,32 @@
{
"icon": "temaki-silo",
"fields": [
"ref",
"operator",
"marker",
"utility_semi",
"inscription",
"colour"
],
"moreFields": [
"height",
"location",
"manufacturer",
"material"
],
"geometry": [
"point"
],
"terms": [
"identifier",
"marking",
"plate",
"pole",
"post",
"sign"
],
"tags": {
"marker": "*"
},
"name": "Marker"
}
data/presets/presets/marker/utility.json
+28
View File
@@ -0,0 +1,28 @@
{
"icon": "temaki-silo",
"fields": [
"ref",
"operator",
"marker",
"{marker}"
],
"geometry": [
"point"
],
"terms": [
"gas line marker",
"identifier",
"marking",
"oil marker",
"pipline marker",
"plate",
"pole",
"post",
"sign"
],
"tags": {
"marker": "*",
"utility": "*"
},
"name": "Utility Marker"
}
data/presets/presets/marker/utility/power.json
+28
View File
@@ -0,0 +1,28 @@
{
"icon": "temaki-silo",
"fields": [
"ref",
"operator",
"marker",
"{marker}"
],
"geometry": [
"point"
],
"terms": [
"electric line",
"identifier",
"marking",
"plate",
"pole",
"post",
"power cable",
"power line",
"sign"
],
"tags": {
"marker": "*",
"utility": "power"
},
"name": "Power Marker"
}
data/taginfo.json
+4 -1
View File
@@ -755,6 +755,9 @@
{"key": "man_made", "value": "watermill", "description": "🄿 Watermill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watermill-15.svg"},
{"key": "man_made", "value": "windmill", "description": "🄿 Windmill", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/windmill-15.svg"},
{"key": "man_made", "value": "works", "description": "🄿 Factory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"},
{"key": "marker", "description": "🄿 Marker, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
{"key": "utility", "description": "🄿 Utility Marker, 🄵 Utilities", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
{"key": "utility", "value": "power", "description": "🄿 Power Marker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
{"key": "military", "value": "bunker", "description": "🄿 Military Bunker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"},
{"key": "military", "value": "checkpoint", "description": "🄿 Checkpoint", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
{"key": "military", "value": "nuclear_explosion_site", "description": "🄿 Nuclear Explosion Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"},
@@ -1851,7 +1854,6 @@
{"key": "usage", "value": "military", "description": "🄵 Usage Type"},
{"key": "usage", "value": "test", "description": "🄵 Usage Type"},
{"key": "usage", "value": "tourism", "description": "🄵 Usage Type"},
{"key": "utility", "description": "🄵 Utilities"},
{"key": "valve", "description": "🄵 Type"},
{"key": "vending", "description": "🄵 Types of Goods"},
{"key": "video", "description": "🄵 Video Calls"},
@@ -2058,6 +2060,7 @@
{"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"},
{"key": "postcode", "description": "🄳 ➜ addr:postcode=*"},
{"key": "power", "value": "busbar", "description": "🄳 ➜ power=line + line=busbar"},
{"key": "power", "value": "marker", "description": "🄳 ➜ marker=* + utility=power"},
{"key": "power", "value": "underground_cable", "description": "🄳 ➜ power=cable + location=underground"},
{"key": "power_source", "description": "🄳 ➜ generator:source=*"},
{"key": "power_rating", "description": "🄳 ➜ generator:output=*"},
dist/locales/en.json
Vendored
+15
View File
@@ -3556,6 +3556,9 @@
"map_type": {
"label": "Type"
},
"marker": {
"label": "Type"
},
"material": {
"label": "Material",
"terms": ""
@@ -7749,6 +7752,18 @@
"name": "Factory",
"terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"
},
"marker": {
"name": "Marker",
"terms": "identifier,marking,plate,pole,post,sign"
},
"marker/utility": {
"name": "Utility Marker",
"terms": "gas line marker,identifier,marking,oil marker,pipline marker,plate,pole,post,sign"
},
"marker/utility/power": {
"name": "Power Marker",
"terms": "electric line,identifier,marking,plate,pole,post,power cable,power line,sign"
},
"military/bunker": {
"name": "Military Bunker",
"terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"