mapknitter-exporter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6396f65106739795c21f41cdbf09f5b83f304ba
-  data.tar.gz: 5e376ff010e5e8de275f189ede66ec06fcbadd1e
+  metadata.gz: aa13d61605063309fe16c87a83a364af8f036b34
+  data.tar.gz: 20ba485d6b3905fb2a8ad2049832dd6305be092a
 SHA512:
-  metadata.gz: d68a28de27755f50174dd36584a2d3a4e6f20f2b79bbd2ac4e788a36157ea6ba7f1d2d0161fa7fad26ec8848af2dfe275e7340047de788e2dd214c2b80ce9e15
-  data.tar.gz: 0c5c5172b613dae3e347aa47b6644d6bfe0fe133ec839dccf97cab71fcbec97ab6bfe69fed0daebc6858d21c003671e0e4c0f72f05052a095ddb064f4409d01b
+  metadata.gz: fbba64c47fa9c10a2ad7287f2a44e8b6f113b59af985991ce294503b253c97f08be02a3e360e97b3c8829daa704acdad5b33744b57a6026e03a6b54e34d26e7c
+  data.tar.gz: d2d0a2295f3020c727166edc6e6df7f2f7d4d30b67b7934114fd93617e187e4f9e643ceb44f7b11b81af2689c67761189cdd9ced6ea92c1359d6cc1dd5e172c9

data/lib/mapknitterExporter.rb

@@ -29,7 +29,7 @@ class MapKnitterExporter
   # pixels per meter = pxperm 
   def self.generate_perspectival_distort(pxperm, id, nodes_array, image_file_name, img_url, height, width, root = "https://mapknitter.org")
     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)
@@ -50,32 +50,28 @@ class MapKnitterExporter
     # 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'
 
-    northmost = nodes_array.first[:lat]
-    southmost = nodes_array.first[:lat]
-    westmost = nodes_array.first[:lon]
-    eastmost = nodes_array.first[:lon]
+    northmost = nodes_array.first['lat'].to_f
+    southmost = nodes_array.first['lat'].to_f
+    westmost =  nodes_array.first['lon'].to_f
+    eastmost =  nodes_array.first['lon'].to_f
 
     nodes_array.each do |node|
-      northmost = node[:lat] if node[:lat] > northmost
-      southmost = node[:lat] if node[:lat] < southmost
-      westmost = node[:lon] if node[:lon] < westmost
-      eastmost = node[:lon] if node[:lon] > eastmost
+      northmost = node['lat'].to_f if node['lat'].to_f > northmost
+      southmost = node['lat'].to_f if node['lat'].to_f < southmost
+      westmost =  node['lon'].to_f if node['lon'].to_f < westmost
+      eastmost =  node['lon'].to_f if node['lon'].to_f > eastmost
     end
-
-    # puts northmost.to_s+','+southmost.to_s+','+westmost.to_s+','+eastmost.to_s
     
     scale = 20037508.34    
-    y1 = pxperm*Cartagen.spherical_mercator_lat_to_y(northmost,scale)
-    x1 = pxperm*Cartagen.spherical_mercator_lon_to_x(westmost,scale)
-    y2 = pxperm*Cartagen.spherical_mercator_lat_to_y(southmost,scale)
-    x2 = pxperm*Cartagen.spherical_mercator_lon_to_x(eastmost,scale)
-    # puts x1.to_s+','+y1.to_s+','+x2.to_s+','+y2.to_s
+    y1 = pxperm.to_f * Cartagen.spherical_mercator_lat_to_y(northmost,scale)
+    x1 = pxperm.to_f * Cartagen.spherical_mercator_lon_to_x(westmost,scale)
+    y2 = pxperm.to_f * Cartagen.spherical_mercator_lat_to_y(southmost,scale)
+    x2 = pxperm.to_f * Cartagen.spherical_mercator_lon_to_x(eastmost,scale)
 
     # should determine if it's stored in s3 or locally:
     if (img_url.slice(0,4) == 'http')
       Net::HTTP.start('s3.amazonaws.com') { |http|
       #Net::HTTP.start('localhost') { |http|
-        puts (img_url)
         resp = http.get(img_url)
         open(local_location, "wb") { |file|
           file.write(resp.body)
@@ -126,8 +122,8 @@ class MapKnitterExporter
       corner = source_corners.shift
       nx1 = corner[0]
       ny1 = corner[1]
-      nx2 = -x1+(pxperm*Cartagen.spherical_mercator_lon_to_x(node[:lon],scale))
-      ny2 = y1-(pxperm*Cartagen.spherical_mercator_lat_to_y(node[:lat],scale))
+      nx2 = -x1 + (pxperm.to_f * Cartagen.spherical_mercator_lon_to_x(node['lon'].to_f, scale.to_f))
+      ny2 =  y1 - (pxperm.to_f * Cartagen.spherical_mercator_lat_to_y(node['lat'].to_f, scale.to_f))
  
       points = points + '  ' unless first
       maskpoints = maskpoints + ' ' unless first
@@ -135,7 +131,7 @@ class MapKnitterExporter
       maskpoints = maskpoints + nx2.to_i.to_s + ',' + ny2.to_i.to_s
       first = false
       # we need to find an origin; find northwestern-most point
-      coordinates = coordinates+' -gcp '+nx2.to_s+', '+ny2.to_s+', '+node[:lon].to_s + ', ' + node[:lat].to_s
+      coordinates = coordinates+' -gcp '+nx2.to_s+', '+ny2.to_s+', '+node['lon'].to_s + ', ' + node['lat'].to_s
       
       # identify largest dimension to set canvas size for ImageMagick:
       maxdimension = nx1.to_i if maxdimension < nx1.to_i
@@ -146,8 +142,8 @@ class MapKnitterExporter
 
     # close mask polygon:
     maskpoints = maskpoints + ' '
-      nx2 = -x1+(pxperm*Cartagen.spherical_mercator_lon_to_x(nodes_array.first[:lon], scale))
-      ny2 = y1-(pxperm*Cartagen.spherical_mercator_lat_to_y(nodes_array.first[:lat], scale))
+      nx2 = -x1 + (pxperm.to_f * Cartagen.spherical_mercator_lon_to_x(nodes_array.first['lon'].to_f, scale.to_f))
+      ny2 =  y1 - (pxperm.to_f * Cartagen.spherical_mercator_lat_to_y(nodes_array.first['lat'].to_f, scale.to_f))
     maskpoints = maskpoints + nx2.to_i.to_s + ',' + ny2.to_i.to_s
 
     height = (y1-y2).to_i.to_s
@@ -235,11 +231,11 @@ class MapKnitterExporter
      img_coords = generate_perspectival_distort(
        scale,
        id,
-       image[:nodes_array],
-       image[:filename],
-       image[:url],
-       image[:height],
-       image[:width]
+       image['nodes'],
+       image['image_file_name'],
+       image['src'],
+       image['height'].to_i,
+       image['width'].to_i
      )
      puts '- '+img_coords.to_s
      all_coords << img_coords
@@ -259,20 +255,20 @@ class MapKnitterExporter
     maxlat = nil
     maxlon = nil
     placed_warpables.each do |warpable|
-      warpable[:nodes_array].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
+      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
       end
     end
     first = true
-    if ordered != true
+    if ordered != true && placed_warpables.first.keys.include?('poly_area')
       # sort by area; this would be overridden by a provided order
-      warpables = placed_warpables.sort{|a,b|b.poly_area <=> a.poly_area}
+      warpables = placed_warpables.sort{ |a,b| b['poly_area'] <=> a['poly_area'] }
     end
     warpables.each do |warpable|
-      wid = warpable[:id].to_s
+      wid = 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"
@@ -312,7 +308,7 @@ class MapKnitterExporter
 
   # 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, placed_warpables, key)
+  def self.run_export(user_id, resolution, export, id, root, warpables, key, ordered = false)
     export.user_id = user_id if user_id
     export.status = 'starting'
     export.tms = false
@@ -321,6 +317,11 @@ class MapKnitterExporter
     export.jpg = false
     export.save
 
+    # filter out those that have no corner coordinates
+    placed_warpables = warpables.keep_if do |w|
+      w['nodes'] && w['nodes'].length > 0
+    end
+
     directory = "#{root}/public/warps/#{id}/"
     stdin, stdout, stderr = Open3.popen3('rm -r '+directory.to_s)
     puts stdout.readlines
@@ -330,7 +331,7 @@ class MapKnitterExporter
     puts stderr.readlines
 
     puts '> averaging scales; resolution: ' + resolution.to_s
-    pxperm = 100/(resolution).to_f # pixels per meter
+    pxperm = 100/(resolution.to_f) # pixels per meter
     puts '> scale: ' + pxperm.to_s + 'pxperm'
 
     puts '> distorting warpables'
@@ -342,7 +343,13 @@ class MapKnitterExporter
     export.save
 
     puts '> generating composite tiff'
-    composite_location = self.generate_composite_tiff(warpable_coords,origin,placed_warpables,id,false) # no ordering yet
+    composite_location = self.generate_composite_tiff(
+      warpable_coords,
+      origin,
+      placed_warpables,
+      id,
+      ordered
+    )
 
     info = (`identify -quiet -format '%b,%w,%h' #{composite_location}`).split(',')
     puts info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mapknitter-exporter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeffrey Warren