From 7055a2a95c57244c47d300c9f32a0a202e23c05f Mon Sep 17 00:00:00 2001
From: xortiz <xavier.ortiz.ch@gmail.com>
Date: Wed, 4 Apr 2018 12:06:25 -0400
Subject: [PATCH] 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: '<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: Advertising Column
+        terms: '<translate with synonyms or related terms for ''Advertising Column'', separated by commas>'
       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": ""