From adbde8c68faf6c48e39eb635e33de6a3a6ba6f20 Mon Sep 17 00:00:00 2001
From: Ajith Ranka <ajith@mapbox.com>
Date: Thu, 12 Jan 2017 14:37:21 +0530
Subject: [PATCH] Add additional aerialway presets, fixes #3733

---
 data/presets.yaml                             | 12 ++++++
 data/presets/presets.json                     | 42 +++++++++++++++++++
 data/presets/presets/aerialway/drag_lift.json | 13 ++++++
 data/presets/presets/aerialway/goods.json     | 13 ++++++
 .../presets/presets/aerialway/mixed_lift.json | 16 +++++++
 data/taginfo.json                             | 12 ++++++
 dist/locales/en.json                          | 12 ++++++
 7 files changed, 120 insertions(+)
 create mode 100644 data/presets/presets/aerialway/drag_lift.json
 create mode 100644 data/presets/presets/aerialway/goods.json
 create mode 100644 data/presets/presets/aerialway/mixed_lift.json

diff --git a/data/presets.yaml b/data/presets.yaml
index b80f4ea521..a0258fc1c1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1312,14 +1312,26 @@ en:
         # aerialway=chair_lift
         name: Chair Lift
         terms: '<translate with synonyms or related terms for ''Chair Lift'', separated by commas>'
+      aerialway/drag_lift:
+        # aerialway=drag_lift
+        name: Drag Lift
+        terms: '<translate with synonyms or related terms for ''Drag Lift'', separated by commas>'
       aerialway/gondola:
         # aerialway=gondola
         name: Gondola
         terms: '<translate with synonyms or related terms for ''Gondola'', separated by commas>'
+      aerialway/goods:
+        # aerialway=goods
+        name: Goods
+        terms: '<translate with synonyms or related terms for ''Goods'', separated by commas>'
       aerialway/magic_carpet:
         # aerialway=magic_carpet
         name: Magic Carpet Lift
         terms: '<translate with synonyms or related terms for ''Magic Carpet Lift'', separated by commas>'
+      aerialway/mixed_lift:
+        # aerialway=mixed_lift
+        name: Mixed Lift
+        terms: '<translate with synonyms or related terms for ''Mixed Lift'', separated by commas>'
       aerialway/platter:
         # aerialway=platter
         name: Platter Lift
diff --git a/data/presets/presets.json b/data/presets/presets.json
index fe29c89937..c271ecd18c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -207,6 +207,19 @@
             },
             "name": "Chair Lift"
         },
+        "aerialway/drag_lift": {
+            "geometry": [
+                "line"
+            ],
+            "fields": [
+                "aerialway/capacity",
+                "aerialway/duration"
+            ],
+            "tags": {
+                "aerialway": "drag_lift"
+            },
+            "name": "Drag Lift"
+        },
         "aerialway/gondola": {
             "geometry": [
                 "line"
@@ -223,6 +236,19 @@
             },
             "name": "Gondola"
         },
+        "aerialway/goods": {
+            "geometry": [
+                "line"
+            ],
+            "fields": [
+                "aerialway/capacity",
+                "aerialway/duration"
+            ],
+            "tags": {
+                "aerialway": "goods"
+            },
+            "name": "Goods"
+        },
         "aerialway/magic_carpet": {
             "geometry": [
                 "line"
@@ -237,6 +263,22 @@
             },
             "name": "Magic Carpet Lift"
         },
+        "aerialway/mixed_lift": {
+            "geometry": [
+                "line"
+            ],
+            "fields": [
+                "aerialway/occupancy",
+                "aerialway/capacity",
+                "aerialway/duration",
+                "aerialway/bubble",
+                "aerialway/heating"
+            ],
+            "tags": {
+                "aerialway": "mixed_lift"
+            },
+            "name": "Mixed Lift"
+        },
         "aerialway/platter": {
             "geometry": [
                 "line"
diff --git a/data/presets/presets/aerialway/drag_lift.json b/data/presets/presets/aerialway/drag_lift.json
new file mode 100644
index 0000000000..d10b15c96e
--- /dev/null
+++ b/data/presets/presets/aerialway/drag_lift.json
@@ -0,0 +1,13 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+        "aerialway/capacity",
+        "aerialway/duration"
+    ],
+    "tags": {
+        "aerialway": "drag_lift"
+    },
+    "name": "Drag Lift"
+}
diff --git a/data/presets/presets/aerialway/goods.json b/data/presets/presets/aerialway/goods.json
new file mode 100644
index 0000000000..0ed598a1c5
--- /dev/null
+++ b/data/presets/presets/aerialway/goods.json
@@ -0,0 +1,13 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+        "aerialway/capacity",
+        "aerialway/duration"
+    ],
+    "tags": {
+        "aerialway": "goods"
+    },
+    "name": "Goods"
+}
diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json
new file mode 100644
index 0000000000..d8ddb64179
--- /dev/null
+++ b/data/presets/presets/aerialway/mixed_lift.json
@@ -0,0 +1,16 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "fields": [
+      "aerialway/occupancy",
+      "aerialway/capacity",
+      "aerialway/duration",
+      "aerialway/bubble",
+      "aerialway/heating"
+    ],
+    "tags": {
+        "aerialway": "mixed_lift"
+    },
+    "name": "Mixed Lift"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 14ed9dc672..556ee31106 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -55,14 +55,26 @@
             "key": "aerialway",
             "value": "chair_lift"
         },
+        {
+            "key": "aerialway",
+            "value": "drag_lift"
+        },
         {
             "key": "aerialway",
             "value": "gondola"
         },
+        {
+            "key": "aerialway",
+            "value": "goods"
+        },
         {
             "key": "aerialway",
             "value": "magic_carpet"
         },
+        {
+            "key": "aerialway",
+            "value": "mixed_lift"
+        },
         {
             "key": "aerialway",
             "value": "platter"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index aae4ab37a7..ed981101a2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1856,14 +1856,26 @@
                     "name": "Chair Lift",
                     "terms": ""
                 },
+                "aerialway/drag_lift": {
+                    "name": "Drag Lift",
+                    "terms": ""
+                },
                 "aerialway/gondola": {
                     "name": "Gondola",
                     "terms": ""
                 },
+                "aerialway/goods": {
+                    "name": "Goods",
+                    "terms": ""
+                },
                 "aerialway/magic_carpet": {
                     "name": "Magic Carpet Lift",
                     "terms": ""
                 },
+                "aerialway/mixed_lift": {
+                    "name": "Mixed Lift",
+                    "terms": ""
+                },
                 "aerialway/platter": {
                     "name": "Platter Lift",
                     "terms": "button lift,poma lift"