X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d13ef1db021391e677a2c3d75f3b0999064ffb3a..a5c8a3b7f8e02cbf7f5d2f84b9bdb2034fcf22ec:/app/views/export/_start.rhtml?ds=sidebyside

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index 749928c12..4da754496 100644
--- 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">
-      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>
 
@@ -30,8 +30,8 @@
     <p class="export_heading">Licence</p>
 
     <div class="export_details">
-      <p>OSM license agreement blah blah blah...</p>
-    </div
+      <p>OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>
+    </div>
   </div>
 
   <div id="export_mapnik">
@@ -39,7 +39,8 @@
 
     <div class="export_details">
       <p>Format <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"], ["Postscript", "ps"]], "png")) %></p>
-      <p>Scale 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(max 1 : <span id="max_scale"></span>)</span></p>
+      <p>Scale 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(max 1 : <span id="mapnik_max_scale"></span>)</span></p>
+      <p>Image Size <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></p>
     </div>
   </div>
 
@@ -57,171 +58,3 @@
   </div>
 
 <% end %>
-
-<script type="text/javascript">
-  <!--
-  var box;
-
-  function startExport() {
-    var 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);
-    updateRegion(map.getExtent());
-  }
-
-  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>