X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2804e77cc373f76ab298c4f429fd958cdf983088..60d8673e3027ea672f50bb12873a440d46195ff3:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index c9e9b504c..3f1b83af4 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,7 +2,7 @@ var map;
 var markers;
 var popup;
 
-function createMap(divName, centre, zoom) {
+function createMap(divName) {
    OpenLayers.Util.onImageLoadError = function() {
       this.src = OpenLayers.Util.getImagesLocation() + "404.png";
    }
@@ -15,7 +15,7 @@ function createMap(divName, centre, zoom) {
                               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);
 
@@ -24,8 +24,10 @@ function createMap(divName, centre, zoom) {
                                              { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
+   markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
+   map.addLayer(markers);
+
    map.addControl(new OpenLayers.Control.LayerSwitcher());
-   map.setCenter(centre, zoom);
 
    return map;
 }
@@ -39,25 +41,37 @@ function getTileURL(bounds) {
 
    if (y < 0 || y >= limit)
    {
-     return null;
+     return OpenLayers.Util.getImagesLocation() + "404.png";
    }
    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 addMarkerToMap(position, icon, description) {
-   if (markers == null) {
-      markers = new OpenLayers.Layer.Markers("markers");
-      map.addLayer(markers);
-   }
+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);
 
    markers.addMarker(marker);
+   markers.setVisibility(true);
 
    if (description) {
       marker.events.register("click", marker, function() { openMapPopup(marker, description) });
@@ -67,17 +81,11 @@ function addMarkerToMap(position, icon, 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,
-                                               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);
@@ -92,23 +100,72 @@ 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 getMapLayers() {
+   var layers = "";
+
+   for (var i=0; i< this.map.layers.length; i++) {
+      var layer = this.map.layers[i];
+
+      if (layer.isBaseLayer) {
+         layers += (layer == this.map.baseLayer) ? "B" : "0";
+      } else {
+         layers += (layer.getVisibility()) ? "T" : "F";
+      }
+   }
+
+   return layers;
+}
+
+function setMapLayers(layers) {
+   for (var i=0; i < layers.length; i++) {
+      var layer = map.layers[i];
+      var c = layers.charAt(i);
+
+      if (c == "B") {
+         map.setBaseLayer(layer);
+      } else if ( (c == "T") || (c == "F") ) {
+         layer.setVisibility(c == "T");
+      }
+   }
+}
+
 function mercatorToLonLat(merc) {
    var lon = (merc.lon / 20037508.34) * 180;
    var lat = (merc.lat / 20037508.34) * 180;
-   var PI = 3.14159265358979323846;
 
-   lat = 180/PI * (2 * Math.atan(Math.exp(lat * PI / 180)) - PI / 2);
+   lat = 180/Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
 
    return new OpenLayers.LonLat(lon, lat);
 }
 
 function lonLatToMercator(ll) {
    var lon = ll.lon * 20037508.34 / 180;
-   var lat = Math.log(Math.tan((90 + ll.lat) * PI / 360)) / (PI / 180);
+   var lat = Math.log(Math.tan((90 + ll.lat) * Math.PI / 360)) / (Math.PI / 180);
 
    lat = lat * 20037508.34 / 180;