From ef1e7038eb91615da5bd0c20b869466af82e2634 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 5 Apr 2017 22:35:59 -0400
Subject: [PATCH] Remove some unused roads from intrograph, add paper street
 12th avenue

---
 data/core.yaml        |   5 +-
 data/intro_graph.json | 316 +++++++++++-------------------------------
 dist/locales/en.json  |   5 +-
 3 files changed, 80 insertions(+), 246 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 9956df22b..d5b4271f9 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -795,6 +795,7 @@ en:
         9th-avenue: 9th Avenue
         10th-avenue: 10th Avenue
         11th-avenue: 11th Avenue
+        12th-avenue: 12th Avenue
         access-point-employment: Access Point Employment
         adams-street: Adams Street
         andrews-elementary-school: Andrews Elementary School
@@ -849,14 +850,12 @@ en:
         paisley-emporium: Paisley Emporium
         paparazzi-tattoo: Paparazzi Tattoo
         pealer-street: Pealer Street
-        pine-river-road: Pine River Road
         pine-street: Pine Street
         pizza-hut: Pizza Hut
         portage-avenue: Portage Avenue
         portage-river: Portage River
         preferred-insurance-services: Preferred Insurance Services
         railroad-drive: Railroad Drive
-        raisin-river-road: Raisin River Road
         river-city-appliance: River City Appliance
         river-drive: River Drive
         river-road: River Road
@@ -865,13 +864,11 @@ en:
         riverwalk-trail: Riverwalk Trail
         riviera-theatre: Riviera Theatre
         rocky-river: Rocky River
-        sable-river-road: Sable River Road
         saint-joseph-river: Saint Joseph River
         scidmore-park-petting-zoo: Scidmore Park Petting Zoo
         scidmore-park: Scidmore Park
         scouter-park: Scouter Park
         sherwin-williams: Sherwin-Williams
-        shiawassee-river-road: Shiawassee River Road
         south-street: South Street
         southern-michigan-bank: Southern Michigan Bank
         spring-street: Spring Street
diff --git a/data/intro_graph.json b/data/intro_graph.json
index f7667dd28..7efdb35b2 100644
--- a/data/intro_graph.json
+++ b/data/intro_graph.json
@@ -6317,10 +6317,6 @@
       "id": "n2844",
       "loc": [-85.620172, 41.945627]
     },
-    "n2845": {
-      "id": "n2845",
-      "loc": [-85.622731, 41.951834]
-    },
     "n2846": {
       "id": "n2846",
       "loc": [-85.622758, 41.947422]
@@ -6387,7 +6383,7 @@
     },
     "n2862": {
       "id": "n2862",
-      "loc": [-85.62384, 41.95466]
+      "loc": [-85.623685, 41.954624]
     },
     "n2863": {
       "id": "n2863",
@@ -6425,22 +6421,6 @@
       "id": "n2872",
       "loc": [-85.624813, 41.950983]
     },
-    "n2873": {
-      "id": "n2873",
-      "loc": [-85.624623, 41.951591]
-    },
-    "n2874": {
-      "id": "n2874",
-      "loc": [-85.623908, 41.953916]
-    },
-    "n2875": {
-      "id": "n2875",
-      "loc": [-85.62389, 41.954096]
-    },
-    "n2876": {
-      "id": "n2876",
-      "loc": [-85.623898, 41.95431]
-    },
     "n2877": {
       "id": "n2877",
       "loc": [-85.628481, 41.945611]
@@ -6528,7 +6508,7 @@
         "highway": "residential",
         "name": "Washington Street"
       },
-      "nodes": ["n2815", "n2813", "n2811", "n2846", "n2857", "n2853", "n2861", "n2879", "n5", "n4", "n2845"]
+      "nodes": ["n2815", "n2813", "n2811", "n2846", "n2857", "n2853", "n2861", "n2879", "n3550", "n5", "n4"]
     },
     "w523": {
       "id": "w523",
@@ -6566,12 +6546,6 @@
         "n2871",
         "n6",
         "n2872",
-        "n2873",
-        "n2874",
-        "n2875",
-        "n2876",
-        "n1203",
-        "n1202",
         "n2862"
       ]
     },
@@ -9793,63 +9767,63 @@
     },
     "n3472": {
       "id": "n3472",
-      "loc": [-85.620141, 41.951901]
+      "loc": [-85.620118, 41.951895]
     },
     "n3473": {
       "id": "n3473",
-      "loc": [-85.617193, 41.954706]
+      "loc": [-85.617062, 41.954691]
     },
     "n3474": {
       "id": "n3474",
-      "loc": [-85.62013, 41.952104]
+      "loc": [-85.620112, 41.952114]
     },
     "n3475": {
       "id": "n3475",
-      "loc": [-85.620104, 41.952305]
+      "loc": [-85.620091, 41.95232]
     },
     "n3476": {
       "id": "n3476",
-      "loc": [-85.620062, 41.952499]
+      "loc": [-85.620047, 41.952505]
     },
     "n3477": {
       "id": "n3477",
-      "loc": [-85.619993, 41.952702]
+      "loc": [-85.61998, 41.952715]
     },
     "n3478": {
       "id": "n3478",
-      "loc": [-85.619879, 41.952986]
+      "loc": [-85.619861, 41.952986]
     },
     "n3479": {
       "id": "n3479",
-      "loc": [-85.619689, 41.95329]
+      "loc": [-85.619622, 41.953365]
     },
     "n3480": {
       "id": "n3480",
-      "loc": [-85.619508, 41.953521]
+      "loc": [-85.619441, 41.953567]
     },
     "n3481": {
       "id": "n3481",
-      "loc": [-85.619286, 41.953728]
+      "loc": [-85.619259, 41.953741]
     },
     "n3482": {
       "id": "n3482",
-      "loc": [-85.618925, 41.954007]
+      "loc": [-85.618835, 41.954056]
     },
     "n3483": {
       "id": "n3483",
-      "loc": [-85.618638, 41.954189]
+      "loc": [-85.618602, 41.954194]
     },
     "n3484": {
       "id": "n3484",
-      "loc": [-85.61831, 41.954358]
+      "loc": [-85.618305, 41.954347]
     },
     "n3485": {
       "id": "n3485",
-      "loc": [-85.618015, 41.954485]
+      "loc": [-85.618006, 41.954466]
     },
     "n3486": {
       "id": "n3486",
-      "loc": [-85.617606, 41.954611]
+      "loc": [-85.617611, 41.954587]
     },
     "n3487": {
       "id": "n3487",
@@ -10014,9 +9988,11 @@
         "n3476",
         "n3477",
         "n3478",
+        "n1202",
         "n3479",
         "n3480",
         "n3481",
+        "n1203",
         "n3482",
         "n3483",
         "n3484",
@@ -10155,10 +10131,6 @@
       },
       "nodes": ["n2745", "n3752", "n3204", "n3201", "n3415", "n2761", "n2767", "n3411"]
     },
-    "n3517": {
-      "id": "n3517",
-      "loc": [-85.622669, 41.951866]
-    },
     "n3518": {
       "id": "n3518",
       "loc": [-85.624105, 41.954704]
@@ -10289,7 +10261,7 @@
     },
     "n3550": {
       "id": "n3550",
-      "loc": [-85.622599, 41.95188]
+      "loc": [-85.622758, 41.951884]
     },
     "n3551": {
       "id": "n3551",
@@ -10901,7 +10873,7 @@
         "highway": "residential",
         "name": "11th Avenue"
       },
-      "nodes": ["n2845", "n3517", "n3550", "n3472"]
+      "nodes": ["n3550", "n3472"]
     },
     "w638": {
       "id": "w638",
@@ -10918,7 +10890,23 @@
         "highway": "residential",
         "name": "Hoffman Street"
       },
-      "nodes": ["n3518", "n1204", "n2862", "n3519", "n3520", "n3521", "n3522", "n3523", "n3524", "n3549", "n3552", "n3551", "n3473"]
+      "nodes": [
+        "n3518",
+        "n1204",
+        "n2862",
+        "n3519",
+        "n3520",
+        "n3521",
+        "n3522",
+        "n4",
+        "n3523",
+        "n3524",
+        "n3549",
+        "n3552",
+        "n3551",
+        "n1684",
+        "n3473"
+      ]
     },
     "w640": {
       "id": "w640",
@@ -11437,53 +11425,6 @@
       },
       "nodes": ["n3788", "n3785", "n3786", "n3787", "n3788"]
     },
-    "n3789": {
-      "id": "n3789",
-      "loc": [-85.61859, 41.956821]
-    },
-    "n3790": {
-      "id": "n3790",
-      "loc": [-85.618669, 41.957009]
-    },
-    "n3791": {
-      "id": "n3791",
-      "loc": [-85.618692, 41.958145]
-    },
-    "n3792": {
-      "id": "n3792",
-      "loc": [-85.618708, 41.958821],
-      "tags": {
-        "highway": "turning_circle"
-      }
-    },
-    "n3793": {
-      "id": "n3793",
-      "loc": [-85.618216, 41.95557]
-    },
-    "n3794": {
-      "id": "n3794",
-      "loc": [-85.618406, 41.956619]
-    },
-    "n3795": {
-      "id": "n3795",
-      "loc": [-85.618237, 41.956377]
-    },
-    "n3796": {
-      "id": "n3796",
-      "loc": [-85.618143, 41.955723]
-    },
-    "n3797": {
-      "id": "n3797",
-      "loc": [-85.618677, 41.957747]
-    },
-    "n3798": {
-      "id": "n3798",
-      "loc": [-85.618161, 41.956088]
-    },
-    "n3799": {
-      "id": "n3799",
-      "loc": [-85.61868, 41.958579]
-    },
     "n3800": {
       "id": "n3800",
       "loc": [-85.620773, 41.955585]
@@ -11500,51 +11441,6 @@
       "id": "n3803",
       "loc": [-85.620691, 41.955367]
     },
-    "n3804": {
-      "id": "n3804",
-      "loc": [-85.615935, 41.958581]
-    },
-    "n3805": {
-      "id": "n3805",
-      "loc": [-85.615914, 41.957758]
-    },
-    "n3806": {
-      "id": "n3806",
-      "loc": [-85.616225, 41.95603]
-    },
-    "n3807": {
-      "id": "n3807",
-      "loc": [-85.61604, 41.956075]
-    },
-    "n3808": {
-      "id": "n3808",
-      "loc": [-85.61593, 41.956201]
-    },
-    "n3809": {
-      "id": "n3809",
-      "loc": [-85.615897, 41.95816]
-    },
-    "n3810": {
-      "id": "n3810",
-      "loc": [-85.618703, 41.955052]
-    },
-    "n3811": {
-      "id": "n3811",
-      "loc": [-85.618644, 41.955202]
-    },
-    "n3812": {
-      "id": "n3812",
-      "loc": [-85.618513, 41.955339]
-    },
-    "w652": {
-      "id": "w652",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "Sable River Road"
-      },
-      "nodes": ["n3791", "n3809"]
-    },
     "w653": {
       "id": "w653",
       "tags": {
@@ -11553,58 +11449,6 @@
       },
       "nodes": ["n3549", "n3802", "n3803", "n3800", "n3801"]
     },
-    "w654": {
-      "id": "w654",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "Pine River Road"
-      },
-      "nodes": ["n3797", "n3805"]
-    },
-    "w655": {
-      "id": "w655",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "Raisin River Road"
-      },
-      "nodes": ["n3799", "n3804"]
-    },
-    "w656": {
-      "id": "w656",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "Shiawassee River Road"
-      },
-      "nodes": [
-        "n3551",
-        "n3810",
-        "n3811",
-        "n3812",
-        "n3793",
-        "n3796",
-        "n3798",
-        "n3795",
-        "n3794",
-        "n3789",
-        "n3790",
-        "n3797",
-        "n3791",
-        "n3799",
-        "n3792"
-      ]
-    },
-    "w657": {
-      "id": "w657",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "Sturgeon River Road"
-      },
-      "nodes": ["n3798", "n3806", "n3807", "n3808"]
-    },
     "n3857": {
       "id": "n3857",
       "loc": [-85.618937, 41.951943]
@@ -11615,11 +11459,11 @@
     },
     "n3859": {
       "id": "n3859",
-      "loc": [-85.616854, 41.954737]
+      "loc": [-85.616799, 41.95472]
     },
     "n3860": {
       "id": "n3860",
-      "loc": [-85.616485, 41.95474]
+      "loc": [-85.616458, 41.954735]
     },
     "n3861": {
       "id": "n3861",
@@ -12075,7 +11919,7 @@
     },
     "n3974": {
       "id": "n3974",
-      "loc": [-85.61981, 41.951041]
+      "loc": [-85.619777, 41.951075]
     },
     "n3977": {
       "id": "n3977",
@@ -12314,7 +12158,7 @@
       "tags": {
         "highway": "service"
       },
-      "nodes": ["n3272", "n3974", "n3863", "n3857", "n3892", "n3883", "n3891", "n3889"]
+      "nodes": ["n3272", "n39", "n40", "n3974", "n3863", "n3857", "n3892", "n3883", "n3891", "n3889"]
     },
     "w670": {
       "id": "w670",
@@ -12448,38 +12292,6 @@
       },
       "nodes": ["n3956", "n3965", "n3957", "n3958", "n3959", "n3968", "n3971", "n3960", "n3961", "n3962", "n3963"]
     },
-    "n4008": {
-      "id": "n4008",
-      "loc": [-85.6159, 41.956336]
-    },
-    "n4009": {
-      "id": "n4009",
-      "loc": [-85.615916, 41.959065]
-    },
-    "n4010": {
-      "id": "n4010",
-      "loc": [-85.615736, 41.959364],
-      "tags": {
-        "highway": "turning_circle"
-      }
-    },
-    "w684": {
-      "id": "w684",
-      "tags": {
-        "access": "private",
-        "highway": "service",
-        "name": "River Road"
-      },
-      "nodes": ["n3808", "n4008", "n3805", "n3809", "n3804", "n4009", "n4010"]
-    },
-    "n4": {
-      "id": "n4",
-      "loc": [-85.62276, 41.951784]
-    },
-    "n5": {
-      "id": "n5",
-      "loc": [-85.622772, 41.951739]
-    },
     "n6": {
       "id": "n6",
       "loc": [-85.624908, 41.95064]
@@ -19847,14 +19659,6 @@
       "loc": [-85.621492, 41.956022],
       "id": "n1201"
     },
-    "n1202": {
-      "id": "n1202",
-      "loc": [-85.623885, 41.954527]
-    },
-    "n1203": {
-      "id": "n1203",
-      "loc": [-85.623905, 41.954415]
-    },
     "n1204": {
       "id": "n1204",
       "loc": [-85.623984, 41.95469]
@@ -22615,6 +22419,42 @@
     "n3840": {
       "loc": [-85.626813, 41.947337],
       "id": "n3840"
+    },
+    "n4": {
+      "loc": [-85.6227, 41.954457],
+      "id": "n4"
+    },
+    "n5": {
+      "loc": [-85.622738, 41.952969],
+      "id": "n5"
+    },
+    "w1": {
+      "id": "w1",
+      "nodes": ["n5", "n3478"],
+      "tags": {
+        "highway": "residential",
+        "name": "12th Avenue"
+      }
+    },
+    "n39": {
+      "id": "n39",
+      "loc": [-85.619931, 41.951013]
+    },
+    "n40": {
+      "id": "n40",
+      "loc": [-85.619841, 41.951037]
+    },
+    "n1202": {
+      "id": "n1202",
+      "loc": [-85.619744, 41.953192]
+    },
+    "n1203": {
+      "id": "n1203",
+      "loc": [-85.619059, 41.953902]
+    },
+    "n1684": {
+      "id": "n1684",
+      "loc": [-85.61786, 41.95473]
     }
   }
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 96c443ce9..8bea99e5b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -652,6 +652,7 @@
                     "9th-avenue": "9th Avenue",
                     "10th-avenue": "10th Avenue",
                     "11th-avenue": "11th Avenue",
+                    "12th-avenue": "12th Avenue",
                     "access-point-employment": "Access Point Employment",
                     "adams-street": "Adams Street",
                     "andrews-elementary-school": "Andrews Elementary School",
@@ -706,14 +707,12 @@
                     "paisley-emporium": "Paisley Emporium",
                     "paparazzi-tattoo": "Paparazzi Tattoo",
                     "pealer-street": "Pealer Street",
-                    "pine-river-road": "Pine River Road",
                     "pine-street": "Pine Street",
                     "pizza-hut": "Pizza Hut",
                     "portage-avenue": "Portage Avenue",
                     "portage-river": "Portage River",
                     "preferred-insurance-services": "Preferred Insurance Services",
                     "railroad-drive": "Railroad Drive",
-                    "raisin-river-road": "Raisin River Road",
                     "river-city-appliance": "River City Appliance",
                     "river-drive": "River Drive",
                     "river-road": "River Road",
@@ -722,13 +721,11 @@
                     "riverwalk-trail": "Riverwalk Trail",
                     "riviera-theatre": "Riviera Theatre",
                     "rocky-river": "Rocky River",
-                    "sable-river-road": "Sable River Road",
                     "saint-joseph-river": "Saint Joseph River",
                     "scidmore-park-petting-zoo": "Scidmore Park Petting Zoo",
                     "scidmore-park": "Scidmore Park",
                     "scouter-park": "Scouter Park",
                     "sherwin-williams": "Sherwin-Williams",
-                    "shiawassee-river-road": "Shiawassee River Road",
                     "south-street": "South Street",
                     "southern-michigan-bank": "Southern Michigan Bank",
                     "spring-street": "Spring Street",