From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Jun 2007 15:43:14 +0000 (+0000)
Subject: With much assistance from kleptog, make the map wrap when zoomed right out.
X-Git-Tag: live~8314
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2804e77cc373f76ab298c4f429fd958cdf983088?ds=inline

With much assistance from kleptog, make the map wrap when zoomed right out.
---

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 4ba66b03f..c9e9b504c 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -8,7 +8,7 @@ function createMap(divName, centre, zoom) {
    }
 
    map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508.34,-20037508.34,20037508.34,20037508.34),
+                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
                               numZoomLevels: 19,
                               maxResolution: 156543,
                               units: 'm',
@@ -16,12 +16,12 @@ function createMap(divName, centre, zoom) {
 
    var mapnik = new OpenLayers.Layer.TMS("Mapnik",
                                          "http://tile.openstreetmap.org/",
-                                         { type: 'png', getURL: getTileURL });
+                                         { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.TMS("Osmarender",
                                              "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/",
-                                             { type: 'png', getURL: getTileURL });
+                                             { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());
@@ -35,8 +35,18 @@ function getTileURL(bounds) {
    var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
    var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
    var z = this.map.getZoom();
+   var limit = Math.pow(2, z);
 
-   return this.url + z + "/" + x + "/" + y + "." + this.type;
+   if (y < 0 || y >= limit)
+   {
+     return null;
+   }
+   else
+   {
+     x = ((x % limit) + limit) % limit;
+
+     return this.url + z + "/" + x + "/" + y + "." + this.type;
+   }
 }
 
 function addMarkerToMap(position, icon, description) {