From 7bf1dab1e08d79551b1396eec25809526401633a Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 1 May 2013 13:32:26 -0400 Subject: [PATCH] add more man_made presets --- data/presets.yaml | 19 +++++++ data/presets/fields.json | 10 ++++ data/presets/fields/location.json | 5 ++ data/presets/fields/towertype.json | 5 ++ data/presets/presets.json | 55 +++++++++++++++++++ data/presets/presets/man_made/breakwater.json | 10 ++++ data/presets/presets/man_made/cutline.json | 9 +++ data/presets/presets/man_made/pipeline.json | 13 +++++ data/presets/presets/man_made/tower.json | 13 +++++ data/presets/presets/man_made/water_well.json | 10 ++++ dist/locales/en.json | 26 +++++++++ 11 files changed, 175 insertions(+) create mode 100644 data/presets/fields/location.json create mode 100644 data/presets/fields/towertype.json create mode 100644 data/presets/presets/man_made/breakwater.json create mode 100644 data/presets/presets/man_made/cutline.json create mode 100644 data/presets/presets/man_made/pipeline.json create mode 100644 data/presets/presets/man_made/tower.json create mode 100644 data/presets/presets/man_made/water_well.json diff --git a/data/presets.yaml b/data/presets.yaml index 76ff217b1..0ff7e0038 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -126,6 +126,8 @@ en: label: Type levels: label: Levels + location: + label: Location man_made: label: Type maxspeed: @@ -197,6 +199,8 @@ en: label: Surface tourism: label: Type + towertype: + label: Tower type tracktype: label: Type trail_visibility: @@ -660,21 +664,36 @@ en: man_made: name: Man Made terms: "" + man_made/breakwater: + name: Breakwater + terms: "" + man_made/cutline: + name: Cut line + terms: "" man_made/lighthouse: name: Lighthouse terms: "" man_made/pier: name: Pier terms: "" + man_made/pipeline: + name: Pipeline + terms: "" man_made/survey_point: name: Survey Point terms: "" + man_made/tower: + name: Tower + terms: "" man_made/wastewater_plant: name: Wastewater Plant terms: "sewage works,sewage treatment plant,water treatment plant,reclamation plant" man_made/water_tower: name: Water Tower terms: "" + man_made/water_well: + name: Water well + terms: "" man_made/water_works: name: Water Works terms: "" diff --git a/data/presets/fields.json b/data/presets/fields.json index 65a27c08d..0b2784688 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -291,6 +291,11 @@ "type": "number", "label": "Levels" }, + "location": { + "key": "location", + "type": "combo", + "label": "Location" + }, "man_made": { "key": "man_made", "type": "combo", @@ -492,6 +497,11 @@ "type": "combo", "label": "Type" }, + "towertype": { + "key": "tower:type", + "type": "combo", + "label": "Tower type" + }, "tracktype": { "key": "tracktype", "type": "combo", diff --git a/data/presets/fields/location.json b/data/presets/fields/location.json new file mode 100644 index 000000000..c4d037184 --- /dev/null +++ b/data/presets/fields/location.json @@ -0,0 +1,5 @@ +{ + "key": "location", + "type": "combo", + "label": "Location" +} diff --git a/data/presets/fields/towertype.json b/data/presets/fields/towertype.json new file mode 100644 index 000000000..08bbc5e9f --- /dev/null +++ b/data/presets/fields/towertype.json @@ -0,0 +1,5 @@ +{ + "key": "tower:type", + "type": "combo", + "label": "Tower type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 9aba80573..97b2041dc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -2467,6 +2467,25 @@ }, "name": "Man Made" }, + "man_made/breakwater": { + "geometry": [ + "line", + "area" + ], + "tags": { + "man_made": "breakwater" + }, + "name": "Breakwater" + }, + "man_made/cutline": { + "geometry": [ + "line" + ], + "tags": { + "man_made": "cutline" + }, + "name": "Cut line" + }, "man_made/lighthouse": { "geometry": [ "point", @@ -2487,6 +2506,19 @@ }, "name": "Pier" }, + "man_made/pipeline": { + "geometry": [ + "line" + ], + "tags": { + "man_made": "pipeline" + }, + "fields": [ + "location", + "operator" + ], + "name": "Pipeline" + }, "man_made/survey_point": { "icon": "monument", "geometry": [ @@ -2501,6 +2533,19 @@ ], "name": "Survey Point" }, + "man_made/tower": { + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "tower" + }, + "fields": [ + "towertype" + ], + "name": "Tower" + }, "man_made/wastewater_plant": { "icon": "water", "geometry": [ @@ -2529,6 +2574,16 @@ }, "name": "Water Tower" }, + "man_made/water_well": { + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "water_well" + }, + "name": "Water well" + }, "man_made/water_works": { "icon": "water", "geometry": [ diff --git a/data/presets/presets/man_made/breakwater.json b/data/presets/presets/man_made/breakwater.json new file mode 100644 index 000000000..e95ab46db --- /dev/null +++ b/data/presets/presets/man_made/breakwater.json @@ -0,0 +1,10 @@ +{ + "geometry": [ + "line", + "area" + ], + "tags": { + "man_made": "breakwater" + }, + "name": "Breakwater" +} diff --git a/data/presets/presets/man_made/cutline.json b/data/presets/presets/man_made/cutline.json new file mode 100644 index 000000000..79601ba21 --- /dev/null +++ b/data/presets/presets/man_made/cutline.json @@ -0,0 +1,9 @@ +{ + "geometry": [ + "line" + ], + "tags": { + "man_made": "cutline" + }, + "name": "Cut line" +} diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json new file mode 100644 index 000000000..c5b855f8d --- /dev/null +++ b/data/presets/presets/man_made/pipeline.json @@ -0,0 +1,13 @@ +{ + "geometry": [ + "line" + ], + "tags": { + "man_made": "pipeline" + }, + "fields": [ + "location", + "operator" + ], + "name": "Pipeline" +} diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json new file mode 100644 index 000000000..ccf2ba81f --- /dev/null +++ b/data/presets/presets/man_made/tower.json @@ -0,0 +1,13 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "tower" + }, + "fields": [ + "towertype" + ], + "name": "Tower" +} diff --git a/data/presets/presets/man_made/water_well.json b/data/presets/presets/man_made/water_well.json new file mode 100644 index 000000000..4627743a0 --- /dev/null +++ b/data/presets/presets/man_made/water_well.json @@ -0,0 +1,10 @@ +{ + "geometry": [ + "point", + "area" + ], + "tags": { + "man_made": "water_well" + }, + "name": "Water well" +} diff --git a/dist/locales/en.json b/dist/locales/en.json index f29dbf73d..525906cd7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -496,6 +496,9 @@ "levels": { "label": "Levels" }, + "location": { + "label": "Location" + }, "man_made": { "label": "Type" }, @@ -598,6 +601,9 @@ "tourism": { "label": "Type" }, + "towertype": { + "label": "Tower type" + }, "tracktype": { "label": "Type" }, @@ -1219,6 +1225,14 @@ "name": "Man Made", "terms": "" }, + "man_made/breakwater": { + "name": "Breakwater", + "terms": "" + }, + "man_made/cutline": { + "name": "Cut line", + "terms": "" + }, "man_made/lighthouse": { "name": "Lighthouse", "terms": "" @@ -1227,10 +1241,18 @@ "name": "Pier", "terms": "" }, + "man_made/pipeline": { + "name": "Pipeline", + "terms": "" + }, "man_made/survey_point": { "name": "Survey Point", "terms": "" }, + "man_made/tower": { + "name": "Tower", + "terms": "" + }, "man_made/wastewater_plant": { "name": "Wastewater Plant", "terms": "sewage works,sewage treatment plant,water treatment plant,reclamation plant" @@ -1239,6 +1261,10 @@ "name": "Water Tower", "terms": "" }, + "man_made/water_well": { + "name": "Water well", + "terms": "" + }, "man_made/water_works": { "name": "Water Works", "terms": ""