mapknitter-exporter 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dd600a2ddcdd7d435cb9a9a5c20886e86bc1083
-  data.tar.gz: 7bfaa441df599a77380aec9b85b4b4a3e8bbc16f
+  metadata.gz: 89a5b76f3d5867d7ec0af78db1e7df96388a990d
+  data.tar.gz: fa3232bcb5378d0cb2eb7e189b617e7cc1005474
 SHA512:
-  metadata.gz: c7143d0afbc78a3f3324978d4088823c301d4ffc813c3f5a7820452d5541bfb36e9d4382f605193ef7fd5ed6d6bd66bea54d8e1ef6c9fc22c59ffd8a99444362
-  data.tar.gz: 38b1e54c611e05b3560afcfbc7241c7e59c92f0a185c278885695ea18f540e04eda52221f9572952268cc3671cc268e926878e678608f86a5a8bfac18c7904aa
+  metadata.gz: be7aaf40565549c1332f789e2af510dd8e00fbcbccbc19917a6420a1a4c914651dacb7ee0670ac71a24f4e3f13b58f85e56664b4841ab3cfcf9107f647ca5e3a
+  data.tar.gz: a270c38522ca390434e7e3718cb4c7f7fe4a3edba61200300c386d909e13ea1181f86c699551fbe7cd458de05ea0f69a7cf1ef83cfcb51341d92e1e4a6c5210c

data/lib/mapknitterExporter.rb

@@ -48,7 +48,7 @@ class MapKnitterExporter
     # know everything -unwarped can be deleted
     geotiff_location = directory + 'w' + id.to_s + '-geo-unwarped.tif'
     # everything -geo WITH AN ID could be deleted, but there is a feature request to preserve these
-    warped_geotiff_location = directory + 'w' + id.to_s + '-geo.tif'
+    warped_geotiff_location = directory + 'w' + id.to_s + '.tif'
 
     northmost = nodes_array.first['lat'].to_f
     southmost = nodes_array.first['lat'].to_f
@@ -222,7 +222,6 @@ class MapKnitterExporter
     images.each_with_index do |image, index|
      current += 1
 
-     ## TODO: refactor to generate static status file:
      export.status = 'warping '+current.to_s+' of '+images.length.to_s
      puts 'warping '+current.to_s+' of '+images.length.to_s
      export.save
@@ -250,20 +249,22 @@ class MapKnitterExporter
   # generate a tiff from all warpable images in this set
   def self.generate_composite_tiff(coords, origin, warpables, id, ordered)
     directory = "public/warps/#{id}/"
-    composite_location = directory + id.to_s + '-geo.tif'
+    composite_location = directory + id.to_s + '.tif'
     geotiffs = ''
     minlat = nil
     minlon = nil
     maxlat = nil
     maxlon = nil
-    warpables.each do |warpable|
+    warpables.each_with_index do |warpable, i|
       warpable['nodes'].each do |n|
-        minlat = n['lat'] if minlat == nil || n['lat'] < minlat
-        minlon = n['lon'] if minlon == nil || n['lon'] < minlon
-        maxlat = n['lat'] if maxlat == nil || n['lat'] > maxlat
-        maxlon = n['lon'] if maxlon == nil || n['lon'] > maxlon
+        puts "warpable: ", n['id'], i, n['lat'], n['lon']
+        minlat = n['lat'].to_f if minlat == nil || n['lat'].to_f < minlat
+        minlon = n['lon'].to_f if minlon == nil || n['lon'].to_f < minlon
+        maxlat = n['lat'].to_f if maxlat == nil || n['lat'].to_f > maxlat
+        maxlon = n['lon'].to_f if maxlon == nil || n['lon'].to_f > maxlon
       end
     end
+    puts "minlat #{minlat}, minlon #{minlon}, maxlat #{maxlat}, maxlon #{maxlon}"
     first = true
     if ordered != true && warpables.first.keys.include?('poly_area')
       # sort by area; this would be overridden by a provided order
@@ -271,12 +272,12 @@ class MapKnitterExporter
     end
     warpables.each do |warpable|
       wid = "w" + warpable['id'].to_s
-      geotiffs += ' '+directory+wid+'-geo.tif'
+      geotiffs += ' '+directory+wid+'.tif'
       if first
-        gdalwarp = "gdalwarp -s_srs EPSG:3857 -te #{minlon} #{minlat} #{maxlon} #{maxlat} #{directory}#{wid}-geo.tif #{directory}#{id}-geo.tif"
+        gdalwarp = "gdalwarp -s_srs EPSG:3857 -te #{minlon} #{minlat} #{maxlon} #{maxlat} #{directory}#{wid}.tif #{directory}#{id}.tif"
         first = false
       else
-        gdalwarp = "gdalwarp #{directory}#{wid}-geo.tif #{directory}#{id}-geo.tif"
+        gdalwarp = "gdalwarp #{directory}#{wid}.tif #{directory}#{id}.tif"
       end
       puts gdalwarp
       system(self.ulimit+gdalwarp)
@@ -288,7 +289,7 @@ class MapKnitterExporter
   def self.generate_tiles(key, id)
     key = "AIzaSyAOLUQngEmJv0_zcG1xkGq-CXIPpLQY8iQ" if key == "" # ugh, let's clean this up!
     key = key || "AIzaSyAOLUQngEmJv0_zcG1xkGq-CXIPpLQY8iQ"
-    gdal2tiles = "gdal2tiles.py -k --s_srs EPSG:3857 -t #{id} -g #{key} public/warps/#{id}/#{id}-geo.tif public/tms/#{id}/"
+    gdal2tiles = "gdal2tiles.py -k --s_srs EPSG:3857 -t #{id} -g #{key} public/warps/#{id}/#{id}.tif public/tms/#{id}/"
     puts gdal2tiles
     if system(self.ulimit+gdal2tiles)
       "public/tms/#{id}/"
@@ -311,7 +312,7 @@ class MapKnitterExporter
 
   # generates a tileset at public/tms/<id>/
   def self.generate_jpg(id)
-    imageMagick = "convert -background white -flatten public/warps/#{id}/#{id}-geo.tif public/warps/#{id}/#{id}.jpg"
+    imageMagick = "convert -background white -flatten public/warps/#{id}/#{id}.tif public/warps/#{id}/#{id}.jpg"
     if system(self.ulimit+imageMagick)
       "public/warps/#{id}/#{id}.jpg"
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mapknitter-exporter
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jeffrey Warren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies: []
 description: The GDAL/ImageMagick-based exporter system from MapKnitter
 email: jeff@unterbahn.com