Add field for line_management and deprecate old values (close #7726)

This commit is contained in:
Quincy Morgan
2020-06-23 15:36:44 -04:00
parent 13f807043c
commit 0d456102f8
9 changed files with 72 additions and 2 deletions
+44
View File
@@ -1002,6 +1002,26 @@
"old": {"pole": "transition"},
"replace": {"location:transition": "yes"}
},
{
"old": {"pole:type": "branch", "branch:type": "cross"},
"replace": {"line_management": "cross"}
},
{
"old": {"pole:type": "branch", "branch:type": "loop"},
"replace": {"line_management": "split"}
},
{
"old": {"pole:type": "branch", "branch:type": "split"},
"replace": {"line_management": "split"}
},
{
"old": {"pole:type": "branch", "branch:type": "tap"},
"replace": {"line_management": "branch"}
},
{
"old": {"pole:type": "termination"},
"replace": {"line_management": "termination"}
},
{
"old": {"postcode": "*"},
"replace": {"addr:postcode": "$1"}
@@ -1378,10 +1398,34 @@
"old": {"tower:type": "anchor"},
"replace": {"line_attachment": "anchor"}
},
{
"old": {"tower:type": "branch", "branch:type": "cross"},
"replace": {"line_management": "cross"}
},
{
"old": {"tower:type": "branch", "branch:type": "loop"},
"replace": {"line_management": "split"}
},
{
"old": {"tower:type": "branch", "branch:type": "split"},
"replace": {"line_management": "split"}
},
{
"old": {"tower:type": "branch", "branch:type": "tap"},
"replace": {"line_management": "branch"}
},
{
"old": {"tower:type": "suspension"},
"replace": {"line_attachment": "suspension"}
},
{
"old": {"tower:type": "termination"},
"replace": {"line_management": "termination"}
},
{
"old": {"tower:type": "transposing"},
"replace": {"line_management": "transpose"}
},
{
"old": {"townhall:village": "yes"},
"replace": {"amenity": "townhall", "townhall:type": "village"}
+5
View File
@@ -1339,6 +1339,11 @@ en:
line_attachment:
# line_attachment=*
label: Line Attachment
line_management:
# line_management=*
label: Line Management
# 'terms: branching,line topology,termination'
terms: '[translate with synonyms or related terms for ''Line Management'', separated by commas]'
lit:
# lit=*
label: Lit
+1
View File
@@ -249,6 +249,7 @@
"level": {"key": "level", "type": "combo", "label": "Level", "terms": ["building floor", "deck", "storey", "story"], "prerequisiteTag": {"keyNot": "building"}},
"liaison": {"key": "liaison", "type": "combo", "label": "Type"},
"line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"},
"line_management": {"key": "line_management", "type": "combo", "label": "Line Management", "terms": ["branching", "line topology", "termination"]},
"lit": {"key": "lit", "type": "check", "label": "Lit", "terms": ["lamp", "lighting"]},
"location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
"location": {"key": "location", "type": "combo", "label": "Location"},
+10
View File
@@ -0,0 +1,10 @@
{
"key": "line_management",
"type": "combo",
"label": "Line Management",
"terms": [
"branching",
"line topology",
"termination"
]
}
+2 -2
View File
@@ -963,10 +963,10 @@
"power/plant/source/nuclear": {"icon": "temaki-radiation", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "nuclear"}, "addTags": {"power": "plant", "landuse": "industrial", "plant:source": "nuclear", "plant:method": "fission", "plant:output:electricity": "*"}, "reference": {"key": "plant:source", "value": "nuclear"}, "terms": ["atomic", "fission", "power station", "nuclear reactor"], "name": "Nuclear Power Plant"},
"power/plant/source/solar": {"icon": "fas-solar-panel", "fields": ["{power/plant}"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "solar"}, "addTags": {"power": "plant", "plant:source": "solar", "plant:method": "photovoltaic", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "*", "plant:source": "solar", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:method", "value": "photovoltaic"}, "terms": ["photovoltaic power station", "solar panels", "solar park", "utility-scale solar"], "name": "Solar Farm"},
"power/plant/source/wind": {"icon": "temaki-wind_turbine", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "moreFields": ["{power/plant}"], "geometry": ["area"], "tags": {"power": "plant", "plant:source": "wind"}, "addTags": {"power": "plant", "plant:source": "wind", "plant:method": "wind_turbine", "plant:output:electricity": "*"}, "removeTags": {"power": "plant", "plant:method": "*", "plant:source": "wind", "plant:output:electricity": "*", "landuse": "industrial"}, "reference": {"key": "plant:source", "value": "wind"}, "terms": ["offshore wind", "wind park", "wind power plant", "wind power station", "wind turbines", "windmills"], "name": "Wind Farm"},
"power/pole": {"icon": "temaki-power_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
"power/pole": {"icon": "temaki-power_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["line_management", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
"power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "moreFields": ["gnis/feature_id"], "geometry": ["area", "point"], "tags": {"power": "substation"}, "name": "Substation"},
"power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
"power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
"power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["line_management", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
"power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"},
"public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
"public_transport/platform": {"icon": "temaki-board_transit", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
+1
View File
@@ -8,6 +8,7 @@
"line_attachment"
],
"moreFields": [
"line_management",
"manufacturer"
],
"geometry": [
+1
View File
@@ -9,6 +9,7 @@
"line_attachment"
],
"moreFields": [
"line_management",
"manufacturer"
],
"geometry": [
+4
View File
@@ -1621,6 +1621,7 @@
{"key": "level", "description": "🄵 Levels, 🄵 Level"},
{"key": "liaison", "description": "🄵 Type"},
{"key": "line_attachment", "description": "🄵 Line Attachment"},
{"key": "line_management", "description": "🄵 Line Management"},
{"key": "lit", "description": "🄵 Lit"},
{"key": "location", "value": "outdoor", "description": "🄵 Location"},
{"key": "location", "value": "indoor", "description": "🄵 Location"},
@@ -2226,6 +2227,7 @@
{"key": "parking", "value": "street", "description": "🄳 ➜ parking=lane"},
{"key": "place_name", "description": "🄳 ➜ name=*"},
{"key": "pole", "value": "transition", "description": "🄳 ➜ location:transition=yes"},
{"key": "pole:type", "value": "termination", "description": "🄳 ➜ line_management=termination"},
{"key": "postcode", "description": "🄳 ➜ addr:postcode=*"},
{"key": "power", "value": "busbar", "description": "🄳 ➜ power=line + line=busbar"},
{"key": "power", "value": "marker", "description": "🄳 ➜ marker=* + utility=power"},
@@ -2310,6 +2312,8 @@
{"key": "tower:type", "value": "power", "description": "🄳 ➜ power=tower"},
{"key": "tower:type", "value": "anchor", "description": "🄳 ➜ line_attachment=anchor"},
{"key": "tower:type", "value": "suspension", "description": "🄳 ➜ line_attachment=suspension"},
{"key": "tower:type", "value": "termination", "description": "🄳 ➜ line_management=termination"},
{"key": "tower:type", "value": "transposing", "description": "🄳 ➜ line_management=transpose"},
{"key": "townhall:village", "value": "yes", "description": "🄳 ➜ amenity=townhall + townhall:type=village"},
{"key": "tunnel", "value": "1", "description": "🄳 ➜ tunnel=yes"},
{"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"},
+4
View File
@@ -3858,6 +3858,10 @@
"line_attachment": {
"label": "Line Attachment"
},
"line_management": {
"label": "Line Management",
"terms": "branching,line topology,termination"
},
"lit": {
"label": "Lit",
"terms": "lamp,lighting"