More cleanup work on the notes javascript

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index df9d30992c7a8751bdfe59bcc836a7e465a06049..58950a1ffa14b724e3a8296d3b3b2c89e3a52ae5 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -149,7 +149,7 @@ function addObjectToMap(url, zoom, callback) {
    layer.loadGML();
 }
 
    layer.loadGML();
 }
 

-function addBoxToMap(boxbounds, attributes, line) {
+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", {


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

-

    var geometry;
    var geometry;

-   if (line) {
+   if (outline) {

      vertices = boxbounds.toGeometry().getVertices();
      vertices = boxbounds.toGeometry().getVertices();

-     vertices.push( new OpenLayers.Geometry.Point( vertices[0].x, vertices[0].y ) );
+     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());
      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, attributes, {
+   }
+   var box = new OpenLayers.Feature.Vector(geometry, {}, {

       strokeWidth: 2,
       strokeColor: '#ee9900',
       fillOpacity: 0
    });
       strokeWidth: 2,
       strokeColor: '#ee9900',
       fillOpacity: 0
    });

+   box.fid = id;

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


@@ -251,6 +251,8 @@ function setMapLayers(layerConfig) {
 
          if (c == "B") {
             map.setBaseLayer(layers[i]);
 
          if (c == "B") {
             map.setBaseLayer(layers[i]);

+         } else {
+            map.layers[i].setVisibility(false);

          }
       }
    } else {
          }
       }
    } else {


@@ -260,7 +262,7 @@ function setMapLayers(layerConfig) {
                if (map.layers[i].isBaseLayer) {
                   map.setBaseLayer(map.layers[i]);
                } else {
                if (map.layers[i].isBaseLayer) {
                   map.setBaseLayer(map.layers[i]);
                } else {

-                   map.layers[i].setVisibility(true);
+                  map.layers[i].setVisibility(true);

                }
             } else {
                map.layers[i].setVisibility(false);
                }
             } else {
                map.layers[i].setVisibility(false);