From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Apr 2008 22:12:50 +0000 (+0000)
Subject: Rework AJAX stuff to work on IE.
X-Git-Tag: live~7850^2~6
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8815700a773665fe861c1bdc5543948de1148829

Rework AJAX stuff to work on IE.
---

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index b1d992e6d..a773d4b72 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -1,9 +1,5 @@
 class ExportController < ApplicationController
   def start
-    render :update do |page|
-      page.replace_html :sidebar_title, 'Export'
-      page.replace_html :sidebar_content, :partial => 'start'
-    end
   end
 
   def finish
diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index 3e6beaf55..501274b46 100644
--- a/app/views/export/_start.rhtml
+++ b/app/views/export/_start.rhtml
@@ -57,195 +57,3 @@
   </div>
 
 <% end %>
-
-<script type="text/javascript">
-  <!--
-  var vectors;
-  var box;
-
-  function startExport() {
-    vectors = new OpenLayers.Layer.Vector("Vector Layer", {
-      displayInLayerSwitcher: false
-    });
-    map.addLayer(vectors);
-
-    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 }
-      }
-    });
-    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") {
-      $("format_osmarender").checked = true;
-    }
-
-    formatChanged();
-
-    $("viewanchor").className = "";
-    $("exportanchor").className = "active";
-  }
-
-  function stopExport() {
-    $("viewanchor").className = "active";
-    $("exportanchor").className = "";
-
-    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";
-    } 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 = function() { formatChanged() };
-  $("format_mapnik").onclick = function() { formatChanged() };
-  $("format_osmarender").onclick = function() { formatChanged() };
-
-  function boundsChanged() {
-    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
-    var bounds = new OpenLayers.Bounds($("minlon").value,
-                                       $("minlat").value,
-                                       $("maxlon").value,
-                                       $("maxlat").value);
- 
-    bounds.transform(epsg4326, map.getProjectionObject());
-
-    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);
-  }
-
-  $("maxlat").onchange = function() { boundsChanged() };
-  $("minlon").onchange = function() { boundsChanged() };
-  $("maxlon").onchange = function() { boundsChanged() };
-  $("minlat").onchange = function() { boundsChanged() };
-
-  function mapMoved() {
-    updateRegion(map.getExtent());
-  }
-
-  function boxComplete(box) {
-    map.events.unregister("moveend", map, mapMoved);
-    updateRegion(box.getBounds());
-  }
-
-  function updateRegion(bounds) {
-    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
-    var decimals = Math.pow(10, Math.floor(map.getZoom() / 3));
-
-    bounds.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;
-
-    if (bounds.getWidth() * bounds.getHeight() > 0.25) {
-      $("format_osm").disabled = true;
-      $("format_osm").checked = false;
-
-      formatChanged();
-    } else {
-      $("format_osm").disabled = false;
-    }
-    
-    var max_zoom = maxOsmarenderZoom();
-    var max_scale = maxMapnikScale();
-
-    $("max_scale").innerHTML = roundScale(max_scale);
-
-    for (var o = 0; o < $("osmarender_zoom").options.length; o++) {
-      var option = $("osmarender_zoom").options[o];
-
-      if (option.value > max_zoom) {
-        option.disabled = true;
-      } else {
-        option.disabled = false;
-      }
-    }
-
-    if ($("osmarender_zoom").options.selectedIndex + 4 > max_zoom) {
-      $("osmarender_zoom").options.selectedIndex = max_zoom - 4;
-    }
-  }
-
-  function maxMapnikScale() {
-    var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
-    var epsg900913 = new OpenLayers.Projection("EPSG:900913");
-
-    bounds.transform(epsg4326, epsg900913);
-
-    return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
-  }
-
-  function maxOsmarenderZoom() {
-    var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var xzoom = Math.LOG2E * Math.log(2000 * 1.40625 / bounds.getWidth());
-    var ymin = bounds.bottom * Math.PI / 180;
-    var ymax = bounds.top * Math.PI / 180;
-    var yzoom = Math.LOG2E * (Math.log(2000 * 2 * Math.PI) - Math.log(Math.log((Math.tan(ymax) + 1 / Math.cos(ymax)) / (Math.tan(ymin) + 1 / Math.cos(ymin)))))
-
-    return Math.floor(Math.min(xzoom, yzoom));
-  }
-
-  function roundScale(scale) {
-    var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
-
-    return precision * Math.ceil(scale / precision);
-  }
-
-  function validateScale() {
-    if ($("mapnik_scale").value < maxMapnikScale()) {
-      $("export_commit").disabled = true;
-    } else {
-      $("export_commit").disabled = false;
-    }
-  }
-
-  $("mapnik_scale").onchange = function() { validateScale() };
-
-  startExport();
-  // -->
-</script>
diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
new file mode 100644
index 000000000..4323cf7f4
--- /dev/null
+++ b/app/views/export/start.rjs
@@ -0,0 +1,191 @@
+page.replace_html :sidebar_title, 'Export'
+page.replace_html :sidebar_content, :partial => 'start'
+page << <<EOJ
+  var vectors;
+  var box;
+
+  function startExport() {
+    vectors = new OpenLayers.Layer.Vector("Vector Layer", {
+      displayInLayerSwitcher: false
+    });
+    map.addLayer(vectors);
+
+    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 }
+      }
+    });
+    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") {
+      $("format_osmarender").checked = true;
+    }
+
+    formatChanged();
+
+    $("viewanchor").className = "";
+    $("exportanchor").className = "active";
+  }
+
+  function stopExport() {
+    $("viewanchor").className = "active";
+    $("exportanchor").className = "";
+
+    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";
+    } 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,
+                                       $("minlat").value,
+                                       $("maxlon").value,
+                                       $("maxlat").value);
+ 
+    bounds.transform(epsg4326, map.getProjectionObject());
+
+    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);
+  }
+
+  $("maxlat").onchange = boundsChanged;
+  $("minlon").onchange = boundsChanged;
+  $("maxlon").onchange = boundsChanged;
+  $("minlat").onchange = boundsChanged;
+
+  function mapMoved() {
+    updateRegion(map.getExtent());
+  }
+
+  function boxComplete(box) {
+    map.events.unregister("moveend", map, mapMoved);
+    updateRegion(box.getBounds());
+  }
+
+  function updateRegion(bounds) {
+    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+    var decimals = Math.pow(10, Math.floor(map.getZoom() / 3));
+
+    bounds.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;
+
+    if (bounds.getWidth() * bounds.getHeight() > 0.25) {
+      $("format_osm").disabled = true;
+      $("format_osm").checked = false;
+
+      formatChanged();
+    } else {
+      $("format_osm").disabled = false;
+    }
+    
+    var max_zoom = maxOsmarenderZoom();
+    var max_scale = maxMapnikScale();
+
+    $("max_scale").innerHTML = roundScale(max_scale);
+
+    for (var o = 0; o < $("osmarender_zoom").options.length; o++) {
+      var option = $("osmarender_zoom").options[o];
+
+      if (option.value > max_zoom) {
+        option.disabled = true;
+      } else {
+        option.disabled = false;
+      }
+    }
+
+    if ($("osmarender_zoom").options.selectedIndex + 4 > max_zoom) {
+      $("osmarender_zoom").options.selectedIndex = max_zoom - 4;
+    }
+  }
+
+  function maxMapnikScale() {
+    var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
+    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+    var epsg900913 = new OpenLayers.Projection("EPSG:900913");
+
+    bounds.transform(epsg4326, epsg900913);
+
+    return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136));
+  }
+
+  function maxOsmarenderZoom() {
+    var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
+    var xzoom = Math.LOG2E * Math.log(2000 * 1.40625 / bounds.getWidth());
+    var ymin = bounds.bottom * Math.PI / 180;
+    var ymax = bounds.top * Math.PI / 180;
+    var yzoom = Math.LOG2E * (Math.log(2000 * 2 * Math.PI) - Math.log(Math.log((Math.tan(ymax) + 1 / Math.cos(ymax)) / (Math.tan(ymin) + 1 / Math.cos(ymin)))))
+
+    return Math.floor(Math.min(xzoom, yzoom));
+  }
+
+  function roundScale(scale) {
+    var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2);
+
+    return precision * Math.ceil(scale / precision);
+  }
+
+  function validateScale() {
+    if ($("mapnik_scale").value < maxMapnikScale()) {
+      $("export_commit").disabled = true;
+    } else {
+      $("export_commit").disabled = false;
+    }
+  }
+
+  $("mapnik_scale").onchange = validateScale;
+
+  startExport();
+EOJ