X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e03861300bca1a44d50a9e9c684ffc0e2d6ad65..d36fab2913d10bef4eae2cee7c34875f20311af9:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 0c13b016e..fd45d9304 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,36 +1,87 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;
+var vectors;
 var popup;
 
-OpenLayers._getScriptLocation = function () {
-   return "/openlayers/";
-}
-   
-function createMap(divName) {
-   map = new OpenLayers.Map(divName);
+var nonamekeys = {
+   'openstreetmap.org': '2f59745a6b525b4ebdb100891d5b6711',
+   'www.openstreetmap.org': 'fd093e52f0965d46bb1c6c6281022199',
+   'openstreetmap.com': '4c60e7f5f31c576a9bb8da71c8d61152',
+   'www.openstreetmap.com': '142f25a0770a51a9a400b3513834a199',
+   'openstreetmap.net': '687c58fd1d715596bfc94abe653d8ac0',
+   'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
+};
+
+function createMap(divName, options) {
+   options = options || {};
+
+   map = new OpenLayers.Map(divName, {
+      controls: options.controls || [
+         new OpenLayers.Control.ArgParser(),
+         new OpenLayers.Control.Attribution(),
+         new OpenLayers.Control.LayerSwitcher(),
+         new OpenLayers.Control.Navigation(),
+         new OpenLayers.Control.PanZoom(),
+         new OpenLayers.Control.PanZoomBar()
+      ],
+      units: "m",
+      maxResolution: 156543.0339,
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")
+   });
 
-   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+      keyid: "mapnik",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
+      keyid: "osmarender",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
    map.addLayer(osmarender);
 
-   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
+      keyid: "cyclemap",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
+   map.addLayer(cyclemap);
+
+   var nonamekey = nonamekeys[document.domain];
+   var noname = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.noname"), [
+      "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
+      "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
+      "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png"
+   ], {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      numZoomLevels: 19
+   });
+   map.addLayer(noname);
+
+   var maplint = new OpenLayers.Layer.OSM.Maplint(i18n("javascripts.map.overlays.maplint"), {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
-   markers = new OpenLayers.Layer.Markers("Markers", { 
-      displayInLayerSwitcher: false, numZoomLevels: numZoomLevels,
+
+   markers = new OpenLayers.Layer.Markers("Markers", {
+      displayInLayerSwitcher: false,
+      numZoomLevels: numZoomLevels,
       maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
       maxResolution: 156543,
       units: "m",
-      projection: "EPSG:41001"
+      projection: "EPSG:900913"
    });
    map.addLayer(markers);
 
-   map.addControl(new OpenLayers.Control.LayerSwitcher());
-   map.addControl(new OpenLayers.Control.KeyboardDefaults());
-
    return map;
 }
 
@@ -43,24 +94,87 @@ function getArrowIcon() {
 }
 
 function addMarkerToMap(position, icon, description) {
-   var marker = new OpenLayers.Marker(position, icon);
+   var marker = new OpenLayers.Marker(position.clone().transform(epsg4326, map.getProjectionObject()), icon);
 
    markers.addMarker(marker);
 
    if (description) {
-      marker.events.register("click", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseout", marker, function() { closeMapPopup() });
    }
 
    return marker;
 }
 
+function addObjectToMap(url, zoom, callback) {
+   var layer = new OpenLayers.Layer.GML("Objects", url, {
+      format: OpenLayers.Format.OSM,
+      style: {
+          strokeColor: "blue",
+          strokeWidth: 3,
+          strokeOpacity: 0.5,
+          fillOpacity: 0.2,
+          fillColor: "lightblue",
+          pointRadius: 6
+      },
+      projection: new OpenLayers.Projection("EPSG:4326"),
+      displayInLayerSwitcher: false
+   });
+
+   layer.events.register("loadend", layer, function() {
+      var extent;
+
+      if (this.features.length) {
+         extent = this.features[0].geometry.getBounds();
+
+         for (var i = 1; i < this.features.length; i++) {
+            extent.extend(this.features[i].geometry.getBounds());
+         }
+
+         if (zoom) {
+            if (extent) {
+               this.map.zoomToExtent(extent);
+            } else {
+               this.map.zoomToMaxExtent();
+            }
+         }
+      }
+
+      if (callback) {
+         callback(extent);
+      }
+   });
+
+   map.addLayer(layer);
+
+   layer.loadGML();
+}
+
+function addBoxToMap(boxbounds) {
+   if (!vectors) {
+     // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions
+     vectors = new OpenLayers.Layer.Vector("Boxes", {
+        displayInLayerSwitcher: false
+     });
+     map.addLayer(vectors);
+   }
+   var geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+   var box = new OpenLayers.Feature.Vector(geometry, {}, {
+      strokeWidth: 2,
+      strokeColor: '#ee9900',
+      fillOpacity: 0
+   });
+
+   vectors.addFeatures(box);
+
+   return box;
+}
+
 function openMapPopup(marker, description) {
    closeMapPopup();
 
-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
-                                               sizeMapPopup(description),
-                                               "<p style='padding-right: 28px'>" + description + "</p>",
-                                               marker.icon, true);
+   popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null,
+                                            description, marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);
 
@@ -74,126 +188,79 @@ function closeMapPopup() {
    }
 }
 
-function sizeMapPopup(text) {
-   var box = document.createElement("div");
+function removeMarkerFromMap(marker){
+   markers.removeMarker(marker);
+}
 
-   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";
+function removeBoxFromMap(box){
+   vectors.removeFeature(box);
+}
 
-   document.body.appendChild(box);
+function getMapCenter() {
+   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+}
 
-   var width = box.offsetWidth;
-   var height = box.offsetHeight;
+function setMapCenter(center, zoom) {
+   zoom = parseInt(zoom);
+   var numzoom = map.getNumZoomLevels();
+   if (zoom >= numzoom) zoom = numzoom - 1;
+   map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
+}
 
-   document.body.removeChild(box);
+function setMapExtent(extent) {
+   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
+}
 
-   return new OpenLayers.Size(width + 30, height + 24);
+function getMapExtent() {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
-function removeMarkerFromMap(marker){
-   markers.removeMarker(marker);
+function getMapZoom() {
+   return map.getZoom();
+}
+
+function getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function getMapLayers() {
-   var layers = "";
+   var layerConfig = "";
 
-   for (var i=0; i< this.map.layers.length; i++) {
-      var layer = this.map.layers[i];
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i] == map.baseLayer ? "B" : "0";
+   }
 
-      if (layer.isBaseLayer) {
-         layers += (layer == this.map.baseLayer) ? "B" : "0";
-      } else {
-         layers += (layer.getVisibility()) ? "T" : "F";
-      }
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i].getVisibility() ? "T" : "F";
    }
 
-   return layers;
+   return layerConfig;
 }
 
-function setMapLayers(layers) {
-   for (var i=0; i < layers.length; i++) {
-      var layer = map.layers[i];
-      var c = layers.charAt(i);
+function setMapLayers(layerConfig) {
+   var l = 0;
+
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);
 
       if (c == "B") {
-         map.setBaseLayer(layer);
-      } else if ( (c == "T") || (c == "F") ) {
-         layer.setVisibility(c == "T");
+         map.setBaseLayer(layers[i]);
       }
    }
-}
 
-function mercatorToLonLat(merc) {
-   var lon = (merc.lon / 20037508.34) * 180;
-   var lat = (merc.lat / 20037508.34) * 180;
-
-   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) * Math.PI / 360)) / (Math.PI / 180);
-
-   lat = lat * 20037508.34 / 180;
-
-   return new OpenLayers.LonLat(lon, lat);
-}
-
-// for interacting with the PostGIS database which uses non spherical
-// Mercator. Taken from Freemap which in turn was taken from a standard
-// algorithm off the net.
-
-function lonLatToNonSphericalMercator(ll) {
-    var custLat  = ll.lat * (Math.PI/180);
-    var a = 6378137;
-    var b = 6356752.3142;
-    var f = (a-b)/a;
-    var e = Math.sqrt(2*f-Math.pow(f,2));
-    custLat=a*Math.log(Math.tan(Math.PI/4+custLat/2)*
-        Math.pow(( (1-e*Math.sin(custLat)) / (1+e*Math.sin(custLat))),e/2));
-    custLon = ll.lon * (Math.PI/180) * 6378137;
-    return new OpenLayers.LonLat (custLon,custLat);
-}
-
-function nonSphericalMercatorToLonLat(merc) {
-    var lon_deg, lat_deg;
-    var a = 6378137.0;
-    var b = 6356752.3142;
-    var k0 = 1.0;
-    var t = 1.0 - b/a;
-    var es = 2*t - t*t;
-    var e = Math.sqrt(es);
-    lon_deg = merc.lon;
-    lat_deg = merc.lat;
-    lon_deg /= a;
-    lat_deg /= a;
-    lon_deg /= k0;
-    lat_deg = phi2(Math.exp(-lat_deg/k0), e);
-    lon_deg *= (180/M_PI);
-    lat_deg *= (180/M_PI);
-    return new OpenLayers.LonLat(lon_deg,lat_deg);
-}
-
-function phi2 (ts,e) {
-    var eccnth = 0.5*e;
-    var Phi = (PI/2) - 2.0*Math.atan(ts);
-    var dphi;
-    var i=15;
-    do {
-        var con = e*Math.sin(Phi);
-        dphi = (PI/2) - 2.0*Math.atan(ts*Math.pow((1.0-con)/(1.0+con),eccnth))
-            - Phi;
-        Phi += dphi;
-    }
-    while(Math.abs(dphi) > 0.0000000001 && --i);
-    return Phi;
+   while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") {
+      l++;
+   }
+
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);
+
+      if (c == "T") {
+         layers[i].setVisibility(true);
+      } else if(c == "F") {
+         layers[i].setVisibility(false);
+      }
+   }
 }
 
 function scaleToZoom(scale) {