Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-09 04:02:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #367 from mikeprimm/master

Browse Source 
Fix map center consistency between map changes, add fromLatLngToLocation to Projection
This commit is contained in:
mikeprimm 2011-08-03 08:26:57 -07:00
commit bb279d7e2f
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/js/dynmaputils.js
View File

@ -4,6 +4,9 @@ var DynmapProjection = L.Class.extend({
},
fromLocationToLatLng: function(location) {
throw "fromLocationToLatLng not implemented";
},
fromLatLngToLocation: function(location) {
return null;
}
});

6
web/js/flatmap.js
View File

@ -4,7 +4,13 @@ var FlatProjection = DynmapProjection.extend({
-location.z / (1 << this.options.mapzoomout),
location.x / (1 << this.options.mapzoomout),
true);
},
fromLatLngToLocation: function(latlon, y) {
var z = -latlon.lat * (1 << this.options.mapzoomout);
var x = latlon.lng * (1 << this.options.mapzoomout);
return { x: x, y: y, z: z };
}
});
var FlatMapType = DynmapTileLayer.extend({

9
web/js/hdmap.js
View File

@ -7,7 +7,16 @@ var HDProjection = DynmapProjection.extend({
xx / (1 << this.options.mapzoomout)
, (128-yy) / (1 << this.options.mapzoomout)
, true);
},
fromLatLngToLocation: function(latlon, y) {
var ptw = this.options.maptoworld;
var lat = latlon.lat * (1 << this.options.mapzoomout);
var lon = 128 - latlon.lng * (1 << this.options.mapzoomout);
var x = ptw[0]*lat + ptw[1]*lon + ptw[2]*y;
var z = ptw[6]*lat + ptw[7]*lon + ptw[8]*y;
return { x: x, y: y, z: z };
}
});
var HDMapType = DynmapTileLayer.extend({

9
web/js/kzedmaps.js
View File

@ -10,7 +10,16 @@ var KzedProjection = DynmapProjection.extend({
var xx = (128 - px) / scale;
var yy = py / scale;
return new L.LatLng(xx, yy, true);
},
fromLatLngToLocation: function(latlon, y) {
var scale = 1 << this.options.mapzoomout;
var px = 128 - (latlon.lat * scale);
var py = latlon.lng * scale;
var x = (px + py + (y-127))/2;
var z = (px - x);
return { x: x, y: y, z: z };
}
});
var KzedMapType = DynmapTileLayer.extend({

10
web/js/map.js
View File

@ -323,6 +323,8 @@ DynMap.prototype = {
me.map.removeLayer(me.maptype);
}
var prevmap = me.maptype;
me.world = mapWorld;
me.maptype = map;
@ -338,7 +340,13 @@ DynMap.prototype = {
centerPoint = me.getProjection().fromLocationToLatLng(centerLocation);
}
else {
centerPoint = me.map.getCenter();
var prevloc = null;
if(prevmap != null)
prevloc = prevmap.getProjection().fromLatLngToLocation(me.map.getCenter(), 64);
if(prevloc != null)
centerPoint = me.getProjection().fromLocationToLatLng(prevloc);
else
centerPoint = me.map.getCenter();
}
me.map.setView(centerPoint, prevzoom, true);
}