mapknitter-exporter 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a2db81a1aea653c39e517f2f91367c4becf7430
-  data.tar.gz: 9da5e614b55cfa867ac4143c36a2377a3565318a
+  metadata.gz: 4746d00b0cdb35d3052ea1e29ebdea992ed259a1
+  data.tar.gz: 2615e67a59a4005470390718c5dab06563c81364
 SHA512:
-  metadata.gz: 31fbd439a12d9ecb2cc03ceff04a3ac7112ae250b250a2005bc0a1e99301b19a963a06e48f3a3583c835e66c9c289eceb5b2e2965c1452bc06e7ca025345abb8
-  data.tar.gz: 3c793bcd793d0dca896d60c8308d317401a8f600318497b86b1842d8b8dcc5302801973be39537f7e664146566a9b2a426ecceae8ea4a780024054794141ca1c
+  metadata.gz: c1abc46a8e1990f43a3868b8a3fc1c7e50d16da4dfc575971251103bf1c3b2d1dbd13b04c17af83e40d5512e22e9e5c6d3fe7a310c977e21d768609451cf42db
+  data.tar.gz: 8457537423064abca2f24ad5621f58b3f142c3f0a5821eabbe6e7dc67cf505e238758b3fb36f21015116a0b5c8c6c177a03fc9299a19a85f5fd0653cf1e493dd

data/lib/mapknitterExporter.rb

@@ -27,28 +27,28 @@ class MapKnitterExporter
   ## Run on each image:
 
   # pixels per meter = pxperm 
-  def self.generate_perspectival_distort(pxperm, id, nodes_array, image_file_name, img_url, height, width, root = "https://mapknitter.org")
+  def self.generate_perspectival_distort(pxperm, id, nodes_array, image_file_name, img_url, height, width)
     require 'net/http'
 
     # everything in -working/ can be deleted; 
     # this is just so we can use the files locally outside of s3
     working_directory = get_working_directory(id)
     Dir.mkdir(working_directory) unless (File.exists?(working_directory) && File.directory?(working_directory))
-    local_location = "#{working_directory}#{id}-#{image_file_name}"
+    local_location = "#{working_directory}w#{id}-#{image_file_name}"
 
     directory = warps_directory(id)
     Dir.mkdir(directory) unless (File.exists?(directory) && File.directory?(directory))
-    completed_local_location = directory+id.to_s+'.png'
+    completed_local_location = directory + 'w' + id.to_s+'.png'
 
     # everything -masked.png can be deleted
-    masked_local_location = directory+id.to_s+'-masked.png'
+    masked_local_location = directory + 'w' + id.to_s + '-masked.png'
     # everything -mask.png can be deleted
-    mask_location = directory+id.to_s+'-mask.png'
+    mask_location = directory + 'w' + id.to_s + '-mask.png'
     #completed_local_location = directory+id.to_s+'.tif'
     # know everything -unwarped can be deleted
-    geotiff_location = directory+id.to_s+'-geo-unwarped.tif'
+    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+id.to_s+'-geo.tif'
+    warped_geotiff_location = directory + 'w' + id.to_s + '-geo.tif'
 
     northmost = nodes_array.first['lat'].to_f
     southmost = nodes_array.first['lat'].to_f
@@ -268,7 +268,7 @@ class MapKnitterExporter
       warpables = warpables.sort{ |a,b| b['poly_area'] <=> a['poly_area'] }
     end
     warpables.each do |warpable|
-      wid = warpable['id'].to_s
+      wid = "w" + warpable['id'].to_s
       geotiffs += ' '+directory+wid+'-geo.tif'
       if first
         gdalwarp = "gdalwarp -s_srs EPSG:3857 -te #{minlon} #{minlat} #{maxlon} #{maxlat} #{directory}#{wid}-geo.tif #{directory}#{id}-geo.tif"
@@ -282,14 +282,17 @@ class MapKnitterExporter
     composite_location
   end
 
-  # generates a tileset at root/public/tms/<id>/
-  # root is something like https://mapknitter.org
-  def self.generate_tiles(key, id, root)
+  # generates a tileset at public/tms/<id>/
+  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}/"
     puts gdal2tiles
-    system(self.ulimit+gdal2tiles)
+    if system(self.ulimit+gdal2tiles)
+      "public/tms/#{id}/"
+    else
+      false
+    end
   end
 
   # zips up tiles at public/tms/<id>.zip;
@@ -297,20 +300,29 @@ class MapKnitterExporter
     rmzip = "cd public/tms/ && rm #{id}.zip && cd ../../"
     system(rmzip)
     zip = "cd public/tms/ && #{self.ulimit} zip -rq #{id}.zip #{id}/ && cd ../../"
-    system(zip)
+    if system(zip)
+      "public/tms/#{id}.zip"
+    else
+      false
+    end
   end
 
   # generates a tileset at public/tms/<id>/
-  def self.generate_jpg(id, root)
-    imageMagick = "convert -background white -flatten public/warps/#{id}/#{id}-geo.tif #{root}/public/warps/#{id}/#{id}.jpg"
-    system(self.ulimit+imageMagick)
+  def self.generate_jpg(id)
+    imageMagick = "convert -background white -flatten public/warps/#{id}/#{id}-geo.tif public/warps/#{id}/#{id}.jpg"
+    if system(self.ulimit+imageMagick)
+      "public/warps/#{id}/#{id}.jpg"
+    else
+      false
+    end
   end
 
   # runs the above map functions while maintaining a record of state in an Export model;
   # we'll be replacing the export model state with a flat status file
-  def self.run_export(user_id, resolution, export, id, root, warpables, key, ordered = false)
+  def self.run_export(user_id, resolution, export, id, warpables, key, ordered = false)
     export.user_id = user_id if user_id
     export.status = 'starting'
+    # we set these false again later...
     export.tms = false
     export.geotiff = false
     export.zip = false
@@ -322,11 +334,11 @@ class MapKnitterExporter
       w['nodes'] && w['nodes'].length > 0
     end
 
-    directory = "#{root}/public/warps/#{id}/"
+    directory = "public/warps/#{id}/"
     stdin, stdout, stderr = Open3.popen3('rm -r '+directory.to_s)
     puts stdout.readlines
     puts stderr.readlines
-    stdin, stdout, stderr = Open3.popen3("rm -r #{root}/public/tms/#{id}")
+    stdin, stdout, stderr = Open3.popen3("rm -r public/tms/#{id}")
     puts stdout.readlines
     puts stderr.readlines
 
@@ -351,33 +363,47 @@ class MapKnitterExporter
       ordered
     )
 
-    info = (`identify -quiet -format '%b,%w,%h' #{composite_location}`).split(',')
+    identify = "identify -quiet -format '%b,%w,%h' #{composite_location}"
+    puts identify
+    info = (`#{identify}`).split(',')
     puts info
 
     if info[0] != ''
-      export.geotiff = true
+      export.geotiff = composite_location
       export.size = info[0]
       export.width = info[1]
       export.height = info[2]
-      export.cm_per_pixel = 100.0000/pxperm
-      export.status = 'tiling'
+      export.cm_per_pixel = 100.0000 / pxperm
       export.save
     end
 
+    # this could be forked
     puts '> generating tiles'
-    export.tms = true if self.generate_tiles(key, id, root)
-    export.status = 'zipping tiles'
+    export.tms = false
+    export.status = 'tiling'
     export.save
+    export.tms = self.generate_tiles(key, id)
+    export.save unless export.tms == false
 
     puts '> zipping tiles'
-    export.zip = true if self.zip_tiles(id)
-    export.status = 'creating jpg'
+    export.zip = false
+    export.status = 'zipping tiles'
     export.save
+    export.zip = self.zip_tiles(id)
+    export.save unless export.zip == false
+    # end fork
 
+    # this could be forked
     puts '> generating jpg'
-    export.jpg = true if self.generate_jpg(id, root)
-    export.status = 'complete'
+    export.jpg = false
+    export.status = 'creating jpg'
     export.save
+    export.jpg = self.generate_jpg(id)
+    unless export.jpg == false
+      export.status = 'complete'
+      export.save
+    end
+    # end fork
 
     export.status
   end

metadata

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