From 5829b643f06263d692ae677bcc9d8307724eab61 Mon Sep 17 00:00:00 2001
From: xortiz <xavier.ortiz.ch@gmail.com>
Date: Wed, 4 Apr 2018 10:21:32 -0400
Subject: [PATCH] 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: '<translate with synonyms or related terms for ''Address'', separated by commas>'
+      advertising/advertising_column:
+        # advertising=advertising_column
+        name: Advertising Column
+        terms: '<translate with synonyms or related terms for ''Advertising Column'', separated by commas>'
       advertising/billboard:
         # advertising=billboard
         name: Billboard
         terms: '<translate with synonyms or related terms for ''Billboard'', separated by commas>'
-      advertising/column:
-        # advertising=column
-        name: Column
-        terms: '<translate with synonyms or related terms for ''Column'', separated by commas>'
       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": {