usps_flags 0.4.1 → 0.5.0

data/lib/usps_flags/core/icons/trident.rb

@@ -5,59 +5,75 @@
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::Icons::Trident
+  require 'usps_flags/core/icons/trident_parts/hashes'
+  include USPSFlags::Core::Icons::TridentParts::Hashes
+
   def initialize(type, color: :blue, field_color: nil)
     valid_types = [:s, :d, :stf, :n]
-    raise "Error: Invalid trident type. Options are #{valid_types}." unless valid_types.include? type
+    raise "Error: Invalid trident type. Options are #{valid_types}." unless valid_types.include?(type)
 
     @type = type
 
-    load_config
+    @trident_config = USPSFlags.configuration.trident
+    load_measures
+    load_measures_from_top
+    load_main_length
     configure_trident_segments
     configure_colors(color, field_color)
   end
 
   def svg
-    svg = ''
+    svg = +''
     svg << '<g mask="url(#delta-mask)">' if @type == :d
     svg << '<g mask="url(#circle-mask-for-main-spike)">' if @type == :stf
-
-    @trident_segments.each do |segment|
-      start = segment.keys.first
-      points = segment.values.first
-      svg << "<path d=\"M #{start[0]} #{start[1]}\n"
-      points.each { |x, y| svg << "l #{x} #{y}\n" }
-      svg << "\" fill=\"#{@color_code}\" />\n"
-    end
+    @trident_segments.each { |seg| svg << add_trident_segment(seg) }
     svg << '</g>' if [:d, :stf].include?(@type)
-
-    case @type
-    when :d
-      svg << delta_hash
-    when :stf
-      svg << circle_hash
-    else
-      svg << standard_hash
-    end
+    svg << add_hash
 
     svg
   end
 
 private
 
-  def load_config
-    @trident_config = USPSFlags.configuration.trident
+  def add_trident_segment(segment)
+    svg = +''
+    start = segment.keys.first
+    points = segment.values.first
+    svg << "<path d=\"M #{start[0]} #{start[1]}\n"
+    points.each { |x, y| svg << "l #{x} #{y}\n" }
+    svg << "\" fill=\"#{@color_code}\" />\n"
+    svg
+  end
+
+  def add_hash
+    return delta_hash if @type == :d
+    return circle_hash if @type == :stf
+
+    standard_hash
+  end
+
+  def load_measures
     @main_spike_overhang = @trident_config[:bar_width] / 2
     @side_spike_overhang = @trident_config[:bar_width] / 2
     @top_point = ((USPSFlags::Config::BASE_HOIST - @trident_config[:height][@type]) / 2)
+  end
+
+  def load_measures_from_top
     @crossbar_top = @top_point + @trident_config[:crossbar_from_top]
     @hash_from_top = @trident_config[:crossbar_from_top] + (@trident_config[:bar_width] * 2)
     @circle_from_top = @trident_config[:crossbar_from_top] + @trident_config[:bar_width] * 123 / 128 + @trident_config[:width] / 2
+  end
+
+  def load_main_length
     @main_length = @trident_config[:height][@type] - (@trident_config[:center_point_height] - @trident_config[:main_point_barb])
   end
 
   def configure_trident_segments
     @trident_segments = [main_spike, crossbar, left_spike, right_spike]
-    @lower_hash = lower_hash
+    @lower_hash = [
+      [@trident_config[:hash_width], 0], [0, @trident_config[:bar_width]],
+      [-@trident_config[:hash_width], 0], [0, -@trident_config[:bar_width]]
+    ]
   end
 
   def main_spike
@@ -66,9 +82,7 @@ private
       [
         [@trident_config[:bar_width], @trident_config[:center_point_height]],
         [-@main_spike_overhang,  -@trident_config[:main_point_barb]],
-        [0, @main_length],
-        [-(@trident_config[:bar_width]), 0],
-        [0, -@main_length],
+        [0, @main_length], [-(@trident_config[:bar_width]), 0], [0, -@main_length],
         [-@main_spike_overhang, @trident_config[:main_point_barb]],
         [@trident_config[:bar_width], -@trident_config[:center_point_height]]
       ]
@@ -79,10 +93,8 @@ private
     {
       [(@trident_config[:center_point] - @trident_config[:width] / 2), (@crossbar_top)] =>
       [
-        [@trident_config[:width], 0],
-        [0, @trident_config[:bar_width]],
-        [-@trident_config[:width], 0],
-        [0, -@trident_config[:bar_width]]
+        [@trident_config[:width], 0], [0, @trident_config[:bar_width]],
+        [-@trident_config[:width], 0], [0, -@trident_config[:bar_width]]
       ]
     }
   end
@@ -93,8 +105,7 @@ private
       [
         [0, -(@trident_config[:side_spike_height] + @trident_config[:side_point_height])],
         [(@trident_config[:bar_width] + @side_spike_overhang), @trident_config[:side_point_height]],
-        [-@side_spike_overhang, 0],
-        [0, @trident_config[:side_spike_height]]
+        [-@side_spike_overhang, 0], [0, @trident_config[:side_spike_height]]
       ]
     }
   end
@@ -105,79 +116,21 @@ private
       [
         [0, -(@trident_config[:side_spike_height] + @trident_config[:side_point_height])],
         [-(@trident_config[:bar_width] + @side_spike_overhang), @trident_config[:side_point_height]],
-        [@side_spike_overhang, 0],
-        [0, @trident_config[:side_spike_height]]
+        [@side_spike_overhang, 0], [0, @trident_config[:side_spike_height]]
       ]
     }
   end
 
-  def lower_hash
-    [
-      [@trident_config[:hash_width], 0],
-      [0, @trident_config[:bar_width]],
-      [-@trident_config[:hash_width], 0],
-      [0, -@trident_config[:bar_width]]
-    ]
-  end
-
   def configure_colors(color, field_color)
     @color_code = '#FFFFFF'
     if color == :red
-      @color_code = USPSFlags::Config::RED
-      @field_color_code = '#FFFFFF'
+      @color_code, @field_color_code = [USPSFlags::Config::RED, '#FFFFFF']
     elsif color == :blue
-      @color_code = USPSFlags::Config::BLUE
-      @field_color_code = '#FFFFFF'
+      @color_code, @field_color_code = [USPSFlags::Config::BLUE, '#FFFFFF']
     elsif field_color == :red
       @field_color_code = USPSFlags::Config::RED
     elsif field_color == :blue
       @field_color_code = USPSFlags::Config::BLUE
     end
   end
-
-  def delta_hash
-    <<~SVG
-      <polyline mask="url(#delta-mask)" fill="#{@color_code}" points="
-        #{@trident_config[:center_point]}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] - @trident_config[:delta_height]}
-        #{@trident_config[:center_point] + @trident_config[:width] / 2}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom]}
-        #{@trident_config[:center_point] - @trident_config[:width] / 2}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom]}
-        #{@trident_config[:center_point]}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] - @trident_config[:delta_height]}" />
-      <mask id="delta-mask">
-        <g>
-          <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-          <polyline transform="scale(#{@trident_config[:delta_gap_scale]}) translate(#{@trident_config[:delta_gap_x]},#{@trident_config[:delta_gap_y]})" fill="#000000" points="
-            #{@trident_config[:center_point]}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] - @trident_config[:delta_height]}
-            #{@trident_config[:center_point] + @trident_config[:width] / 2}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] * 17 / 20}
-            #{@trident_config[:center_point] - @trident_config[:width] / 2}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] * 17 / 20}
-            #{@trident_config[:center_point]}, #{@top_point + @trident_config[:height][:d] - @trident_config[:delta_from_bottom] - @trident_config[:delta_height]}" />
-        </g>
-      </mask>
-    SVG
-  end
-
-  def circle_hash
-    <<~SVG
-      <circle cx="#{@trident_config[:center_point]}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2}" fill="#{@color_code}" mask="url(#circle-mask)" />
-      <mask id="circle-mask">
-        <g>
-          <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-          <circle cx="#{@trident_config[:center_point]}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
-        </g>
-      </mask>
-      <mask id="circle-mask-for-main-spike">
-        <g transform="scale(1.05) translate(-@trident_config[:br_width], -@trident_config[:br_width]/2)">
-          <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
-          <circle cx="#{@trident_config[:center_point]}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
-        </g>
-      </mask>
-    SVG
-  end
-
-  def standard_hash
-    svg = "<path d=\"M #{(@trident_config[:center_point] - @trident_config[:hash_width] / 2)} #{(@top_point + @hash_from_top)}\n"
-    @lower_hash.each { |x, y| svg << "l #{x} #{y}\n" }
-    svg << "\" fill=\"#{@color_code}\" />\n"
-
-    svg
-  end
 end

data/lib/usps_flags/core/icons/trident_parts/hashes.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: false
+
+# Trident hash configurations.
+#
+# These methods should never need to be called directly.
+# @private
+module USPSFlags::Core::Icons::TridentParts
+  module Hashes
+    def delta_hash
+      <<~SVG
+        <polyline mask="url(#delta-mask)" fill="#{@color_code}" points="#{delta_mask_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
+        <mask id="delta-mask">
+          <g>
+            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+            <polyline transform="scale(#{@trident_config[:delta_gap_scale]}) translate(#{@trident_config[:delta_gap_x]},#{@trident_config[:delta_gap_y]})" fill="#000000" points="#{delta_points(@trident_config[:center_point], @trident_config[:height][:d], @trident_config[:delta_from_bottom])}" />
+          </g>
+        </mask>
+      SVG
+    end
+
+    def delta_mask_points(center, height, bottom)
+      top = @top_point + height - bottom
+      <<~SVG
+        #{center}, #{top - @trident_config[:delta_height]}
+        #{center + @trident_config[:width] / 2}, #{top}
+        #{center - @trident_config[:width] / 2}, #{top}
+        #{center}, #{top - @trident_config[:delta_height]}
+      SVG
+    end
+
+    def delta_points(center, height, bottom)
+      top = @top_point + height - bottom - @trident_config[:delta_height]
+      mid = @top_point + height - bottom * 17 / 20
+      <<~SVG
+        #{center}, #{top}
+        #{center + @trident_config[:width] / 2}, #{mid}
+        #{center - @trident_config[:width] / 2}, #{mid}
+        #{center}, #{top}
+      SVG
+    end
+
+    def circle_hash
+      center = @trident_config[:center_point]
+      <<~SVG
+        <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2}" fill="#{@color_code}" mask="url(#circle-mask)" />
+        <mask id="circle-mask">
+          <g>
+            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+            <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
+          </g>
+        </mask>
+        <mask id="circle-mask-for-main-spike">
+          <g transform="scale(1.05) translate(-@trident_config[:br_width], -@trident_config[:br_width]/2)">
+            <rect x="0" y="0" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_FLY}" fill="#FFFFFF" />
+            <circle cx="#{center}" cy="#{@top_point + @circle_from_top}" r="#{@trident_config[:width] / 2 - @trident_config[:bar_width]}" fill="#000000" />
+          </g>
+        </mask>
+      SVG
+    end
+
+    def standard_hash
+      svg = "<path d=\"M #{(@trident_config[:center_point] - @trident_config[:hash_width] / 2)} #{(@top_point + @hash_from_top)}\n"
+      @lower_hash.each { |x, y| svg << "l #{x} #{y}\n" }
+      svg << "\" fill=\"#{@color_code}\" />\n"
+
+      svg
+    end
+  end
+end

data/lib/usps_flags/core/icons/trumpet.rb

@@ -11,7 +11,20 @@ class USPSFlags::Core::Icons::Trumpet
   end
 
   def svg
-    trumpet = <<~SVG
+    if @count == 2
+      <<~SVG
+        <g transform="translate(1100,-600)"><g transform="rotate(45)">#{trumpet}</g></g>
+        <g transform="translate(-300,1100)"><g transform="rotate(-45)">#{trumpet}</g></g>
+      SVG
+    else
+      trumpet
+    end
+  end
+
+private
+
+  def trumpet
+    <<~SVG
       <path d="M1139.9999958974363,480.00000000000006
       c-44.15476410256406,-6.5910035897434796,-116.84910635897381,-20.41065056410247,-114.87185282051291,-47.179479230769175
       c4.028547230769618,-65.74318056410249,367.85434817948703,-61.23149248717954,369.23087128205134,-2.051282051282101
@@ -22,14 +35,5 @@ class USPSFlags::Core::Icons::Trumpet
       c106.18124384615362,-96.7690410256414,99.88082358974339,-91.1716969230772,229.74356769230792,-141.53843102564088"
       fill="#{@color}" />
     SVG
-
-    if @count == 2
-      <<~SVG
-        <g transform="translate(1100,-600)"><g transform="rotate(45)">#{trumpet}</g></g>
-        <g transform="translate(-300,1100)"><g transform="rotate(-45)">#{trumpet}</g></g>
-      SVG
-    else
-      trumpet
-    end
   end
 end

data/lib/usps_flags/core/pennant.rb

@@ -12,16 +12,8 @@ class USPSFlags::Core::Pennant
   end
 
   def svg
-    if @type == 'OIC'
-      oic
-    elsif @type == 'CRUISE'
-      <<~SVG
-        #{cruise}
-        <g transform=\"translate(385, 340)\">
-          #{USPSFlags::Core.star}
-        </g>"
-      SVG
-    end
+    return oic if @type == 'OIC'
+    return cruise if @type == 'CRUISE'
   end
 
 private
@@ -34,24 +26,29 @@ private
 
   def cruise
     <<~SVG
-      <path d="M 0 0
-        l #{@fly * 10 / 36} #{@hoist * 5 / 36}
-        l 0 #{@hoist * 26 / 36}
-        l -#{@fly * 10 / 36} #{@hoist * 5 / 36}
-      " fill="#{USPSFlags::Config::RED}" />
-      <path d="M #{@fly * 10 / 36} #{@hoist * 5 / 36}
-        l #{@fly * 11 / 36} #{@hoist * 5.5 / 36}
-        l 0 #{@hoist * 15 / 36}
-        l -#{@fly * 11 / 36} #{@hoist * 5.5 / 36}
-      " fill="#FFFFFF" />
-      <path d="M #{@fly * 21 / 36} #{@hoist * 10.5 / 36}
-        l #{@fly * 15 / 36} #{@hoist * 7.5 / 36}
-        l -#{@fly * 15 / 36} #{@hoist * 7.5 / 36}
-      " fill="#{USPSFlags::Config::BLUE}" />
-      <path d="M 0 0
-        l #{@fly} #{@hoist / 2}
-        l -#{@fly} #{@hoist / 2}
-      " fill="none" stroke="#000000" stroke-width="2" />
+      #{cruise_red}#{cruise_white}#{cruise_blue}
+      <path d="M 0 0 l #{@fly} #{@hoist / 2} l -#{@fly} #{@hoist / 2}" fill="none" stroke="#000000" stroke-width="2" />
+      <g transform=\"translate(385, 340)\">
+        #{USPSFlags::Core.star}
+      </g>"
+    SVG
+  end
+
+  def cruise_red
+    <<~SVG
+      <path d="M 0 0 l #{@fly * 10 / 36} #{@hoist * 5 / 36} l 0 #{@hoist * 26 / 36} l -#{@fly * 10 / 36} #{@hoist * 5 / 36}" fill="#{USPSFlags::Config::RED}" />
+    SVG
+  end
+
+  def cruise_white
+    <<~SVG
+      <path d="M #{@fly * 10 / 36} #{@hoist * 5 / 36} l #{@fly * 11 / 36} #{@hoist * 5.5 / 36} l 0 #{@hoist * 15 / 36} l -#{@fly * 11 / 36} #{@hoist * 5.5 / 36}" fill="#FFFFFF" />
+    SVG
+  end
+
+  def cruise_blue
+    <<~SVG
+      <path d="M #{@fly * 21 / 36} #{@hoist * 10.5 / 36} l #{@fly * 15 / 36} #{@hoist * 7.5 / 36} l -#{@fly * 15 / 36} #{@hoist * 7.5 / 36}" fill="#{USPSFlags::Config::BLUE}" />
     SVG
   end
 end

data/lib/usps_flags/core/trident_specs/circle.rb

@@ -22,13 +22,13 @@ private
 
   def inner_diameter
     <<~SVG
-      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] * 2, @box_top + @config[:crossbar_from_top] + @config[:width], @config[:center_point], @config[:center_point], fly: @fly, unit: @unit)} <!-- Inner circle diameter -->
+      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] * 2, @box_top + @config[:crossbar_from_top] + @config[:width], pointer_top: @config[:center_point], pointer_bottom: @config[:center_point], fly: @fly, unit: @unit)} <!-- Inner circle diameter -->
     SVG
   end
 
   def outer_diameter
     <<~SVG
-      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] + @config[:width], nil, outer_box_right, fly: @fly, unit: @unit)} <!-- Outer circle diameter -->
+      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] + @config[:width], pointer_bottom: outer_box_right, fly: @fly, unit: @unit)} <!-- Outer circle diameter -->
     SVG
   end
 
@@ -38,7 +38,7 @@ private
 
   def circle_to_bottom
     <<~SVG
-      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] + @config[:width], @box_bottom, nil, @box_right, fly: @fly, unit: @unit)} <!-- Circle to bottom -->
+      #{SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] + @config[:width], @box_bottom, pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Circle to bottom -->
     SVG
   end
 end

data/lib/usps_flags/core/trident_specs/delta.rb

@@ -22,13 +22,13 @@ private
     <<~SVG
       <!-- Right -->
         #{gap_height} <!-- Delta gap height -->
-        #{SA.vertical(@box_right + @config[:bar_width], @box_bottom - @config[:delta_from_bottom] - @config[:bar_width], @box_bottom - @config[:delta_from_bottom], nil, @box_right, fly: @fly, unit: @unit)} <!-- Delta width -->
-        #{SA.vertical(@box_right + @config[:bar_width], @box_bottom - @config[:delta_from_bottom], @box_bottom, nil, @box_right, fly: @fly, unit: @unit)} <!-- Delta to bottom -->
+        #{SA.vertical(@box_right + @config[:bar_width], @box_bottom - @config[:delta_from_bottom] - @config[:bar_width], @box_bottom - @config[:delta_from_bottom], pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Delta width -->
+        #{SA.vertical(@box_right + @config[:bar_width], @box_bottom - @config[:delta_from_bottom], @box_bottom, pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Delta to bottom -->
     SVG
   end
 
   def gap_height
-    SA.vertical(@box_right + @config[:bar_width], gap_height_top, @box_bottom - @config[:delta_from_bottom] - @config[:bar_width], @config[:center_point], @config[:center_point] + @config[:delta_gap_width], fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], gap_height_top, @box_bottom - @config[:delta_from_bottom] - @config[:bar_width], pointer_top: @config[:center_point], pointer_bottom: @config[:center_point] + @config[:delta_gap_width], fly: @fly, unit: @unit)
   end
 
   def gap_height_top
@@ -38,7 +38,7 @@ private
   def left
     <<~SVG
       <!-- Left -->
-        #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, @box_left, @box_left, label_offset: -BF / 30, label_offset_y: -BF * 2 / 11, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
+        #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, pointer_top: @box_left, pointer_bottom: @box_left, label_offset: -BF / 30, label_offset_y: -BF * 2 / 11, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
     SVG
   end
 end

data/lib/usps_flags/core/trident_specs/long.rb

@@ -28,11 +28,11 @@ private
   def left
     <<~SVG
       <!-- Left -->
-        #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, @box_left, @box_left, label_offset: -BF / 30, label_offset_y: -BF / 4.5, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
+        #{SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top, @box_bottom, pointer_top: @box_left, pointer_bottom: @box_left, label_offset: -BF / 30, label_offset_y: -BF / 4.5, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
     SVG
   end
 
   def hash_to_bottom
-    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] * 3, @box_bottom, @config[:center_point] + @config[:hash_width] / 2, @box_right, fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:crossbar_from_top] + @config[:bar_width] * 3, @box_bottom, pointer_top: @config[:center_point] + @config[:hash_width] / 2, pointer_bottom: @box_right, fly: @fly, unit: @unit)
   end
 end

data/lib/usps_flags/core/trident_specs/short.rb

@@ -30,7 +30,7 @@ private
   def right
     <<~SVG
       <!-- Right -->
-        #{SA.vertical(@box_right + @config[:bar_width], @box_top, @box_top + @config[:bar_width] * 4 / 5, @box_right, @box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
+        #{SA.vertical(@box_right + @config[:bar_width], @box_top, @box_top + @config[:bar_width] * 4 / 5, pointer_top: @box_right, pointer_bottom: @box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
         #{right_top_gap_to_hash_gap} <!-- Top gap to hash gap -->
         #{right_crossbar_to_hash_gap} <!-- Crossbar to hash gap -->
 
@@ -40,7 +40,7 @@ private
   end
 
   def right_top_gap_to_hash_gap
-    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:bar_width] * 4 / 5, right_top_gap_bottom, nil, @box_right, fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:bar_width] * 4 / 5, right_top_gap_bottom, pointer_bottom: @box_right, fly: @fly, unit: @unit)
   end
 
   def right_top_gap_bottom
@@ -48,7 +48,7 @@ private
   end
 
   def right_crossbar_to_hash_gap
-    SA.vertical(@box_right + @config[:bar_width], right_crossbar_top, right_crossbar_bottom, nil, @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], right_crossbar_top, right_crossbar_bottom, pointer_bottom: @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit)
   end
 
   def right_crossbar_top
@@ -60,7 +60,7 @@ private
   end
 
   def right_hash
-    SA.vertical(@box_right + @config[:bar_width], right_hash_top, right_hash_bottom, nil, @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], right_hash_top, right_hash_bottom, pointer_bottom: @config[:center_point] + @config[:hash_width] / 2, fly: @fly, unit: @unit)
   end
 
   def right_hash_top
@@ -72,24 +72,24 @@ private
   end
 
   def right_hash_to_bottom
-    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:bar_width] * 38 / 10 + @config[:side_point_height] + @config[:side_spike_height], @box_bottom, nil, @box_right, fly: @fly, unit: @unit)
+    SA.vertical(@box_right + @config[:bar_width], @box_top + @config[:bar_width] * 38 / 10 + @config[:side_point_height] + @config[:side_spike_height], @box_bottom, pointer_bottom: @box_right, fly: @fly, unit: @unit)
   end
 
   def left
     <<~SVG
       <!-- Left -->
-        #{SA.vertical(@box_left - @config[:bar_width] * 5.25, @box_top, @box_bottom, @box_left, @box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
+        #{SA.vertical(@box_left - @config[:bar_width] * 5.25, @box_top, @box_bottom, pointer_top: @box_left, pointer_top: @box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
         #{left_main_point_height} <!-- Main point height -->
         #{left_side_point_height} <!-- Side point height -->
     SVG
   end
 
   def left_main_point_height
-    SA.vertical(@box_left - @config[:bar_width] * 0.75, @box_top, @box_top + @config[:center_point_height], nil, @config[:center_point] - @config[:bar_width], label_offset: -BF / 24, label_offset_y: -BF / 60, label_align: 'middle', fly: @fly, unit: @unit)
+    SA.vertical(@box_left - @config[:bar_width] * 0.75, @box_top, @box_top + @config[:center_point_height], pointer_bottom: @config[:center_point] - @config[:bar_width], label_offset: -BF / 24, label_offset_y: -BF / 60, label_align: 'middle', fly: @fly, unit: @unit)
   end
 
   def left_side_point_height
-    SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top + @config[:bar_width] * 4 / 5, left_side_point_bottom, @box_left, @box_left + @config[:bar_width], label_offset: -BF / 24, label_align: 'middle', fly: @fly, unit: @unit)
+    SA.vertical(@box_left - @config[:bar_width] * 1.5, @box_top + @config[:bar_width] * 4 / 5, left_side_point_bottom, pointer_top: @box_left, pointer_bottom: @box_left + @config[:bar_width], label_offset: -BF / 24, label_align: 'middle', fly: @fly, unit: @unit)
   end
 
   def left_side_point_bottom
@@ -101,16 +101,16 @@ private
       <!-- Bottom -->
         #{bottom_bar_width} <!-- Bar width -->
         #{bottom_hash_width} <!-- Hash width -->
-        #{SA.horizontal(@box_bottom + @config[:bar_width] * 4, @box_left, @box_right, @box_bottom, @box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
+        #{SA.horizontal(@box_bottom + @config[:bar_width] * 4, @box_left, @box_right, pointer_left: @box_bottom, pointer_right: @box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
     SVG
   end
 
   def bottom_bar_width
-    SA.horizontal(@box_bottom + @config[:bar_width], @config[:center_point] - @config[:bar_width] / 2, @config[:center_point] + @config[:bar_width] / 2, @box_bottom, @box_bottom, fly: @fly, unit: @unit)
+    SA.horizontal(@box_bottom + @config[:bar_width], @config[:center_point] - @config[:bar_width] / 2, @config[:center_point] + @config[:bar_width] / 2, pointer_left: @box_bottom, pointer_right: @box_bottom, fly: @fly, unit: @unit)
   end
 
   def bottom_hash_width
-    SA.horizontal(@box_bottom + @config[:bar_width] * 2.5, @config[:center_point] - @config[:hash_width] / 2, @config[:center_point] + @config[:hash_width] / 2, bottom_hash_width_pointer_left, bottom_hash_width_pointer_right, fly: @fly, unit: @unit)
+    SA.horizontal(@box_bottom + @config[:bar_width] * 2.5, @config[:center_point] - @config[:hash_width] / 2, @config[:center_point] + @config[:hash_width] / 2, pointer_left: bottom_hash_width_pointer_left, pointer_right: bottom_hash_width_pointer_right, fly: @fly, unit: @unit)
   end
 
   def bottom_hash_width_pointer_left
@@ -130,11 +130,11 @@ private
   end
 
   def top_side_point_width
-    SA.horizontal(@box_top - @config[:bar_width], @box_left, @box_left + @config[:bar_width] * 3 / 2, @box_top, @box_top + @config[:bar_width] * 4 / 5 + @config[:side_point_height], label_offset: -BF / 60, fly: @fly, unit: @unit)
+    SA.horizontal(@box_top - @config[:bar_width], @box_left, @box_left + @config[:bar_width] * 3 / 2, pointer_left: @box_top, pointer_right: @box_top + @config[:bar_width] * 4 / 5 + @config[:side_point_height], label_offset: -BF / 60, fly: @fly, unit: @unit)
   end
 
   def top_main_point_width
-    SA.horizontal(@box_top - @config[:bar_width] * 2.5, top_main_point_top, @config[:center_point] + @config[:bar_width], @box_top + @config[:center_point_height], @box_top + @config[:center_point_height], label_offset: -BF / 60, fly: @fly, unit: @unit)
+    SA.horizontal(@box_top - @config[:bar_width] * 2.5, top_main_point_top, @config[:center_point] + @config[:bar_width], pointer_left: @box_top + @config[:center_point_height], pointer_right: @box_top + @config[:center_point_height], label_offset: -BF / 60, fly: @fly, unit: @unit)
   end
 
   def top_main_point_top

data/lib/usps_flags/core/tridents.rb

@@ -53,7 +53,7 @@ class USPSFlags::Core::Tridents
     def offset(type, field_color:, field: true)
       # Swallowtail tridents need to move towards the hoist due to the tails
       x_distance = USPSFlags::Config::BASE_FLY / 10 if field
-      svg = ''
+      svg = +''
       svg << "<g transform=\"translate(-#{x_distance})\">" if field
       svg << USPSFlags::Core.trident(type, field_color: field_color, color: :red)
       svg << '</g>' if field

data/lib/usps_flags/core/us.rb

@@ -33,23 +33,21 @@ private
   end
 
   def stars
-    rows = {
-      odd: (1..9).step(2).to_a,
-      even: (2..8).step(2).to_a
-    }
-    columns = {
-      odd: (1..11).step(2).to_a,
-      even: (2..10).step(2).to_a
-    }
+    rows = { odd: (1..9).step(2).to_a, even: (2..8).step(2).to_a }
+    columns = { odd: (1..11).step(2).to_a, even: (2..10).step(2).to_a }
 
-    svg = ''
-    %i[odd even].each do |type|
-      rows[type].each do |r|
-        columns[type].each do |c|
-          svg << <<~SVG
-            <g transform="translate(#{@canton_fly * c / 12}, #{@star_offset + @canton_hoist * r / 10})"><g><use href="#star" /></g></g>
-          SVG
-        end
+    svg = +''
+    %i[odd even].each { |type| svg << star_set(rows, columns, type) }
+    svg
+  end
+
+  def star_set(rows, columns, type)
+    svg = +''
+    rows[type].each do |r|
+      columns[type].each do |c|
+        svg << <<~SVG
+          <g transform="translate(#{@canton_fly * c / 12}, #{@star_offset + @canton_hoist * r / 10})"><g><use href="#star" /></g></g>
+        SVG
       end
     end
     svg