Change the feature commited in [16174] to use the main map view

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 07c6b32d174b082481de347f72ee8e332418439a..0457713c591102567392226dd536ba8fe7f188dd 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,42 +1,90 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");

 var map;
 var markers;
 var map;
 var markers;

+var vectors;

 var popup;
 
 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 () {
 OpenLayers._getScriptLocation = function () {

+  // Should really have this file as an erb, so that this can return 
+  // the real rails root

    return "/openlayers/";
 }
    return "/openlayers/";
 }

-   
-function createMap(divName) {
+
+function createMap(divName, options) {
+   options = options || {};
+

    map = new OpenLayers.Map(divName, {
    map = new OpenLayers.Map(divName, {

-      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-      maxResolution: 156543,
-      units: "m",
-      projection: "EPSG:900913",
-      controls: [
-         new OpenLayers.Control.ArgParser(), 
+      controls: options.controls || [
+         new OpenLayers.Control.ArgParser(),

          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),

-         new OpenLayers.Control.Navigation(), 
-         new OpenLayers.Control.PanZoomBar()
-      ]
+         new OpenLayers.Control.Navigation(),
+         new OpenLayers.Control.PanZoomBar(),
+         new OpenLayers.Control.ScaleLine()
+      ],
+      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("Mapnik", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(mapnik);
 
    map.addLayer(mapnik);
 

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(osmarender);
 
    map.addLayer(osmarender);
 

-   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
+   map.addLayer(cyclemap);
+
+   var nonamekey = nonamekeys[document.domain];
+   var noname = new OpenLayers.Layer.OSM("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("Maplint", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });

    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);

-   markers = new OpenLayers.Layer.Markers("Markers", { 
+
+   markers = new OpenLayers.Layer.Markers("Markers", {

       displayInLayerSwitcher: false,
       displayInLayerSwitcher: false,

-      numZoomLevels: numZoomLevels
+      numZoomLevels: numZoomLevels,
+      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
+      maxResolution: 156543,
+      units: "m",
+      projection: "EPSG:900913"

    });
    map.addLayer(markers);
    });
    map.addLayer(markers);

-
+   

    return map;
 }
 
    return map;
 }
 


@@ -49,7 +97,7 @@ function getArrowIcon() {
 }
 
 function addMarkerToMap(position, icon, description) {
 }
 
 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.addMarker(marker);
 


@@ -60,14 +108,33 @@ function addMarkerToMap(position, icon, description) {
    return marker;
 }
 
    return marker;
 }
 

+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("Box Layer", {
+        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();
 
 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.AnchoredBubble("popup", marker.lonlat, null,
+                                               description, marker.icon, true);

    popup.setBackgroundColor("#E3FFC5");
    popup.setBackgroundColor("#E3FFC5");

+   popup.autoSize = true;

    map.addPopup(popup);
 
    return popup;
    map.addPopup(popup);
 
    return popup;


@@ -80,76 +147,75 @@ 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(center, zoom) {
+   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 getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);

 }
 
 function getMapLayers() {
 }
 
 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") {
 
       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);
+   while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") {
+      l++;
+   }

 
 

-   lat = lat * 20037508.34 / 180;
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);

 
 

-   return new OpenLayers.LonLat(lon, lat);
+      if (c == "T") {
+         layers[i].setVisibility(true);
+      } else if(c == "F") {
+         layers[i].setVisibility(false);
+      }
+   }

 }
 
 function scaleToZoom(scale) {
 }
 
 function scaleToZoom(scale) {