aixm 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbcadda83460463ad9ab68569e04738a5811b10e3534f3f91fde0ed1f4104874
-  data.tar.gz: aa14c72ecf04553fde4243ff74b68e5cfe2b1d3f19efbb4ef1f473a6dce79a38
+  metadata.gz: efe8ab0dda077e481484589c0e2943b6417cefb5386e16d872692161b46add3f
+  data.tar.gz: f7fb02c428760481b9159d81c93baec8e4e2d1ef1267e1884f02422d44af7b9b
 SHA512:
-  metadata.gz: 18f3c67e93a4d6527d8240f819c942d82e81cef33332902749ebcde5e62c3aa4aaf2e12ea2ddce4b642b4ba63b2913e557207161dd4400b01685ec673c436885
-  data.tar.gz: f35b079b357d0b00e5c7bc11a71f0e610cc787863eb678f49aa6697ab11eccc32804c33e73e9f2d4851209d9604b16a271c9f85759b2c41b7e8094a928ff5034
+  metadata.gz: 1dcee1f3e19c58ada30b66bfa48201bae02a382bb6a8746b6f144de6c3280ef58ce2e6b6dc25ba5343ff9cfc9589e81e2217573bdfce642623f73530bf626e56
+  data.tar.gz: 1cf3f783adfa14e2af626d97810c8bfbd3e776718a207e70343ed1bf1f2f5ccbaa52142aa5ab32727af99a8c07733d056817536f3157b171878c0d03b9363208

data/.travis.yml

@@ -1,4 +1,4 @@
 ---
 language: ruby
 rvm:
-  - 2.6.0
+  - 2.6.3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.5
+
+#### Additions
+* Refinement `Object#then_if`
+* Airspace activity types `:aeromodelling` and `:glider_winch`
+* `AIXM::XY#to_point` convenience method
+
+#### Breaking Changes
+* Renamed airspace activity type "TOWING" from `:winch_activity` to `:towing_traffic`
+* Updated obstacles and obstacle groups to reflect recent changes in OFMX
+
 ## 0.3.4
 
 #### Additions

data/lib/aixm/component/geometry.rb

@@ -26,7 +26,7 @@ module AIXM
     # @example Built by adding elements
     #   geometry = AIXM.geometry
     #   geometry << AIXM.point(...)
-    #   geometry << AIXM.point(...)
+    #   geometry.concat [AIXM.point(...), AIXM.point(...), ...]
     #
     # @see https://github.com/openflightmaps/ofmx/wiki/Airspace#avx-border-vertex
     class Geometry
@@ -37,7 +37,9 @@ module AIXM
       #   @return [Enumerator] see Array#each
       # @!method <<
       #   @return [Array] see Array#<<
-      def_delegators :@result_array, :each, :<<
+      # @!method concat
+      #   @return [Array] see Array#concat
+      def_delegators :@result_array, :each, :<<, :concat
 
       def initialize(*segments)
         @result_array = segments

data/lib/aixm/component/geometry/arc.rb

@@ -26,7 +26,7 @@ module AIXM
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} xy="#{xy.to_s}">)
+          %Q(#<#{self.class} xy="#{xy}" center_xy="#{center_xy}" clockwise=#{clockwise}>)
         end
 
         def center_xy=(value)

data/lib/aixm/component/geometry/border.rb

@@ -25,7 +25,7 @@ module AIXM
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} xy="#{xy.to_s}">)
+          %Q(#<#{self.class} xy="#{xy}" name=#{name.inspect}>)
         end
 
         def name=(value)

data/lib/aixm/component/geometry/circle.rb

@@ -26,7 +26,7 @@ module AIXM
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} xy="#{xy.to_s}">)
+          %Q(#<#{self.class} center_xy="#{center_xy}" radius="#{radius.to_s}">)
         end
 
         def center_xy=(value)

data/lib/aixm/component/geometry/point.rb

@@ -22,7 +22,7 @@ module AIXM
 
         # @return [String]
         def inspect
-          %Q(#<#{self.class} xy="#{xy.to_s}">)
+          %Q(#<#{self.class} xy="#{xy}">)
         end
 
         def xy=(value)

data/lib/aixm/component/layer.rb

@@ -25,6 +25,7 @@ module AIXM
         ACCIDENT: :accident_investigation,
         ACROBAT: :acrobatics,
         AIRGUN: :aerial_gunnery,
+        AIRMODEL: :aeromodelling,
         AIRSHOW: :air_show,
         ANTIHAIL: :anti_hail_rocket,
         ARTILERY: :artillary_firing,
@@ -71,7 +72,7 @@ module AIXM
         TECHNICAL:  :technical_activity,
         'TFC-AD': :aerodrome_traffic,
         'TFC-HELI': :helicopter_traffic,
-        TOWING: :winch_activity,
+        TOWING: :towing_traffic,
         TRG: :training,
         UAV: :drone,
         ULM: :ultra_light_flight,
@@ -79,6 +80,7 @@ module AIXM
         'VIP-PRES': :president,
         'VIP-VICE': :vice_president,
         WATERBLAST: :underwater_explosion,
+        WINCH: :glider_winch,
         WORK: :aerial_work,
         OTHER: :other
       }.freeze
@@ -161,7 +163,9 @@ module AIXM
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.codeClass(self.class.to_s) if self.class
         builder.codeLocInd(location_indicator) if location_indicator
-        builder.codeActivity(ACTIVITIES.key(activity).to_s) if activity
+        if activity
+          builder.codeActivity(ACTIVITIES.key(activity).to_s.then_if(AIXM.aixm?) { |a| { 'AIRMODEL' => 'UAV', 'WINCH' => 'GLIDER' }[a] || a })
+        end
         builder << vertical_limits.to_xml
         builder << timetable.to_xml(as: :Att) if timetable
         builder.codeSelAvbl(selective? ? 'Y' : 'N') if AIXM.ofmx?

data/lib/aixm/component/vertical_limits.rb

@@ -6,15 +6,17 @@ module AIXM
     # Vertical limits define a 3D airspace vertically. They are often noted in
     # AIP as follows:
     #
-    #   upper_z (or max_z whichever is higher)
+    #   upper_z
+    #   (max_z)   whichever is higher
     #   -------
-    #   lower_z (or min_z whichever is lower)
+    #   lower_z
+    #   (min_z)   whichever is lower
     #
     # ===Cheat Sheet in Pseudo Code:
     #   vertical_limits = AIXM.vertical_limits(
     #     upper_z: AIXM.z
-    #     lower_z: AIXM.z
     #     max_z: AIXM.z or nil
+    #     lower_z: AIXM.z
     #     min_z: AIXM.z or nil
     #   )
     #
@@ -25,7 +27,7 @@ module AIXM
     # @see https://github.com/openflightmaps/ofmx/wiki/Airspace#ase-airspace
     class VerticalLimits
       # @api private
-      TAGS = { upper: :Upper, lower: :Lower, max: :Max, min: :Mnm }.freeze
+      TAGS = { upper_z: :Upper, lower_z: :Lower, max_z: :Max, min_z: :Mnm }.freeze
 
       # @api private
       CODES = { qfe: :HEI, qnh: :ALT, qne: :STD }.freeze
@@ -42,13 +44,14 @@ module AIXM
       # @return [AIXM::Z] alternative lower limit ("whichever is lower")
       attr_reader :min_z
 
-      def initialize(upper_z:, lower_z:, max_z: nil, min_z: nil)
-        self.upper_z, self.lower_z, self.max_z, self.min_z = upper_z, lower_z, max_z, min_z
+      def initialize(upper_z:, max_z: nil, lower_z:, min_z: nil)
+        self.upper_z, self.max_z, self.lower_z, self.min_z = upper_z, max_z, lower_z, min_z
       end
 
       # @return [String]
       def inspect
-        %Q(#<#{self.class} upper_z="#{upper_z.to_s}" lower_z="#{lower_z.to_s}">)
+        payload = %i(upper_z max_z lower_z min_z).map { |l| %Q(#{l}="#{send(l)}") if send(l) }.compact
+        %Q(#<#{self.class} #{payload.join(' ')}>)
       end
 
       def upper_z=(value)
@@ -56,16 +59,16 @@ module AIXM
         @upper_z = value
       end
 
-      def lower_z=(value)
-        fail(ArgumentError, "invalid lower_z") unless value.is_a? AIXM::Z
-        @lower_z = value
-      end
-
       def max_z=(value)
         fail(ArgumentError, "invalid max_z") unless value.nil? || value.is_a?(AIXM::Z)
         @max_z = value
       end
 
+      def lower_z=(value)
+        fail(ArgumentError, "invalid lower_z") unless value.is_a? AIXM::Z
+        @lower_z = value
+      end
+
       def min_z=(value)
         fail(ArgumentError, "invalid min_z") unless value.nil? || value.is_a?(AIXM::Z)
         @min_z = value
@@ -73,8 +76,8 @@ module AIXM
 
       # @return [String] AIXM or OFMX markup
       def to_xml
-        %i(upper lower max min).each_with_object(Builder::XmlMarkup.new(indent: 2)) do |limit, builder|
-          if z = send(:"#{limit}_z")
+        TAGS.keys.each_with_object(Builder::XmlMarkup.new(indent: 2)) do |limit, builder|
+          if z = send(limit)
             builder.tag!(:"codeDistVer#{TAGS[limit]}", CODES[z.code].to_s)
             builder.tag!(:"valDistVer#{TAGS[limit]}", z.alt.to_s)
             builder.tag!(:"uomDistVer#{TAGS[limit]}", z.unit.upcase.to_s)

data/lib/aixm/constants.rb

@@ -35,6 +35,6 @@ module AIXM
   )x.freeze
 
   # Pattern matching timetable working hour codes
-  H_RE = /H(?:24|J|N|X|O)/.freeze
+  H_RE = /(?<code>H24|HJ|HN|HX|HO)/.freeze
 
 end

data/lib/aixm/feature/address.rb

@@ -79,7 +79,7 @@ module AIXM
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.tag!(as) do |tag|
           tag << addressable.to_uid.indent(2) if addressable
-          tag.codeType(TYPES.key(type).to_s.then { |t| AIXM.aixm? ? t.sub(/-\w+$/, '') : t })
+          tag.codeType(TYPES.key(type).to_s.then_if(AIXM.aixm?) { |t| t.sub(/-\w+$/, '') })
           tag.noSeq(sequence)
         end
       end

data/lib/aixm/feature/airspace.rb

@@ -140,9 +140,7 @@ module AIXM
         fail(LayerError.new("no layers defined", self)) unless layers.any?
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.comment! "Airspace: [#{TYPES.key(type)}] #{name || :UNNAMED}"
-        builder.Ase({
-          source: (source if AIXM.ofmx?)
-        }.compact) do |ase|
+        builder.Ase({ source: (source if AIXM.ofmx?) }.compact) do |ase|
           ase << to_uid.indent(2)
           ase.txtLocalType(local_type) if local_type && local_type != name
           ase.txtName(name) if name

data/lib/aixm/feature/obstacle.rb

@@ -12,20 +12,29 @@ module AIXM
     #     name: String or nil
     #     type: TYPES
     #     xy: AIXM.xy
-    #     radius: AIXM.d
     #     z: AIXM.z
+    #     radius: AIXM.d
     #   )
     #   obstacle.lighting = true or false (default for AIXM) or nil (means: unknown, default for OFMX)
     #   obstacle.lighting_remarks = String or nil
     #   obstacle.marking = true or false or nil (means: unknown, default)
     #   obstacle.marking_remarks = String or nil
     #   obstacle.height = AIXM.d or nil
+    #   obstacle.height_accurate = true or false or nil (means: unknown, default)
     #   obstacle.xy_accuracy = AIXM.d or nil
     #   obstacle.z_accuracy = AIXM.d or nil
-    #   obstacle.height_accurate = true or false or nil (means: unknown, default)
     #   obstacle.valid_from = Time or Date or String or nil
     #   obstacle.valid_until = Time or Date or String or nil
     #   obstacle.remarks = String or nil
+    #   obstacle.link_to   # => AIXM.obstacle or nil
+    #   obstacle.link_type   # => LINK_TYPE or nil
+    #
+    # See {AIXM::Feature::ObstacleGroup} for how to define physical links
+    # between two obstacles (e.g. cables between powerline towers).
+    #
+    # Please note: As soon as an obstacle is added to an obstacle group, the
+    # +xy_accuracy+ and +z_accuracy+ of the obstacle group overwrite whatever
+    # is set on the individual obstacles!
     #
     # @see https://github.com/openflightmaps/ofmx/wiki/Obstacle
     class Obstacle < Feature
@@ -42,6 +51,12 @@ module AIXM
         OTHER: :other   # specify in remarks
       }.freeze
 
+      LINK_TYPES = {
+        CABLE: :cable,
+        SOLID: :solid,
+        OTHER: :other
+      }.freeze
+
       # @return [String] full name
       attr_reader :name
 
@@ -74,16 +89,16 @@ module AIXM
       # @return [AIXM::D, nil] height from ground to top point
       attr_reader :height
 
+      # @return [Boolean, nil] height accuracy
+      #   true => height measured, false => height estimated, nil => unknown
+      attr_reader :height_accurate
+
       # @return [AIXM::D, nil] margin of error for circular base center point
       attr_reader :xy_accuracy
 
       # @return [AIXM::D, nil] margin of error for top point
       attr_reader :z_accuracy
 
-      # @return [Boolean, nil] height accuracy
-      #   true => height measured, false => height estimated, nil => unknown
-      attr_reader :height_accurate
-
       # @return [Time, Date, String, nil] effective after this point in time
       attr_reader :valid_from
 
@@ -93,9 +108,18 @@ module AIXM
       # @return [String, nil] free text remarks
       attr_reader :remarks
 
-      def initialize(source: nil, name: nil, type:, xy:, radius:, z:)
+      # @return [AIXM::Feature::ObstacleGroup] group this obstacle belongs to
+      attr_reader :obstacle_group
+
+      # @return [Symbol, nil] another obstacle to which a physical link exists
+      attr_reader :linked_to
+
+      # @return [Symbol, nil] type of physical link between this and another obstacle
+      attr_reader :link_type
+
+      def initialize(source: nil, name: nil, type:, xy:, z:, radius:)
         super(source: source)
-        self.name, self.type, self.xy, self.radius, self.z = name, type, xy, radius, z
+        self.name, self.type, self.xy, self.z, self.radius = name, type, xy, z, radius
         @lighting = @marking = @height_accurate = false
       end
 
@@ -118,16 +142,16 @@ module AIXM
         @xy = value
       end
 
-      def radius=(value)
-        fail(ArgumentError, "invalid radius") unless value.is_a?(AIXM::D) && value.dist > 0
-        @radius = value
-      end
-
       def z=(value)
         fail(ArgumentError, "invalid z") unless value.is_a?(AIXM::Z) && value.qnh?
         @z = value
       end
 
+      def radius=(value)
+        fail(ArgumentError, "invalid radius") unless value.nil? || (value.is_a?(AIXM::D) && value.dist > 0)
+        @radius = value
+      end
+
       def lighting=(value)
         fail(ArgumentError, "invalid lighting") unless [true, false, nil].include? value
         @lighting = value
@@ -151,6 +175,11 @@ module AIXM
         @height = value
       end
 
+      def height_accurate=(value)
+        fail(ArgumentError, "invalid height accurate") unless [true, false, nil].include? value
+        @height_accurate = value
+      end
+
       def xy_accuracy=(value)
         fail(ArgumentError, "invalid xy accuracy") unless value.nil? || value.is_a?(AIXM::D)
         @xy_accuracy = value
@@ -161,11 +190,6 @@ module AIXM
         @z_accuracy = value
       end
 
-      def height_accurate=(value)
-        fail(ArgumentError, "invalid height accurate") unless [true, false, nil].include? value
-        @height_accurate = value
-      end
-
       def valid_from=(value)
         @valid_from = value&.to_time
       end
@@ -178,39 +202,59 @@ module AIXM
         @remarks = value&.to_s
       end
 
-      # @return [Boolean] estimation whether one obstacle (e.g. single tree) or
-      #    a cluster of obstacles (e.g. a few trees)
-      def clustered?
-        height && radius > height
+      def obstacle_group=(value)
+        fail(ArgumentError, "invalid obstacle group") unless value.is_a?(AIXM::Feature::ObstacleGroup)
+        @obstacle_group = value
+      end
+      private :obstacle_group=
+
+      def linked_to=(value)
+        fail(ArgumentError, "invalid linked to") unless value.is_a?(AIXM::Feature::Obstacle)
+        @linked_to = value
       end
+      private :linked_to=
+
+      def link_type=(value)
+        @link_type = LINK_TYPES.lookup(value&.to_s&.to_sym, nil) || fail(ArgumentError, "invalid link type")
+      end
+      private :link_type=
 
       # @return [Boolean] whether part of an obstacle group
       def grouped?
-        respond_to? :group
+        obstacle_group && obstacle_group.obstacles.count > 1
+      end
+
+      # @return [Boolean] whether obstacle is linked to another one
+      def linked?
+        !!linked_to
       end
 
       # @return [String] UID markup
       def to_uid(as: :ObsUid)
+        self.obstacle_group ||= singleton_obstacle_group
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.tag!(as) do |tag|
+          tag << obstacle_group.to_uid.indent(2) if AIXM.ofmx?
           tag.geoLat((xy.lat(AIXM.schema)))
           tag.geoLong((xy.long(AIXM.schema)))
         end
       end
 
       # @return [String] AIXM or OFMX markup
-      def to_xml
+      def to_xml(delegate: true)
+        self.obstacle_group ||= singleton_obstacle_group
+        return obstacle_group.to_xml if delegate && AIXM.ofmx?
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.comment! "Obstacle: [#{type}] #{xy.to_s} #{name}".strip
-        builder.Obs({ source: ((source || (group.source if grouped?)) if AIXM.ofmx?) }.compact) do |obs|
+        builder.Obs do |obs|
           obs << to_uid.indent(2)
           obs.txtName(name) if name
           if AIXM.ofmx?
             obs.codeType(TYPES.key(type).to_s)
           else
             obs.txtDescrType(TYPES.key(type).to_s)
-            obs.codeGroup(grouped? || clustered? ? 'Y' : 'N')
           end
+          obs.codeGroup(grouped? ? 'Y' : 'N')
           if AIXM.ofmx?
             obs.codeLgt(lighting ? 'Y' : 'N') unless lighting.nil?
             obs.codeMarking(marking ? 'Y' : 'N') unless marking.nil?
@@ -220,27 +264,27 @@ module AIXM
           obs.txtDescrLgt(lighting_remarks) if lighting_remarks
           obs.txtDescrMarking(marking_remarks) if marking_remarks
           obs.codeDatum('WGE')
-          if xy_accuracy
-            obs.valGeoAccuracy(xy_accuracy.dist.trim)
-            obs.uomGeoAccuracy(xy_accuracy.unit.upcase.to_s)
+          if AIXM.aixm? && obstacle_group.xy_accuracy
+            obs.valGeoAccuracy(obstacle_group.xy_accuracy.dist.trim)
+            obs.uomGeoAccuracy(obstacle_group.xy_accuracy.unit.upcase.to_s)
           end
           obs.valElev(z.alt)
-          obs.valElevAccuracy(z_accuracy.to_ft.dist.round) if z_accuracy
+          if AIXM.aixm? && obstacle_group.z_accuracy
+            obs.valElevAccuracy(obstacle_group.z_accuracy.to_ft.dist.round)
+          end
           obs.valHgt(height.to_ft.dist.round) if height
+          obs.uomDistVer('FT')
           if AIXM.ofmx? && !height_accurate.nil?
             obs.codeHgtAccuracy(height_accurate ? 'Y' : 'N')
           end
-          obs.uomDistVer('FT')
           if AIXM.ofmx?
-            obs.valRadius(radius.dist.trim)
-            obs.uomRadius(radius.unit.upcase.to_s)
-            if grouped?
-              obs.codeGroupId(group.id)
-              obs.txtGroupName(group.name) if group.name
-              if linked?
-                obs << linked_to.to_uid(as: :ObsUidLink).indent(2)
-                obs.codeLinkType(AIXM::Feature::ObstacleGroup::LINK_TYPES.key(link_type).to_s)
-              end
+            if radius
+              obs.valRadius(radius.dist.trim)
+              obs.uomRadius(radius.unit.upcase.to_s)
+            end
+            if grouped? && linked?
+              obs << linked_to.to_uid(as: :ObsUidLink).indent(2)
+              obs.codeLinkType(LINK_TYPES.key(link_type).to_s)
             end
             obs.datetimeValidWef(valid_from.xmlschema) if valid_from
             obs.datetimeValidTil(valid_until.xmlschema) if valid_until
@@ -249,38 +293,12 @@ module AIXM
         end
       end
 
-      # Extensions used by ObstacleGroup feature
-      module Grouped
-        # @return [AIXM::Feature::ObstacleGroup] group this obstacle belongs to
-        attr_reader :group
-
-        # @return [AIXM::Feature::Obstacle] another obstacle this one is linked to
-        attr_reader :linked_to
-
-        # @return [Symbol] type of link between two obstacles
-        attr_reader :link_type
+      private
 
-        def group=(value)
-          fail(ArgumentError, "invalid group") unless value.is_a?(AIXM::Feature::ObstacleGroup)
-          @group = value
-        end
-        private :group=
-
-        # @return [Boolean] whether obstacle is linked to another one
-        def linked?
-          !!linked_to
-        end
-
-        def linked_to=(value)
-          fail(ArgumentError, "invalid linked to") unless value.is_a?(AIXM::Feature::Obstacle)
-          @linked_to = value
-        end
-        private :linked_to=
-
-        def link_type=(value)
-          @link_type = AIXM::Feature::ObstacleGroup::LINK_TYPES.lookup(value&.to_s&.to_sym, nil) || fail(ArgumentError, "invalid link type")
-        end
-        private :link_type=
+      # OFMX requires single, ungrouped obstacles to be the only member of a
+      # singleton obstacle group.
+      def singleton_obstacle_group
+        AIXM.obstacle_group.add_obstacle self
       end
 
     end