diff --git a/lib/exporter.rb b/lib/exporter.rb index 3d0aaf20..43917403 100644 --- a/lib/exporter.rb +++ b/lib/exporter.rb @@ -254,22 +254,16 @@ class Exporter maxlon = n.lon if maxlon == nil || n.lon > maxlon end end - first = true if ordered != true # sort by area; this would be overridden by a provided order warpables = placed_warpables.sort{|a,b|b.poly_area <=> a.poly_area} end warpables.each do |warpable| geotiffs += ' '+directory+warpable.id.to_s+'-geo.tif' - if first - gdalwarp = "gdalwarp -s_srs EPSG:3857 -te "+minlon.to_s+" "+minlat.to_s+" "+maxlon.to_s+" "+maxlat.to_s+" "+directory+warpable.id.to_s+'-geo.tif '+directory+slug+'-geo.tif' - first = false - else - gdalwarp = "gdalwarp "+directory+warpable.id.to_s+'-geo.tif '+directory+slug+'-geo.tif' - end - puts gdalwarp - system(self.ulimit+gdalwarp) end + gdalwarp = "gdalwarp -s_srs EPSG:3857 -te #{minlon} #{minlat} #{maxlon} #{maxlat} #{geotiffs} #{directory}#{id}.tif" + puts gdalwarp + system(self.ulimit+gdalwarp) composite_location end