From e87581a86edc8911da465b19c5b0c63902b58135 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Wed, 5 Jun 2019 10:36:40 -0700
Subject: [PATCH] adjusting map of 23rd ave for first real demo. making
 unzoomed colors match between sim and psrc trip viz

---
 data/polygons/23rd.poly         | 10 +++++-----
 docs/project/references.md      |  1 +
 editor/src/mission/all_trips.rs | 15 +++++++--------
 editor/src/ui.rs                |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/polygons/23rd.poly b/data/polygons/23rd.poly
index 2977b455b1..c1960fb7a2 100644
--- a/data/polygons/23rd.poly
+++ b/data/polygons/23rd.poly
@@ -1,9 +1,9 @@
 23rd
 1
-     -122.33955839886022    47.6650960061724
-     -122.26351332043961    47.66461116083562
-     -122.2818960605346    47.60821587211569
-     -122.33254012391556    47.63026041235239
-     -122.33955839886022    47.6650960061724
+     -122.30964296873428    47.5977517049213
+     -122.29152725418099    47.597290174872846
+     -122.29537891155186    47.652213533970354
+     -122.31036966897095    47.65513966206871
+     -122.30964296873428    47.5977517049213
 END
 END
diff --git a/docs/project/references.md b/docs/project/references.md
index 3f66fa98f2..2b12728bcc 100644
--- a/docs/project/references.md
+++ b/docs/project/references.md
@@ -28,6 +28,7 @@
 - https://humantransit.org/2019/03/notes-on-simcity-at-30.html
 - https://mynorthwest.com/category/chokepoints/
 - https://blogs.uw.edu/ceadvice/2019/05/08/infrastructure-week-2019-welcome-uw-cee-students-and-faculty/
+- https://escience.washington.edu/dssg/
 
 ## Similar projects
 
diff --git a/editor/src/mission/all_trips.rs b/editor/src/mission/all_trips.rs
index cbc5f0a111..f2f92731cf 100644
--- a/editor/src/mission/all_trips.rs
+++ b/editor/src/mission/all_trips.rs
@@ -3,8 +3,7 @@ use crate::mission::trips::{clip_trips, Trip};
 use crate::ui::{ShowEverything, UI};
 use abstutil::prettyprint_usize;
 use ezgui::{
-    hotkey, Color, EventCtx, EventLoopMode, GeomBatch, GfxCtx, Key, ModalMenu, ScreenPt, Slider,
-    Text,
+    hotkey, EventCtx, EventLoopMode, GeomBatch, GfxCtx, Key, ModalMenu, ScreenPt, Slider, Text,
 };
 use geom::{Circle, Distance, Duration};
 use map_model::{PathRequest, LANE_THICKNESS};
@@ -161,12 +160,12 @@ impl TripsVisualizer {
 
             let pl = trip.route.as_ref().unwrap();
             let color = match trip.mode {
-                Mode::Drive => Color::RED,
-                Mode::Walk => Color::GREEN,
-                Mode::Bike => Color::BLUE,
-                Mode::Transit => Color::ORANGE,
-            }
-            .alpha(0.5);
+                Mode::Drive => ui.cs.get("unzoomed car"),
+                Mode::Walk => ui.cs.get("unzoomed pedestrian"),
+                Mode::Bike => ui.cs.get("unzoomed bike"),
+                // Little weird, but close enough.
+                Mode::Transit => ui.cs.get("unzoomed bus"),
+            };
             batch.push(
                 color,
                 Circle::new(
diff --git a/editor/src/ui.rs b/editor/src/ui.rs
index 2190e5f5b6..9cc71db00a 100644
--- a/editor/src/ui.rs
+++ b/editor/src/ui.rs
@@ -98,7 +98,7 @@ impl UI {
                 ),
                 (
                     self.cs
-                        .get_def("unzoomed pedestrian ", Color::CYAN.alpha(0.5)),
+                        .get_def("unzoomed pedestrian", Color::ORANGE.alpha(0.5)),
                     peds,
                 ),
             ] {