X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d69a518b9e69107503b332728dfa583594293ea1..ef40b61ff40881966ae4280cfdcb9f92965e9d10:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 291fd18fa..a25ab1614 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,11 +1,17 @@
 var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;
+var vectors;
 var popup;
 
-OpenLayers._getScriptLocation = function () {
-   return "/openlayers/";
-}
+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 || {};
@@ -16,39 +22,52 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
-         new OpenLayers.Control.PanZoomBar(),
-         new OpenLayers.Control.ScaleLine()
+         new OpenLayers.Control.PanZoomBar()
       ],
       units: "m",
       maxResolution: 156543.0339,
-      numZoomLevels: 20
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 
-   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
-   var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(cyclemap);
 
-   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
+   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,
@@ -82,6 +101,70 @@ function addMarkerToMap(position, icon, description) {
    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();
 
@@ -105,11 +188,18 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
+function removeBoxFromMap(box){
+   vectors.removeFeature(box);
+}
+
 function getMapCenter(center, zoom) {
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 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);
 }
 
@@ -117,7 +207,7 @@ function setMapExtent(extent) {
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 
-function getMapExtent(extent) {
+function getMapExtent() {
    return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }