X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/97aefa23d0606edaee71d04cf6c1a2006689b1fa..2c52b067168084265ed577104fe1fa2677c6e620:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 291fd18fa..3cfa2f9a1 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,9 +1,21 @@
 var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;
+var vectors;
 var popup;
 
+var nonamekeys = {
+   'openstreetmap.org': '2f59745a6b525b4ebdb100891d5b6711',
+   'www.openstreetmap.org': 'fd093e52f0965d46bb1c6c6281022199',
+   'openstreetmap.com': '4c60e7f5f31c576a9bb8da71c8d61152',
+   'www.openstreetmap.com': '142f25a0770a51a9a400b3513834a199',
+   'openstreetmap.net': '687c58fd1d715596bfc94abe653d8ac0',
+   'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
+};
+
 OpenLayers._getScriptLocation = function () {
+  // Should really have this file as an erb, so that this can return 
+  // the real rails root
    return "/openlayers/";
 }
 
@@ -21,7 +33,8 @@ function createMap(divName, options) {
       ],
       units: "m",
       maxResolution: 156543.0339,
-      numZoomLevels: 20
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
@@ -42,6 +55,18 @@ function createMap(divName, options) {
    });
    map.addLayer(cyclemap);
 
+   var nonamekey = nonamekeys[document.domain];
+   var noname = new OpenLayers.Layer.OSM("NoName", [
+      "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/",
+      "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/",
+      "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/"
+   ], {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      numZoomLevels: 19
+   });
+   map.addLayer(noname);
+
    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
@@ -58,6 +83,17 @@ function createMap(divName, options) {
       projection: "EPSG:900913"
    });
    map.addLayer(markers);
+   
+   vectors = new OpenLayers.Layer.Vector("Vectors", {
+      displayInLayerSwitcher: false,
+      numZoomLevels: numZoomLevels,
+      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
+      maxResolution: 156543,
+      units: "m",
+      projection: "EPSG:900913"
+   });
+   map.addLayer(vectors);
+   
 
    return map;
 }
@@ -82,6 +118,19 @@ function addMarkerToMap(position, icon, description) {
    return marker;
 }
 
+function addBoxToMap(boxbounds) {
+   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 +154,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 +173,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);
 }