Spread T@H over three host names.

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 803f273bdb6aaede0580572e6bf519c1a6233668..7b5c06bd045e33fc05e6487124bf1659330faf4b 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,7 +2,7 @@ var map;
 var markers;
 var popup;
 
 var markers;
 var popup;
 

-function createMap(divName, centre, zoom) {
+function createMap(divName) {

    OpenLayers.Util.onImageLoadError = function() {
       this.src = OpenLayers.Util.getImagesLocation() + "404.png";
    }
    OpenLayers.Util.onImageLoadError = function() {
       this.src = OpenLayers.Util.getImagesLocation() + "404.png";
    }


@@ -15,12 +15,12 @@ function createMap(divName, centre, zoom) {
                               projection: "EPSG:41001" });
 
    var mapnik = new OpenLayers.Layer.TMS("Mapnik",
                               projection: "EPSG:41001" });
 
    var mapnik = new OpenLayers.Layer.TMS("Mapnik",

-                                         "http://tile.openstreetmap.org/",
+                                         ["http://a.tile.openstreetmap.org/","http://b.tile.openstreetmap.org/","http://c.tile.openstreetmap.org/"],

                                          { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.TMS("Osmarender",
                                          { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.TMS("Osmarender",

-                                             "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/",
+                                             ["http://a.tah.openstreetmap.org/Tiles/tile.php/","http://b.tah.openstreetmap.org/Tiles/tile.php/","http://c.tah.openstreetmap.org/Tiles/tile.php/"],

                                              { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
                                              { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 


@@ -28,7 +28,6 @@ function createMap(divName, centre, zoom) {
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());

-   map.setCenter(centre, zoom);

 
    return map;
 }
 
    return map;
 }


@@ -42,16 +41,32 @@ function getTileURL(bounds) {
 
    if (y < 0 || y >= limit)
    {
 
    if (y < 0 || y >= limit)
    {

-     return null;
+     return OpenLayers.Util.getImagesLocation() + "404.png";

    }
    else
    {
      x = ((x % limit) + limit) % limit;
 
    }
    else
    {
      x = ((x % limit) + limit) % limit;
 

-     return this.url + z + "/" + x + "/" + y + "." + this.type;
+     var url = this.url;
+     var path = z + "/" + x + "/" + y + "." + this.type;
+
+     if (url instanceof Array)
+     {
+        url = this.selectUrl(path, url);
+     }
+
+     return url + path;

    }
 }
 
    }
 }
 

+function getArrowIcon() {
+   var size = new OpenLayers.Size(25, 22);
+   var offset = new OpenLayers.Pixel(-30, -27);
+   var icon = new OpenLayers.Icon("/images/arrow.png", size, offset);
+
+   return icon;
+}
+

 function addMarkerToMap(position, icon, description) {
    var marker = new OpenLayers.Marker(position, icon);
 
 function addMarkerToMap(position, icon, description) {
    var marker = new OpenLayers.Marker(position, icon);
 


@@ -66,17 +81,11 @@ function addMarkerToMap(position, icon, description) {
 }
 
 function openMapPopup(marker, description) {
 }
 
 function openMapPopup(marker, description) {

-//   var box = document.createElement("div");
-//   box.innerHTML = description;
-//   box.style.display = 'none';
-//   box.style.width = "200px";
-//   document.body.appendChild(box);
-

    closeMapPopup();
 
    popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
    closeMapPopup();
 
    popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,

-                                               new OpenLayers.Size(200, 50),
-                                               "<p>" + description + "</p>",
+                                               sizeMapPopup(description),
+                                               "<p style='padding-right: 28px'>" + description + "</p>",

                                                marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);
                                                marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);


@@ -91,6 +100,27 @@ function closeMapPopup() {
    }
 }
 
    }
 }
 

+function sizeMapPopup(text) {
+   var box = document.createElement("div");
+
+   box.innerHTML = text;
+   box.style.visibility = "hidden";
+   box.style.position = "absolute";
+   box.style.top = "0px";
+   box.style.left = "0px";
+   box.style.width = "200px";
+   box.style.height = "auto";
+
+   document.body.appendChild(box);
+
+   var width = box.offsetWidth;
+   var height = box.offsetHeight;
+
+   document.body.removeChild(box);
+
+   return new OpenLayers.Size(width + 30, height + 24);
+}
+

 function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }