astromapper 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5273245b8abdf862d99dd54fdfd64e35d96ff1f2
-  data.tar.gz: 5dbe72dbc3c3af5ee68adb9707379267ae91906e
+  metadata.gz: 6a9cfe24acc8a2bc95bdd68bb086bea417e6a88f
+  data.tar.gz: 8112420708e36c7b322d75fe396e8c70739db970
 SHA512:
-  metadata.gz: e6ce1000f285d0af740dbd56ebb28fcbf4f84075e6b644c1fd11bebf32c00996930ef7fb67a9189bdbe5c431d3603524fb4da911af63940317c097097c38fa1c
-  data.tar.gz: b474772f11906d013f6466e3db164966f39df072971779bb4836a16a27725a05937fd423905810ac9b5ee168a2000643cd87f4ea4e861dda438ac9a3b6e163ea
+  metadata.gz: 32fc9e5f9f16656b4bcf83803136dd4b1ecbdd3a2cd9c1eabf93fe57b1cfd5e745c271d575c1417f34735cad5ab6469e578511c8b13234c7369b7cdb55d8491a
+  data.tar.gz: 37f9179db14c9c620c3b1f9b73b1733679df91a424232b15d92299863e1cdcee3ca9db9bb7006a415bb334d19cb7df063156d6582b8b69159510744c9739cb5f

data/lib/astromapper/svg.rb

@@ -17,53 +17,7 @@ module Astromapper
       @zones   = []
       @volumes = []
       @name = config['name']
-      # puts "Height: #{@height}; Width: #{@width}"
 
-      base03  = config['colors']['base03']  ||  '#002b36'
-      base02  = config['colors']['base02']  ||  '#073642'
-      base01  = config['colors']['base01']  ||  '#586e75'
-      base00  = config['colors']['base03']  ||  '#657b83'
-      base0   = config['colors']['base0']   ||  '#839496'
-      base1   = config['colors']['base1']   ||  '#93a1a1'
-      base2   = config['colors']['base2']   ||  '#eee8d5'
-      base3   = config['colors']['base3']   ||  '#fdf6e3'
-      yellow  = config['colors']['yellow']  ||  '#b58900'
-      orange  = config['colors']['orange']  ||  '#cb4b16'
-      red     = config['colors']['red']     ||  '#dc322f'
-      magenta = config['colors']['magenta'] ||  '#d33682'
-      violet  = config['colors']['violet']  ||  '#6c71c4'
-      blue    = config['colors']['blue']    ||  '#268bd2'
-      cyan    = config['colors']['cyan']    ||  '#2aa198'
-      green   = config['colors']['green']   ||  '#859900'
-      white   = config['colors']['white']   ||  '#FFFFFF'
-      black   = config['colors']['black']   ||  '#222222'
-
-      @theme = {
-        'dark' => {
-          :background => base03,
-          :zone       => {'AZ' => yellow, 'RZ' => red},
-          :hex        => base1,
-          :hex_id     => base2,
-          :world_text => base2,
-          :black      => base3,
-          :base02     => base2,
-          :base1      => base01,
-          :white      => white,
-          :tract_id   => base01
-        },
-        'lite' => {
-          :background => white,
-          :zone       => {'AZ' => yellow, 'RZ' => red},
-          :hex        => base1,
-          :hex_id     => base01,
-          :world_text => base01,
-          :black      => black,
-          :base02     => base02,
-          :base1      => base1,
-          :white      => white,
-          :tract_id   => base2
-        }
-      }
       theme = (%w{lite dark}.include?(config['svg_theme'])) ? config['svg_theme'] : 'lite'
       @color = @theme[theme]
       @hex = {
@@ -71,47 +25,6 @@ module Astromapper
         :side_w => (@side / 2).tweak,
         :width  => @side
       }
-      # @style = {
-      #   :circle    => "fill='#{@color[:black]}' stroke='#{@color[:white]}' stroke-width='1'",
-      #   :polyline  => "fill='none'",
-      #   :polygon   => "fill='#{@color[:black]}' stroke='none' stroke-width='1'",
-      #   :ellipse   => "fill='none' stroke='#{@color[:base02]}' stroke-width='1'",
-      #   :Belt      => "stroke='#{@color[:white]}' stroke-width='1'",
-      #   :AZ_zone   => "fill='none' stroke='#{@color[:zone]['AZ']}' stroke-width='3' stroke-dasharray='5%,5%'",
-      #   :RZ_zone   => "fill='none' stroke='#{@color[:zone]['RZ']}' stroke-width='3'",
-      #   :Planet    => "fill='#{@color[:black]}' stroke='#{@color[:black]}' stroke-width='1'",
-      #   :Desert    => "fill='none' stroke='#{@color[:black]}' stroke-width='2'",
-      #   :Frame     => "fill='none' stroke='#{@color[:black]}' stroke-width='4'",
-      #   :Tract     => "fill='none' stroke='#{@color[:hex]}' stroke-width='1'",
-      #   :Hexgrid   => "fill='none' stroke='#{@color[:hex]}' stroke-width='1'",
-      #   :Name      => "text-anchor='middle' font-size='#{@side/5}px' fill='#{@color[:world_text]}' font-family='Verdana'",
-      #   :symbol    => "text-anchor='middle' font-size='#{@side/2.5}px' fill='#{@color[:black]}' font-family='Verdana'",
-      #   :Spaceport => "text-anchor='middle' font-size='#{@side/3}px' fill='#{@color[:world_text]}' font-family='Verdana'",
-      #   :TractID   => "text-anchor='middle' font-size='#{@side*3}px' fill='#{@color[:tract_id]}' font-family='Verdana'",
-      #   :VolumeId  => "text-anchor='middle' font-size='#{@side/5}px' fill='#{@color[:hex_id]}' font-family='Verdana'",
-      #   :rect      => "fill='#{@color[:background]}'"
-      # }
-      @style = {
-        :circle    => "fill='#{@color[:black]}' stroke='#{@color[:white]}' stroke-width='1'",
-        :polyline  => "fill='none'",
-        :polygon   => "fill='#{@color[:black]}' stroke='none' stroke-width='1'",
-        :ellipse   => "fill='none' stroke='#{@color[:base02]}' stroke-width='1'",
-        :Belt      => "stroke='#{@color[:white]}' stroke-width='1'",
-        :AZ_zone   => "class='lowsec'",
-        :RZ_zone   => "class='lowsec'",
-        :Planet    => "",
-        :Desert    => "",
-        :Frame     => "",
-        :Tract     => "",
-        :Hexgrid   => "",
-        :Name      => "",
-        :symbol    => "",
-        :Spaceport => "",
-        :TractID   => "",
-        :VolumeId  => "",
-        :rect      => "fill='#{@color[:background]}'"
-      }
-      @style[:UWP] = @style[:Name]
     end
     def from_file
       File.open(@source_filename,'r').readlines.each { |line| @volumes << line if /^\d{4}/.match(line) }
@@ -150,10 +63,10 @@ module Astromapper
       fill: #eed;
       font: 120px sans-serif;
     }
-    text.sector-name {
+    text.namestamp {
       font-size: 13px;
     }
-    text.scout {
+    text.symbol {
       font-size: 14px;
       fill: #222;
     }
@@ -191,7 +104,7 @@ module Astromapper
       stroke-dasharray: 3,6;
     }
   </style>
-  <rect #{@style[:rect]} width='#{@width}' height='#{@height}' />
+  <rect width='#{@width}' height='#{@height}' />
       EOS
     end
     def center_of(locx)
@@ -234,12 +147,12 @@ module Astromapper
 
       output =  "<!-- Volume: #{volume.strip.gsub(/\t/,' // ')} -->\n"
       output +=  (size == '0') ? draw_belt(c) : draw_planet(c,uwp)
-      output += "    <text #{@style[:Spaceport]} x='#{c[0]}' y='#{(c[1] + @side / 2).tweak}'>#{spaceport.strip}</text>\n"
-      output += "    <text #{@style[:UWP]} x='#{c[0]}' y='#{(c[1]+(@side/1.3)).tweak}'>#{uwp.strip}</text>\n"
-      output += "    <text #{@style[:Name]} x='#{c[0]}' y='#{(c[1]-(@side/2.1)).tweak}'>#{name.strip}</text>\n"
+      output += "    <text class='spaceport' x='#{c[0]}' y='#{(c[1] + @side / 2).tweak}'>#{spaceport.strip}</text>\n"
+      output += "    <text x='#{c[0]}' y='#{(c[1]+(@side/1.3)).tweak}'>#{uwp.strip}</text>\n"
+      output += "    <text x='#{c[0]}' y='#{(c[1]-(@side/2.1)).tweak}'>#{name.strip}</text>\n"
       unless zone == '..'
         style = zone + '_zone'
-        output += "    <path #{@style[style.to_sym]} d='M #{c[0] - curve/2;} #{c[1] - (curve/1.4)} a #{curve} #{curve} 0 1 0 20 0' />\n"
+        output += "    <path d='M #{c[0] - curve/2;} #{c[1] - (curve/1.4)} a #{curve} #{curve} 0 1 0 20 0' />\n"
       end
       output += navy_base(c)  if nsg.include?('N')
       output += scout_base(c) if nsg.include?('S')
@@ -256,7 +169,7 @@ module Astromapper
       x = (c[0]+(@side/1.8)).tweak + 2
       y = (c[1]-(@side/3)).tweak + 3
       stars.split('/').each do |star|
-        output += "    <text #{@style[:Name]} x='#{x}' y='#{y}'>#{star[0..1].strip}</text>\n"
+        output += "    <text x='#{x}' y='#{y}'>#{star[0..1].strip}</text>\n"
         x += 3
         y += 7
       end
@@ -264,21 +177,21 @@ module Astromapper
     end
     def draw_planet(c,w)
       k = (w[3] == '0') ? 'Desert' : 'Planet'
-       "    <circle #{@style[:circle]} cx='#{c[0]}' cy='#{c[1]}' r='#{@side/7}' />\n"
+       "    <circle class='planet' cx='#{c[0]}' cy='#{c[1]}' r='#{@side/7}' />\n"
     end
     def draw_belt(c)
       output = "    <g stroke='none' fill='none'>\n"
       7.times do
         x = c[0] + Random.rand(@side/3) - @side/6
         y = c[1] + Random.rand(@side/3) - @side/6
-        output += "      <circle #{@style[:Belt]} cx='#{x.tweak}' cy='#{y.tweak}' r='#{(@side/15).tweak}' />\n"
+        output += "      <circle class='belt' cx='#{x.tweak}' cy='#{y.tweak}' r='#{(@side/15).tweak}' />\n"
       end
       output + "    </g>\n"
     end
     def frame(k='Frame')
       style = k.to_sym
       z = 0; w = @width - 0; h = @height - z;
-      "    <polyline #{@style[style]} points='#{z},#{z} #{w},#{z} #{w},#{h} #{z},#{h} #{z},#{z}' />"
+      "    <polyline class='frame' points='#{z},#{z} #{w},#{z} #{w},#{h} #{z},#{h} #{z},#{z}' />"
     end
     def tract_marks
       height = (@height / 4).floor
@@ -292,8 +205,8 @@ module Astromapper
         w2 = 0
         4.times do |c|
           w1 = w2; w2 += (width - [-4,4,5,-4][c])
-          output += "    <text #{@style[:TractID]} x='#{w1 + 70}' y='#{h1 + 110}'>#{letters.shift}</text>\n"
-          output += "    <polyline #{@style[:Tract]} points='#{w1},#{h1} #{w2},#{h1} #{w2},#{h2} #{w1},#{h2} #{w1},#{h1}' />\n"
+          output += "    <text class='tract' x='#{w1 + 70}' y='#{h1 + 110}'>#{letters.shift}</text>\n"
+          output += "    <polyline class='tract' points='#{w1},#{h1} #{w2},#{h1} #{w2},#{h2} #{w1},#{h2} #{w1},#{h1}' />\n"
           # raise output
         end
       end
@@ -306,42 +219,42 @@ module Astromapper
         (@columns+1).times do |c|
           x = @side + ((c-1) * @side * 1.5)
           y = (c % 2 == 1) ? (r-1) * @side * @factor + (0.2 * @side) : (r-1) * @side * @factor + @hex[:side_h]+ (0.2 * @side)
-          output += "<text #{@style[:VolumeId]} x='#{x.tweak}' y='#{y.tweak}'>%02d%02d</text>\n" % [c,r]
+          output += "<text class='volume-id' x='#{x.tweak}' y='#{y.tweak}'>%02d%02d</text>\n" % [c,r]
         end
       end
       output
     end
     def polygon(x, y, sx, sy, sides=4)
       polygon = star_coords(sx, sy, sides).map { |c| "#{x + c[0]},#{y.tweak+c[1]}" }
-      "    <polygon #{@style[:polygon]} points='#{polygon.join(' ')}' />\n"
+      "    <polygon points='#{polygon.join(' ')}' />\n"
     end
     def gas_giant(c)
       x = (c[0]+(@side/1.8)).tweak; y = (c[1]+(@side/3)).tweak;
       return<<-GIANT
-      <g><!-- Has Gas Giant -->
-        <ellipse #{@style[:ellipse]} cx='#{x}' cy='#{y}' rx='#{(@side/(@mark * 0.5)).tweak}' ry='#{(@side/@mark * 0.3).tweak}' />
-        <circle  #{@style[:circle]} cx='#{x}' cy='#{y}' r='#{(@side/(@mark * 1.2)).tweak}' />
+      <g class='gas-giant'><!-- Has Gas Giant -->
+        <ellipse cx='#{x}' cy='#{y}' rx='#{(@side/(@mark * 0.5)).tweak}' ry='#{(@side/@mark * 0.3).tweak}' />
+        <circle cx='#{x}' cy='#{y}' r='#{(@side/(@mark * 1.2)).tweak}' />
       </g>
       GIANT
     end
     def pirates(c);
-        return "<!-- Pirates --><text #{@style[:symbol]} x='#{c[0]-(@side/3.1)}' y='#{c[1]+(@side/7)}'>\u2620</text>\n"
+        return "<!-- Pirates --><text class='symbol' x='#{c[0]-(@side/3.1)}' y='#{c[1]+(@side/7)}'>\u2620</text>\n"
     end
     def consulate(c);
-        return "<!-- Consulate --><text #{@style[:symbol]} x='#{c[0]-(@side/1.5)}' y='#{c[1]+(@side/7)}'>\u2691</text>\n"
+        return "<!-- Consulate --><text class='symbol' x='#{c[0]-(@side/1.5)}' y='#{c[1]+(@side/7)}'>\u2691</text>\n"
     end
     def scout_base(c);
-        return "<!-- Scout Base --><text #{@style[:symbol]} x='#{c[0]-(@side/1.8)}' y='#{c[1]+(@side/2.4)}'>\u269C</text>\n"
+        return "<!-- Scout Base --><text class='symbol' x='#{c[0]-(@side/1.8)}' y='#{c[1]+(@side/2.4)}'>\u269C</text>\n"
       '<!-- SB -->' + polygon(c[0]-(@side/1.8),c[1]+(@side/3.7), @side/(@mark/2), @side/@mark, 3);
     end
     def navy_base(c);
-      return "<!-- Navy Base --><text #{@style[:symbol]} x='#{c[0]-(@side/1.8)}' y='#{c[1]-(@side/6)}'>\u2693</text>\n"
+      return "<!-- Navy Base --><text class='symbol' x='#{c[0]-(@side/1.8)}' y='#{c[1]-(@side/6)}'>\u2693</text>\n"
       '<!-- NB -->' +polygon(c[0]-(@side/1.8), c[1]-(@side/3.7), @side/(@mark/2), @side/@mark, 5);
     end
     def hex_grid; (@rows * 3 + 2).times.map { |j| hex_row((j/2).floor, (j % 2 != 0)) };
     end
     def namestamp
-      return "<text text-anchor='left' font-size='30px' fill='#8A9DD1' font-family='Verdana' x='30' y='2800'>#{@name}</text>"
+      return "<text class='namestamp' x='30' y='2800'>#{@name}</text>"
     end
     def hex_row(row, top=false)
       ly = (row * 2 * @hex[:side_h]) + @hex[:side_h]
@@ -369,7 +282,7 @@ module Astromapper
       x += @hex[:side_w]
       y = (top) ? y - @hex[:side_h] : y + @hex[:side_h]
       points << "#{x.tweak},#{y.tweak}"
-      "    <polyline #{@style[:Hexgrid]} points='#{points.join(' ')}' />"
+      "    <polyline points='#{points.join(' ')}' />"
     end
   end
 end

data/lib/astromapper/version.rb

@@ -1,3 +1,3 @@
 module Astromapper
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

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