Merge branch 'adding_advertising_column' of https://github.com/Xavier-J-Ortiz/iD into Xavier-J-Ortiz-adding_advertising_column

data/presets.yaml

@@ -1691,6 +1691,10 @@ en:
         # 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

data/presets/presets.json

@@ -197,6 +197,20 @@
             },
             "name": "Billboard"
         },
+        "advertising/column": {
+            "fields": [
+                "direction",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "advertising": "column"
+            },
+            "name": "Advertising Column"
+        },
         "aerialway/station": {
             "icon": "aerialway",
             "geometry": [

data/presets/presets/advertising/column.json

@@ -0,0 +1,14 @@
+{
+    "fields": [
+       "direction",
+       "lit"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "advertising": "column"
+    },
+    "name": "Advertising Column"
+}

data/taginfo.json

@@ -117,6 +117,15 @@
                 "way"
             ]
         },
+        {
+            "key": "advertising",
+            "value": "column",
+            "description": "Advertising Column",
+            "object_types": [
+                "node",
+                "area"
+            ]
+        },
         {
             "key": "aerialway",
             "value": "station",

dist/locales/en.json

@@ -2819,6 +2819,10 @@
                     "name": "Billboard",
                     "terms": ""
                 },
+                "advertising/column": {
+                    "name": "Advertising Column",
+                    "terms": ""
+                },
                 "aerialway/station": {
                     "name": "Aerialway Station",
                     "terms": ""
@@ -6673,7 +6677,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": {
@@ -6735,7 +6739,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"
             },