Make some links more rails like, thus easier to read. Test that partials are included...

[rails.git] / app / views / export / start.rjs

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index 2a7985037d27d1349d438423ba939ff6e808f057..8a17ca6ae416eb9e6ee4ffbfe759f1ffe4d65bf6 100644 (file)
--- 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;
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var vectors;


@@ -77,7 +77,7 @@ page << <<EOJ
   $("minlat").onchange = boundsChanged;
 
   function startDrag() {
   $("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();
 
     clearBox();
     box.activate();


@@ -94,11 +94,11 @@ page << <<EOJ
     box.deactivate();
     validateControls();
 
     box.deactivate();
     validateControls();
 

-    $("drag_box").innerHTML = "Manually select a different area";
+    $("drag_box").innerHTML = "#{I18n.t('export.start_rjs.manually_select')}";

   }
 
   function startMarker() {
   }
 
   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("",{
 
     if (!markerLayer) {
       markerLayer = new OpenLayers.Layer.Vector("",{


@@ -130,7 +130,7 @@ page << <<EOJ
   function endMarker(event) {
     markerControl.deactivate();
 
   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");
     $("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";
     $("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();
 
     if (markerLayer) { 
       markerControl.destroy();


@@ -190,7 +190,7 @@ page << <<EOJ
   function validateControls() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
 
   function validateControls() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
 

-    if (bounds.getWidth() * bounds.getHeight() > 0.25) {
+    if (bounds.getWidth() * bounds.getHeight() > #{APP_CONFIG['max_request_area']}) {

       $("format_osm").disabled = true;
       $("format_osm").checked = false;
       $("export_osm").style.display = "none";
       $("format_osm").disabled = true;
       $("format_osm").checked = false;
       $("export_osm").style.display = "none";


@@ -229,12 +229,27 @@ page << <<EOJ
     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 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 markerUrl = "";

 
     if ($("marker_lat").value && $("marker_lon").value) {
 
     if ($("marker_lat").value && $("marker_lon").value) {

+      markerUrl = "&mlat=" + $("marker_lat").value + "&mlon=" + $("marker_lon").value;

       url += "&marker=" + $("marker_lat").value + "," + $("marker_lon").value;
     } 
       url += "&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>';
     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 epsg4326 = new OpenLayers.Projection("EPSG:4326");
+    var epsg900913 = new OpenLayers.Projection("EPSG:900913");
+
+    bounds.transform(epsg4326, epsg900913);
+    var zoom = map.getZoomForExtent(bounds);
+    
+    var layers = getMapLayers();
+
+    html += '<br /><small><a href="http://#{SERVER_URL}/?lat='+center.lat+'&lon='+center.lon+'&zoom='+zoom+'&layers='+layers+markerUrl+'">#{I18n.t('export.start_rjs.view_larger_map')}</a></small>';
+

     $("export_html_text").value = html;
 
     if ($("format_html").checked) {
     $("export_html_text").value = html;
 
     if ($("format_html").checked) {


@@ -312,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)))))
 
     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) {
   }
 
   function roundScale(scale) {