v1.0.5

publiclab · May 23, 2019 · b2f8338 · b2f8338
1 parent 93cb78f
commit b2f8338
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/lib/mapknitterExporter.rb b/lib/mapknitterExporter.rb
@@ -250,7 +250,6 @@ def self.distort_warpables(scale, images, export, id)
   def self.generate_composite_tiff(coords, origin, warpables, id, ordered)
     directory = "public/warps/#{id}/"
     composite_location = directory + id.to_s + '.tif'
-    geotiffs = ''
     minlat = nil
     minlon = nil
     maxlat = nil
@@ -270,18 +269,14 @@ def self.generate_composite_tiff(coords, origin, warpables, id, ordered)
       # sort by area; this would be overridden by a provided order
       warpables = warpables.sort{ |a,b| b['poly_area'] <=> a['poly_area'] }
     end
+    geotiffs = ""
     warpables.each do |warpable|
       wid = "w" + warpable['id'].to_s
       geotiffs += ' '+directory+wid+'.tif'
-      if first
-        gdalwarp = "gdalwarp -s_srs EPSG:3857 -te #{minlon} #{minlat} #{maxlon} #{maxlat} #{directory}#{wid}.tif #{directory}#{id}.tif"
-        first = false
-      else
-        gdalwarp = "gdalwarp #{directory}#{wid}.tif #{directory}#{id}.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
 

diff --git a/mapknitter-exporter-1.0.5.gem b/mapknitter-exporter-1.0.5.gem
diff --git a/mapknitter-exporter.gemspec b/mapknitter-exporter.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'mapknitter-exporter'
-  s.version     = '1.0.4'
-  s.date        = '2019-05-17'
+  s.version     = '1.0.5'
+  s.date        = '2019-05-22'
   s.summary     = "The GDAL/ImageMagick-based exporter system from MapKnitter"
   s.description = "The GDAL/ImageMagick-based exporter system from MapKnitter"
   s.authors     = ["Jeffrey Warren"]