Only check some user validations when the field has changed

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 2349c3230d5770e5aa0f7a486415fb02b92b6a3f..58950a1ffa14b724e3a8296d3b3b2c89e3a52ae5 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -23,7 +23,8 @@ function createMap(divName, options) {
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.PanZoom(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.PanZoom(),

-         new OpenLayers.Control.PanZoomBar()
+         new OpenLayers.Control.PanZoomBar(),
+         new OpenLayers.Control.ScaleLine({geodesic: true})

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


@@ -32,20 +33,26 @@ function createMap(divName, options) {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.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);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
    });
    map.addLayer(mapnik);
 
    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);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
    });
    map.addLayer(osmarender);
 
    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);
 
    });
    map.addLayer(cyclemap);
 


@@ -57,16 +64,11 @@ function createMap(divName, options) {
    ], {
       displayOutsideMaxExtent: true,
       wrapDateLine: true,
    ], {
       displayOutsideMaxExtent: true,
       wrapDateLine: true,

-      numZoomLevels: 19
+      numZoomLevels: 19,
+      layerCode: "N"

    });
    map.addLayer(noname);
 
    });
    map.addLayer(noname);
 

-   var maplint = new OpenLayers.Layer.OSM.Maplint(i18n("javascripts.map.overlays.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", {


@@ -96,7 +98,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;


@@ -146,7 +149,7 @@ function addObjectToMap(url, zoom, callback) {
    layer.loadGML();
 }
 
    layer.loadGML();
 }
 

-function addBoxToMap(boxbounds) {
+function addBoxToMap(boxbounds, id, outline) {

    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("Boxes", {
    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("Boxes", {


@@ -154,12 +157,20 @@ function addBoxToMap(boxbounds) {
      });
      map.addLayer(vectors);
    }
      });
      map.addLayer(vectors);
    }

-   var geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+   var geometry;
+   if (outline) {
+     vertices = boxbounds.toGeometry().getVertices();
+     vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y));
+     geometry = new OpenLayers.Geometry.LineString(vertices).transform(epsg4326, map.getProjectionObject());
+   } else {
+     geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+   }

    var box = new OpenLayers.Feature.Vector(geometry, {}, {
       strokeWidth: 2,
       strokeColor: '#ee9900',
       fillOpacity: 0
    });
    var box = new OpenLayers.Feature.Vector(geometry, {}, {
       strokeWidth: 2,
       strokeColor: '#ee9900',
       fillOpacity: 0
    });

+   box.fid = id;

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


@@ -169,10 +180,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;


@@ -223,39 +233,41 @@ 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]);
+         } else {
+            map.layers[i].setVisibility(false);
+         }

       }
       }

-   }
-
-   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++);
-
-      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);
+            }
+         }

       }
    }
 }
       }
    }
 }