From 4e5b5a806e2ce2699bc772010a812b86cc435bb8 Mon Sep 17 00:00:00 2001 From: xortiz Date: Tue, 3 Apr 2018 20:20:12 -0400 Subject: [PATCH 1/3] added column in presets/presets/advertising --- data/presets.yaml | 4 ++++ data/presets/presets.json | 14 ++++++++++++++ data/presets/presets/advertising/column.json | 14 ++++++++++++++ data/taginfo.json | 8 ++++++++ dist/locales/en.json | 8 ++++++-- 5 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 data/presets/presets/advertising/column.json diff --git a/data/presets.yaml b/data/presets.yaml index 6d2ad96b5..7a18c3b95 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1688,6 +1688,10 @@ en: # advertising=billboard name: Billboard terms: '' + advertising/column: + # advertising=column + name: Column + terms: '' aerialway: # aerialway=* name: Aerialway diff --git a/data/presets/presets.json b/data/presets/presets.json index 177181ca0..4be16e5ba 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -197,6 +197,20 @@ }, "name": "Billboard" }, + "advertising/column": { + "fields": [ + "direction", + "lit" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "advertising": "column" + }, + "name": "Column" + }, "aerialway/station": { "icon": "aerialway", "geometry": [ diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/column.json new file mode 100644 index 000000000..05c83399e --- /dev/null +++ b/data/presets/presets/advertising/column.json @@ -0,0 +1,14 @@ +{ + "fields": [ + "direction", + "lit" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "advertising": "column" + }, + "name": "Column" +} diff --git a/data/taginfo.json b/data/taginfo.json index b95f36328..7cd168fed 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -117,6 +117,14 @@ "way" ] }, + { + "key": "advertising", + "value": "column", + "description": "Column", + "object_types": [ + "node" + ] + }, { "key": "aerialway", "value": "station", diff --git a/dist/locales/en.json b/dist/locales/en.json index 877661180..a25a6cff2 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2811,6 +2811,10 @@ "name": "Billboard", "terms": "" }, + "advertising/column": { + "name": "Column", + "terms": "" + }, "aerialway/station": { "name": "Aerialway Station", "terms": "" @@ -6665,7 +6669,7 @@ "attribution": { "text": "basemap.at" }, - "description": "Basemap of Austria, based on goverment data.", + "description": "Basemap of Austria, based on government data.", "name": "basemap.at" }, "basemap.at-orthofoto": { @@ -6727,7 +6731,7 @@ }, "stamen-terrain-background": { "attribution": { - "text": "Map tiles by Stamen Design, under CC BY 3.0" + "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL" }, "name": "Stamen Terrain" }, From 5829b643f06263d692ae677bcc9d8307724eab61 Mon Sep 17 00:00:00 2001 From: xortiz Date: Wed, 4 Apr 2018 10:21:32 -0400 Subject: [PATCH 2/3] modified column to advertising_column, changed vertex to area --- data/presets.yaml | 8 +++--- data/presets/presets.json | 28 +++++++++---------- .../{column.json => advertising_column.json} | 6 ++-- data/taginfo.json | 17 +++++------ dist/locales/en.json | 8 +++--- 5 files changed, 34 insertions(+), 33 deletions(-) rename data/presets/presets/advertising/{column.json => advertising_column.json} (57%) diff --git a/data/presets.yaml b/data/presets.yaml index 7a18c3b95..30173b4cd 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1684,14 +1684,14 @@ en: # 'addr:*=*' name: Address terms: '' + advertising/advertising_column: + # advertising=advertising_column + name: Advertising Column + terms: '' advertising/billboard: # advertising=billboard name: Billboard terms: '' - advertising/column: - # advertising=column - name: Column - terms: '' aerialway: # aerialway=* name: Aerialway diff --git a/data/presets/presets.json b/data/presets/presets.json index 4be16e5ba..c87a59f32 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -182,6 +182,20 @@ "name": "Address", "matchScore": 0.15 }, + "advertising/advertising_column": { + "fields": [ + "direction", + "lit" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "advertising": "advertising_column" + }, + "name": "Advertising Column" + }, "advertising/billboard": { "fields": [ "direction", @@ -197,20 +211,6 @@ }, "name": "Billboard" }, - "advertising/column": { - "fields": [ - "direction", - "lit" - ], - "geometry": [ - "point", - "vertex" - ], - "tags": { - "advertising": "column" - }, - "name": "Column" - }, "aerialway/station": { "icon": "aerialway", "geometry": [ diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/advertising_column.json similarity index 57% rename from data/presets/presets/advertising/column.json rename to data/presets/presets/advertising/advertising_column.json index 05c83399e..982181a8e 100644 --- a/data/presets/presets/advertising/column.json +++ b/data/presets/presets/advertising/advertising_column.json @@ -5,10 +5,10 @@ ], "geometry": [ "point", - "vertex" + "area" ], "tags": { - "advertising": "column" + "advertising": "advertising_column" }, - "name": "Column" + "name": "Advertising Column" } diff --git a/data/taginfo.json b/data/taginfo.json index 7cd168fed..03d401894 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -108,6 +108,15 @@ "area" ] }, + { + "key": "advertising", + "value": "advertising_column", + "description": "Advertising Column", + "object_types": [ + "node", + "area" + ] + }, { "key": "advertising", "value": "billboard", @@ -117,14 +126,6 @@ "way" ] }, - { - "key": "advertising", - "value": "column", - "description": "Column", - "object_types": [ - "node" - ] - }, { "key": "aerialway", "value": "station", diff --git a/dist/locales/en.json b/dist/locales/en.json index a25a6cff2..36f6ef264 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2807,12 +2807,12 @@ "name": "Address", "terms": "" }, - "advertising/billboard": { - "name": "Billboard", + "advertising/advertising_column": { + "name": "Advertising Column", "terms": "" }, - "advertising/column": { - "name": "Column", + "advertising/billboard": { + "name": "Billboard", "terms": "" }, "aerialway/station": { From 7055a2a95c57244c47d300c9f32a0a202e23c05f Mon Sep 17 00:00:00 2001 From: xortiz Date: Wed, 4 Apr 2018 12:06:25 -0400 Subject: [PATCH 3/3] misunderstood name change, reverted to column, only changed the name within the file --- data/presets.yaml | 8 +++--- data/presets/presets.json | 28 +++++++++---------- .../{advertising_column.json => column.json} | 2 +- data/taginfo.json | 18 ++++++------ dist/locales/en.json | 8 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) rename data/presets/presets/advertising/{advertising_column.json => column.json} (79%) diff --git a/data/presets.yaml b/data/presets.yaml index 30173b4cd..4de13bf77 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1684,14 +1684,14 @@ en: # 'addr:*=*' name: Address terms: '' - advertising/advertising_column: - # advertising=advertising_column - name: Advertising Column - terms: '' advertising/billboard: # advertising=billboard name: Billboard terms: '' + advertising/column: + # advertising=column + name: Advertising Column + terms: '' aerialway: # aerialway=* name: Aerialway diff --git a/data/presets/presets.json b/data/presets/presets.json index c87a59f32..353d9aca0 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -182,20 +182,6 @@ "name": "Address", "matchScore": 0.15 }, - "advertising/advertising_column": { - "fields": [ - "direction", - "lit" - ], - "geometry": [ - "point", - "area" - ], - "tags": { - "advertising": "advertising_column" - }, - "name": "Advertising Column" - }, "advertising/billboard": { "fields": [ "direction", @@ -211,6 +197,20 @@ }, "name": "Billboard" }, + "advertising/column": { + "fields": [ + "direction", + "lit" + ], + "geometry": [ + "point", + "area" + ], + "tags": { + "advertising": "column" + }, + "name": "Advertising Column" + }, "aerialway/station": { "icon": "aerialway", "geometry": [ diff --git a/data/presets/presets/advertising/advertising_column.json b/data/presets/presets/advertising/column.json similarity index 79% rename from data/presets/presets/advertising/advertising_column.json rename to data/presets/presets/advertising/column.json index 982181a8e..b17ebe1fc 100644 --- a/data/presets/presets/advertising/advertising_column.json +++ b/data/presets/presets/advertising/column.json @@ -8,7 +8,7 @@ "area" ], "tags": { - "advertising": "advertising_column" + "advertising": "column" }, "name": "Advertising Column" } diff --git a/data/taginfo.json b/data/taginfo.json index 03d401894..3bdee6095 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -108,15 +108,6 @@ "area" ] }, - { - "key": "advertising", - "value": "advertising_column", - "description": "Advertising Column", - "object_types": [ - "node", - "area" - ] - }, { "key": "advertising", "value": "billboard", @@ -126,6 +117,15 @@ "way" ] }, + { + "key": "advertising", + "value": "column", + "description": "Advertising Column", + "object_types": [ + "node", + "area" + ] + }, { "key": "aerialway", "value": "station", diff --git a/dist/locales/en.json b/dist/locales/en.json index 36f6ef264..d1b09f958 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2807,14 +2807,14 @@ "name": "Address", "terms": "" }, - "advertising/advertising_column": { - "name": "Advertising Column", - "terms": "" - }, "advertising/billboard": { "name": "Billboard", "terms": "" }, + "advertising/column": { + "name": "Advertising Column", + "terms": "" + }, "aerialway/station": { "name": "Aerialway Station", "terms": ""