From a44d451f61654fefbce0898377cee4d7a38d29bf Mon Sep 17 00:00:00 2001
From: Kathryn Killebrew <kkillebrew@azavea.com>
Date: Fri, 29 Jul 2016 17:09:05 -0400
Subject: [PATCH 1/5] Add reverse button

Add button to switch origin and destination in map directions sidebar.
---
 python/cac_tripplanner/templates/map.html     |  1 +
 .../control/cac-control-sidebar-directions.js | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/python/cac_tripplanner/templates/map.html b/python/cac_tripplanner/templates/map.html
index aa9c8fba2..14a413bfe 100644
--- a/python/cac_tripplanner/templates/map.html
+++ b/python/cac_tripplanner/templates/map.html
@@ -116,6 +116,7 @@ <h6>Maximum walking distance</h6>
             <div class="sidebar-block sidebar-search hidden-xs">
                 <input class="typeahead origin" data-typeahead-key="origin" type="search" placeholder="Select an origin " />
                 <input class="typeahead destination" data-typeahead-key="destination" type="search" placeholder="Select a destination" />
+                <button id="reverse"><span class="glyphicon glyphicon-sort"></span></button>
                 <button type="submit"><span class="glyphicon glyphicon-search"></span></button>
             </div>
             <div class="sidebar-block sidebar-options hidden-xs">
diff --git a/src/app/scripts/cac/control/cac-control-sidebar-directions.js b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
index fb5ae5454..9719f1596 100644
--- a/src/app/scripts/cac/control/cac-control-sidebar-directions.js
+++ b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
@@ -31,6 +31,7 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
             modeSelectors: '#directionsModes input',
             origin: 'section.directions input.origin',
             resultsClass: 'show-results',
+            reverseButton: '#reverse',
             spinner: 'section.directions div.sidebar-details > .sk-spinner',
             wheelchairDiv: '#directionsWheelchair',
 
@@ -71,6 +72,8 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
 
         $(options.selectors.modeSelectors).change($.proxy(changeMode, this));
 
+        $(options.selectors.reverseButton).click($.proxy(reverseOriginDestination, this));
+
         // initiallize date/time picker
         datepicker = $(options.selectors.datepicker).datetimepicker({useCurrent: true});
         datepicker.on('dp.change', planTrip);
@@ -300,6 +303,31 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
         }
     }
 
+    function reverseOriginDestination() {
+        // read what they are now
+        var origin = UserPreferences.getPreference('origin');
+        var originText = UserPreferences.getPreference('originText');
+        var destination = UserPreferences.getPreference('destination');
+        var destinationText = UserPreferences.getPreference('destinationText');
+
+        // update local storage
+        UserPreferences.setPreference('origin', destination);
+        UserPreferences.setPreference('originText', destinationText);
+        UserPreferences.setPreference('destination', origin);
+        UserPreferences.setPreference('destinationText', originText);
+
+        // update the text control
+        typeaheadOrigin.setValue(destinationText);
+        typeaheadDest.setValue(originText);
+
+        // set on this object and validate
+        setDirections('origin', [destination.feature.geometry.y, destination.feature.geometry.x]);
+        setDirections('destination', [origin.feature.geometry.y, origin.feature.geometry.x]);
+
+        // update the directions for the reverse trip
+        planTrip();
+    }
+
     function onTypeaheadCleared(event, key) {
         clearItineraries();
         directions[key] = null;

From 16932054b6e6130556907bd7d305cd236dab5ccc Mon Sep 17 00:00:00 2001
From: Kathryn Killebrew <kkillebrew@azavea.com>
Date: Fri, 29 Jul 2016 17:50:03 -0400
Subject: [PATCH 2/5] Linting

Fix python linter errors about unused things.
---
 python/cac_tripplanner/cac_tripplanner/urls.py | 2 +-
 python/cac_tripplanner/shortlinks/tests.py     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/cac_tripplanner/cac_tripplanner/urls.py b/python/cac_tripplanner/cac_tripplanner/urls.py
index d9f5a4aa9..f82635118 100644
--- a/python/cac_tripplanner/cac_tripplanner/urls.py
+++ b/python/cac_tripplanner/cac_tripplanner/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib.gis import admin
 
 from django.contrib.staticfiles import views as staticviews
diff --git a/python/cac_tripplanner/shortlinks/tests.py b/python/cac_tripplanner/shortlinks/tests.py
index 66396aaf9..2420d14b3 100644
--- a/python/cac_tripplanner/shortlinks/tests.py
+++ b/python/cac_tripplanner/shortlinks/tests.py
@@ -93,7 +93,6 @@ def test_bad_key(self):
 
 class ShortenedLinkViewsTestCase(TestCase):
     def setUp(self):
-        urls = 'shortlinks.test.urls'
         self.client = Client()
 
     def test_methods_and_url_resolution(self):

From 7507fe784584be55fa4885e3055397ea78b18599 Mon Sep 17 00:00:00 2001
From: Kathryn Killebrew <kkillebrew@azavea.com>
Date: Mon, 1 Aug 2016 11:50:59 -0400
Subject: [PATCH 3/5] Bump test VM OTP memory

---
 deployment/ansible/group_vars/test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/ansible/group_vars/test b/deployment/ansible/group_vars/test
index 8a96c3a4c..126df35de 100644
--- a/deployment/ansible/group_vars/test
+++ b/deployment/ansible/group_vars/test
@@ -3,4 +3,4 @@ test: true
 develop: false
 production: false
 
-otp_process_mem: 2G
+otp_process_mem: 4G

From f90a4bce654998cd731459ec76d05bb72db7b4bf Mon Sep 17 00:00:00 2001
From: Kathryn Killebrew <kkillebrew@azavea.com>
Date: Mon, 1 Aug 2016 14:14:08 -0400
Subject: [PATCH 4/5] Change search to reverse

Remove redundant search button, and use space instead for reversing origin/destination
---
 python/cac_tripplanner/templates/map.html                     | 3 +--
 src/app/scripts/cac/control/cac-control-sidebar-directions.js | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/python/cac_tripplanner/templates/map.html b/python/cac_tripplanner/templates/map.html
index 14a413bfe..cd3524d4b 100644
--- a/python/cac_tripplanner/templates/map.html
+++ b/python/cac_tripplanner/templates/map.html
@@ -116,8 +116,7 @@ <h6>Maximum walking distance</h6>
             <div class="sidebar-block sidebar-search hidden-xs">
                 <input class="typeahead origin" data-typeahead-key="origin" type="search" placeholder="Select an origin " />
                 <input class="typeahead destination" data-typeahead-key="destination" type="search" placeholder="Select a destination" />
-                <button id="reverse"><span class="glyphicon glyphicon-sort"></span></button>
-                <button type="submit"><span class="glyphicon glyphicon-search"></span></button>
+                <button id="reverse" type="submit"><span class="glyphicon glyphicon-sort"></span></button>
             </div>
             <div class="sidebar-block sidebar-options hidden-xs">
                 <div class="options search">
diff --git a/src/app/scripts/cac/control/cac-control-sidebar-directions.js b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
index 9719f1596..5cf99e4bb 100644
--- a/src/app/scripts/cac/control/cac-control-sidebar-directions.js
+++ b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
@@ -18,7 +18,6 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
     var defaults = {
         selectors: {
             bikeTriangleDiv: '#directionsBikeTriangle',
-            buttonPlanTrip: 'section.directions button[type=submit]',
             datepicker: '#datetimeDirections',
             departAtSelect: '#directionsDepartAt',
             destination: 'section.directions input.destination',
@@ -67,9 +66,6 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
         urlRouter = options.urlRouter;
         bikeModeOptions = new BikeModeOptions();
 
-        // Plan a trip using information provided
-        $(options.selectors.buttonPlanTrip).click($.proxy(planTrip, this));
-
         $(options.selectors.modeSelectors).change($.proxy(changeMode, this));
 
         $(options.selectors.reverseButton).click($.proxy(reverseOriginDestination, this));

From 6d854395d799fa2661e89fe8fb9344c1eac3f595 Mon Sep 17 00:00:00 2001
From: Kathryn Killebrew <kkillebrew@azavea.com>
Date: Mon, 1 Aug 2016 14:20:22 -0400
Subject: [PATCH 5/5] Show/hide reverse button

Hide reverse origin/destination button if either field is empty.
---
 .../scripts/cac/control/cac-control-sidebar-directions.js    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/scripts/cac/control/cac-control-sidebar-directions.js b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
index 5cf99e4bb..31cc73c40 100644
--- a/src/app/scripts/cac/control/cac-control-sidebar-directions.js
+++ b/src/app/scripts/cac/control/cac-control-sidebar-directions.js
@@ -329,6 +329,8 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
         directions[key] = null;
         UserPreferences.clearLocation(key);
         mapControl.clearDirectionsMarker(key);
+        // hide reverse origin/destination button
+        $(options.selectors.reverseButton).css('visibility', 'hidden');
     }
 
     function onTypeaheadSelected(event, key, location) {
@@ -338,6 +340,9 @@ CAC.Control.SidebarDirections = (function (_, $, Control, BikeModeOptions, Geoco
             return;
         }
 
+        // show reverse origin/destination button
+        $(options.selectors.reverseButton).css('visibility', 'visible');
+
         // save text for address to preferences
         UserPreferences.setLocation(key, location);
         setDirections(key, [location.feature.geometry.y, location.feature.geometry.x]);