From 49fa8d379790e9bff73a98a66790f988c066e86b Mon Sep 17 00:00:00 2001 From: vershwal Date: Wed, 21 Mar 2018 04:42:05 +0530 Subject: [PATCH 1/2] Added preset for allotments=plot. --- data/presets.yaml | 4 +++ data/presets/presets.json | 25 +++++++++++++++++++ .../presets/landuse/allotments/plot.json | 25 +++++++++++++++++++ data/taginfo.json | 4 +++ dist/locales/en.json | 4 +++ 5 files changed, 62 insertions(+) create mode 100644 data/presets/presets/landuse/allotments/plot.json diff --git a/data/presets.yaml b/data/presets.yaml index f71c85188..1ee5bad0a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3405,6 +3405,10 @@ en: name: Community Garden # 'terms: allotment,garden' terms: '' + landuse/allotments/plot: + # allotments=plot + name: Plot + terms: '' landuse/aquaculture: # landuse=aquaculture name: Aquaculture diff --git a/data/presets/presets.json b/data/presets/presets.json index 597ef9224..7789b470e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8363,6 +8363,31 @@ ], "name": "Community Garden" }, + "landuse/allotments/plot": { + "geometry": [ + "area" + ], + "fields": [ + "name", + "ref" + ], + "tags": { + "allotments": "plot" + }, + "addTags": { + "landuse": "allotments", + "allotments": "plot" + }, + "removeTags": { + "landuse": "allotments", + "allotments": "plot" + }, + "reference": { + "key": "allotments", + "value": "plot" + }, + "name": "Plot" + }, "landuse/aquaculture": { "icon": "aquarium", "fields": [ diff --git a/data/presets/presets/landuse/allotments/plot.json b/data/presets/presets/landuse/allotments/plot.json new file mode 100644 index 000000000..a5662709f --- /dev/null +++ b/data/presets/presets/landuse/allotments/plot.json @@ -0,0 +1,25 @@ +{ + "geometry": [ + "area" + ], + "fields": [ + "name", + "ref" + ], + "tags": { + "allotments": "plot" + }, + "addTags": { + "landuse": "allotments", + "allotments": "plot" + }, + "removeTags": { + "landuse": "allotments", + "allotments": "plot" + }, + "reference": { + "key": "allotments", + "value": "plot" + }, + "name": "Plot" +} diff --git a/data/taginfo.json b/data/taginfo.json index ea370b748..d318452c1 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1594,6 +1594,10 @@ "key": "landuse", "value": "allotments" }, + { + "key": "allotments", + "value": "plot" + }, { "key": "landuse", "value": "aquaculture" diff --git a/dist/locales/en.json b/dist/locales/en.json index 58d9818c9..8cc9909ba 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -4349,6 +4349,10 @@ "name": "Community Garden", "terms": "allotment,garden" }, + "landuse/allotments/plot": { + "name": "Plot", + "terms": "" + }, "landuse/aquaculture": { "name": "Aquaculture", "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture" From 2f01571d3c8f2af50dd3bca9996c6ac39d78065f Mon Sep 17 00:00:00 2001 From: vershwal Date: Wed, 21 Mar 2018 11:45:03 +0530 Subject: [PATCH 2/2] presets/landuse/allotments/plot.json -> presets/allotments/plot.json --- data/presets.yaml | 8 ++-- data/presets/presets.json | 42 ++++++++----------- .../{landuse => }/allotments/plot.json | 10 +---- data/taginfo.json | 8 ++-- dist/locales/en.json | 8 ++-- 5 files changed, 30 insertions(+), 46 deletions(-) rename data/presets/presets/{landuse => }/allotments/plot.json (53%) diff --git a/data/presets.yaml b/data/presets.yaml index 1ee5bad0a..4fc6a2d5b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1763,6 +1763,10 @@ en: name: Airport Terminal # 'terms: airport,aerodrome' terms: '' + allotments/plot: + # allotments=plot + name: Community Garden Plot + terms: '' amenity: # amenity=* name: Amenity @@ -3405,10 +3409,6 @@ en: name: Community Garden # 'terms: allotment,garden' terms: '' - landuse/allotments/plot: - # allotments=plot - name: Plot - terms: '' landuse/aquaculture: # landuse=aquaculture name: Aquaculture diff --git a/data/presets/presets.json b/data/presets/presets.json index 7789b470e..ad219ece5 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -535,6 +535,23 @@ }, "name": "Airport Terminal" }, + "allotments/plot": { + "geometry": [ + "area" + ], + "fields": [ + "name", + "ref" + ], + "tags": { + "allotments": "plot" + }, + "reference": { + "key": "allotments", + "value": "plot" + }, + "name": "Community Garden Plot" + }, "amenity/bus_station": { "icon": "bus", "fields": [ @@ -8363,31 +8380,6 @@ ], "name": "Community Garden" }, - "landuse/allotments/plot": { - "geometry": [ - "area" - ], - "fields": [ - "name", - "ref" - ], - "tags": { - "allotments": "plot" - }, - "addTags": { - "landuse": "allotments", - "allotments": "plot" - }, - "removeTags": { - "landuse": "allotments", - "allotments": "plot" - }, - "reference": { - "key": "allotments", - "value": "plot" - }, - "name": "Plot" - }, "landuse/aquaculture": { "icon": "aquarium", "fields": [ diff --git a/data/presets/presets/landuse/allotments/plot.json b/data/presets/presets/allotments/plot.json similarity index 53% rename from data/presets/presets/landuse/allotments/plot.json rename to data/presets/presets/allotments/plot.json index a5662709f..c00920a34 100644 --- a/data/presets/presets/landuse/allotments/plot.json +++ b/data/presets/presets/allotments/plot.json @@ -9,17 +9,9 @@ "tags": { "allotments": "plot" }, - "addTags": { - "landuse": "allotments", - "allotments": "plot" - }, - "removeTags": { - "landuse": "allotments", - "allotments": "plot" - }, "reference": { "key": "allotments", "value": "plot" }, - "name": "Plot" + "name": "Community Garden Plot" } diff --git a/data/taginfo.json b/data/taginfo.json index d318452c1..1823621fe 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -131,6 +131,10 @@ "key": "aeroway", "value": "terminal" }, + { + "key": "allotments", + "value": "plot" + }, { "key": "amenity", "value": "bus_station" @@ -1594,10 +1598,6 @@ "key": "landuse", "value": "allotments" }, - { - "key": "allotments", - "value": "plot" - }, { "key": "landuse", "value": "aquaculture" diff --git a/dist/locales/en.json b/dist/locales/en.json index 8cc9909ba..bba549cbb 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2877,6 +2877,10 @@ "name": "Airport Terminal", "terms": "airport,aerodrome" }, + "allotments/plot": { + "name": "Community Garden Plot", + "terms": "" + }, "amenity/bus_station": { "name": "Bus Station / Terminal", "terms": "" @@ -4349,10 +4353,6 @@ "name": "Community Garden", "terms": "allotment,garden" }, - "landuse/allotments/plot": { - "name": "Plot", - "terms": "" - }, "landuse/aquaculture": { "name": "Aquaculture", "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture"