Merge commit 'bf07d3d10c2e00eba3371cff700c8f3cb4d8e3e8'
Note: now that the tiles directory has changed, anyone with existing tiles should be sure to remove or move their old set of tiles Conflicts: template.html
This commit is contained in:
5
gmap.py
5
gmap.py
@@ -41,8 +41,11 @@ def main():
|
|||||||
|
|
||||||
if not os.path.exists(destdir):
|
if not os.path.exists(destdir):
|
||||||
os.mkdir(destdir)
|
os.mkdir(destdir)
|
||||||
|
tiledir = os.path.join(destdir, "tiles");
|
||||||
|
if not os.path.exists(tiledir):
|
||||||
|
os.mkdir(tiledir)
|
||||||
|
|
||||||
zoom = world.generate_quadtree(results, mincol, maxcol, minrow, maxrow, destdir)
|
zoom = world.generate_quadtree(results, mincol, maxcol, minrow, maxrow, tiledir)
|
||||||
|
|
||||||
print "DONE"
|
print "DONE"
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
</script>
|
</script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var config = {
|
var config = {
|
||||||
path: '.',
|
path: 'tiles',
|
||||||
fileExt: 'png',
|
fileExt: 'png',
|
||||||
tileSize: 384,
|
tileSize: 384,
|
||||||
defaultZoom: 1,
|
defaultZoom: 1,
|
||||||
@@ -30,10 +30,10 @@
|
|||||||
for(var z = zoom - 1; z >= 0; --z) {
|
for(var z = zoom - 1; z >= 0; --z) {
|
||||||
var x = Math.floor(tile.x / Math.pow(2, z)) % 2;
|
var x = Math.floor(tile.x / Math.pow(2, z)) % 2;
|
||||||
var y = Math.floor(tile.y / Math.pow(2, z)) % 2;
|
var y = Math.floor(tile.y / Math.pow(2, z)) % 2;
|
||||||
url += '/' + (x + 2 * y)
|
url += '/' + (x + 2 * y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
url += '.' + config.fileExt;
|
url = config.path + url + '.' + config.fileExt;
|
||||||
return(url);
|
return(url);
|
||||||
},
|
},
|
||||||
tileSize: new google.maps.Size(config.tileSize, config.tileSize),
|
tileSize: new google.maps.Size(config.tileSize, config.tileSize),
|
||||||
@@ -70,4 +70,4 @@
|
|||||||
<body onload="initialize()">
|
<body onload="initialize()">
|
||||||
<div id="mcmap" style="width:100%; height:100%"></div>
|
<div id="mcmap" style="width:100%; height:100%"></div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user