rcap 2.5.0 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b2493782c58861730c554776d6e5848e9b15728
-  data.tar.gz: ab89552659a96fc8130ff839734c61a255403030
+SHA256:
+  metadata.gz: 257bbebf78d6bd1acba243fff3c24b7d52504f32acd494e395102c5a25f0108a
+  data.tar.gz: 4aad2a1c2a79a997a46e8a47f7542aa6eae55881302a76be9c8fe9bedf44965a
 SHA512:
-  metadata.gz: c27d24fa3f957feb2f36ef8400d33a741c6e163ab79508a7c614f5dbaf7daf051bc81072132c04f985c31529fef475676165dddd4a386df5dc96b3e249e8cf00
-  data.tar.gz: d220753d7b59abb718ce149ba7e25fe74e12bd7bf0b73b9b3f8e0170a801d0d476ba596ec66c879eb3d5051268e371c3d8ba6e97fa55b0ab6ce130fa1c9dc15d
+  metadata.gz: 7274c4ad7f92bc6c9df731880ba73d77b8a11ba39f250ad6844fe8f2a3e044b8fbf35ec819ad64a0cc473c493a0b5f39df07361a52364af38ded56217817ce4d
+  data.tar.gz: a8d8e973dc56197011383b83f7923cb5856cdc5da32152bfd4929ad0e860add185be4389fda09f106482f25a58f00f5aa5e15567e4931a971078a795ddd54018

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/CHANGELOG.md

@@ -1,6 +1,24 @@
 Change Log
 ==========
 
+## 2.7.3 - 14 July 2020
+
+* Added `Avoid` and `All Clear` response types for CAP 1.2 
+
+## 2.7.0 - 22 March 2017
+
+* Coordinates of a polygon should be an array of coordinate arrays rather than a single coordinate array.  (Seth Deckard)
+* Moved Fixnum extenions to Integer
+* Ruby 2.4.0 tested
+
+## 2.6.0 - 30 October 2016
+
+* Adds GeoJSON export to Polygon and Circle
+
+## 2.5.1 - 3 November 2014
+
+* Allow the polygons to be empty.
+
 ## 2.5.0 - 3 November 2014
 
 * Allow the values of parameters, area codes and event codes to be empty.

data/README.md

@@ -156,6 +156,7 @@ Authors
 
 * Earle Clubb - http://github.com/eclubb
 * David van Geest - https://github.com/DWvanGeest
+* Seth Deckard - https://github.com/sethdeckard
 
 Change Log
 ----------

data/lib/rcap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # System and require libs
 require 'date'
 require 'uuidtools'
@@ -11,7 +13,7 @@ require 'digest/sha1'
 
 # Extensions
 require 'rcap/extensions/nil_class'
-require 'rcap/extensions/fixnum'
+require 'rcap/extensions/integer'
 require 'rcap/extensions/float'
 require 'rcap/extensions/array'
 require 'rcap/extensions/string'

data/lib/rcap/alert.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RCAP
   module Alert
     XMLNS_KEY            = 'xmlns'
     YAML_CAP_VERSION_KEY = 'CAP Version'
     JSON_CAP_VERSION_KEY = 'cap_version'
 
-    CAP_NAMESPACES = [RCAP::CAP_1_0::Alert::XMLNS, RCAP::CAP_1_1::Alert::XMLNS, RCAP::CAP_1_2::Alert::XMLNS]
+    CAP_NAMESPACES = [RCAP::CAP_1_0::Alert::XMLNS, RCAP::CAP_1_1::Alert::XMLNS, RCAP::CAP_1_2::Alert::XMLNS].freeze
 
     # Initialise a RCAP Alert from a XML document.
     #
@@ -36,7 +38,7 @@ module RCAP
     # @param [IO, String] yaml CAP Alert in YAML format. Can be a String or any IO object.
     # @return [RCAP::CAP_1_0::Alert, RCAP::CAP_1_1::Alert, RCAP::CAP_1_2::Alert ]
     def self.from_yaml(yaml)
-      yaml_data = YAML.load(yaml)
+      yaml_data = YAML.safe_load(yaml, [Time, DateTime])
 
       case yaml_data[YAML_CAP_VERSION_KEY]
       when CAP_1_0::Alert::CAP_VERSION

data/lib/rcap/base/alert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Alert
@@ -8,7 +10,7 @@ module RCAP
       STATUS_SYSTEM   = 'System'
       STATUS_TEST     = 'Test'
       # Valid values for status
-      VALID_STATUSES = [STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST]
+      VALID_STATUSES = [STATUS_ACTUAL, STATUS_EXERCISE, STATUS_SYSTEM, STATUS_TEST].freeze
 
       MSG_TYPE_ALERT  = 'Alert'
       MSG_TYPE_UPDATE = 'Update'
@@ -16,13 +18,13 @@ module RCAP
       MSG_TYPE_ACK    = 'Ack'
       MSG_TYPE_ERROR  = 'Error'
       # Valid values for msg_type
-      VALID_MSG_TYPES = [MSG_TYPE_ALERT, MSG_TYPE_UPDATE, MSG_TYPE_CANCEL, MSG_TYPE_ACK, MSG_TYPE_ERROR]
+      VALID_MSG_TYPES = [MSG_TYPE_ALERT, MSG_TYPE_UPDATE, MSG_TYPE_CANCEL, MSG_TYPE_ACK, MSG_TYPE_ERROR].freeze
 
       SCOPE_PUBLIC     = 'Public'
       SCOPE_RESTRICTED = 'Restricted'
       SCOPE_PRIVATE    = 'Private'
       # Valid values for scope
-      VALID_SCOPES = [SCOPE_PUBLIC, SCOPE_PRIVATE, SCOPE_RESTRICTED]
+      VALID_SCOPES = [SCOPE_PUBLIC, SCOPE_PRIVATE, SCOPE_RESTRICTED].freeze
 
       # @return [String] If not set a UUID will be set by default on object initialisation
       attr_accessor(:identifier)
@@ -121,27 +123,21 @@ module RCAP
       def to_xml_element
         xml_element = REXML::Element.new(XML_ELEMENT_NAME)
         xml_element.add_namespace(self.class::XMLNS)
-        xml_element.add_element(IDENTIFIER_ELEMENT_NAME).add_text(@identifier)   if @identifier
-        xml_element.add_element(SENDER_ELEMENT_NAME).add_text(@sender)           if @sender
-        xml_element.add_element(SENT_ELEMENT_NAME).add_text(@sent.to_s_for_cap)  if @sent
-        xml_element.add_element(STATUS_ELEMENT_NAME).add_text(@status)           if @status
-        xml_element.add_element(MSG_TYPE_ELEMENT_NAME).add_text(@msg_type)       if @msg_type
-        xml_element.add_element(SOURCE_ELEMENT_NAME).add_text(@source)           if @source
-        xml_element.add_element(SCOPE_ELEMENT_NAME).add_text(@scope)             if @scope
-        xml_element.add_element(RESTRICTION_ELEMENT_NAME).add_text(@restriction) if @restriction
-        if @addresses.any?
-          xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap)
-        end
+        xml_element.add_element(IDENTIFIER_ELEMENT_NAME).add_text(@identifier.to_s)   if @identifier
+        xml_element.add_element(SENDER_ELEMENT_NAME).add_text(@sender.to_s)           if @sender
+        xml_element.add_element(SENT_ELEMENT_NAME).add_text(@sent.to_s_for_cap)       if @sent
+        xml_element.add_element(STATUS_ELEMENT_NAME).add_text(@status.to_s)           if @status
+        xml_element.add_element(MSG_TYPE_ELEMENT_NAME).add_text(@msg_type.to_s)       if @msg_type
+        xml_element.add_element(SOURCE_ELEMENT_NAME).add_text(@source.to_s)           if @source
+        xml_element.add_element(SCOPE_ELEMENT_NAME).add_text(@scope.to_s)             if @scope
+        xml_element.add_element(RESTRICTION_ELEMENT_NAME).add_text(@restriction.to_s) if @restriction
+        xml_element.add_element(ADDRESSES_ELEMENT_NAME).add_text(@addresses.to_s_for_cap) if @addresses.any?
         @codes.each do |code|
-          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code)
-        end
-        xml_element.add_element(NOTE_ELEMENT_NAME).add_text(@note) if @note
-        if @references.any?
-          xml_element.add_element(REFERENCES_ELEMENT_NAME).add_text(@references.join(' '))
-        end
-        if @incidents.any?
-          xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' '))
+          xml_element.add_element(CODE_ELEMENT_NAME).add_text(code.to_s)
         end
+        xml_element.add_element(NOTE_ELEMENT_NAME).add_text(@note.to_s) if @note
+        xml_element.add_element(REFERENCES_ELEMENT_NAME).add_text(@references.join(' ')) if @references.any?
+        xml_element.add_element(INCIDENTS_ELEMENT_NAME).add_text(@incidents.join(' ')) if @incidents.any?
         @infos.each do |info|
           xml_element.add_element(info.to_xml_element)
         end
@@ -162,7 +158,7 @@ module RCAP
       # @return [String]
       def to_xml(pretty_print = false)
         if pretty_print
-          xml_document = ''
+          xml_document = +''
           RCAP::XML_PRETTY_PRINTER.write(to_xml_document, xml_document)
           xml_document
         else
@@ -175,26 +171,27 @@ module RCAP
       #
       # @return [String]
       def to_reference
-        "#{ @sender },#{ @identifier },#{ RCAP.to_s_for_cap(@sent)}"
+        "#{@sender},#{@identifier},#{RCAP.to_s_for_cap(@sent)}"
       end
 
       # @return [String]
       def inspect
-        alert_inspect = ["CAP Version:  #{ self.class::CAP_VERSION }",
-                         "Identifier:   #{ @identifier }",
-                         "Sender:       #{ @sender }",
-                         "Sent:         #{ @sent }",
-                         "Status:       #{ @status }",
-                         "Message Type: #{ @msg_type }",
-                         "Source:       #{ @source }",
-                         "Scope:        #{ @scope }",
-                         "Restriction:  #{ @restriction }",
-                         "Addresses:    #{ @addresses.to_s_for_cap }",
+        alert_inspect = ["CAP Version:  #{self.class::CAP_VERSION}",
+                         "Identifier:   #{@identifier}",
+                         "Sender:       #{@sender}",
+                         "Sent:         #{@sent}",
+                         "Status:       #{@status}",
+                         "Message Type: #{@msg_type}",
+                         "Source:       #{@source}",
+                         "Scope:        #{@scope}",
+                         "Restriction:  #{@restriction}",
+                         "Addresses:    #{@addresses.to_s_for_cap}",
                          'Codes:',
                          @codes.map { |code| '  ' + code }.join("\n") + '',
-                         "Note:         #{ @note }",
-                         "References:   #{ @references.join(' ')}",
-                         "Incidents:    #{ @incidents.join(' ')}",
+                         "Note:         #{@note}",
+                         'References:',
+                         @references.join("\n "),
+                         "Incidents:    #{@incidents.join(' ')}",
                          'Information:',
                          @infos.map { |info| '  ' + info.to_s }.join("\n")].join("\n")
         RCAP.format_lines_for_inspect('ALERT', alert_inspect)
@@ -206,23 +203,23 @@ module RCAP
       #
       # @return [String]
       def to_s
-        "#{ @sender }/#{ @identifier }/#{ RCAP.to_s_for_cap(@sent)}"
+        "#{@sender}/#{@identifier}/#{RCAP.to_s_for_cap(@sent)}"
       end
 
       XPATH             = 'cap:alert'
-      IDENTIFIER_XPATH  = "cap:#{ IDENTIFIER_ELEMENT_NAME }"
-      SENDER_XPATH      = "cap:#{ SENDER_ELEMENT_NAME }"
-      SENT_XPATH        = "cap:#{ SENT_ELEMENT_NAME }"
-      STATUS_XPATH      = "cap:#{ STATUS_ELEMENT_NAME }"
-      MSG_TYPE_XPATH    = "cap:#{ MSG_TYPE_ELEMENT_NAME }"
-      SOURCE_XPATH      = "cap:#{ SOURCE_ELEMENT_NAME }"
-      SCOPE_XPATH       = "cap:#{ SCOPE_ELEMENT_NAME }"
-      RESTRICTION_XPATH = "cap:#{ RESTRICTION_ELEMENT_NAME }"
-      ADDRESSES_XPATH   = "cap:#{ ADDRESSES_ELEMENT_NAME }"
-      CODE_XPATH        = "cap:#{ CODE_ELEMENT_NAME }"
-      NOTE_XPATH        = "cap:#{ NOTE_ELEMENT_NAME }"
-      REFERENCES_XPATH  = "cap:#{ REFERENCES_ELEMENT_NAME }"
-      INCIDENTS_XPATH   = "cap:#{ INCIDENTS_ELEMENT_NAME }"
+      IDENTIFIER_XPATH  = "cap:#{IDENTIFIER_ELEMENT_NAME}"
+      SENDER_XPATH      = "cap:#{SENDER_ELEMENT_NAME}"
+      SENT_XPATH        = "cap:#{SENT_ELEMENT_NAME}"
+      STATUS_XPATH      = "cap:#{STATUS_ELEMENT_NAME}"
+      MSG_TYPE_XPATH    = "cap:#{MSG_TYPE_ELEMENT_NAME}"
+      SOURCE_XPATH      = "cap:#{SOURCE_ELEMENT_NAME}"
+      SCOPE_XPATH       = "cap:#{SCOPE_ELEMENT_NAME}"
+      RESTRICTION_XPATH = "cap:#{RESTRICTION_ELEMENT_NAME}"
+      ADDRESSES_XPATH   = "cap:#{ADDRESSES_ELEMENT_NAME}"
+      CODE_XPATH        = "cap:#{CODE_ELEMENT_NAME}"
+      NOTE_XPATH        = "cap:#{NOTE_ELEMENT_NAME}"
+      REFERENCES_XPATH  = "cap:#{REFERENCES_ELEMENT_NAME}"
+      INCIDENTS_XPATH   = "cap:#{INCIDENTS_ELEMENT_NAME}"
 
       # @param [REXML::Element] alert_xml_element
       # @return [RCAP::CAP_1_0::Alert]
@@ -317,7 +314,7 @@ module RCAP
       # @param [String] yaml
       # @return [Alert]
       def self.from_yaml(yaml)
-        from_yaml_data(YAML.load(yaml))
+        from_yaml_data(YAML.safe_load(yaml, [Time, DateTime]))
       end
 
       # Initialise an Alert object from a hash reutrned from YAML.load.
@@ -326,28 +323,28 @@ module RCAP
       # @return [Alert]
       def self.from_yaml_data(alert_yaml_data)
         new do |alert|
-          alert.identifier  = RCAP.strip_if_given(alert_yaml_data[ IDENTIFIER_YAML])
-          alert.sender      = RCAP.strip_if_given(alert_yaml_data[ SENDER_YAML])
-          alert.sent        = RCAP.parse_datetime(alert_yaml_data[ SENT_YAML])
-          alert.status      = RCAP.strip_if_given(alert_yaml_data[ STATUS_YAML])
-          alert.msg_type    = RCAP.strip_if_given(alert_yaml_data[ MSG_TYPE_YAML])
-          alert.source      = RCAP.strip_if_given(alert_yaml_data[ SOURCE_YAML])
-          alert.scope       = RCAP.strip_if_given(alert_yaml_data[ SCOPE_YAML])
-          alert.restriction = RCAP.strip_if_given(alert_yaml_data[ RESTRICTION_YAML])
-          Array(alert_yaml_data[ ADDRESSES_YAML]).each do |address|
+          alert.identifier  = RCAP.strip_if_given(alert_yaml_data[IDENTIFIER_YAML])
+          alert.sender      = RCAP.strip_if_given(alert_yaml_data[SENDER_YAML])
+          alert.sent        = RCAP.parse_datetime(alert_yaml_data[SENT_YAML])
+          alert.status      = RCAP.strip_if_given(alert_yaml_data[STATUS_YAML])
+          alert.msg_type    = RCAP.strip_if_given(alert_yaml_data[MSG_TYPE_YAML])
+          alert.source      = RCAP.strip_if_given(alert_yaml_data[SOURCE_YAML])
+          alert.scope       = RCAP.strip_if_given(alert_yaml_data[SCOPE_YAML])
+          alert.restriction = RCAP.strip_if_given(alert_yaml_data[RESTRICTION_YAML])
+          Array(alert_yaml_data[ADDRESSES_YAML]).each do |address|
             alert.addresses << address.strip
           end
-          Array(alert_yaml_data[ CODES_YAML]).each do |code|
+          Array(alert_yaml_data[CODES_YAML]).each do |code|
             alert.codes << code.strip
           end
-          alert.note        = alert_yaml_data[ NOTE_YAML]
-          Array(alert_yaml_data[ REFERENCES_YAML]).each do |reference|
+          alert.note = alert_yaml_data[NOTE_YAML]
+          Array(alert_yaml_data[REFERENCES_YAML]).each do |reference|
             alert.references << reference.strip
           end
-          Array(alert_yaml_data[ INCIDENTS_YAML]).each do |incident|
+          Array(alert_yaml_data[INCIDENTS_YAML]).each do |incident|
             alert.incidents << incident.strip
           end
-          Array(alert_yaml_data[ INFOS_YAML]).each do |info_yaml_data|
+          Array(alert_yaml_data[INFOS_YAML]).each do |info_yaml_data|
             alert.infos <<  alert.info_class.from_yaml_data(info_yaml_data)
           end
         end
@@ -387,7 +384,7 @@ module RCAP
                                       [NOTE_KEY,        @note],
                                       [REFERENCES_KEY,  @references],
                                       [INCIDENTS_KEY,   @incidents],
-                                      [INFOS_KEY,       @infos.map { |info| info.to_h  }])
+                                      [INFOS_KEY,       @infos.map(&:to_h)])
       end
 
       # Initialises an Alert object from a Hash produced by Alert#to_h
@@ -404,22 +401,22 @@ module RCAP
           alert.source      = RCAP.strip_if_given(alert_hash[SOURCE_KEY])
           alert.scope       = RCAP.strip_if_given(alert_hash[SCOPE_KEY])
           alert.restriction = RCAP.strip_if_given(alert_hash[RESTRICTION_KEY])
-          Array(alert_hash[ ADDRESSES_KEY]).each do |address|
+          Array(alert_hash[ADDRESSES_KEY]).each do |address|
             alert.addresses << address.strip
           end
-          Array(alert_hash[ CODES_KEY]).each do |code|
+          Array(alert_hash[CODES_KEY]).each do |code|
             alert.codes << code.strip
           end
-          alert.note = alert_hash[ NOTE_KEY]
-          Array(alert_hash[ REFERENCES_KEY]).each do |reference|
+          alert.note = alert_hash[NOTE_KEY]
+          Array(alert_hash[REFERENCES_KEY]).each do |reference|
             alert.references << reference.strip
           end
 
-          Array(alert_hash[ INCIDENTS_KEY]).each do |incident|
+          Array(alert_hash[INCIDENTS_KEY]).each do |incident|
             alert.incidents << incident.strip
           end
 
-          Array(alert_hash[ INFOS_KEY]).each do |info_hash|
+          Array(alert_hash[INFOS_KEY]).each do |info_hash|
             alert.infos << alert.info_class.from_h(info_hash)
           end
         end

data/lib/rcap/base/area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Area
@@ -25,10 +27,10 @@ module RCAP
       ALTITUDE_ELEMENT_NAME  = 'altitude'
       CEILING_ELEMENT_NAME   = 'ceiling'
 
-      XPATH           = "cap:#{ XML_ELEMENT_NAME }"
-      AREA_DESC_XPATH = "cap:#{ AREA_DESC_ELEMENT_NAME }"
-      ALTITUDE_XPATH  = "cap:#{ ALTITUDE_ELEMENT_NAME }"
-      CEILING_XPATH   = "cap:#{ CEILING_ELEMENT_NAME }"
+      XPATH           = "cap:#{XML_ELEMENT_NAME}"
+      AREA_DESC_XPATH = "cap:#{AREA_DESC_ELEMENT_NAME}"
+      ALTITUDE_XPATH  = "cap:#{ALTITUDE_ELEMENT_NAME}"
+      CEILING_XPATH   = "cap:#{CEILING_ELEMENT_NAME}"
 
       # @example
       #   Area.new do |area|
@@ -121,16 +123,16 @@ module RCAP
       # @param [Area] other Area object to compare
       # @return [true,false]
       def ==(other)
-        comparison_attributes = lambda { |area| [area.area_desc, area.altitude, area.ceiling, area.circles, area.geocodes, area.polygons] }
+        comparison_attributes = ->(area) { [area.area_desc, area.altitude, area.ceiling, area.circles, area.geocodes, area.polygons] }
         comparison_attributes.call(self) == comparison_attributes.call(other)
       end
 
       # @return [String]
       def inspect
-        area_inspect = "Area Description: #{ @area_desc }\n"\
-                       "Polygons:\n" +                        @polygons.map { |polygon| '  ' + polygon.inspect }.join("\n") + "\n"\
-                       "Circles:          #{ @circles.inspect }\n"\
-                       "Geocodes:         #{ @geocodes.inspect }\n"
+        area_inspect = "Area Description: #{@area_desc}\n"\
+                       "Polygons:\n" + @polygons.map { |polygon| '  ' + polygon.inspect }.join("\n") + "\n"\
+                       "Circles:          #{@circles.inspect}\n"\
+                       "Geocodes:         #{@geocodes.inspect}\n"
         RCAP.format_lines_for_inspect('AREA', area_inspect)
       end
 
@@ -153,7 +155,7 @@ module RCAP
         RCAP.attribute_values_to_hash([AREA_DESC_YAML, @area_desc],
                                       [ALTITUDE_YAML,  @altitude],
                                       [CEILING_YAML,   @ceiling],
-                                      [CIRCLES_YAML,   @circles.map { |circle| circle.to_a }],
+                                      [CIRCLES_YAML,   @circles.map(&:to_a)],
                                       [GEOCODES_YAML,  @geocodes.reduce({}) { |h, geocode| h.merge(geocode.name => geocode.value) }],
                                       [POLYGONS_YAML,  @polygons.map(&:to_yaml_data)])
       end
@@ -222,9 +224,13 @@ module RCAP
         RCAP.attribute_values_to_hash([AREA_DESC_KEY, @area_desc],
                                       [ALTITUDE_KEY,  @altitude],
                                       [CEILING_KEY,   @ceiling],
-                                      [CIRCLES_KEY,   @circles.map { |circle| circle.to_a }],
-                                      [GEOCODES_KEY,  @geocodes.map { |geocode| geocode.to_h }],
-                                      [POLYGONS_KEY,  @polygons.map { |polygon| polygon.to_h }])
+                                      [CIRCLES_KEY,   @circles.map(&:to_a)],
+                                      [GEOCODES_KEY,  @geocodes.map(&:to_h)],
+                                      [POLYGONS_KEY,  @polygons.map(&:to_h)])
+      end
+
+      def map_data?
+        @circles.any? || @polygons.any?
       end
     end
   end

data/lib/rcap/base/circle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RCAP
   module Base
     class Circle < Point
@@ -21,17 +23,26 @@ module RCAP
         yield(self) if block_given?
       end
 
+      # Returns GeoJSON representation of the circle in the form of a Point
+      # with radius property
+      def to_geojson
+        { 'type' => 'Feature',
+          'geometry' => { 'type' => 'Point',
+                          'coordinates' => [@longitude, @lattitude] },
+          'properties' => { 'radius' => @radius } }.to_json
+      end
+
       # Returns a string representation of the circle of the form
       #  lattitude,longitude radius
       #
       # @return [String]
       def to_s
-        "#{ @lattitude },#{ @longitude } #{ @radius }"
+        "#{@lattitude},#{@longitude} #{@radius}"
       end
 
       # @return [String]
       def inspect
-        "(#{ self })"
+        "(#{self})"
       end
 
       # @return [REXML::Element]
@@ -54,7 +65,7 @@ module RCAP
       def self.parse_circle_string(circle_string)
         coordinates, radius = circle_string.split(' ')
         lattitude, longitude = coordinates.split(',')
-        [lattitude, longitude, radius].map { |e| e.to_f }
+        [lattitude, longitude, radius].map(&:to_f)
       end
 
       # @param [REXML::Element] circle_xml_element
@@ -82,7 +93,7 @@ module RCAP
         end
       end
 
-      RADIUS_KEY    = 'radius'
+      RADIUS_KEY = 'radius'
       # @return [Hash]
       def to_h
         RCAP.attribute_values_to_hash([RADIUS_KEY,    @radius],