Fixing the migration so that it will better match the live databetter.

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 9a834593d996cb1377f0e72910c4faaced68d276..c2ddf9c391fb7cb461a3c3f4aed48b933638989e 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,14 +1,28 @@
+var epsg4326 = new OpenLayers.Projection("EPSG:4326");

 var map;
 var markers;
 var popup;
 
 var map;
 var markers;
 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, {

-      controls: [
+      controls: options.controls || [

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


@@ -16,7 +30,9 @@ function createMap(divName) {
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine()
       ],
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine()
       ],

-      units: "m"
+      units: "m",
+      maxResolution: 156543.0339,
+      numZoomLevels: 20

    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {


@@ -31,6 +47,24 @@ function createMap(divName) {
    });
    map.addLayer(osmarender);
 
    });
    map.addLayer(osmarender);
 

+   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/",
+      "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
    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
       displayOutsideMaxExtent: true,
       wrapDateLine: true


@@ -60,7 +94,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);
 


@@ -94,51 +128,64 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
    markers.removeMarker(marker);
 }
 

-function getMapLayers() {
-   var layers = "";
+function getMapCenter(center, zoom) {
+   return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
+}

 
 

-   for (var i=0; i< this.map.layers.length; i++) {
-      var layer = this.map.layers[i];
+function setMapCenter(center, zoom) {
+   map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
+}

 
 

-      if (layer.isBaseLayer) {
-         layers += (layer == this.map.baseLayer) ? "B" : "0";
-      } else {
-         layers += (layer.getVisibility()) ? "T" : "F";
-      }
-   }
+function setMapExtent(extent) {
+   map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
+}

 
 

-   return layers;
+function getMapExtent(extent) {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);

 }
 
 }
 

-function setMapLayers(layers) {
-   for (var i=0; i < layers.length; i++) {
-      var layer = map.layers[i];
-      var c = layers.charAt(i);
+function getEventPosition(event) {
+   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+}

 
 

-      if (c == "B") {
-         map.setBaseLayer(layer);
-      } else if ( (c == "T") || (c == "F") ) {
-         layer.setVisibility(c == "T");
-      }
+function getMapLayers() {
+   var layerConfig = "";
+
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i] == map.baseLayer ? "B" : "0";
+   }
+
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i].getVisibility() ? "T" : "F";

    }
    }

+
+   return layerConfig;

 }
 
 }
 

-function mercatorToLonLat(merc) {
-   var lon = (merc.lon / 20037508.34) * 180;
-   var lat = (merc.lat / 20037508.34) * 180;
+function setMapLayers(layerConfig) {
+   var l = 0;

 
 

-   lat = 180/Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
+   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]);
+      }
+   }

 
 

-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) {