Add support for displaying a map covering a specified bounding box.

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 2a468f893d4a1789c97e25b98257fbe682c70d0b..8e52166c875c9ab6b8c7a941ee6616be7b42f1de 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -6,6 +6,14 @@
 <% mlat = params['mlat'] %>
 <% end %>
 
 <% mlat = params['mlat'] %>
 <% end %>
 

+<% if params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] %>
+<% bbox = true %>
+<% minlon = params['minlon'] %>
+<% minlat = params['minlat'] %>
+<% maxlon = params['maxlon'] %>
+<% maxlat = params['maxlat'] %>
+<% end %>
+

 <% if params['lon'] and params['lat'] %>
 <% lon =  params['lon'] %>
 <% lat =  params['lat'] %>
 <% if params['lon'] and params['lat'] %>
 <% lon =  params['lon'] %>
 <% lat =  params['lat'] %>


@@ -43,22 +51,31 @@
   var map;
 
   function init(){
   var map;
 
   function init(){

+    var map = createMap("map");
+
+    <% if bbox %>
+    var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
+    var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
+    var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
+
+    map.zoomToExtent(bbox);
+    <% else %>

     var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
     var zoom = <%= zoom %>;
     var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
     var zoom = <%= zoom %>;

-    var layers = "<%= layers %>";

 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

-    var map = createMap("map", centre, zoom);
+    map.setCentre(center, zoom);
+    <% end %>

 
     <% if marker %>
     addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
     <% if layers %>
 
     <% if marker %>
     addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
     <% end %>
 
     <% if layers %>

-    setMapLayers(layers);
+    setMapLayers("<%= layers %>");

     <% end %>
 
     map.events.register("moveend", map, updateLocation);
     <% end %>
 
     map.events.register("moveend", map, updateLocation);

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 4933dc085e3c296ef7ac4708cb0ab25941b0f31c..9be6a1dbc788f57f56aea3a42ab53a00f1b4bf2a 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -64,7 +64,9 @@
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 

-    var map = createMap("map", centre, zoom);
+    var map = createMap("map");
+
+    map.setCentre(centre, zoom);

 
     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");
 
     <% if marker %>
     marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 803f273bdb6aaede0580572e6bf519c1a6233668..781ea5551de36d67030e872cc07ae3a1dac7f05f 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,7 +2,7 @@ var map;
 var markers;
 var popup;
 
 var markers;
 var popup;
 

-function createMap(divName, centre, zoom) {
+function createMap(divName) {

    OpenLayers.Util.onImageLoadError = function() {
       this.src = OpenLayers.Util.getImagesLocation() + "404.png";
    }
    OpenLayers.Util.onImageLoadError = function() {
       this.src = OpenLayers.Util.getImagesLocation() + "404.png";
    }


@@ -28,7 +28,6 @@ function createMap(divName, centre, zoom) {
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());
    map.addLayer(markers);
 
    map.addControl(new OpenLayers.Control.LayerSwitcher());

-   map.setCenter(centre, zoom);

 
    return map;
 }
 
    return map;
 }