Add a remove_foreign_key method and make migration 34 reversible.

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 3e6d687b0faac740c10d212c637e4ca9870af9e4..6e012b3d30f4cd0128d58654e63d20b1a02813be 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -1,6 +1,7 @@
 var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;
 var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 var map;
 var markers;

+var vectors;

 var popup;
 
 var nonamekeys = {
 var popup;
 
 var nonamekeys = {


@@ -13,7 +14,9 @@ var nonamekeys = {
 };
 
 OpenLayers._getScriptLocation = function () {
 };
 
 OpenLayers._getScriptLocation = function () {

-   return "openlayers/";
+  // Should really have this file as an erb, so that this can return 
+  // the real rails root
+   return "/openlayers/";

 }
 
 function createMap(divName, options) {
 }
 
 function createMap(divName, options) {


@@ -30,7 +33,8 @@ function createMap(divName, options) {
       ],
       units: "m",
       maxResolution: 156543.0339,
       ],
       units: "m",
       maxResolution: 156543.0339,

-      numZoomLevels: 20
+      numZoomLevels: 20,
+      displayProjection: new OpenLayers.Projection("EPSG:4326")

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


@@ -70,6 +74,7 @@ function createMap(divName, options) {
    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
    map.addLayer(maplint);
 
    var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);

+

    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
       numZoomLevels: numZoomLevels,
    markers = new OpenLayers.Layer.Markers("Markers", {
       displayInLayerSwitcher: false,
       numZoomLevels: numZoomLevels,


@@ -79,7 +84,7 @@ function createMap(divName, options) {
       projection: "EPSG:900913"
    });
    map.addLayer(markers);
       projection: "EPSG:900913"
    });
    map.addLayer(markers);

-
+   

    return map;
 }
 
    return map;
 }
 


@@ -103,6 +108,26 @@ function addMarkerToMap(position, icon, description) {
    return marker;
 }
 
    return marker;
 }
 

+function addBoxToMap(boxbounds) {
+   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("Box Layer", {
+        displayInLayerSwitcher: false
+     });
+     map.addLayer(vectors);
+   }
+   var geometry = boxbounds.toGeometry().transform(epsg4326, map.getProjectionObject());
+   var box = new OpenLayers.Feature.Vector(geometry, {}, {
+      strokeWidth: 2,
+      strokeColor: '#ee9900',
+      fillOpacity: 0
+   });
+   
+   vectors.addFeatures(box);
+
+   return box;
+}
+

 function openMapPopup(marker, description) {
    closeMapPopup();
 
 function openMapPopup(marker, description) {
    closeMapPopup();
 


@@ -126,11 +151,18 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
    markers.removeMarker(marker);
 }
 

+function removeBoxFromMap(box){
+   vectors.removeFeature(box);
+}
+

 function getMapCenter(center, zoom) {
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function setMapCenter(center, zoom) {
 function getMapCenter(center, zoom) {
    return map.getCenter().clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function setMapCenter(center, zoom) {

+   zoom = parseInt(zoom);
+   var numzoom = map.getNumZoomLevels();
+   if (zoom >= numzoom) zoom = numzoom - 1;

    map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
 }
 
    map.setCenter(center.clone().transform(epsg4326, map.getProjectionObject()), zoom);
 }
 


@@ -138,7 +170,7 @@ function setMapExtent(extent) {
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 

-function getMapExtent(extent) {
+function getMapExtent() {

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