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

Adds the Underground Power Cable Preset (closes #5380)

Browse Source 
Adds the Utility Features preset category for line geometry
Adds terms to the Pipeline preset
This commit is contained in:
Quincy Morgan
2018-10-07 11:05:31 -07:00
parent 6fca79fc23
commit 72842ff0f5
10 changed files with 78 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+7
View File
@@ -25,6 +25,8 @@ en:
name: Road Features
category-route:
name: Route Features
category-utility:
name: Utility Features
category-water-area:
name: Water Features
category-water-line:
@@ -4603,6 +4605,7 @@ en:
man_made/pipeline:
# man_made=pipeline
name: Pipeline
# 'terms: oil,natural gas,water,sewer,sewage'
terms: '<translate with synonyms or related terms for ''Pipeline'', separated by commas>'
man_made/pumping_station:
# man_made=pumping_station
@@ -5170,6 +5173,10 @@ en:
power:
# power=*
name: Power
power/cable/underground:
# 'power=cable, location=underground'
name: Underground Power Cable
terms: '<translate with synonyms or related terms for ''Underground Power Cable'', separated by commas>'
power/generator:
# power=generator
name: Power Generator
data/presets/categories.json
+11
View File
@@ -186,6 +186,17 @@
"type/route"
]
},
"category-utility": {
"icon": "iD-category-utility",
"geometry": "line",
"name": "Utility Features",
"members": [
"power/line",
"power/minor_line",
"man_made/pipeline",
"power/cable/underground"
]
},
"category-water-area": {
"icon": "maki-water",
"geometry": "area",
data/presets/categories/utility.json
+11
View File
@@ -0,0 +1,11 @@
{
"icon": "iD-category-utility",
"geometry": "line",
"name": "Utility Features",
"members": [
"power/line",
"power/minor_line",
"man_made/pipeline",
"power/cable/underground"
]
}
data/presets/defaults.json
+1 -1
View File
@@ -19,7 +19,7 @@
"category-water-line",
"category-barrier",
"category-natural-line",
"power/line",
"category-utility",
"line"
],
"point": [
data/presets/presets.json
+2 -1
View File
@@ -571,7 +571,7 @@
"man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
"man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
"man_made/pier": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
"man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
"man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
"man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
"man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
"man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
@@ -697,6 +697,7 @@
"playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"},
"point": {"fields": ["name"], "geometry": ["point"], "tags": {}, "name": "Point", "matchScore": 0.1},
"power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false},
"power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "name": "Underground Power Cable"},
"power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
"power/generator/source_nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
"power/generator/source_wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "height", "ref"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
data/presets/presets/man_made/pipeline.json
+7
View File
@@ -9,6 +9,13 @@
"geometry": [
"line"
],
"terms": [
"oil",
"natural gas",
"water",
"sewer",
"sewage"
],
"tags": {
"man_made": "pipeline"
},
data/presets/presets/power/cable/underground.json
+17
View File
@@ -0,0 +1,17 @@
{
"fields": [
"name",
"operator",
"voltage",
"ref",
"layer"
],
"geometry": [
"line"
],
"tags": {
"power": "cable",
"location": "underground"
},
"name": "Underground Power Cable"
}
data/taginfo.json
+6
View File
@@ -4669,6 +4669,12 @@
"object_types": ["node", "area"],
"icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/power.svg?sanitize=true"
},
{
"key": "location",
"value": "underground",
"description": "Underground Power Cable",
"object_types": ["way"]
},
{
"key": "power",
"value": "generator",
dist/locales/en.json
Vendored
+8 -1
View File
@@ -1455,6 +1455,9 @@
"category-route": {
"name": "Route Features"
},
"category-utility": {
"name": "Utility Features"
},
"category-water-area": {
"name": "Water Features"
},
@@ -5446,7 +5449,7 @@
},
"man_made/pipeline": {
"name": "Pipeline",
"terms": ""
"terms": "oil,natural gas,water,sewer,sewage"
},
"man_made/pumping_station": {
"name": "Pumping Station",
@@ -5948,6 +5951,10 @@
"name": "Substation",
"terms": ""
},
"power/cable/underground": {
"name": "Underground Power Cable",
"terms": ""
},
"power/generator": {
"name": "Power Generator",
"terms": "hydro,solar,turbine,wind"
svg/iD-sprite/presets/category-utility.svg
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="60" height="60" viewBox="0 0 60 60">
<svg y="7">
<path d="M20,10 L20,11 L22,11 L22,10 L20,10 z M24,10 L24,11 L26,11 L26,10 L24,10 z M34,10 L34,11 L36,11 L36,10 L34,10 z M38,10 L38,11 L40,11 L40,10 L38,10 z M20.312,15 C19.647,18.533 17.267,20.5 15,20.5 L14,20.5 L14,21.5 L15,21.5 C16.042,21.5 17.082,21.196 18,20.594 L18,21.5 L19,21.5 C21.879,21.5 24.615,19.022 25.312,15 L24.312,15 C23.647,18.533 21.267,20.5 19,20.5 L18.125,20.5 C19.686,19.42 20.885,17.509 21.312,15 L20.312,15 z M34.688,15 C35.385,19.022 38.121,21.5 41,21.5 L42,21.5 L42,20.594 C42.918,21.196 43.958,21.5 45,21.5 L46,21.5 L46,20.5 L45,20.5 C42.733,20.5 40.353,18.533 39.688,15 L38.688,15 C39.115,17.509 40.314,19.42 41.875,20.5 L41,20.5 C38.733,20.5 36.353,18.533 35.688,15 L34.688,15 z" fill="#989898"/>
<path d="M28,10 L28,12 L19,12 L19,14 L28,14 L28,36 L32,36 L32,14 L41,14 L41,12 L32,12 L32,10 L28,10 z" fill="#989898"/>
</svg>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB