X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cbb7d974052c079dff81b70d40c0d134b14298ae..48929e8781f9c136a142400a7a2ef1cf994f74fd:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 781ea5551..df9d30992 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,82 +1,187 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;
+var vectors;
 var popup;
 
-function createMap(divName) {
-   OpenLayers.Util.onImageLoadError = function() {
-      this.src = OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-
-   map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-                              numZoomLevels: 19,
-                              maxResolution: 156543,
-                              units: 'm',
-                              projection: "EPSG:41001" });
-
-   var mapnik = new OpenLayers.Layer.TMS("Mapnik",
-                                         "http://tile.openstreetmap.org/",
-                                         { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+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(),
+         new OpenLayers.Control.ScaleLine({geodesic: true})
+      ],
+      units: "m",
+      maxResolution: 156543.0339,
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")
+   });
+
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+      keyid: "mapnik",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      layerCode: "M"
+   });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.TMS("Osmarender",
-                                             "http://dev.openstreetmap.org/~ojw/Tiles/tile.php/",
-                                             { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
+      keyid: "osmarender",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      layerCode: "O"
+   });
    map.addLayer(osmarender);
 
-   markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
+      keyid: "cyclemap",
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      layerCode: "C"
+   });
+   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,
+      layerCode: "N"
+   });
+   map.addLayer(noname);
+
+   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.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:900913"
+   });
    map.addLayer(markers);
 
-   map.addControl(new OpenLayers.Control.LayerSwitcher());
-
    return map;
 }
 
-function getTileURL(bounds) {
-   var res = this.map.getResolution();
-   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);
+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);
 
-   if (y < 0 || y >= limit)
-   {
-     return null;
-   }
-   else
-   {
-     x = ((x % limit) + limit) % limit;
-
-     return this.url + z + "/" + x + "/" + y + "." + this.type;
-   }
+   return icon;
 }
 
 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);
-   markers.setVisibility(true);
 
    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 openMapPopup(marker, description) {
-//   var box = document.createElement("div");
-//   box.innerHTML = description;
-//   box.style.display = 'none';
-//   box.style.width = "200px";
-//   document.body.appendChild(box);
+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, attributes, line) {
+   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;
+   if (line) {
+     vertices = boxbounds.toGeometry().getVertices();
+     vertices.push( new OpenLayers.Geometry.Point( vertices[0].x, vertices[0].y ) );
+     geometry = new OpenLayers.Geometry.LineString(vertices).transform(epsg4326, map.getProjectionObject());
+   } else {
+     geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+   }  
+   var box = new OpenLayers.Feature.Vector(geometry, attributes, {
+      strokeWidth: 2,
+      strokeColor: '#ee9900',
+      fillOpacity: 0
+   });
+
+   vectors.addFeatures(box);
+
+   return box;
+}
 
+function openMapPopup(marker, description) {
    closeMapPopup();
 
-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat,
-                                               new OpenLayers.Size(200, 50),
-                                               "<p>" + description + "</p>",
-                                               marker.icon, true);
+   popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null,
+                                            description, marker.icon, true);
    popup.setBackgroundColor("#E3FFC5");
    map.addPopup(popup);
 
@@ -94,51 +199,75 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
-function getMapLayers() {
-   var layers = "";
+function removeBoxFromMap(box){
+   vectors.removeFeature(box);
+}
 
-   for (var i=0; i< this.map.layers.length; i++) {
-      var layer = this.map.layers[i];
+function getMapCenter() {
+   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+}
 
-      if (layer.isBaseLayer) {
-         layers += (layer == this.map.baseLayer) ? "B" : "0";
-      } else {
-         layers += (layer.getVisibility()) ? "T" : "F";
-      }
-   }
+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);
+}
 
-   return layers;
+function setMapExtent(extent) {
+   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 
-function setMapLayers(layers) {
-   for (var i=0; i < layers.length; i++) {
-      var layer = map.layers[i];
-      var c = layers.charAt(i);
+function getMapExtent() {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
+}
 
-      if (c == "B") {
-         map.setBaseLayer(layer);
-      } else if ( (c == "T") || (c == "F") ) {
-         layer.setVisibility(c == "T");
-      }
-   }
+function getMapZoom() {
+   return map.getZoom();
 }
 
-function mercatorToLonLat(merc) {
-   var lon = (merc.lon / 20037508.34) * 180;
-   var lat = (merc.lat / 20037508.34) * 180;
+function getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+}
 
-   lat = 180/Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
+function getMapLayers() {
+   var layerConfig = "";
 
-   return new OpenLayers.LonLat(lon, lat);
+   for (var i = 0; i < map.layers.length; i++) {
+      if (map.layers[i].layerCode && map.layers[i].getVisibility()) {
+         layerConfig += map.layers[i].layerCode;
+      }
+   }
+
+   return layerConfig;
 }
 
-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);
+function setMapLayers(layerConfig) {
+   if (layerConfig.charAt(0) == "B" || layerConfig.charAt(0) == "0") {
+      var l = 0;
 
-   lat = lat * 20037508.34 / 180;
+      for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+         var c = layerConfig.charAt(l++);
 
-   return new OpenLayers.LonLat(lon, lat);
+         if (c == "B") {
+            map.setBaseLayer(layers[i]);
+         }
+      }
+   } else {
+      for (var i = 0; i < map.layers.length; i++) {
+         if (map.layers[i].layerCode) {
+            if (layerConfig.indexOf(map.layers[i].layerCode) >= 0) {
+               if (map.layers[i].isBaseLayer) {
+                  map.setBaseLayer(map.layers[i]);
+               } else {
+                   map.layers[i].setVisibility(true);
+               }
+            } else {
+               map.layers[i].setVisibility(false);
+            }
+         }
+      }
+   }
 }
 
 function scaleToZoom(scale) {