X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7fa1041340e3f1ad1074bfd8376b39535b862a69..2d9282d864231b59ffd26edab970ed75cf5107cc:/app/views/export/start.rjs?ds=sidebyside

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 5e4a2b91c..2d3ec06ec 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -12,24 +12,19 @@ page << <<EOJ
 
     box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { 
       handlerOptions: {
-        keyMask: OpenLayers.Handler.MOD_CTRL,
         sides: 4,
         snapAngle: 90,
         irregular: true,
         persist: true,
-        callbacks: { done: boxComplete }
+        callbacks: { done: endDrag }
       }
     });
     map.addControl(box);
 
-    box.activate();
-
     map.events.register("moveend", map, mapMoved);
 
     openSidebar({ onclose: stopExport });
 
-    updateRegion(map.getExtent());
-
     if (map.baseLayer.name == "Mapnik") {
       $("format_mapnik").checked = true;
     } else if (map.baseLayer.name == "Osmarender") {
@@ -37,6 +32,7 @@ page << <<EOJ
     }
 
     formatChanged();
+    setBounds(map.getExtent());
 
     $("viewanchor").className = "";
     $("exportanchor").className = "active";
@@ -46,41 +42,11 @@ page << <<EOJ
     $("viewanchor").className = "active";
     $("exportanchor").className = "";
 
+    clearBox();
     map.events.unregister("moveend", map, mapMoved);
-    box.handler.clear();
     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,
@@ -93,11 +59,10 @@ page << <<EOJ
     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);
 
+    validateControls();
     mapnikSizeChanged();
   }
 
@@ -106,41 +71,78 @@ page << <<EOJ
   $("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);
-    updateRegion(box.getBounds());
+    setBounds(bounds);
+    drawBox(bounds);
+    box.deactivate();
+    validateControls();
+
+    $("drag_box").innerHTML = "Manually select a different area";
+  }
+
+  function mapMoved() {
+    setBounds(map.getExtent());
+    validateControls();
   }
 
-  function updateRegion(bounds) {
+  function setBounds(bounds) {
     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;
 
+    mapnikSizeChanged();
+  }
+
+  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;
       $("format_osm").checked = false;
-
-      formatChanged();
+      $("export_osm").style.display = "none";
     } else {
       $("format_osm").disabled = false;
     }
-    
-    var max_zoom = maxOsmarenderZoom();
+
     var max_scale = maxMapnikScale();
 
-    $("mapnik_max_scale").innerHTML = roundScale(max_scale);
+    if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
+      $("export_commit").disabled = true;
+    } else {
+      $("export_commit").disabled = false;
+    }
 
-    mapnikSizeChanged();
+    $("mapnik_max_scale").innerHTML = roundScale(max_scale);
+  
+    var max_zoom = maxOsmarenderZoom();
 
     for (var o = 0; o < $("osmarender_zoom").options.length; o++) {
       var option = $("osmarender_zoom").options[o];
@@ -157,6 +159,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";
+    } 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";
+    }
+
+    validateControls();
+  }
+
+  $("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");
@@ -203,12 +235,7 @@ page << <<EOJ
 
   function mapnikScaleChanged() {
     mapnikSizeChanged();
-
-    if ($("mapnik_scale").value < maxMapnikScale()) {
-      $("export_commit").disabled = true;
-    } else {
-      $("export_commit").disabled = false;
-    }
+    validateControls();
   }
 
   $("mapnik_scale").onchange = mapnikScaleChanged;