astromapper 1.0.51 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d833ff3cc4bddbeb16e40603245b5916204a0ca
-  data.tar.gz: 3aff41cfa30b81e257b80c5b8889062d89913e0f
+  metadata.gz: 3d9a36dfde13824da0135e67df60a7c8331aecd8
+  data.tar.gz: 8f5f3fcdac9e026fdda26572b7ad5b6901cdc3ae
 SHA512:
-  metadata.gz: af34d49225a177d838cfb7499b230500a7767f2ebf0476d97b83487e27a1022a11648d9dbb5a827e86cbaeaed0a5dcd02c5416c717b815cb97d97202320231a1
-  data.tar.gz: 41fb21680111903f6579666152dc92c5d1e3ea3624f6d084973039d951abd34b2edcae11392248ff309e963916a773ca281487400641fd93c4c751c5047c851f
+  metadata.gz: f8efcc69879ee5a75435cfe57fa22adc5af8c91cfe18dc3a9bf997374c651f2899415d29933b6f392281e39303642bb2532faf7fc3892b564a1b650b1ab9ebe4
+  data.tar.gz: 67053e837773e6cd6de6b7675424ff6213f4e5fc6b1863460c7be208fd351705aeda2dff0c8d6ef9b8590c0ccfe736fe935c3c8d7a64ba32210df708dd0efa25

data/lib/astromapper/svg.rb

@@ -18,6 +18,7 @@ module Astromapper
       @volumes = []
       # @routes  = {}
       @routes = []
+      @slopes = {}
       @name = config['name']
 
       @hex = {
@@ -29,46 +30,60 @@ module Astromapper
     def from_file
       File.open(@source_filename,'r').readlines.each { |line| @volumes << line if /^\d{4}/.match(line) }
     end
+    def calc_route(keys,x,x1,y,y1)
+      route = nil
+      c = "%02d%02d" % [x1, y1]
+      k = "%02d%02d" % [x, y]
+      # puts "#{k}:#{c} (#{x}, #{y}) (#{x1}, #{y1})"
+      # Calcuate Route Distance
+      d = Math.sqrt((x - x1)**2 + (y - y1)**2).round(0)
+      return route if d == 0
+
+      # Calculate Route Slope to avoid slope collisions
+      s = ((x1 - x) == 0) ? 0 :  ((y1 - y) / (x1 - x))
+      # return route if (@slopes[k].include?(s))
+
+      if (keys.include?(c) and !@routes.include?("#{k}#{c}"))
+        a = center_of(k)
+        b = center_of(c)
+        @slopes[k] << s
+        @routes << "#{c}#{k}" # reverse look-up.
+        route = "<!-- #{k} > #{c} --><line class='line#{d}' x1='#{a[0]}' y1='#{a[1]}' x2='#{b[0]}' y2='#{b[1]}' />"
+      end
+      return route
+    end
     def build_routes
-      routes = []
+      routes = ["<g class='routes'>"]
       keys = @volumes.map do |v|
         v[0..3]
-      end
-      slopes = {}
+      end.sort
+      @slopes = {}
+      paths = {
+        "0"  => (-4..4).to_a,
+        "1"  => (-3..3).to_a,
+        "2"  => (-3..3).to_a,
+        "3"  => (-2..2).to_a,
+        "4"  => (-2..2).to_a,
+      }
       keys.each do |k|
         x = k[0..1].to_i
         y = k[2..3].to_i
-        # @routes[k] = [] if @routes[k].nil?
-        slopes[k] = []
-        (-4..4).to_a.each do |n|
-          (-4..4).to_a.each do |m|
-            x1 = (x + m)
-            y1 = (y + n)
-            next if y1 > 40
-            next if x1 > 32
-            # Calcuate Route Distance
-            d = Math.sqrt((x - x1)**2 + (y - y1)**2).floor # Distance
-            next if d == 0
-            # Calculate Route Slope to avoid slope collisions
-            s = 0
-            s = (y1 - y) / (x1 - x) unless ((x1 - x) == 0)
-            next if slopes[k].include?(s)
-            slopes[k] << s
-
-            c = "%02d%02d" % [x1, y1]
-            # if (keys.include?(c) and !@routes[c].include?(k))
-            if (keys.include?(c) and !@routes.include?("#{k}#{c}"))
-              a = center_of(k)
-              b = center_of(c)
-              routes << "<!-- #{k} > #{c} --><line class='line#{d}' x1='#{a[0]}' y1='#{a[1]}' x2='#{b[0]}' y2='#{b[1]}' />"
-              # @routes[k] << c
-              # @routes[c] = [k] if @routes[c].nil?
-              @routes << "#{c}#{k}" # reverse look-up.
+        @slopes[k] = []
+        paths.keys.each do |pk|
+          [pk.to_i, pk.to_i * -1].each do |m|
+            paths[pk].each do |n|
+              x1 = (x + m)
+              y1 = (y + n)
+              c = "%02d%02d" % [x1, y1]
+              k = "%02d%02d" % [x, y]
+              puts "#{k}:#{c} (#{x}, #{y}) (#{x1}, #{y1}) / (#{pk}:#{paths[pk].inspect}):(#{m}:#{n})"
+              routes << calc_route(keys,x,x1,y,y1)
             end
           end
         end
       end
-      routes.join("\n")
+      routes << "</g>"
+      routes.compact.join("\n")
     end
     def convert
       from_file
@@ -120,27 +135,25 @@ module Astromapper
     }
     line {
       opacity: 0.5;
+      stroke-linecap: round;
     }
     line.line1 {
       stroke: #666;
       stroke-width:4;
     }
     line.line2 {
-      stroke: #66C;
+      stroke: #69C;
       stroke-width:3;
     }
     line.line3 {
-      stroke: #C60;
+      stroke: #C96;
       stroke-width:2;
-      xstroke-dasharray: 5, 5, 1, 5;
-      display:none;
+      stroke-dasharray: 5, 5, 1, 5;
     }
     line.line4 {
-      stroke: #C00;
+      stroke: #C66;
       stroke-width:1;
       stroke-dasharray: 2,6;
-      stroke-linecap: round;
-      display:none;
     }
     polyline {
       fill: none;
@@ -169,6 +182,7 @@ module Astromapper
       stroke: #B90;
       stroke-width: 3;
       stroke-dasharray: 3,6;
+      stroke-linecap: round;
     }
   </style>
   <rect width='#{@width}' height='#{@height}' />

data/lib/astromapper/version.rb

@@ -1,3 +1,3 @@
 module Astromapper
-  VERSION = "1.0.51"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astromapper
 version: !ruby/object:Gem::Version
-  version: 1.0.51
+  version: 1.1.0
 platform: ruby
 authors:
 - Merovex