Merge pull request #485 from flibbertigibbet/feature/trip-reverse-button

Add reverse button
azavea · Aug 1, 2016 · f3283b3 · f3283b3
2 parents 44a91cb + 6d85439
commit f3283b3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git 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
diff --git 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
@@ -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):

diff --git a/python/cac_tripplanner/templates/map.html b/python/cac_tripplanner/templates/map.html
@@ -116,7 +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 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
@@ -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',
@@ -31,6 +30,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',
 
@@ -66,11 +66,10 @@ 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));
+
         // initiallize date/time picker
         datepicker = $(options.selectors.datepicker).datetimepicker({useCurrent: true});
         datepicker.on('dp.change', planTrip);
@@ -300,11 +299,38 @@ 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;
         UserPreferences.clearLocation(key);
         mapControl.clearDirectionsMarker(key);
+        // hide reverse origin/destination button
+        $(options.selectors.reverseButton).css('visibility', 'hidden');
     }
 
     function onTypeaheadSelected(event, key, location) {
@@ -314,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]);