More fixed to trace redirection

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 7c979822711c0c2388386212ffbb4c8d2aa34978..272913d203c2ae8462888ff84ae1e85b748d2f7e 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -13,12 +13,6 @@ var nonamekeys = {
    'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
 };
 
    '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/";
-}
-

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


@@ -28,8 +22,8 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),

-         new OpenLayers.Control.PanZoomBar(),
-         new OpenLayers.Control.ScaleLine()
+         new OpenLayers.Control.PanZoom(),
+         new OpenLayers.Control.PanZoomBar()

       ],
       units: "m",
       maxResolution: 156543.0339,
       ],
       units: "m",
       maxResolution: 156543.0339,


@@ -37,42 +31,43 @@ function createMap(divName, options) {
       displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 
       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"), {
+      keyid: "mapnik",

       displayOutsideMaxExtent: true,
       displayOutsideMaxExtent: true,

-      wrapDateLine: true
+      wrapDateLine: true,
+      layerCode: "M"

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

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
+      keyid: "osmarender",

       displayOutsideMaxExtent: true,
       displayOutsideMaxExtent: true,

-      wrapDateLine: true
+      wrapDateLine: true,
+      layerCode: "O"

    });
    map.addLayer(osmarender);
 
    });
    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"), {
+      keyid: "cyclemap",

       displayOutsideMaxExtent: true,
       displayOutsideMaxExtent: true,

-      wrapDateLine: true
+      wrapDateLine: true,
+      layerCode: "C"

    });
    map.addLayer(cyclemap);
 
    var nonamekey = nonamekeys[document.domain];
    });
    map.addLayer(cyclemap);
 
    var nonamekey = nonamekeys[document.domain];

-   var noname = new OpenLayers.Layer.OSM("NoName", [
+   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,
       "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
+      numZoomLevels: 19,
+      layerCode: "N"

    });
    map.addLayer(noname);
 
    });
    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);
 
    markers = new OpenLayers.Layer.Markers("Markers", {
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
 
    markers = new OpenLayers.Layer.Markers("Markers", {


@@ -102,7 +97,8 @@ function addMarkerToMap(position, icon, description) {
    markers.addMarker(marker);
 
    if (description) {
    markers.addMarker(marker);
 
    if (description) {

-      marker.events.register("click", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseover", marker, function() { openMapPopup(marker, description) });
+      marker.events.register("mouseout", marker, function() { closeMapPopup() });

    }
 
    return marker;
    }
 
    return marker;


@@ -114,7 +110,10 @@ function addObjectToMap(url, zoom, callback) {
       style: {
           strokeColor: "blue",
           strokeWidth: 3,
       style: {
           strokeColor: "blue",
           strokeWidth: 3,

-          strokeOpacity: 0.5
+          strokeOpacity: 0.5,
+          fillOpacity: 0.2,
+          fillColor: "lightblue",
+          pointRadius: 6

       },
       projection: new OpenLayers.Projection("EPSG:4326"),
       displayInLayerSwitcher: false
       },
       projection: new OpenLayers.Projection("EPSG:4326"),
       displayInLayerSwitcher: false


@@ -143,16 +142,16 @@ function addObjectToMap(url, zoom, callback) {
          callback(extent);
       }
    });
          callback(extent);
       }
    });

-  
+

    map.addLayer(layer);
 
    layer.loadGML();
 }
 
 function addBoxToMap(boxbounds) {
    map.addLayer(layer);
 
    layer.loadGML();
 }
 
 function addBoxToMap(boxbounds) {

-   if(!vectors) {
+   if (!vectors) {

      // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions
      // 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", {
+     vectors = new OpenLayers.Layer.Vector("Boxes", {

         displayInLayerSwitcher: false
      });
      map.addLayer(vectors);
         displayInLayerSwitcher: false
      });
      map.addLayer(vectors);


@@ -163,7 +162,7 @@ function addBoxToMap(boxbounds) {
       strokeColor: '#ee9900',
       fillOpacity: 0
    });
       strokeColor: '#ee9900',
       fillOpacity: 0
    });

-   
+

    vectors.addFeatures(box);
 
    return box;
    vectors.addFeatures(box);
 
    return box;


@@ -172,10 +171,9 @@ function addBoxToMap(boxbounds) {
 function openMapPopup(marker, description) {
    closeMapPopup();
 
 function openMapPopup(marker, description) {
    closeMapPopup();
 

-   popup = new OpenLayers.Popup.AnchoredBubble("popup", marker.lonlat, null,
-                                               description, marker.icon, true);
+   popup = new OpenLayers.Popup.FramedCloud("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;


@@ -196,7 +194,7 @@ function removeBoxFromMap(box){
    vectors.removeFeature(box);
 }
 
    vectors.removeFeature(box);
 }
 

-function getMapCenter(center, zoom) {
+function getMapCenter() {

    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 


@@ -215,6 +213,10 @@ function getMapExtent() {
    return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
    return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
 }
 

+function getMapZoom() {
+   return map.getZoom();
+}
+

 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }
 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }


@@ -222,39 +224,53 @@ function getEventPosition(event) {
 function getMapLayers() {
    var layerConfig = "";
 
 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";
+   for (var i = 0; i < map.layers.length; i++) {
+      if (map.layers[i].layerCode && map.layers[i].getVisibility()) {
+         layerConfig += map.layers[i].layerCode;
+      }

    }
 
    return layerConfig;
 }
 
 function setMapLayers(layerConfig) {
    }
 
    return layerConfig;
 }
 
 function setMapLayers(layerConfig) {

-   var l = 0;
+   if (layerConfig.charAt(0) == "B" || layerConfig.charAt(0) == "0") {
+      var l = 0;

 
 

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

 
 

-      if (c == "B") {
-         map.setBaseLayer(layers[i]);
+         if (c == "B") {
+            map.setBaseLayer(layers[i]);
+         }

       }
       }

-   }

 
 

-   while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") {
-      l++;
-   }
+      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++);
+      for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+         var c = layerConfig.charAt(l++);

 
 

-      if (c == "T") {
-         layers[i].setVisibility(true);
-      } else if(c == "F") {
-         layers[i].setVisibility(false);
+         if (c == "T") {
+            layers[i].setVisibility(true);
+         } else if(c == "F") {
+            layers[i].setVisibility(false);
+         }
+      }
+   } else {
+      for (var i = 0; i < map.layers.length; i++) {
+         if (map.layers[i].layerCode) {
+            if (layerConfig.indexOf(map.layers[i].layerCode) >= 0) {
+               if (map.layers[i].isBaseLayer) {
+                  map.setBaseLayer(map.layers[i]);
+               } else {
+                   map.layers[i].setVisibility(true);
+               }
+            } else {
+               map.layers[i].setVisibility(false);
+            }
+         }

       }
    }
 }
       }
    }
 }