From 742e04b363831e3ce76cc01f97a2be0389649231 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 11 Feb 2019 14:55:55 -0500
Subject: [PATCH] Alphabetize and update deprecated tags list

---
 data/deprecated.json | 132 +++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 68 deletions(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index 7f75ddb7d..e4ce1d1ee 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -20,10 +20,26 @@
       "old": {"amenity": "community_center"},
       "replace": {"amenity": "community_centre"}
     },
+    {
+      "old": {"amenity": "ev_charging"},
+      "replace": {"amenity": "charging_station"}
+    },
     {
       "old": {"amenity": "firepit"},
       "replace": {"leisure": "firepit"}
     },
+    {
+      "old": {"amenity": "garage"},
+      "replace": {"landuse": "garages"}
+    },
+    {
+      "old": {"amenity": "garages"},
+      "replace": {"landuse": "garages"}
+    },
+    {
+      "old": {"amenity": "real_estate"},
+      "replace": {"office": "estate_agent"}
+    },
     {
       "old": {"amenity": "register_office"},
       "replace": {"office": "government", "government": "register_office"}
@@ -48,6 +64,14 @@
       "old": {"amenity": "vending_machine", "vending": "news_papers"},
       "replace": {"amenity": "vending_machine", "vending": "newspapers"}
     },
+    {
+      "old": {"amenity": "youth_center"},
+      "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
+    },
+    {
+      "old": {"amenity": "youth_centre"},
+      "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
+    },
     {
       "old": {"barrier": "wire_fence"},
       "replace": {"barrier": "fence", "fence_type": "chain"}
@@ -56,6 +80,30 @@
       "old": {"barrier": "wood_fence"},
       "replace": {"barrier": "fence", "fence_type": "wood"}
     },
+    {
+      "old": {"bridge": "arch"},
+      "replace": {"bridge": "yes", "bridge:structure": "arch"}
+    },
+    {
+      "old": {"bridge": "beam"},
+      "replace": {"bridge": "yes", "bridge:structure": "beam"}
+    },
+    {
+      "old": {"bridge": "humpback"},
+      "replace": {"bridge": "yes", "bridge:structure": "humpback"}
+    },
+    {
+      "old": {"bridge": "lift"},
+      "replace": {"bridge": "yes", "bridge:moveable": "lift"}
+    },
+    {
+      "old": {"bridge": "pontoon"},
+      "replace": {"bridge": "yes", "bridge:structure": "floating"}
+    },
+    {
+      "old": {"bridge": "suspension"},
+      "replace": {"bridge": "yes", "bridge:structure": "suspension"}
+    },
     {
       "old": {"building": "entrance"},
       "replace": {"entrance": "*"}
@@ -72,14 +120,6 @@
       "old": {"color": "*"},
       "replace": {"colour": "$1"}
     },
-    {
-      "old": {"amenity": "ev_charging"},
-      "replace": {"amenity": "charging_station"}
-    },
-    {
-      "old": {"amenity": "charging"},
-      "replace": {"amenity": "charging_station"}
-    },
     {
       "old": {"craft": "jeweler"},
       "replace": {"shop": "jewelery"}
@@ -88,14 +128,6 @@
       "old": {"craft": "optician"},
       "replace": {"shop": "optician"}
     },
-    {
-      "old": {"amenity": "garage"},
-      "replace": {"amenity": "parking", "landuse": "garages"}
-    },
-    {
-      "old": {"amenity": "garages"},
-      "replace": {"amenity": "parking", "landuse": "garages"}
-    },
     {
       "old": {"drinkable": "*"},
       "replace": {"drinking_water": "$1"}
@@ -108,18 +140,6 @@
       "old": {"fenced": "yes"},
       "replace": {"barrier": "fence"}
     },
-    {
-      "old": {"amenity": "real_estate"},
-      "replace": {"office": "estate_agent"}
-    },
-    {
-      "old": {"office": "real_estate"},
-      "replace": {"office": "estate_agent"}
-    },
-    {
-      "old": {"shop": "real_estate"},
-      "replace": {"office": "estate_agent"}
-    },
     {
       "old": {"highway": "ford"},
       "replace": {"ford": "*"}
@@ -135,38 +155,6 @@
       "old": {"highway": "incline"},
       "replace": {"highway": "road", "incline": "up"}
     },
-    {
-      "old": {"amenity": "youth_center"},
-      "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
-    },
-    {
-      "old": {"amenity": "youth_centre"},
-      "replace": {"amenity": "community_centre", "community_centre:for": "juvenile"}
-    },
-    {
-      "old": {"bridge": "arch"},
-      "replace": {"bridge:structure": "*"}
-    },
-    {
-      "old": {"bridge": "beam"},
-      "replace": {"bridge:structure": "*"}
-    },
-    {
-      "old": {"bridge": "humpback"},
-      "replace": {"bridge:structure": "*"}
-    },
-    {
-      "old": {"bridge": "suspension"},
-      "replace": {"bridge:structure": "*"}
-    },
-    {
-      "old": {"bridge": "lift"},
-      "replace": {"bridge:structure": "*"}
-    },
-    {
-      "old": {"bridge": "swing"},
-      "replace": {"bridge:structure": "*"}
-    },
     {
       "old": {"highway": "incline_steep"},
       "replace": {"highway": "road", "incline": "up"}
@@ -203,6 +191,14 @@
       "old": {"man_made": "jetty"},
       "replace": {"man_made": "pier"}
     },
+    {
+      "old": {"man_made": "mdf"},
+      "replace": {"telecom": "exchange"}
+    },
+    {
+      "old": {"man_made": "MDF"},
+      "replace": {"telecom": "exchange"}
+    },
     {
       "old": {"man_made": "water_tank"},
       "replace": {"man_made": "storage_tank", "content": "water"}
@@ -219,6 +215,10 @@
       "old": {"office": "administrative"},
       "replace": {"office": "government"}
     },
+    {
+      "old": {"office": "real_estate"},
+      "replace": {"office": "estate_agent"}
+    },
     {
       "old": {"place_name": "*"},
       "replace": {"name": "$1"}
@@ -271,6 +271,10 @@
       "old": {"shop": "perfume"},
       "replace": {"shop": "perfumery"}
     },
+    {
+      "old": {"shop": "real_estate"},
+      "replace": {"office": "estate_agent"}
+    },
     {
       "old": {"tourism": "bed_and_breakfast"},
       "replace": {"tourism": "guest_house"}
@@ -290,14 +294,6 @@
     {
       "old": {"water": "tidal"},
       "replace": {"natural": "water", "tidal": "yes"}
-    },
-    {
-      "old": {"man_made": "MDF"},
-      "replace": {"telecom": "exchange"}
-    },
-    {
-      "old": {"man_made": "mdf"},
-      "replace": {"telecom": "exchange"}
     }
   ]
 }