X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5620d7263a36fe842f4d97bc21dda5edd0651b37..51971248c15fe9cc65b2c6479d977016e1886e55:/app/views/export/start.rjs?ds=inline

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 2babcc982..abf9e671d 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -1,4 +1,4 @@
-page.replace_html :sidebar_title, 'Export'
+page.replace_html :sidebar_title, t('export.start_rjs.export')
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var vectors;
@@ -17,10 +17,10 @@ page << <<EOJ
         sides: 4,
         snapAngle: 90,
         irregular: true,
-        persist: true,
-        callbacks: { done: endDrag }
+        persist: true
       }
     });
+    box.handler.callbacks.done = endDrag;
     map.addControl(box);
 
     map.events.register("moveend", map, mapMoved);
@@ -77,7 +77,7 @@ page << <<EOJ
   $("minlat").onchange = boundsChanged;
 
   function startDrag() {
-    $("drag_box").innerHTML='Drag a box on the map to select an area';
+    $("drag_box").innerHTML="#{I18n.t('export.start_rjs.drag_a_box')}";
 
     clearBox();
     box.activate();
@@ -94,11 +94,11 @@ page << <<EOJ
     box.deactivate();
     validateControls();
 
-    $("drag_box").innerHTML = "Manually select a different area";
+    $("drag_box").innerHTML = "#{I18n.t('export.start_rjs.manually_select')}";
   }
 
   function startMarker() {
-    $("add_marker").innerHTML='Click on the map to add a marker';
+    $("add_marker").innerHTML='#{I18n.t('export.start_rjs.click_add_marker')}';
 
     if (!markerLayer) {
       markerLayer = new OpenLayers.Layer.Vector("",{
@@ -130,7 +130,7 @@ page << <<EOJ
   function endMarker(event) {
     markerControl.deactivate();
 
-    $("add_marker").innerHTML = "Change marker position";
+    $("add_marker").innerHTML = "#{I18n.t('export.start_rjs.change_marker')}";
     $("marker_inputs").style.display = "block";
     
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
@@ -147,7 +147,7 @@ page << <<EOJ
     $("marker_lon").value = "";
     $("marker_lat").value = "";
     $("marker_inputs").style.display = "none";
-    $("add_marker").innerHTML = "Add a marker to the map";
+    $("add_marker").innerHTML = "#{I18n.t('export.start_rjs.add_marker')}";
 
     if (markerLayer) { 
       markerControl.destroy();
@@ -190,17 +190,17 @@ page << <<EOJ
   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;
-      $("export_osm").style.display = "none";
+    if (bounds.getWidth() * bounds.getHeight() > #{MAX_REQUEST_AREA}) {
+      $("export_osm_too_large").style.display = "block";
     } else {
-      $("format_osm").disabled = false;
+      $("export_osm_too_large").style.display = "none";
     }
 
     var max_scale = maxMapnikScale();
 
-    if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
+    if ($("format_osm").checked && bounds.getWidth() * bounds.getHeight() > #{MAX_REQUEST_AREA}) {
+      $("export_commit").disabled = true;
+    } else if ($("format_mapnik").checked && $("mapnik_scale").value < max_scale) {
       $("export_commit").disabled = true;
     } else {
       $("export_commit").disabled = false;
@@ -227,13 +227,13 @@ page << <<EOJ
 
   function htmlUrlChanged() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var layerName = map.baseLayer.name.toLowerCase();
-    var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
+    var layerName = map.baseLayer.keyid;
+    var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&amp;layer=" + layerName;
     var markerUrl = "";
 
     if ($("marker_lat").value && $("marker_lon").value) {
-      markerUrl = "&mlat=" + $("marker_lat").value + "&mlon=" + $("marker_lon").value;
-      url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
+      markerUrl = "&amp;mlat=" + $("marker_lat").value + "&amp;mlon=" + $("marker_lon").value;
+      url += "&amp;marker=" + $("marker_lat").value + "," + $("marker_lon").value;
     } 
     
     var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'" style="border: 1px solid black"></iframe>';
@@ -246,7 +246,9 @@ page << <<EOJ
     bounds.transform(epsg4326, epsg900913);
     var zoom = map.getZoomForExtent(bounds);
     
-    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+markerUrl+'">View Larger Map</a></small>';
+    var layers = getMapLayers();
+
+    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&amp;lon='+center.lon+'&amp;zoom='+zoom+'&amp;layers='+layers+markerUrl+'">'+"#{html_escape_unicode(I18n.t('export.start_rjs.view_larger_map'))}"+'</a></small>';
 
     $("export_html_text").value = html;
 
@@ -325,7 +327,7 @@ page << <<EOJ
     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));
+    return Math.min(Math.floor(Math.min(xzoom, yzoom)), 17);
   }
 
   function roundScale(scale) {