Skip to content

Commit

Permalink
Merge pull request #644 from cmv/fixes/adjust-streeview-stylesheet
Browse files Browse the repository at this point in the history
Fix StreetView Stylesheet and allow Google API version to be configured.
  • Loading branch information
DavidSpriggs authored Dec 5, 2016
2 parents 177882d + 69a8944 commit d6282af
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions viewer/js/gis/dijit/StreetView/css/StreetView.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
width: 100%;
height: 250px;
padding-bottom: 5px;
position: relative;
}

.gis_StreetView .streetViewButton {
Expand Down
10 changes: 6 additions & 4 deletions viewer/js/gis/plugins/Google.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
'use strict';


var googleVersion = '3.18';

var script = null;

var google = null;
Expand Down Expand Up @@ -52,7 +50,7 @@

GoogleMapsLoader.REGION = null;

GoogleMapsLoader.VERSION = googleVersion;
GoogleMapsLoader.VERSION = '3';

GoogleMapsLoader.WINDOW_CALLBACK_NAME = '__google_maps_api_provider_initializator__';

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit d6282af

Please sign in to comment.