Potlatch 0.9c

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 51cd9f6a5abfbc62abcf4c382825e59dad1e4e9b..7591d7d162b4e2b73c40449efab37256d77bee3b 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -17,8 +17,9 @@ function createMap(divName) {
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine()
       ],
          new OpenLayers.Control.PanZoomBar(),
          new OpenLayers.Control.ScaleLine()
       ],

+      units: "m",

       maxResolution: 156543,
       maxResolution: 156543,

-      units: "m"
+      numZoomLevels: 20

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


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


@@ -108,40 +115,48 @@ function setMapExtent(extent) {
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 

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

 function getEventPosition(event) {
 function getEventPosition(event) {

-   return map.getLonLatFromViewPortPx(e.xy).clone().transform(epsg4326, map.getProjectionObject());
+   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];
+function setMapLayers(layerConfig) {
+   var l = 0;

 
 

-      if (layer) {
-         var c = layers.charAt(i);
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);

 
 

-         if (c == "B") {
-            map.setBaseLayer(layer);
-         } else if ( (c == "T") || (c == "F") ) {
-            layer.setVisibility(c == "T");
-         }
+      if (c == "B") {
+         map.setBaseLayer(layers[i]);

       }
    }
       }
    }

+
+   while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") {
+      l++;
+   }
+
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);
+
+      layers[i].setVisibility(c == "T");
+   }

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