Merge branch 'release/3.0.3'

azavea · Jan 16, 2020 · 8d85b89 · 8d85b89
2 parents 8b6ff17 + b989c8c
commit 8d85b89
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 132 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.4.4"
 
-nodejs_version: 12.13.1
-nodejs_npm_version: 6.13.1
+nodejs_version: 12.14.1
+nodejs_npm_version: 6.13.4
 
 otp_router: "default"
 

diff --git a/src/app/scripts/cac/map/cac-map-control.js b/src/app/scripts/cac/map/cac-map-control.js
@@ -239,8 +239,10 @@ CAC.Map.Control = (function ($, Handlebars, cartodb, L, turf, _, Utils) {
     }
 
     function fitToBounds(bounds) {
-        map.invalidateSize();
-        map.fitBounds(bounds);
+        if (map) {
+            map.invalidateSize();
+            map.fitBounds(bounds);
+        }
     }
 
     function setGeocodeMarker(latLng) {
@@ -348,7 +350,9 @@ CAC.Map.Control = (function ($, Handlebars, cartodb, L, turf, _, Utils) {
             }
         }
         // Deal with Chrome mobile not always fully loading tiles
-        map.invalidateSize();
+        if (map) {
+            map.invalidateSize();
+        }
     }
 
     function clearDirectionsMarker(type) {