X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2ae082a1f360c25621f73dd872c746659c61ef2..28579180e55dc671bc646f58a3d0d56630922255:/app/views/export/start.rjs

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 375c0ab39..abf9e671d 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -1,8 +1,10 @@
-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;
   var box;
+  var markerLayer;
+  var markerControl;
 
   function startExport() {
     vectors = new OpenLayers.Layer.Vector("Vector Layer", {
@@ -15,13 +17,14 @@ 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);
+    map.events.register("changebaselayer", map, htmlUrlChanged);
 
     openSidebar({ onclose: stopExport });
 
@@ -43,7 +46,9 @@ page << <<EOJ
     $("exportanchor").className = "";
 
     clearBox();
+    clearMarker();
     map.events.unregister("moveend", map, mapMoved);
+    map.events.unregister("changebaselayer", map, htmlUrlChanged);
     map.removeLayer(vectors);
   }
 
@@ -72,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();
@@ -89,9 +94,69 @@ 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='#{I18n.t('export.start_rjs.click_add_marker')}';
+
+    if (!markerLayer) {
+      markerLayer = new OpenLayers.Layer.Vector("",{
+        displayInLayerSwitcher: false,
+        style: { 
+          externalGraphic: OpenLayers.Util.getImagesLocation() + "marker.png",
+          graphicXOffset: -10.5,
+          graphicYOffset: -25, 
+          graphicWidth: 21,
+          graphicHeight: 25
+        } 
+      });
+      map.addLayer(markerLayer);
+
+      markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point);
+      map.addControl(markerControl);
+
+      markerLayer.events.on({ "featureadded": endMarker });
+    }
+
+    markerLayer.destroyFeatures();
+    markerControl.activate();
+
+    return false;
+  }
+
+  $("add_marker").onclick = startMarker;
+
+  function endMarker(event) {
+    markerControl.deactivate();
+
+    $("add_marker").innerHTML = "#{I18n.t('export.start_rjs.change_marker')}";
+    $("marker_inputs").style.display = "block";
+    
+    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+    var epsg900913 = new OpenLayers.Projection("EPSG:900913");
+    var geom = event.feature.geometry.clone().transform(epsg900913, epsg4326);
+
+    $("marker_lon").value = geom.x.toFixed(5);
+    $("marker_lat").value = geom.y.toFixed(5);
+
+    htmlUrlChanged(); 
+  }
+
+  function clearMarker() {
+    $("marker_lon").value = "";
+    $("marker_lat").value = "";
+    $("marker_inputs").style.display = "none";
+    $("add_marker").innerHTML = "#{I18n.t('export.start_rjs.add_marker')}";
+
+    if (markerLayer) { 
+      markerControl.destroy();
+      markerLayer.destroy();
+      markerLayer = null;
+      markerControl = null;
+    }
+  }  
+
   function mapMoved() {
     setBounds(map.getExtent());
     validateControls();
@@ -109,7 +174,7 @@ page << <<EOJ
     $("maxlat").value = Math.round(bounds.top * decimals) / decimals;
 
     mapnikSizeChanged();
-    htmlBoundsChanged();
+    htmlUrlChanged();
   }
 
   function clearBox() {
@@ -125,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;
@@ -160,18 +225,31 @@ page << <<EOJ
     }
   }
 
-  function htmlBoundsChanged() {
+  function htmlUrlChanged() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var projBounds = bounds.clone().transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"));
-    var zoom = map.getZoomForExtent(projBounds);
+    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 = "&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>';
+   
+    // Create "larger map" link
     var center = bounds.getCenterLonLat();
-    var url = "http://#{SERVER_URL}/export/embed.html?lat=" + center.lat.toFixed(5) + "&lon=" + center.lon.toFixed(5) + "&zoom=" + zoom;
+    var epsg4326 = new OpenLayers.Projection("EPSG:4326");
+    var epsg900913 = new OpenLayers.Projection("EPSG:900913");
 
-    if ($("html_marker").checked) {
-      url += "&marker=true";
-    }
+    bounds.transform(epsg4326, epsg900913);
+    var zoom = map.getZoomForExtent(bounds);
+    
+    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>';
 
-    var html = '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'+url+'"></iframe>';
     $("export_html_text").value = html;
 
     if ($("format_html").checked) {
@@ -179,8 +257,6 @@ page << <<EOJ
     }
   }
 
-  $("html_marker").onclick = htmlBoundsChanged;
-
   function formatChanged() {
     $("export_commit").style.display = "inline";
 
@@ -212,8 +288,9 @@ page << <<EOJ
       $("export_html_text").select();
     } else {
       $("export_html").style.display = "none";
+      clearMarker();
     }
-    	
+        
     validateControls();
   }
 
@@ -250,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) {