diff --git a/overviewerConfig.js b/overviewerConfig.js
index 1ceb336..8b34a0f 100644
--- a/overviewerConfig.js
+++ b/overviewerConfig.js
@@ -30,10 +30,13 @@ var overviewerConfig = {
*/
'controls': {
/**
- * Navigation controls are the pan and zoom typically on the upper
- * left.
+ * Pan control is the hand with the arrows around it in the upper left.
*/
- 'navigation': true
+ 'pan': true,
+ /**
+ * Zoom control is the zoom slider bar in the upper left.
+ */
+ 'zoom': true
},
/**
* The zoom level when the page is loaded without a specific zoom setting
@@ -135,4 +138,4 @@ var overviewerConfig = {
* ]
*/
'mapTypes': {maptypedata}
-};
\ No newline at end of file
+};
diff --git a/web_assets/index.html b/web_assets/index.html
index 14c6666..b3cb596 100644
--- a/web_assets/index.html
+++ b/web_assets/index.html
@@ -7,6 +7,8 @@
+
+
diff --git a/web_assets/overviewer.js b/web_assets/overviewer.js
index a298bf0..37b465b 100644
--- a/web_assets/overviewer.js
+++ b/web_assets/overviewer.js
@@ -172,27 +172,30 @@ var overviewer = {
mapcenter = overviewer.util.fromWorldToLatLng(queryParams.x,
queryParams.y, queryParams.z);
// Add a market indicating the user-supplied position
- overviewer.collections.markers.push({
+ overviewer.collections.markerDatas.push([{
'msg': 'Coordinates ' + queryParams.x + ', ' +
queryParams.y + ', ' + queryParams.z,
'y': parseFloat(queryParams.y),
'x': parseFloat(queryParams.x),
'z': parseFloat(queryParams.z),
- 'type': 'querypos'});
+ 'type': 'querypos'}]);
} else {
mapcenter = new google.maps.LatLng(lat, lng);
}
var mapOptions = {
- zoom: zoom,
- center: mapcenter,
- navigationControl: overviewerConfig.map.controls.navigation,
- scaleControl: false,
- mapTypeControl: overviewer.collections.mapTypeIds.length > 1,
+ zoom: zoom,
+ center: mapcenter,
+ panControl: overviewerConfig.map.controls.pan,
+ scaleControl: false,
+ mapTypeControl: overviewer.collections.mapTypeIds.length > 1,
mapTypeControlOptions: {
mapTypeIds: overviewer.collections.mapTypeIds
},
- mapTypeId: overviewer.util.getDefaultMapTypeId(),
- streetViewControl: false
+ mapTypeId: overviewer.util.getDefaultMapTypeId(),
+ streetViewControl: false,
+ zoomControl: overviewerConfig.map.controls.zoom,
+ backgroundColor: overviewer.util.getMapTypeBackgroundColor(
+ overviewer.util.getDefaultMapTypeId())
};
overviewer.map = new google.maps.Map(document.getElementById(
overviewerConfig.CONST.mapDivId), mapOptions);
@@ -230,15 +233,9 @@ var overviewer = {
overviewer.util.setViewUrl();
});
google.maps.event.addListener(overviewer.map, 'maptypeid_changed', function() {
- var newType = overviewer.map.getMapTypeId();
- for(i in overviewerConfig.mapTypes) {
- if( overviewerConfig.CONST.mapDivId +
- overviewerConfig.mapTypes[i].label == newType ) {
- $('#'+overviewerConfig.CONST.mapDivId).css(
- 'background-color', overviewerConfig.mapTypes[i].bg_color);
- break;
- }
- }
+ $('#'+overviewerConfig.CONST.mapDivId).css(
+ 'background-color', overviewer.util.getMapTypeBackgroundColor(
+ overviewer.map.getMapTypeId()));
});
// We can now set the map to use the 'coordinate' map type
overviewer.map.setMapTypeId(overviewer.util.getDefaultMapTypeId());
@@ -412,6 +409,22 @@ var overviewer = {
}
}
},
+ /**
+ * Change the map's div's background color according to the mapType's bg_color setting
+ *
+ * @param string mapTypeId
+ * @return string
+ */
+ 'getMapTypeBackgroundColor': function(mapTypeId) {
+ for(i in overviewerConfig.mapTypes) {
+ if( overviewerConfig.CONST.mapDivId +
+ overviewerConfig.mapTypes[i].label == mapTypeId ) {
+ overviewer.util.debug('Found background color for: ' +
+ overviewerConfig.mapTypes[i].bg_color);
+ return overviewerConfig.mapTypes[i].bg_color;
+ }
+ }
+ },
/**
* Gee, I wonder what this does.
*