Merge branch 'develop' into feature/add-widget-loading-indicator

cmv · Dec 5, 2016 · 146784f · 146784f
2 parents 2837cdb + d6282af
commit 146784f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/viewer/js/gis/dijit/StreetView/css/StreetView.css b/viewer/js/gis/dijit/StreetView/css/StreetView.css
@@ -2,6 +2,7 @@
     width: 100%;
     height: 250px;
     padding-bottom: 5px;
+    position:  relative;
 }
 
 .gis_StreetView .streetViewButton {

diff --git a/viewer/js/gis/plugins/Google.js b/viewer/js/gis/plugins/Google.js
@@ -20,8 +20,6 @@
 	'use strict';
 
 
-	var googleVersion = '3.18';
-
 	var script = null;
 
 	var google = null;
@@ -52,7 +50,7 @@
 
 	GoogleMapsLoader.REGION = null;
 
-	GoogleMapsLoader.VERSION = googleVersion;
+	GoogleMapsLoader.VERSION = '3';
 
 	GoogleMapsLoader.WINDOW_CALLBACK_NAME = '__google_maps_api_provider_initializator__';
 
@@ -108,8 +106,12 @@
 			url += '&libraries=' + GoogleMapsLoader.LIBRARIES.join(',');
 		}
 
+		if (GoogleMapsLoader.VERSION) {
+			url += '&v=' + GoogleMapsLoader.VERSION;
+		}
+
 		if (GoogleMapsLoader.CLIENT) {
-			url += '&client=' + GoogleMapsLoader.CLIENT + '&v=' + GoogleMapsLoader.VERSION;
+			url += '&client=' + GoogleMapsLoader.CLIENT;
 		}
 
 		if (GoogleMapsLoader.CHANNEL) {