Merge branch 'release/3.1.1'

azavea · May 4, 2020 · 9faaf8d · 9faaf8d
2 parents 38f8fb2 + 2d3b2de
commit 9faaf8d
Show file tree

Hide file tree

Showing 6 changed files with 905 additions and 847 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -14,8 +14,8 @@ postgresql_support_psycopg2_version: "2.8.*"
 
 packer_version: "1.5.4"
 
-nodejs_version: 12.16.1
-nodejs_npm_version: 6.13.4
+nodejs_version: 12.16.3
+nodejs_npm_version: 6.14.4
 
 otp_router: "default"
 

diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,16 +1,16 @@
 base58==2.0.0
-boto3==1.12.26
-Django==2.2.11
+boto3==1.12.47
+Django==2.2.12
 django-ckeditor==5.9.0
-django-image-cropping==1.3.0
-django-extensions==2.2.8
+django-image-cropping==1.4.0
+django-extensions==2.2.9
 django-storages==1.9.1
 easy-thumbnails==2.7
 gunicorn==20.0.4
-Pillow==7.0.0
-psycopg2-binary==2.8.4
-pytz==2019.3
+Pillow==7.1.2
+psycopg2-binary==2.8.5
+pytz==2020.1
 PyYAML==5.3.1
 requests==2.23.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
-virtualenv==20.0.13
+virtualenv==20.0.18
diff --git a/src/app/scripts/cac/control/cac-control-directions-list.js b/src/app/scripts/cac/control/cac-control-directions-list.js
@@ -106,15 +106,14 @@ CAC.Control.DirectionsList = (function (_, $, ShareModal, MapTemplates) {
         });
 
         // Show alert with link to transit agency bicycle policy for bike+transit itineraries
+        var alert;
         if (_.includes(itinerary.modes, 'BICYCLE') && itinerary.agencies.length) {
-            var alert = MapTemplates.bicycleWarningAlert(itinerary.agencies);
-            var $alert = $(alert);
-            $alert.one('click', options.selectors.alertCloseButton, function () {
-                $alert.remove();
-            });
-            $container.find(options.selectors.directionsHeader).after($alert);
+            alert = MapTemplates.bicycleWarningAlert(itinerary.agencies);
         } else if (itinerary.agencies.length) {
-            var alert = MapTemplates.transitWarningAlert();
+            alert = MapTemplates.transitWarningAlert();
+        }
+
+        if (alert) {
             var $alert = $(alert);
             $alert.one('click', options.selectors.alertCloseButton, function () {
                 $alert.remove();

diff --git a/src/app/scripts/cac/map/cac-map-overlays.js b/src/app/scripts/cac/map/cac-map-overlays.js
@@ -25,8 +25,9 @@ CAC.Map.OverlaysControl = (function ($, cartodb, L, Utils) {
     function bikeShareOverlay() {
         bikeShareFeatureGroup = cartodb.L.featureGroup([]);
         $.ajax({
-            contentType: 'application/json',
-            url: 'https://api.phila.gov/bike-share-stations/v1',
+            cache: false,
+            dataType: 'json',
+            url: 'https://kiosks.bicycletransit.workers.dev/phl',
             success: function (data) {
                 $.each(data.features, function (i, share) {
                     bikeShareFeatureGroup.addLayer(getBikeShareMarker(share));