More work on export tab.

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 3350e733cbb41a7cece2e62ba074c42e42efc42f..3ef5e753aef135fc6f7fbe0ddfc162bcbc6803d3 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -79,8 +79,9 @@ class ApiController < ApplicationController
       exit!
     end
 
       exit!
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    response.headers("Content-Disposition") = "attachment; filename=\"map.osm\""

 
 

+    render :text => doc.to_s, :content_type => "text/xml"

   end
 
   def map
   end
 
   def map

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 9b8d878f2c999724bf0575c42bba052a6d0d1582..a5766e99c840acdcdedcc31d7c6d7ceb6ed31cef 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -6,4 +6,25 @@ class ExportController < ApplicationController
       page.call "openSidebar"
     end
   end
       page.call "openSidebar"
     end
   end

+
+  def finish
+    bbox = BoundingBox.new(params[:minlon], params[:minlat], params[:maxlon], params[:maxlat])
+    format = params[:format]
+
+    if format == "osm"
+      redirect_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=#{bbox}"
+    elsif format == "mapnik"
+      format = params[:mapnik_format]
+      scale = params[:mapnik_scale]
+
+      redirect_to "http://tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+    elsif format == "osmarender"
+      format = params[:osmarender_format]
+      zoom = params[:osmarender_zoom].to_i
+      width = bbox.slippy_width(zoom).to_i
+      height = bbox.slippy_height(zoom).to_i
+
+      redirect_to "http://tah.openstreetmap.org/MapOf/index.php?long=#{bbox.centre_lon}&lat=#{bbox.centre_lat}&z=#{zoom}&w=#{width}&h=#{height}&format=#{format}"
+    end
+  end

 end
 end

diff --git a/app/views/export/_start.rhtml b/app/views/export/_start.rhtml
index e63b87c565c3a763ffb6953e66d34d69fc1f4e68..749928c124ff9d580fe07154eee933fdb060f09f 100644 (file)
--- a/app/views/export/_start.rhtml
+++ b/app/views/export/_start.rhtml
@@ -1,26 +1,29 @@
-<% form_tag :action => 'next' do %>
+<% form_tag :action => "finish" do %>

 
   <p class="export_heading">Area to Export</p>
 
   <div class="export_bounds">
 
   <p class="export_heading">Area to Export</p>
 
   <div class="export_bounds">

-    <%= text_field('export', 'maxlat', { :size => 10, :class => "export_bound" }) %>
+    <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %>

     <br/>
     <br/>

-    <%= text_field('export', 'minlon', { :size => 10, :class => "export_bound" }) %>
-    <%= text_field('export', 'maxlon', { :size => 10, :class => "export_bound" }) %>
+    <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %>
+    <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %>

     <br/>
     <br/>

-    <%= text_field('export', 'minlat', { :size => 10, :class => "export_bound" }) %>
+    <%= 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
+    </p>

   </div>
 
   <p class="export_heading">Format to Export</p>
 
   <div class="export_details">
   </div>
 
   <p class="export_heading">Format to Export</p>
 
   <div class="export_details">

-    <%= radio_button('export', 'format', 'osm' ) %>OpenStreetMap XML Data
-    <br/>
-    <%= radio_button('export', 'format', 'png' ) %>PNG Image
-    <br/>
-    <%= radio_button('export', 'format', 'pdf' ) %>PDF Document
-    <br/>
-    <%= radio_button('export', 'format', 'svg' ) %>SVG Document
+    <p>
+      <%= radio_button_tag("format", "osm") %>OpenStreetMap XML Data
+      <br/>
+      <%= radio_button_tag("format", "mapnik") %>Mapnik Image
+      <br/>
+      <%= radio_button_tag("format", "osmarender") %>Osmarender Image
+    </p>

   </div>
 
   <div id="export_osm">
   </div>
 
   <div id="export_osm">


@@ -35,10 +38,24 @@
     <p class="export_heading">Options</p>
 
     <div class="export_details">
     <p class="export_heading">Options</p>
 
     <div class="export_details">

-      <p>Scale 1 : <%= text_field('export', 'mapnik_scale', { :size => 10 }) %></p>
+      <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>
+    </div>
+  </div>
+
+  <div id="export_osmarender">
+    <p class="export_heading">Options</p>
+
+    <div class="export_details">
+      <p>Format <%= select_tag("osmarender_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"]], "png")) %></p>
+      <p>Zoom <%= select_tag("osmarender_zoom", options_for_select([4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17])) %></p>

     </div>
   </div>
 
     </div>
   </div>
 

+  <div class="export_buttons">
+    <p><%= submit_tag "Export", :id => "export_commit" %></p>
+  </div>
+

 <% end %>
 
 <script type="text/javascript">
 <% end %>
 
 <script type="text/javascript">


@@ -70,32 +87,39 @@
   }
 
   function formatChanged() {
   }
 
   function formatChanged() {

-    if ($("export_format_osm").checked) {
+    if ($("format_osm").checked) {

       $("export_osm").style.display = "inline";
     } else {
       $("export_osm").style.display = "none";
     }
 
       $("export_osm").style.display = "inline";
     } else {
       $("export_osm").style.display = "none";
     }
 

-    if ($("export_format_png").checked ||
-        $("export_format_pdf").checked ||
-        $("export_format_svg").checked) {
+    if ($("format_mapnik").checked) {
+      $("mapnik_scale").value = roundScale(map.getScale());

       $("export_mapnik").style.display = "inline";
     } else {
       $("export_mapnik").style.display = "none";
     }
       $("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";
+    }

   }
 
   }
 

-  $("export_format_osm").onclick = function() { formatChanged() };
-  $("export_format_png").onclick = function() { formatChanged() };
-  $("export_format_pdf").onclick = function() { formatChanged() };
-  $("export_format_svg").onclick = function() { formatChanged() };
+  $("format_osm").onclick = function() { formatChanged() };
+  $("format_mapnik").onclick = function() { formatChanged() };
+  $("format_osmarender").onclick = function() { formatChanged() };

 
   function boundsChanged() {
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");
 
   function boundsChanged() {
     var epsg4326 = new OpenLayers.Projection("EPSG:4326");

-    var bounds = new OpenLayers.Bounds($("export_minlon").value,
-                                       $("export_minlat").value,
-                                       $("export_maxlon").value,
-                                       $("export_maxlat").value);
+    var bounds = new OpenLayers.Bounds($("minlon").value,
+                                       $("minlat").value,
+                                       $("maxlon").value,
+                                       $("maxlat").value);

  
     bounds.transform(epsg4326, map.getProjectionObject());
 
  
     bounds.transform(epsg4326, map.getProjectionObject());
 


@@ -108,10 +132,10 @@
     box.handler.layer.drawFeature(box.handler.feature, box.handler.style);
   }
 
     box.handler.layer.drawFeature(box.handler.feature, box.handler.style);
   }
 

-  $("export_maxlat").onchange = function() { boundsChanged() };
-  $("export_minlon").onchange = function() { boundsChanged() };
-  $("export_maxlon").onchange = function() { boundsChanged() };
-  $("export_minlat").onchange = function() { boundsChanged() };
+  $("maxlat").onchange = function() { boundsChanged() };
+  $("minlon").onchange = function() { boundsChanged() };
+  $("maxlon").onchange = function() { boundsChanged() };
+  $("minlat").onchange = function() { boundsChanged() };

 
   function mapMoved() {
     updateRegion(map.getExtent());
 
   function mapMoved() {
     updateRegion(map.getExtent());


@@ -128,21 +152,76 @@
 
     bounds.transform(map.getProjectionObject(), epsg4326);
 
 
     bounds.transform(map.getProjectionObject(), epsg4326);
 

-    $("export_maxlat").value = Math.round(bounds.top * decimals) / decimals;
-    $("export_minlon").value = Math.round(bounds.left * decimals) / decimals;
-    $("export_maxlon").value = Math.round(bounds.right * decimals) / decimals;
-    $("export_minlat").value = Math.round(bounds.bottom * decimals) / decimals;
+    $("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) {
 
     if (bounds.getWidth() * bounds.getHeight() > 0.25) {

-      $("export_format_osm").disabled = true;
-      $("export_format_osm").checked = false;
+      $("format_osm").disabled = true;
+      $("format_osm").checked = false;

 
       formatChanged();
     } else {
 
       formatChanged();
     } else {

-      $("export_format_osm").disabled = false;
+      $("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>
   startExport();
   // -->
 </script>

diff --git a/config/routes.rb b/config/routes.rb
index b44139c4ad4944733e523e3fd877b30331fd7006..51914241193deb696fd2e979a65a5e5b5fe3f28d 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,6 +124,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # export
   map.connect '/export/start', :controller => 'export', :action => 'start'
 
   # export
   map.connect '/export/start', :controller => 'export', :action => 'start'

+  map.connect '/export/finish', :controller => 'export', :action => 'finish'

 
   # messages
 
 
   # messages
 


@@ -135,6 +136,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
 
   # fall through
   map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
 
   # fall through

-     map.connect ':controller/:id/:action'
+  map.connect ':controller/:id/:action'

   map.connect ':controller/:action'
 end
   map.connect ':controller/:action'
 end

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
new file mode 100644 (file)
index 0000000..d943768
--- /dev/null
+++ b/lib/bounding_box.rb
@@ -0,0 +1,72 @@
+class BoundingBox
+  def initialize(min_lon, min_lat, max_lon, max_lat)
+    @bbox = [min_lon.to_f, min_lat.to_f, max_lon.to_f, max_lat.to_f]
+  end
+
+  def self.from_s(s)
+    BoundingBox.new(s.split(/,/))
+  end
+
+  def min_lon
+    @bbox[0]
+  end
+
+  def min_lon=(min_lon)
+    @bbox[0] = min_lon
+  end
+
+  def min_lat
+    @bbox[1]
+  end
+
+  def min_lat=(min_lat)
+    @bbox[1] = min_lat
+  end
+
+  def max_lon
+    @bbox[2]
+  end
+
+  def max_lon=(max_lon)
+    @bbox[2] = max_lon
+  end
+
+  def max_lat
+    @bbox[3]
+  end
+
+  def max_lat=(max_lat)
+    @bbox[3] = max_lat
+  end
+
+  def centre_lon
+    (@bbox[0] + @bbox[2]) / 2.0
+  end
+
+  def centre_lat
+    (@bbox[1] + @bbox[3]) / 2.0
+  end
+
+  def width
+    @bbox[2] - @bbox[0]
+  end
+
+  def height
+    @bbox[3] - @bbox[1]
+  end
+
+  def slippy_width(zoom)
+    width * 256.0 * 2.0 ** zoom / 360.0
+  end
+
+  def slippy_height(zoom)
+    min = min_lat * Math::PI / 180.0
+    max = max_lat * Math::PI / 180.0
+
+    Math.log((Math.tan(max) + 1.0 / Math.cos(max)) / (Math.tan(min) + 1.0 / Math.cos(min))) * 128.0 * 2.0 ** zoom / Math::PI
+  end
+
+  def to_s
+    return @bbox.join(",")
+  end
+end

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index bb8bbe9993ef9cbc6f1fd29f93aea6a2bbb6d4e5..dee3e85049ce6e592f4bf95c89188ef4f55136af 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -608,3 +608,17 @@ input {
 #export_mapnik {
   display: none;
 }
 #export_mapnik {
   display: none;
 }

+
+#export_osmarender {
+  display: none;
+}
+
+.export_hint {
+  padding: 0px 12px 0px 12px;
+  font-style: italic;
+}
+
+.export_buttons {
+  width: 100%;
+  text-align: center;
+}