panomosity 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a182f799a0789e1a9a3ce30b1bf8936264397aa125b169331039a31436935fad
-  data.tar.gz: c6409d39cfd42beb780f6c40059316290ff08cf6350b94139134e4857537d53e
+  metadata.gz: 960aaa7a596d0b4a03dd08035f2ba977f213611ec966c854377d50e6579d6bc9
+  data.tar.gz: 31897c3519e3dc653663da142195af8098c70227498c7a78c557f58829038f56
 SHA512:
-  metadata.gz: 56dd5d550d87a277a8bc2778aa9a73dbd373e543cb53718c9ac5015de25ca307283414ffe4bbb28a66e440b9682c7109cb177f7202778f645851ef0fdf46612f
-  data.tar.gz: cae10bb2101d9e69bccf7ca461fbe7821dce48bc3315c30d84465ddcfd1a8a224a16c242ce8392795601f31eb3d30d8ff984d5ce5a8bc8047b89b39cfa28106f
+  metadata.gz: 6257b5e9f06245063f35a7c9c5694100022b589af83c2c8804c7c244d4025437af8be95d16d0508363107479d7895f822b133f2c0bff9bd220ff37fd04b41180
+  data.tar.gz: 84838c53dc43d6e071223fedee1ea2c1f8a957a966d77f2867ad8cfc77a345e73bd72e05403b74484fdd17b086d4d1aba92bea58163aed1c526410ff25ede68b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panomosity (0.1.12)
+    panomosity (0.1.14)
 
 GEM
   remote: https://rubygems.org/

data/lib/panomosity/runner.rb

@@ -394,6 +394,25 @@ module Panomosity
     def merge_image_parameters
       logger.info 'merging image parameters'
       control_points = ControlPoint.parse(@compare_file)
+      images = Image.parse(@compare_file)
+
+      # sort images
+      logger.info 'sorting images in case they get out of order'
+      lexically_sorted_images = images
+      numerically_sorted_images = images.sort_by { |image| [image.column, image.row] }
+      image_map = {}
+      lexically_sorted_images.each_with_index do |image_l, i|
+        image_map[image_l.name] = numerically_sorted_images[i]
+        image_map[numerically_sorted_images[i].id.to_i] = image_l.id.to_i
+      end
+
+      # fix control points
+      control_points.each do |control_point|
+        logger.debug "#{control_point[:n]} => #{image_map[control_point[:n].to_i]} | #{control_point[:N]} => #{image_map[control_point[:N].to_i]}"
+        control_point[:n] = image_map[control_point[:n].to_i]
+        control_point[:N] = image_map[control_point[:N].to_i]
+      end
+
       v_lines_started = false
       @lines = @input_file.each_line.map do |line|
         if line[0] == 'v'
@@ -416,20 +435,10 @@ module Panomosity
       optimizer = Optimizer.new(panorama)
       optimizer.run
 
-      # sort images
-      logger.info 'sorting images in case they get out of order'
-      lexically_sorted_images = optimizer.images
-      numerically_sorted_images = optimizer.images.sort_by { |image| [image.column, image.row] }
-      image_map = {}
-      lexically_sorted_images.each_with_index do |image_l, i|
-        image_map[image_l.name] = numerically_sorted_images[i]
-      end
-
       @lines = @input_file.each_line.map do |line|
         image = optimizer.images.find { |i| i.raw == line }
         if image
-          sorted_image = image_map[image.name]
-          sorted_image.to_s
+          image.to_s
         else
           next line
         end
@@ -450,7 +459,7 @@ module Panomosity
         i.n = "c#{ds.reverse.index(i.d)}_r#{es.reverse.index(i.e)}.jpg"
         i.v = fov
       end
-      images = images.sort_by(&:n)
+      images = images.sort_by { |image| [image.column, image.row] }
 
       index = -1
       @lines = @input_file.each_line.map do |line|

data/lib/panomosity/version.rb

@@ -1,3 +1,3 @@
 module Panomosity
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panomosity
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Oliver Garcia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler