usps_flags 0.1.26 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaffc7ccddc27ce5e71b12e62c4ca7b9dacefc15
-  data.tar.gz: 2e12d76245da32f5f244faae056c79033742e083
+  metadata.gz: 1f60a474823123130c88cb0644669640e155c213
+  data.tar.gz: 9bbf9f5359b28e8a8f375754000a5290046f6a69
 SHA512:
-  metadata.gz: 125aed09b0115a6c149b280fbf91a6e2404b98b5abb49bd56f9624f1e038de06a27481690c91dac356bc4b7af6b67e374d4cf4bccceb18f8184330284740d678
-  data.tar.gz: b4d47e17b881b673ef4c3880da22fab90348d816300b3cbd6936c7e74e8535084dbe4d71f49ea6ec43821ab3f372b979ee51adcb7b4f5ed84f9a912cee812e42
+  metadata.gz: 24bf52afae4c48b31d9304939e350922f27e8fb9409130c5b897cc4bf78db1f99f9632320d49f1092fbd226302846fe8d4c1d917534fd4c36f35c1e7b081d7e5
+  data.tar.gz: d1ee90e5fe2895a6cdbc1f8306237258b5835b93b8939f2111f3e6f81c56e0ac1a01b2459d507212a20094b67062362698864aa9fc5f6daf43802b384bcde319

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-@]u�Q�o�(�6��W�����H\��d�aC�����<"
����RKz��`��rݳ
_�3��u�!w'C��jd_��6�P>?��Nm{��P�H�V�G?�_�{�?ݛ��P�ˌ�&,g������Y[ߵ�Áv��x4uh�W���1�X��5%U���.�M}�B��h����6�q�x�{�*!��k���]��CeV��o]����>`�e����R(��g�.5�>G)h[��P� �Z.�T���ӝ0^�'
+׳[pgM����	'M�/r�����,.;ƁBO��9K81����/C��r���˄=�Q�eg[����-�}��72A�/��s鶱F�
+%�1n��fK�׌�X�l�8
+Z����I�

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps_flags (0.1.26)
+    usps_flags (0.2.0)
       file_utils (~> 1.1, >= 1.1.2)
       mini_magick (~> 4.8, >= 4.8.0)
       rubyzip (~> 1.2, >= 1.2.1)

data/README.md

@@ -2,30 +2,37 @@
 
 [![Gem Version](https://img.shields.io/gem/v/usps_flags.svg)](https://rubygems.org/gems/usps_flags)
 [![Build Status](https://travis-ci.org/jfiander/usps-flags.svg)](https://travis-ci.org/jfiander/usps-flags)
-[![Coverage Status](https://coveralls.io/repos/github/jfiander/usps-flags/badge.svg?branch=master)](https://coveralls.io/github/jfiander/usps-flags?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/jfiander/usps-flags/badge.svg?branch=master&service=github)](https://coveralls.io/github/jfiander/usps-flags?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/760b824f0edac3316a11/maintainability)](https://codeclimate.com/github/jfiander/usps-flags/maintainability)
 
-This gem allows you to generate precise SVG and PNG flag images based on official specifications.
+This gem allows you to generate precise SVG and PNG flag images based on
+official specifications.
 
 ## Installation
 
 ### Rails
 
 Add to your Gemfile:
+
 ```ruby
 gem 'usps_flags'
 ```
 
 Create the file `config/initializers/usps_flags.rb`:
+
 ```ruby
 USPSFlags::Config.flags_dir "#{Rails.root}/app/assets/images/flags"
 ```
 
 ### Other
 
-Run `gem install usps_flags`.
+Run the following commands:
 
-Run `require 'usps_flags'` then `USPSFlags::Config.flags_dir "path/to/flags/dir"` to specify where to output all generated files and logs. (Otherwise, will default to `/output` in the gem directory.)
+```ruby
+gem install usps_flags
+require 'usps_flags'
+USPSFlags::Config.flags_dir "path/to/flags/dir"
+```
 
 ## Available flags
 
@@ -45,6 +52,7 @@ Tests are written in Rspec. To run all specs in a cloned repo, run 'rake'.
 ### All files
 
 To generate all static files, run:
+
 ```ruby
 USPSFlags::Generate.all svg: true, png: true, zips: true
 ```
@@ -54,6 +62,7 @@ USPSFlags::Generate.all svg: true, png: true, zips: true
 ### Zip archives
 
 To re-generate zip files from current static files, run:
+
 ```ruby
 USPSFlags::Generate.zips svg: true, png: true
 ```
@@ -63,38 +72,47 @@ USPSFlags::Generate.zips svg: true, png: true
 ### Individual files
 
 To generate an individual SVG file, run:
+
 ```ruby
-USPSFlags::Generate.get "flag", outfile: nil, scale: nil, field: true
+USPSFlags::Generate.svg "flag", outfile: nil, scale: nil, field: true
 ```
 
-- `outfile` specifies where to save the file. If left as `nil`, this method will `puts` the generated SVG. Either way, the SVG code is returned.
-- `scale` is a divisor scaling factor – the larger it is, the smaller the resulting SVG will be rendered. Accepted values are floats between 0 and 1, and integers above that.
-- `field` specifies whether to render the field of a flag, or to only render the insignia. Setting this to `false` will invert some colors for visibility.
+- `outfile` specifies where to save the file. If left as `nil`, this method will
+  `puts` the generated SVG. Either way, the SVG code is returned.
+- `scale` is a divisor scaling factor – the larger it is, the smaller the 
+  resulting SVG will be rendered. Accepted values are floats between 0 and 1,
+  and integers above that.
+- `field` specifies whether to render the field of a flag, or to only render the
+  insignia. Setting this to `false` will invert some colors for visibility.
 
 ### Trident spec sheet
 
 To generate the trident spec sheet, run:
+
 ```ruby
 USPSFlags::Generate.spec outfile: nil, scale: nil, fly: 24, unit: "in"
 ```
 
-- `outfile` specifies where to save the file. If left as `nil`, this method will `puts` the generated SVG. Either way, the SVG code is returned.
-- `scale` is a divisor scaling factor – the larger it is, the smaller the resulting SVG will be rendered. Accepted values are floats between 0 and 1, and integers above that.
+- `outfile` specifies where to save the file. If left as `nil`, this method will
+  `puts` the generated SVG. Either way, the SVG code is returned.
+- `scale` is a divisor scaling factor – the larger it is, the smaller the
+  resulting SVG will be rendered. Accepted values are floats between 0 and 1,
+  and integers above that.
 - `fly` specifies the custom fly measurement to scale all trident labels to.
-- `unit` specifies the custom fly measurement unit to append to all trident labels.
+- `unit` specifies the custom fly measurement unit to append to all trident
+  labels.
 
 ### Convert SVG to PNG
 
 To convert SVG data to a PNG image, run:
+
 ```ruby
 USPSFlags::Generate.png svg_data, outfile: nil, trim: false
-
-# USPSFlags::Generate.png File.read("path/to/svg_image.svg"), outfile: "path/to/output.png", trim: false
-# USPSFlags::Generate.png USPSFlags::Generate.get("LtC"), outfile: "path/to/output.png", trim: true
 ```
 
 - `outfile` is required, and specifies where to save the file.
-- `trim` specifies whether to trim blank space from around the image. (This is ideal for generating insignia.)
+- `trim` specifies whether to trim blank space from around the image. (This is
+  ideal for generating insignia.)
 
 ## Constructing
 
@@ -114,13 +132,16 @@ f.svg # Generate SVG file
 f.png # Generate PNG file
 ```
 
-- Calling any DSL method without argument, or with `nil` as argument will return the current value.
-- You can explicitly set `svg_file` to `""` to suppress printing the SVG content to console/log.
+- Calling any DSL method without argument, or with `nil` as argument will return
+  the current value.
+- You can explicitly set `svg_file` to `""` to suppress printing the SVG content
+  to console/log.
 - Calling `.png` requires `png_file` to be set.
 
 ## Security
 
-This gem is cryptographically signed. To be sure the gem code hasn’t been tampered with:
+This gem is cryptographically signed. To be sure the gem code hasn’t been
+tampered with:
 
 Add my public key as a trusted certificate:
 
@@ -136,6 +157,9 @@ gem install usps_flags -P HighSecurity
 
 ## License
 
-Actual images generated (other than the US Ensign) are [registered trademarks](http://www.usps.org/national/itcom/trademark.html) of United States Power Squadrons.
+Actual images generated (other than the US Ensign) are
+[registered trademarks](http://www.usps.org/national/itcom/trademark.html) of
+United States Power Squadrons.
 
-This project is released under the [GPLv3](https://raw.github.com/jfiander/usps-flags/master/LICENSE).
+This project is released under the
+[GPLv3](https://raw.github.com/jfiander/usps-flags/master/LICENSE).

data/lib/usps_flags/core/field.rb

@@ -31,25 +31,25 @@ class USPSFlags::Core::Field
   def svg
     case @style
     when :regular
-      <<~FIELD
+      <<~SVG
         <path d="M 0 0
           l #{@fly} 0
           l 0 #{@hoist}
           l -#{@fly} 0
           l 0 -#{@hoist}
         " fill="#{@color_code}" #{@border_svg}/>
-      FIELD
+      SVG
     when :swallowtail
-      <<~FIELD
+      <<~SVG
         <path d="M 0 0
           l #{@fly} #{@hoist/6}
           l -#{@fly/5} #{@hoist/3}
           l #{@fly/5} #{@hoist/3}
           l -#{@fly} #{@hoist/6}
         " fill="#FFFFFF" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-      FIELD
+      SVG
     when :past
-      <<~FIELD
+      <<~SVG
         <path d="M 0 0
           l #{@fly/2} #{@hoist*1/12}
           l 0 #{@hoist*10/12}
@@ -72,7 +72,7 @@ class USPSFlags::Core::Field
           l #{@fly/5} #{@hoist/3}
           l -#{@fly} #{@hoist/6}
         " fill="none" stroke="#000000" stroke-width="#{USPSFlags::Config::BASE_FLY/600}" />
-      FIELD
+      SVG
     end
   end
 end

data/lib/usps_flags/core/footer.rb

@@ -4,8 +4,8 @@
 # @private
 class USPSFlags::Core::Footer
   def svg
-    <<~FOOTER
+    <<~SVG
       </svg>
-    FOOTER
+    SVG
   end
 end

data/lib/usps_flags/core/pennant.rb

@@ -15,26 +15,26 @@ class USPSFlags::Core::Pennant
         <polyline fill="#{USPSFlags::Config::BLUE}" points="0 0 #{USPSFlags::Config::BASE_FLY} #{USPSFlags::Config::BASE_HOIST/8} 0 #{USPSFlags::Config::BASE_HOIST/4}" />
       SVG
     elsif @type == "CRUISE"
-      svg = <<~FIELD
+      svg = <<~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" />
-      FIELD
+      SVG
 
       svg << "<g transform=\"translate(385, 340)\">"
       svg << USPSFlags::Core::Star.new.svg

data/lib/usps_flags/core/trident.rb

@@ -8,158 +8,171 @@ class USPSFlags::Core::Trident
     raise "Error: Invalid trident type. Options are #{valid_types}." unless valid_types.include? type
     @type = type
 
+    load_config
+    configure_trident_segments
+    configure_colors(color, field_color)
+  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
+
+    @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
+    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
+  end
+
+  private
+  def load_config
     @trident_config = USPSFlags::Config.trident
-    main_spike_overhang = @trident_config[:bar_width] / 2
-    side_spike_overhang = @trident_config[:bar_width] / 2
+    @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)
-    crossbar_top = @top_point + @trident_config[:crossbar_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
-    main_length = @trident_config[:height][@type] - (@trident_config[:point_height] - @trident_config[:main_point_barb])
-
-    @trident_segments = [
-      {
-        # Main spike
-        [@trident_config[:center_point], @top_point] =>
-        [
-          [@trident_config[:bar_width], @trident_config[:point_height]],
-          [-main_spike_overhang,  -@trident_config[:main_point_barb]],
-          [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[:point_height]]
-        ]
-      },
-      {
-        # Crossbar
-        [(@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]]
-        ]
-      },
-      {
-        # Left spike
-        [(@trident_config[:center_point] - @trident_config[:width]/2), (crossbar_top + 1)] =>
-        [
-          [0, -(@trident_config[:side_spike_height]+@trident_config[:point_height])],
-          [(@trident_config[:bar_width]+side_spike_overhang), @trident_config[:point_height]],
-          [-side_spike_overhang, 0],
-          [0, @trident_config[:side_spike_height]]
-        ]
-      },
-      {
-        # Right spike
-        [(@trident_config[:center_point] + @trident_config[:width]/2), (crossbar_top + 1)] =>
-        [
-          [0, -(@trident_config[:side_spike_height]+@trident_config[:point_height])],
-          [-(@trident_config[:bar_width]+side_spike_overhang), @trident_config[:point_height]],
-          [side_spike_overhang, 0],
-          [0, @trident_config[:side_spike_height]]
-        ]
-      }
-    ]
+    @main_length = @trident_config[:height][@type] - (@trident_config[: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
+  end
+
+  def main_spike
+    {
+      [@trident_config[:center_point], @top_point] =>
+      [
+        [@trident_config[:bar_width], @trident_config[:point_height]],
+        [-@main_spike_overhang,  -@trident_config[:main_point_barb]],
+        [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[:point_height]]
+      ]
+    }
+  end
 
-    @lower_hash = [
+  def crossbar
+    {
+      [(@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]]
+      ]
+    }
+  end
+
+  def left_spike
+    {
+      [(@trident_config[:center_point] - @trident_config[:width]/2), (@crossbar_top + 1)] =>
+      [
+        [0, -(@trident_config[:side_spike_height]+@trident_config[:point_height])],
+        [(@trident_config[:bar_width]+@side_spike_overhang), @trident_config[:point_height]],
+        [-@side_spike_overhang, 0],
+        [0, @trident_config[:side_spike_height]]
+      ]
+    }
+  end
+
+  def right_spike
+    {
+      [(@trident_config[:center_point] + @trident_config[:width]/2), (@crossbar_top + 1)] =>
+      [
+        [0, -(@trident_config[:side_spike_height]+@trident_config[:point_height])],
+        [-(@trident_config[:bar_width]+@side_spike_overhang), @trident_config[:point_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
 
-    case color
-    when :white
-      @color_code = "#FFFFFF"
-      @field_color_code = case field_color
-      when :red
-        USPSFlags::Config::RED
-      when :blue
-        USPSFlags::Config::BLUE
-      end
-    when :red
+  def configure_colors(color, field_color)
+    @color_code = "#FFFFFF"
+    if color == :red
       @color_code = USPSFlags::Config::RED
       @field_color_code = "#FFFFFF"
-    when :blue
+    elsif color == :blue
       @color_code = USPSFlags::Config::BLUE
       @field_color_code = "#FFFFFF"
+    elsif color == :white && field_color == :red
+      @field_color_code = USPSFlags::Config::RED
+    elsif color == :white && field_color == :blue
+      @field_color_code = USPSFlags::Config::BLUE
     end
   end
 
-  def svg
-    svg = case @type
-    when :d
-      "<g mask=\"url(#delta-mask)\">"
-    when :stf
-      "<g mask=\"url(#circle-mask-for-main-spike)\">"
-    else
-      ""
-    end
-
-    @trident_segments.each do |segment|
-      start = segment.keys.first
-      points = segment.values.first
-      svg << "<path d=\"M #{start[0]} #{start[1]}\n"
-      points.each do |x, y|
-        svg << "l #{x} #{y}\n"
-      end
-      svg << "\" fill=\"#{@color_code}\" />\n"
-    end
-    svg << "</g>" if [:d, :stf].include?(@type)
+  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]}
+            #{@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]}" />
+        </g>
+      </mask>
+    SVG
+  end
 
-    if @type == :d
-      # Delta hash
-      svg << <<~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]}
-              #{@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]}" />
-          </g>
-        </mask>
-      SVG
-    elsif @type == :stf
-      # Circle hash
-      svg << <<~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
-    else
-      # Standard hash
-      svg << "<path d=\"M #{(@trident_config[:center_point] - @trident_config[:hash_width]/2)} #{(@top_point + @hash_from_top)}\n"
-      @lower_hash.each do |x, y|
-        svg << "l #{x} #{y}\n"
-      end
-      svg << "\" fill=\"#{@color_code}\" />\n"
+  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
 
-      # # V/C crossing, marks @ 15/32 up
-      # vc_cross_marker = USPSFlags::Config::BASE_HOIST*7/8-(USPSFlags::Config::BASE_HOIST/8+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*3)*15/32
-      # svg << "<line x1=\"#{USPSFlags::Config::BASE_FLY*3/8}\" x2=\"#{USPSFlags::Config::BASE_FLY*5/8}\" y1=\"#{vc_cross_marker}\" y2=\"#{vc_cross_marker}\" stroke=\"black\" stroke-width=\"#{USPSFlags::Config::BASE_FLY/600}\" />"
-      # # C/C crossing, marks @ 1/3 up
-      # cc_cross_marker = USPSFlags::Config::BASE_HOIST*7/8-(USPSFlags::Config::BASE_HOIST/8+@trident_config[:crossbar_from_top]+@trident_config[:bar_width]*3)*1/3
-      # svg << "<line x1=\"#{USPSFlags::Config::BASE_FLY*3/8}\" x2=\"#{USPSFlags::Config::BASE_FLY*5/8}\" y1=\"#{cc_cross_marker}\" y2=\"#{cc_cross_marker}\" stroke=\"black\" stroke-width=\"#{USPSFlags::Config::BASE_FLY/600}\" />"
-    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