usps_flags 0.3.26 → 0.4.0

data/lib/usps_flags/core/footer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # Core SVG data for the file footer.
 #
 # This class should never need to be called directly.

data/lib/usps_flags/core/headers.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: false
+
 # Core SVG data for the file headers.
 #
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::Headers
-  def initialize(width: nil, height: nil, pennant: false, scale: nil, title: "USPS Flag")
+  def initialize(width: nil, height: nil, pennant: false, scale: nil, title: 'USPS Flag')
     @width = width
     @height = height
     @title = title
     scale ||= 3
-    @generated_at = Time.now.strftime("%Y%m%d.%H%S%z")
+    @generated_at = Time.now.strftime('%Y%m%d.%H%S%z')
 
     if @width.nil? || @height.nil?
       @width = USPSFlags::Config::BASE_FLY / scale
-      @height = (@width*Rational(2,3)).to_i
+      @height = (@width * Rational(2, 3)).to_i
       @view_width = USPSFlags::Config::BASE_FLY
       @view_height = USPSFlags::Config::BASE_HOIST
       set_pennant_height(@height) if pennant
@@ -23,7 +25,7 @@ class USPSFlags::Core::Headers
   end
 
   def svg
-    svg = ""
+    svg = ''
     svg << <<~SVG
       <?xml version="1.0" standalone="no"?>
       <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
@@ -34,7 +36,7 @@ class USPSFlags::Core::Headers
       <desc id="generated-at">#{@generated_at}</desc>
     SVG
 
-    unless @title == "US Ensign"
+    unless @title == 'US Ensign'
       svg << <<~SVG
         <desc id="trademark-desc">This image is a registered trademark of United States Power Squadrons.</desc>
         <desc id="trademark-link">https://www.usps.org/images/secretary/itcom/trademark.pdf</desc>
@@ -48,9 +50,10 @@ class USPSFlags::Core::Headers
     svg
   end
 
-  private
+private
+
   def set_pennant_height(height)
-    @height = height/4
-    @view_height = USPSFlags::Config::BASE_HOIST/4
+    @height = height / 4
+    @view_height = USPSFlags::Config::BASE_HOIST / 4
   end
 end

data/lib/usps_flags/core/icons.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: false
+
+# Base module for Icons.
+#
+# These methods should never need to be called directly.
+# @private
+module USPSFlags::Core::Icons
+  require 'usps_flags/core/icons/anchor'
+  require 'usps_flags/core/icons/binoculars'
+  require 'usps_flags/core/icons/lighthouse'
+  require 'usps_flags/core/icons/star'
+  require 'usps_flags/core/icons/trident'
+  require 'usps_flags/core/icons/trumpet'
+end

data/lib/usps_flags/core/{anchor.rb → icons/anchor.rb}

@@ -1,14 +1,16 @@
+# frozen_string_literal: false
+
 # Core SVG data for the anchor insignia.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Anchor
+class USPSFlags::Core::Icons::Anchor
   def initialize(color: :red)
     @color_code = case color
-    when :red
-      USPSFlags::Config::RED
-    when :white
-      "#FFFFFF"
+                  when :red
+                    USPSFlags::Config::RED
+                  when :white
+                    '#FFFFFF'
     end
   end
 

data/lib/usps_flags/core/{binoculars.rb → icons/binoculars.rb}

@@ -1,14 +1,16 @@
+# frozen_string_literal: false
+
 # Core SVG data for the binoculars insignia.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Binoculars
+class USPSFlags::Core::Icons::Binoculars
   def initialize(type: :d)
     @color = case type
-    when :d
-      USPSFlags::Config::RED
-    when :n
-      USPSFlags::Config::BLUE
+             when :d
+               USPSFlags::Config::RED
+             when :n
+               USPSFlags::Config::BLUE
     end
   end
 

data/lib/usps_flags/core/{lighthouse.rb → icons/lighthouse.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: false
+
 # Core SVG data for the lighthouse insignia.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Lighthouse
+class USPSFlags::Core::Icons::Lighthouse
   def svg
     <<~SVG
       <mask id="lighthouse-mask">

data/lib/usps_flags/core/{star.rb → icons/star.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: false
+
 # Core SVG data for stars.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Star
+class USPSFlags::Core::Icons::Star
   def svg
     points = [
       [117.555,   81.805],

data/lib/usps_flags/core/{trident.rb → icons/trident.rb}

@@ -1,11 +1,14 @@
+# frozen_string_literal: false
+
 # Core SVG data for the trident insignia.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Trident
+class USPSFlags::Core::Icons::Trident
   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
+
     @type = type
 
     load_config
@@ -14,9 +17,9 @@ class USPSFlags::Core::Trident
   end
 
   def svg
-    svg = ""
-    svg << "<g mask=\"url(#delta-mask)\">" if @type == :d
-    svg << "<g mask=\"url(#circle-mask-for-main-spike)\">" if @type == :stf
+    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
@@ -25,7 +28,7 @@ class USPSFlags::Core::Trident
       points.each { |x, y| svg << "l #{x} #{y}\n" }
       svg << "\" fill=\"#{@color_code}\" />\n"
     end
-    svg << "</g>" if [:d, :stf].include?(@type)
+    svg << '</g>' if [:d, :stf].include?(@type)
 
     case @type
     when :d
@@ -39,7 +42,8 @@ class USPSFlags::Core::Trident
     svg
   end
 
-  private
+private
+
   def load_config
     @trident_config = USPSFlags.configuration.trident
     @main_spike_overhang = @trident_config[:bar_width] / 2
@@ -47,7 +51,7 @@ class USPSFlags::Core::Trident
     @top_point = ((USPSFlags::Config::BASE_HOIST - @trident_config[:height][@type]) / 2)
     @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
+    @circle_from_top = @trident_config[:crossbar_from_top] + @trident_config[:bar_width] * 123 / 128 + @trident_config[:width] / 2
     @main_length = @trident_config[:height][@type] - (@trident_config[:center_point_height] - @trident_config[:main_point_barb])
   end
 
@@ -73,7 +77,7 @@ class USPSFlags::Core::Trident
 
   def crossbar
     {
-      [(@trident_config[:center_point] - @trident_config[:width]/2), (@crossbar_top)] =>
+      [(@trident_config[:center_point] - @trident_config[:width] / 2), (@crossbar_top)] =>
       [
         [@trident_config[:width], 0],
         [0, @trident_config[:bar_width]],
@@ -85,10 +89,10 @@ class USPSFlags::Core::Trident
 
   def left_spike
     {
-      [(@trident_config[:center_point] - @trident_config[:width]/2), (@crossbar_top + 1)] =>
+      [(@trident_config[:center_point] - @trident_config[:width] / 2), (@crossbar_top + 1)] =>
       [
-        [0, -(@trident_config[:side_spike_height]+@trident_config[:side_point_height])],
-        [(@trident_config[:bar_width]+@side_spike_overhang), @trident_config[:side_point_height]],
+        [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]]
       ]
@@ -97,10 +101,10 @@ class USPSFlags::Core::Trident
 
   def right_spike
     {
-      [(@trident_config[:center_point] + @trident_config[:width]/2), (@crossbar_top + 1)] =>
+      [(@trident_config[:center_point] + @trident_config[:width] / 2), (@crossbar_top + 1)] =>
       [
-        [0, -(@trident_config[:side_spike_height]+@trident_config[:side_point_height])],
-        [-(@trident_config[:bar_width]+@side_spike_overhang), @trident_config[:side_point_height]],
+        [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]]
       ]
@@ -117,13 +121,13 @@ class USPSFlags::Core::Trident
   end
 
   def configure_colors(color, field_color)
-    @color_code = "#FFFFFF"
+    @color_code = '#FFFFFF'
     if color == :red
       @color_code = USPSFlags::Config::RED
-      @field_color_code = "#FFFFFF"
+      @field_color_code = '#FFFFFF'
     elsif color == :blue
       @color_code = USPSFlags::Config::BLUE
-      @field_color_code = "#FFFFFF"
+      @field_color_code = '#FFFFFF'
     elsif field_color == :red
       @field_color_code = USPSFlags::Config::RED
     elsif field_color == :blue
@@ -135,16 +139,16 @@ class USPSFlags::Core::Trident
     <<~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] + @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] + @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>
@@ -153,24 +157,24 @@ class USPSFlags::Core::Trident
 
   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)" />
+      <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" />
+          <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" />
+          <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"
+    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"
 

data/lib/usps_flags/core/{trumpet.rb → icons/trumpet.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: false
+
 # Core SVG data for the trumpet insignia.
 #
 # This class should never need to be called directly.
 # @private
-class USPSFlags::Core::Trumpet
+class USPSFlags::Core::Icons::Trumpet
   def initialize(type: :s)
     @color = type == :n ? USPSFlags::Config::BLUE : USPSFlags::Config::RED
     @count = type == :s ? 1 : 2

data/lib/usps_flags/core/pennant.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 # Core SVG data for the pennants.
 #
 # This class should never need to be called directly.
@@ -6,13 +8,13 @@ class USPSFlags::Core::Pennant
   def initialize(type: :cruise)
     @type = type.to_s.upcase
     @fly = USPSFlags::Config::BASE_FLY
-    @hoist = USPSFlags::Config::BASE_HOIST/4
+    @hoist = USPSFlags::Config::BASE_HOIST / 4
   end
 
   def svg
-    if @type == "OIC"
+    if @type == 'OIC'
       oic
-    elsif @type == "CRUISE"
+    elsif @type == 'CRUISE'
       <<~SVG
         #{cruise}
         <g transform=\"translate(385, 340)\">
@@ -22,32 +24,33 @@ class USPSFlags::Core::Pennant
     end
   end
 
-  private
+private
+
   def oic
     <<~SVG
-      <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST/8} 0 #{USPSFlags::Config::BASE_HOIST/4}" />
+      <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST / 8} 0 #{USPSFlags::Config::BASE_HOIST / 4}" />
     SVG
   end
 
   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}
+        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}
+      <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}
+      <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}
+        l #{@fly} #{@hoist / 2}
+        l -#{@fly} #{@hoist / 2}
       " fill="none" stroke="#000000" stroke-width="2" />
     SVG
   end

data/lib/usps_flags/core/trident_spec.rb

@@ -1,10 +1,16 @@
+# frozen_string_literal: false
+
 # Core SVG data for the trident specification sheet.
 #
 # This class should never need to be called directly.
 # @private
 class USPSFlags::Core::TridentSpec
-  def initialize(fly: 24, unit: "in", scaled_border: false)
-    @trident_config = USPSFlags.configuration.trident
+  SA = USPSFlags::Helpers::SpecArrows
+  BF = USPSFlags::Config::BASE_FLY
+  BH = USPSFlags::Config::BASE_HOIST
+
+  def initialize(fly: 24, unit: 'in', scaled_border: false)
+    @config = USPSFlags.configuration.trident
     @scaled_border = scaled_border
     configure_sizes(fly)
     configure_labels(unit)
@@ -12,26 +18,42 @@ class USPSFlags::Core::TridentSpec
 
   def svg
     svg = spec_header
+    svg << add_short_trident
+    svg << add_delta_trident
+    svg << add_national_tridents
 
-    box_left   = (USPSFlags::Config::BASE_FLY*27/32)/2
-    box_right  = (USPSFlags::Config::BASE_FLY*37/32)/2
-    box_top    = USPSFlags::Config::BASE_HOIST/4
-    box_bottom = USPSFlags::Config::BASE_HOIST*3/4
-    svg << short_trident(box_top, box_bottom, box_left, box_right)
+    svg
+  end
 
-    box_top    = USPSFlags::Config::BASE_HOIST*3/16
-    box_bottom = USPSFlags::Config::BASE_HOIST*13/16
-    svg << delta_trident(box_top, box_bottom, box_left, box_right)
+private
 
-    box_top    = USPSFlags::Config::BASE_HOIST/8
-    box_bottom = USPSFlags::Config::BASE_HOIST*7/8
-    svg << circle_trident(box_top, box_bottom, box_left, box_right)
-    svg << long_trident(box_top, box_bottom, box_left, box_right)
+  def box_left
+    (BF * 27 / 32) / 2
+  end
 
-    svg
+  def box_right
+    (BF * 37 / 32) / 2
+  end
+
+  def add_short_trident
+    box_top    = BH / 4
+    box_bottom = BH * 3 / 4
+    add_trident(:Short, box_top, box_bottom, box_left, box_right)
+  end
+
+  def add_delta_trident
+    box_top    = BH * 3 / 16
+    box_bottom = BH * 13 / 16
+    add_trident(:Delta, box_top, box_bottom, box_left, box_right)
+  end
+
+  def add_national_tridents
+    box_top    = BH / 8
+    box_bottom = BH * 7 / 8
+    add_trident(:Circle, box_top, box_bottom, box_left, box_right) +
+    add_trident(:Long, box_top, box_bottom, box_left, box_right)
   end
 
-  private
   def configure_sizes(fly)
     @fly = Rational(fly)
     get_hoist_from_fly(@fly)
@@ -40,7 +62,7 @@ class USPSFlags::Core::TridentSpec
   end
 
   def get_hoist_from_fly(fly)
-    hoist = (fly*Rational(2,3))
+    hoist = (fly * Rational(2, 3))
     @hoist = if hoist == hoist.to_i
       hoist.to_i
     else
@@ -49,7 +71,7 @@ class USPSFlags::Core::TridentSpec
   end
 
   def configure_hoist_fraction
-    @hoist_fraction = ""
+    @hoist_fraction = ''
     if @hoist == @hoist.to_i
       @hoist = @hoist.to_i
     else
@@ -58,7 +80,7 @@ class USPSFlags::Core::TridentSpec
   end
 
   def configure_fly_fraction
-    @fly_fraction = ""
+    @fly_fraction = ''
     if @fly == @fly.to_i
       @fly = @fly.to_i
     else
@@ -68,19 +90,19 @@ class USPSFlags::Core::TridentSpec
 
   def configure_labels(unit)
     @label_font_size = if Math.sqrt(@fly) > 24
-      USPSFlags::Config::BASE_FLY * Math.log(24, Math.sqrt(@fly)) / 60
+      BF * Math.log(24, Math.sqrt(@fly)) / 60
     else
-      USPSFlags::Config::BASE_FLY / 60
+      BF / 60
     end
 
-    @unit_text = unit.nil? ? "" :  "#{unit}"
+    @unit_text = unit.nil? ? '' : "#{unit}"
     @unit = unit
 
     configure_barb_label
   end
 
   def configure_barb_label
-    barb_label = Rational(@trident_config[:main_point_barb]) * @fly / USPSFlags::Config::BASE_FLY
+    barb_label = Rational(@config[:main_point_barb]) * @fly / BF
     @barb_label = if barb_label == barb_label.to_i
       "#{barb_label.to_i}#{@unit_text}"
     else
@@ -89,164 +111,30 @@ class USPSFlags::Core::TridentSpec
   end
 
   def spec_header
-    <<~SVG
-      <!-- Field -->
-      #{USPSFlags::Core.field}
-
-      <!-- Specification Heading Information -->
-      <g>
-        <style><![CDATA[tspan.heading{font-size: 50%;}]]></style>
-        <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST*3/40}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/20}px" font-weight="bold" fill="#041E42" text-anchor="middle">United States Power Squadrons<tspan class="heading" dy ="-#{USPSFlags::Config::BASE_HOIST/50}">®</tspan></text>
-      </g>
-      <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST/8}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/30}px" fill="#041E42" text-anchor="middle">Officer Flag Trident Specification</text>
-      <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST*2/11}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/40}px" fill="#041E42" text-anchor="middle">All measurements are relative to a field with</text>
-      <g>
-        <style><![CDATA[tspan.title{font-size: #{USPSFlags::Config::FRACTION_SCALE*9/10}%;}]]></style>
-        <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST*4/19}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/40}px" fill="#041E42" text-anchor="middle">fly of #{@fly} <tspan class="title">#{@fly_fraction}</tspan> #{@unit_text} and hoist of #{@hoist} <tspan class="title">#{@hoist_fraction}</tspan> #{@unit_text}.</text>
-      </g>
-      <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST/4}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/40}px" fill="#041E42" text-anchor="middle">Measurements not specified are the same as on the short trident.</text>
-      #{scaled_border if @scaled_border}
-    SVG
+    USPSFlags::Core::TridentSpecs::Header.new(
+      fly: @fly, fly_fraction: @fly_fraction, hoist: @hoist, hoist_fraction: @hoist_fraction,
+      unit_text: @unit_text, scaled_border: @scaled_border
+    ).p
   end
 
-  def scaled_border
-    <<~SVG
-      <!-- Flag border scaled to spec trident size -->
-      <rect x="#{USPSFlags::Config::BASE_FLY*0.41}" y="#{USPSFlags::Config::BASE_HOIST*0.38}" width="#{USPSFlags::Config::BASE_FLY}" height="#{USPSFlags::Config::BASE_HOIST}" transform="scale(0.7)" style="fill: none; stroke: #E0E0E0; stroke-width: 5px;" />
-      <text x="#{USPSFlags::Config::BASE_FLY*0.64}" y="#{USPSFlags::Config::BASE_HOIST*0.96}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/60}px" fill="#CCCCCC" text-anchor="middle">Scale size of a flag.</text>
-    SVG
-  end
+  def add_trident(type, box_top, box_bottom, box_left, box_right)
+    sym = { Short: :s, Delta: :d, Circle: :stf, Long: :n }[type]
 
-  def short_trident(box_top, box_bottom, box_left, box_right)
-    <<~SVG
-      <!-- Short Trident -->
-      <g transform="translate(-#{USPSFlags::Config::BASE_FLY*14/80},#{USPSFlags::Config::BASE_HOIST*9/32})"><g transform="scale(0.7)">
-        #{trident_heading(:s)}
-
-        #{USPSFlags::Core::Trident.new(:s).svg}
-
-        <!-- Boundary box -->
-        <rect x="#{box_left}" y="#{box_top}" width="#{box_right-box_left}" height="#{USPSFlags::Config::BASE_HOIST/2}" stroke="#666666" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" stroke-dasharray="15, 15" fill="none" />
-
-        <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top, box_top+@trident_config[:bar_width]*4/5, box_right, box_right, fly: @fly, unit: @unit)} <!-- Side spike top gap -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*4/5, box_top+@trident_config[:bar_width]*9/10*2+@trident_config[:side_point_height]+@trident_config[:side_spike_height], nil, box_right, fly: @fly, unit: @unit)} <!-- Top gap to hash gap -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*18/10+@trident_config[:side_point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*28/10+@trident_config[:side_point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2, fly: @fly, unit: @unit)} <!-- Crossbar to hash gap -->
-
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*28/10+@trident_config[:side_point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*38/10+@trident_config[:side_point_height]+@trident_config[:side_spike_height], nil, @trident_config[:center_point]+@trident_config[:hash_width]/2, fly: @fly, unit: @unit)} <!-- Hash -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:bar_width]*38/10+@trident_config[:side_point_height]+@trident_config[:side_spike_height], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Hash to bottom -->
-
-        <!-- Left -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*5.25, box_top, box_bottom, box_left, box_left, fly: @fly, unit: @unit)} <!-- Boundary height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*0.75, box_top, box_top+@trident_config[:center_point_height], nil, @trident_config[:center_point]-@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/24, label_offset_y: -USPSFlags::Config::BASE_FLY/60, label_align: "middle", fly: @fly, unit: @unit)} <!-- Main point height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top+@trident_config[:bar_width]*4/5, box_top+@trident_config[:bar_width]*4/5+@trident_config[:side_point_height], box_left, box_left+@trident_config[:bar_width], label_offset: -USPSFlags::Config::BASE_FLY/24, label_align: "middle", fly: @fly, unit: @unit)} <!-- Side point height -->
-
-        <!-- Bottom -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width], @trident_config[:center_point]-@trident_config[:bar_width]/2, @trident_config[:center_point]+@trident_config[:bar_width]/2, box_bottom, box_bottom, fly: @fly, unit: @unit)} <!-- Bar width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:hash_width]/2, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_top+@trident_config[:bar_width]*4+@trident_config[:center_point_height]+@trident_config[:side_spike_height], box_top+@trident_config[:bar_width]*4+@trident_config[:center_point_height]+@trident_config[:side_spike_height], fly: @fly, unit: @unit)} <!-- Hash width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_bottom+@trident_config[:bar_width]*4, box_left, box_right, box_bottom, box_bottom, fly: @fly, unit: @unit)} <!-- Boundary width -->
-
-        <!-- Top -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width], box_left, box_left+@trident_config[:bar_width]*3/2, box_top, box_top+@trident_config[:bar_width]*4/5+@trident_config[:side_point_height], label_offset: -USPSFlags::Config::BASE_FLY/60, fly: @fly, unit: @unit)} <!-- Side point width -->
-          #{USPSFlags::Helpers::SpecArrows.horizontal(box_top-@trident_config[:bar_width]*2.5, @trident_config[:center_point]-@trident_config[:bar_width], @trident_config[:center_point]+@trident_config[:bar_width], box_top+@trident_config[:center_point_height], box_top+@trident_config[:center_point_height], label_offset: -USPSFlags::Config::BASE_FLY/60, fly: @fly, unit: @unit)} <!-- Main point width -->
-
-        <!-- Overlay -->
-          <!-- Main point barb -->
-          <line x1="#{@trident_config[:center_point]+@trident_config[:bar_width]/2}" y1="#{box_top+@trident_config[:center_point_height]-@trident_config[:main_point_barb]}" x2="#{@trident_config[:center_point]+@trident_config[:bar_width]*3/2}" y2="#{box_top+@trident_config[:center_point_height]-@trident_config[:main_point_barb]*5}" stroke="#666666" stroke-width="2" stroke-dasharray="5, 5" />
-          <line x1="#{@trident_config[:center_point]+@trident_config[:bar_width]/2}" y1="#{box_top+@trident_config[:center_point_height]}" x2="#{@trident_config[:center_point]+@trident_config[:bar_width]*3/2}" y2="#{box_top+@trident_config[:center_point_height]}" stroke="#666666" stroke-width="2" stroke-dasharray="5, 5" />
-          <text x="#{@trident_config[:center_point]+@trident_config[:bar_width]*9/8}" y="#{box_top+@trident_config[:center_point_height]-@trident_config[:main_point_barb]}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_FLY/100}px" fill="#041E42" text-anchor="left">#{@barb_label}</text>
-      </g></g>
-    SVG
+    Object.const_get("USPSFlags::Core::TridentSpecs::#{type}").new(
+      bt: box_top, bb: box_bottom, bl: box_left, br: box_right,
+      fly: @fly, unit: @unit, heading: heading(sym), config: @config
+    ).p
   end
 
-  def delta_trident(box_top, box_bottom, box_left, box_right)
-    <<~SVG
-      <!-- Delta Trident -->
-      <g transform="translate(#{USPSFlags::Config::BASE_FLY*5/80},#{USPSFlags::Config::BASE_HOIST*9/32})"><g transform="scale(0.7)">
-        #{trident_heading(:d)}
-
-        #{USPSFlags::Core::Trident.new(:d).svg}
-
-        <!-- Boundary box -->
-        <rect x="#{box_left}" y="#{box_top}" width="#{box_right-box_left}" height="#{USPSFlags::Config::BASE_HOIST*5/8}" stroke="#666666" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" stroke-dasharray="15, 15" fill="none" />
-
-        <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width]-@trident_config[:delta_gap_height], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], @trident_config[:center_point], @trident_config[:center_point]+@trident_config[:delta_gap_width], fly: @fly, unit: @unit)} <!-- Delta gap height -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom]-@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], nil, box_right, fly: @fly, unit: @unit)} <!-- Delta width -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_bottom-@trident_config[:delta_from_bottom], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Delta to bottom -->
-
-        <!-- Left -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY*2/11, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
-      </g></g>
-    SVG
-  end
-
-  def circle_trident(box_top, box_bottom, box_left, box_right)
-    <<~SVG
-      <!-- Circle Trident -->
-      <g transform="translate(#{USPSFlags::Config::BASE_FLY*23/80},#{USPSFlags::Config::BASE_HOIST*9/32})"><g transform="scale(0.7)">
-        #{trident_heading(:stf)}
-
-        #{USPSFlags::Core::Trident.new(:stf).svg}
-
-        #{long_trident_boundary_box(box_top, box_left, box_right)}
-
-        <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*2, box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], @trident_config[:center_point], @trident_config[:center_point], fly: @fly, unit: @unit)} <!-- Inner circle diameter -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], nil, @trident_config[:center_point]+@trident_config[:bar_width]/2, fly: @fly, unit: @unit)} <!-- Outer circle diameter -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]+@trident_config[:width], box_bottom, nil, box_right, fly: @fly, unit: @unit)} <!-- Circle to bottom -->
-
-        #{long_trident_left_arrow(box_top, box_bottom, box_left, box_right)}
-      </g></g>
-    SVG
-  end
-
-  def long_trident(box_top, box_bottom, box_left, box_right)
-    <<~SVG
-      <!-- Long Trident -->
-      <g transform="translate(#{USPSFlags::Config::BASE_FLY*40/80},#{USPSFlags::Config::BASE_HOIST*9/32})"><g transform="scale(0.7)">
-        #{trident_heading(:n)}
-
-        #{USPSFlags::Core::Trident.new(:n).svg}
-
-        #{long_trident_boundary_box(box_top, box_left, box_right)}
-
-        <!-- Right -->
-          #{USPSFlags::Helpers::SpecArrows.vertical(box_right+@trident_config[:bar_width], box_top+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*3, box_bottom, @trident_config[:center_point]+@trident_config[:hash_width]/2, box_right, fly: @fly, unit: @unit)} <!-- Hash to bottom -->
-
-        #{long_trident_left_arrow(box_top, box_bottom, box_left, box_right)}
-      </g></g>
-    SVG
-  end
-
-  def trident_heading(type_sym)
-    type, description = case type_sym
-    when :s
-      ["Short", "Squadron Officers"]
-    when  :d
-      ["Delta", "District Officers"]
-    when  :stf
-      ["Circle", "Staff Commanders Only"]
-    when  :n
-      ["Long", "National Officers"]
-    end
-    <<~SVG
-      <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST*1/40}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
-      <text x="#{USPSFlags::Config::BASE_FLY/2}" y="#{USPSFlags::Config::BASE_HOIST*5/80}" font-family="sans-serif" font-size="#{USPSFlags::Config::BASE_HOIST/40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
-    SVG
-  end
-
-  def long_trident_boundary_box(box_top, box_left, box_right)
-    <<~SVG
-      <!-- Boundary box -->
-        <rect x="#{box_left}" y="#{box_top}" width="#{box_right-box_left}" height="#{USPSFlags::Config::BASE_HOIST*3/4}" stroke="#666666" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" stroke-dasharray="15, 15" fill="none" />
-    SVG
-  end
+  def heading(type_sym)
+    type, description = {
+      s: ['Short', 'Squadron Officers'], d: ['Delta', 'District Officers'],
+      stf: ['Circle', 'Staff Commanders Only'], n: ['Long', 'National Officers']
+    }[type_sym]
 
-  def long_trident_left_arrow(box_top, box_bottom, box_left, box_right)
     <<~SVG
-      <!-- Left -->
-        #{USPSFlags::Helpers::SpecArrows.vertical(box_left-@trident_config[:bar_width]*1.5, box_top, box_bottom, box_left, box_left, label_offset: -USPSFlags::Config::BASE_FLY/30, label_offset_y: -USPSFlags::Config::BASE_FLY/4.5, label_align: "middle", fly: @fly, unit: @unit)} <!-- Boundary height -->
+      <text x="#{BF / 2}" y="#{BH * 1 / 40}" font-family="sans-serif" font-size="#{BH / 30}px" font-weight="bold" fill="#BF0D3E" text-anchor="middle">#{type}</text>
+      <text x="#{BF / 2}" y="#{BH * 5 / 80}" font-family="sans-serif" font-size="#{BH / 40}px" fill="#BF0D3E" text-anchor="middle">#{description}</text>
     SVG
   end
 end