Rework export to not rely on ctrl+drag to select an area.

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index 969b8efc7352daae9b7d224330267c16106584b0..4da7544960d38573d3eead6a287abc770a335dc6 100644 (file)
--- a/app/views/export/_start.rhtml
+++ b/app/views/export/_start.rhtml
@@ -10,7 +10,7 @@
     <br/>
     <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
     <p class="export_hint">
     <br/>
     <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %>
     <p class="export_hint">

-      Drag a box with control held down to select an area to export
+      <a id='drag_box' href="#" onclick="return startBox();">Manually select a different area</a>  

     </p>
   </div>
 
     </p>
   </div>
 

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 2796d92fe83b328abf779ff38580e5d752e8b57f..c0fced02585b1af56b72ee88e00aeb9885185efa 100644 (file)
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -12,23 +12,20 @@ page << <<EOJ
 
     box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { 
       handlerOptions: {
 
     box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { 
       handlerOptions: {

-        keyMask: OpenLayers.Handler.MOD_CTRL,

         sides: 4,
         snapAngle: 90,
         irregular: true,
         persist: true,
         sides: 4,
         snapAngle: 90,
         irregular: true,
         persist: true,

-        callbacks: { done: boxComplete }
+        callbacks: { done: endDrag }

       }
     });
     map.addControl(box);
 
       }
     });
     map.addControl(box);
 

-    box.activate();
-

     map.events.register("moveend", map, mapMoved);
 
     openSidebar({ onclose: stopExport });
 
     map.events.register("moveend", map, mapMoved);
 
     openSidebar({ onclose: stopExport });
 

-    updateRegion(map.getExtent());
+    setBounds(map.getExtent());

 
     if (map.baseLayer.name == "Mapnik") {
       $("format_mapnik").checked = true;
 
     if (map.baseLayer.name == "Mapnik") {
       $("format_mapnik").checked = true;


@@ -51,36 +48,6 @@ page << <<EOJ
     map.removeLayer(vectors);
   }
 
     map.removeLayer(vectors);
   }
 

-  function formatChanged() {
-    if ($("format_osm").checked) {
-      $("export_osm").style.display = "inline";
-    } else {
-      $("export_osm").style.display = "none";
-    }
-
-    if ($("format_mapnik").checked) {
-      $("mapnik_scale").value = roundScale(map.getScale());
-      $("export_mapnik").style.display = "inline";
-
-      mapnikScaleChanged();
-    } else {
-      $("export_mapnik").style.display = "none";
-    }
-
-    if ($("format_osmarender").checked) {
-      var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
-
-      $("osmarender_zoom").options.selectedIndex = zoom - 4;
-      $("export_osmarender").style.display = "inline";
-    } else {
-      $("export_osmarender").style.display = "none";
-    }
-  }
-
-  $("format_osm").onclick = formatChanged;
-  $("format_mapnik").onclick = formatChanged;
-  $("format_osmarender").onclick = formatChanged;
-

   function boundsChanged() {
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
     var bounds = new OpenLayers.Bounds($("minlon").value,
   function boundsChanged() {
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
     var bounds = new OpenLayers.Bounds($("minlon").value,


@@ -93,12 +60,10 @@ page << <<EOJ
     map.events.unregister("moveend", map, mapMoved);
     map.zoomToExtent(bounds);
 
     map.events.unregister("moveend", map, mapMoved);
     map.zoomToExtent(bounds);
 

-    box.handler.clear();
-    box.handler.feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
-    box.handler.layer.addFeatures([box.handler.feature], [box.handler.style]);
-    box.handler.layer.drawFeature(box.handler.feature, box.handler.style);
+    clearBox();
+    drawBox(bounds);

 
 

-    mapnikSizeChanged();
+    validateControls();

   }
 
   $("maxlat").onchange = boundsChanged;
   }
 
   $("maxlat").onchange = boundsChanged;


@@ -106,25 +71,56 @@ page << <<EOJ
   $("maxlon").onchange = boundsChanged;
   $("minlat").onchange = boundsChanged;
 
   $("maxlon").onchange = boundsChanged;
   $("minlat").onchange = boundsChanged;
 

-  function mapMoved() {
-    updateRegion(map.getExtent());
-  }
+  function startDrag() {
+    $("drag_box").innerHTML='Drag a box on the map to select an area';
+
+    clearBox();
+    box.activate();
+  };
+
+  $("drag_box").onclick = startDrag;
+
+  function endDrag(bbox) {
+    var bounds = bbox.getBounds();

 
 

-  function boxComplete(box) {

     map.events.unregister("moveend", map, mapMoved);
     map.events.unregister("moveend", map, mapMoved);

-    updateRegion(box.getBounds());
+    setBounds(bounds);
+    drawBox(bounds);
+    box.deactivate();
+    validateControls();
+
+    $("drag_box").innerHTML = "Manually select a different area";

   }
 
   }
 

-  function updateRegion(bounds) {
+  function mapMoved() {
+    setBounds(map.getExtent());
+    validateControls();
+  }
+
+  function setBounds(bounds) {

     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
     var decimals = Math.pow(10, Math.floor(map.getZoom() / 3));
 
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
     var decimals = Math.pow(10, Math.floor(map.getZoom() / 3));
 

-    bounds.transform(map.getProjectionObject(), epsg4326);
+    bounds = bounds.clone().transform(map.getProjectionObject(), epsg4326);

 
     $("minlon").value = Math.round(bounds.left * decimals) / decimals;
     $("minlat").value = Math.round(bounds.bottom * decimals) / decimals;
     $("maxlon").value = Math.round(bounds.right * decimals) / decimals;
     $("maxlat").value = Math.round(bounds.top * decimals) / decimals;
 
     $("minlon").value = Math.round(bounds.left * decimals) / decimals;
     $("minlat").value = Math.round(bounds.bottom * decimals) / decimals;
     $("maxlon").value = Math.round(bounds.right * decimals) / decimals;
     $("maxlat").value = Math.round(bounds.top * decimals) / decimals;

+  }
+
+  function clearBox() {
+    vectors.destroyFeatures();
+  }
+
+  function drawBox(bounds) {
+    var feature = new OpenLayers.Feature.Vector(bounds.toGeometry());
+
+    vectors.addFeatures(feature);
+  }
+
+  function validateControls() {
+    var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);

 
     if (bounds.getWidth() * bounds.getHeight() > 0.25) {
       $("format_osm").disabled = true;
 
     if (bounds.getWidth() * bounds.getHeight() > 0.25) {
       $("format_osm").disabled = true;


@@ -156,6 +152,36 @@ page << <<EOJ
     }
   }
 
     }
   }
 

+  function formatChanged() {
+    if ($("format_osm").checked) {
+      $("export_osm").style.display = "inline";
+    } else {
+      $("export_osm").style.display = "none";
+    }
+
+    if ($("format_mapnik").checked) {
+      $("mapnik_scale").value = roundScale(map.getScale());
+      $("export_mapnik").style.display = "inline";
+
+      mapnikScaleChanged();
+    } else {
+      $("export_mapnik").style.display = "none";
+    }
+
+    if ($("format_osmarender").checked) {
+      var zoom = Math.min(map.getZoom(), maxOsmarenderZoom());
+
+      $("osmarender_zoom").options.selectedIndex = zoom - 4;
+      $("export_osmarender").style.display = "inline";
+    } else {
+      $("export_osmarender").style.display = "none";
+    }
+  }
+
+  $("format_osm").onclick = formatChanged;
+  $("format_mapnik").onclick = formatChanged;
+  $("format_osmarender").onclick = formatChanged;
+

   function maxMapnikScale() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
   function maxMapnikScale() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");