LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fixed remaining known bugs

Browse Source 
made zoom/pan controls independently toggle-able
re-added markers.js and regions.js to index.html
fixed adding marker from query string
fixed initial bg_color setting
This commit is contained in:
Alex Headley
2011-04-23 23:36:29 -04:00
parent 1c92776e41
commit 219fa3e7a9
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
overviewerConfig.js
View File

@@ -30,10 +30,13 @@ var overviewerConfig = {
*/ */
'controls': { 'controls': {
/** /**
* Navigation controls are the pan and zoom typically on the upper * Pan control is the hand with the arrows around it in the upper left.
* 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 * The zoom level when the page is loaded without a specific zoom setting
@@ -135,4 +138,4 @@ var overviewerConfig = {
* ] * ]
*/ */
'mapTypes': {maptypedata} 'mapTypes': {maptypedata}
}; };

2
web_assets/index.html
View File

@@ -7,6 +7,8 @@
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script> <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="overviewerConfig.js"></script> <script type="text/javascript" src="overviewerConfig.js"></script>
<script type="text/javascript" src="overviewer.js"></script> <script type="text/javascript" src="overviewer.js"></script>
<script type="text/javascript" src="markers.js"></script>
<script type="text/javascript" src="regions.js"></script>
</head> </head>
<!-- Generated at: {time} --> <!-- Generated at: {time} -->
<body onload="overviewer.util.initialize()"> <body onload="overviewer.util.initialize()">

49
web_assets/overviewer.js
View File

@@ -172,27 +172,30 @@ var overviewer = {
mapcenter = overviewer.util.fromWorldToLatLng(queryParams.x, mapcenter = overviewer.util.fromWorldToLatLng(queryParams.x,
queryParams.y, queryParams.z); queryParams.y, queryParams.z);
// Add a market indicating the user-supplied position // Add a market indicating the user-supplied position
overviewer.collections.markers.push({ overviewer.collections.markerDatas.push([{
'msg': 'Coordinates ' + queryParams.x + ', ' + 'msg': 'Coordinates ' + queryParams.x + ', ' +
queryParams.y + ', ' + queryParams.z, queryParams.y + ', ' + queryParams.z,
'y': parseFloat(queryParams.y), 'y': parseFloat(queryParams.y),
'x': parseFloat(queryParams.x), 'x': parseFloat(queryParams.x),
'z': parseFloat(queryParams.z), 'z': parseFloat(queryParams.z),
'type': 'querypos'}); 'type': 'querypos'}]);
} else { } else {
mapcenter = new google.maps.LatLng(lat, lng); mapcenter = new google.maps.LatLng(lat, lng);
} }
var mapOptions = { var mapOptions = {
zoom: zoom, zoom: zoom,
center: mapcenter, center: mapcenter,
navigationControl: overviewerConfig.map.controls.navigation, panControl: overviewerConfig.map.controls.pan,
scaleControl: false, scaleControl: false,
mapTypeControl: overviewer.collections.mapTypeIds.length > 1, mapTypeControl: overviewer.collections.mapTypeIds.length > 1,
mapTypeControlOptions: { mapTypeControlOptions: {
mapTypeIds: overviewer.collections.mapTypeIds mapTypeIds: overviewer.collections.mapTypeIds
}, },
mapTypeId: overviewer.util.getDefaultMapTypeId(), mapTypeId: overviewer.util.getDefaultMapTypeId(),
streetViewControl: false streetViewControl: false,
zoomControl: overviewerConfig.map.controls.zoom,
backgroundColor: overviewer.util.getMapTypeBackgroundColor(
overviewer.util.getDefaultMapTypeId())
}; };
overviewer.map = new google.maps.Map(document.getElementById( overviewer.map = new google.maps.Map(document.getElementById(
overviewerConfig.CONST.mapDivId), mapOptions); overviewerConfig.CONST.mapDivId), mapOptions);
@@ -230,15 +233,9 @@ var overviewer = {
overviewer.util.setViewUrl(); overviewer.util.setViewUrl();
}); });
google.maps.event.addListener(overviewer.map, 'maptypeid_changed', function() { google.maps.event.addListener(overviewer.map, 'maptypeid_changed', function() {
var newType = overviewer.map.getMapTypeId(); $('#'+overviewerConfig.CONST.mapDivId).css(
for(i in overviewerConfig.mapTypes) { 'background-color', overviewer.util.getMapTypeBackgroundColor(
if( overviewerConfig.CONST.mapDivId + overviewer.map.getMapTypeId()));
overviewerConfig.mapTypes[i].label == newType ) {
$('#'+overviewerConfig.CONST.mapDivId).css(
'background-color', overviewerConfig.mapTypes[i].bg_color);
break;
}
}
}); });
// We can now set the map to use the 'coordinate' map type // We can now set the map to use the 'coordinate' map type
overviewer.map.setMapTypeId(overviewer.util.getDefaultMapTypeId()); 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. * Gee, I wonder what this does.
* *