LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Get rid of overviewer.gmap, move code into util

Browse Source
This commit is contained in:
Nicolas F
2016-07-11 21:52:24 +02:00
committed by Andrew Chin
parent 2cfa3e8731
commit 044c65f922
2 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
overviewer_core/data/js_src/overviewer.js
View File

@@ -86,40 +86,3 @@ overviewer.classes = {
} }
}; };
overviewer.gmap = {
/**
* Generate a function to get the path to a tile at a particular location
* and zoom level.
*
* @param string path
* @param string pathBase
* @param string pathExt
*/
'getTileUrlGenerator': function(path, pathBase, pathExt) {
return function(o) {
var url = path;
var zoom = o.z;
var urlBase = ( pathBase ? pathBase : '' );
if(o.x < 0 || o.x >= Math.pow(2, zoom) ||
o.y < 0 || o.y >= Math.pow(2, zoom)) {
url += '/blank';
} else if(zoom === 0) {
url += '/base';
} else {
for(var z = zoom - 1; z >= 0; --z) {
var x = Math.floor(o.x / Math.pow(2, z)) % 2;
var y = Math.floor(o.y / Math.pow(2, z)) % 2;
url += '/' + (x + 2 * y);
}
}
url = url + '.' + pathExt;
if(typeof overviewerConfig.map.cacheTag !== 'undefined') {
url += '?c=' + overviewerConfig.map.cacheTag;
}
return(urlBase + url);
};
}
};

34
overviewer_core/data/js_src/util.js
View File

@@ -161,7 +161,7 @@ overviewer.util = {
minZoom: obj.minZoom, minZoom: obj.minZoom,
errorTileUrl: obj.base + obj.path + "/blank.png", errorTileUrl: obj.base + obj.path + "/blank.png",
}); });
myLayer.getTileUrl = overviewer.gmap.getTileUrlGenerator(obj.path, obj.base, obj.imgextension); myLayer.getTileUrl = overviewer.util.getTileUrlGenerator(obj.path, obj.base, obj.imgextension);
if (obj.isOverlay) { if (obj.isOverlay) {
overviewer.collections.overlays[obj.world][obj.name] = myLayer; overviewer.collections.overlays[obj.world][obj.name] = myLayer;
@@ -600,5 +600,37 @@ overviewer.util = {
overviewer.map.setZoom(zoom); overviewer.map.setZoom(zoom);
var locationmarker = new overviewer.views.LocationIconView(); var locationmarker = new overviewer.views.LocationIconView();
locationmarker.render(); locationmarker.render();
},
/**
* Generate a function to get the path to a tile at a particular location
* and zoom level.
*
* @param string path
* @param string pathBase
* @param string pathExt
*/
'getTileUrlGenerator': function(path, pathBase, pathExt) {
return function(o) {
var url = path;
var zoom = o.z;
var urlBase = ( pathBase ? pathBase : '' );
if(o.x < 0 || o.x >= Math.pow(2, zoom) ||
o.y < 0 || o.y >= Math.pow(2, zoom)) {
url += '/blank';
} else if(zoom === 0) {
url += '/base';
} else {
for(var z = zoom - 1; z >= 0; --z) {
var x = Math.floor(o.x / Math.pow(2, z)) % 2;
var y = Math.floor(o.y / Math.pow(2, z)) % 2;
url += '/' + (x + 2 * y);
}
}
url = url + '.' + pathExt;
if(typeof overviewerConfig.map.cacheTag !== 'undefined') {
url += '?c=' + overviewerConfig.map.cacheTag;
}
return(urlBase + url);
};
} }
}; };