aixm 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3f6bbccc417b5489c0406281f074c0e2ba763681f2ba93eecce13fc4512a5a3
-  data.tar.gz: 2ee3415fd70d683ed60911ddb78f3cd2fa2277aaeea5546cb3e22ab1c22b2d73
+  metadata.gz: d86771a98ab156be9da1487e7e2e11615bcd63590824108717a51f07c044e241
+  data.tar.gz: b6fc6d7c2803169145153d434f1675f161be6ae731b54eb1d53b6d2fbcf4807b
 SHA512:
-  metadata.gz: c8105e111e3ee60f5ad28b99a2beccd05ce719297c9bb836cca7742dc4b6dec6187fd3cc32b2f09d3924deea35e863329350ca02db869079a2a0f0855a60a6d5
-  data.tar.gz: 5d620f1fb1d47d8a8e6f542029bba5e29d31db796baa6dba3c418d8aef0a6dd75e8996c95d68fa5f45187aae66119bf765af9ebc9d304c8179287c1bb395927c
+  metadata.gz: e537adc538ba520a2f0e891da01ccb13e768a5e183c8a042fbe3bf55f63bfc9f2a66125cf6a19b1882e7d646d8c9b0f848fc551f095a24323f24216d9a8036a1
+  data.tar.gz: 5a3884e00a329f243835648bce2bc13f1cd0ae701113dc89a86f23e83ebe9a82abf4af7a5c6aa87a8f22b1d7c49bc94fd222b2752a5a9bef42276936def12e60

checksums.yaml.gz.sig

@@ -1 +1 @@
-��*;^ь�G�`��ِ.�%o+�����Z�P[~fRs��O7�ߘn(�8�.Yg����9�EV��&Et���ט�97��0�`�ɨ���lxtl����_;���ٮa�EO��@V��g���|H�n�lb7�J���'����Ui4%@J"�(_�ذ���#
+���W۰
��.�},�G������s��o����r�o�s��9J�

data/CHANGELOG.md

@@ -1,6 +1,21 @@
+## 0.3.11
+
+#### Breaking Changes
+* Renamed default git branch to `main`
+* Require Ruby 3.0
+* `Address#address` requires and returns `AIXM::F` for type `:radio_frequency`
+
+#### Changes
+* Fix `Obstacle#source` for OFMX
+
+#### Additions
+* Add `f#voice?` and `AIXM.config.voice_channel_separation` to check whether a
+  frequency belongs to the voice communication airband and use it to validate
+  `AIXM::Frequency`
+
 ## 0.3.10
 
-### Additions
+#### Additions
 * Proper `has_many` and `has_one` associations
 * `AIXM::Association:Array#find_by|find|duplicate` on `has_many` associations
 * `AIXM.config.mid` now defines whether `mid` attributes are inserted or not
@@ -12,7 +27,7 @@
 * `AIXM::Component::Geometry#point?|circle?|polygon?`
 * `AIXM::Component::Layer#services`
 
-### Breaking Changes
+#### Breaking Changes
 * Require Ruby 2.7
 * Moved `region` attribute from `Document` back to features again
 * Use `Document#add_feature` instead of `Document@features#<<`
@@ -25,7 +40,7 @@
 * Refinement `String#payload_hash` removed in favor of `AIXM::PayloadHash` class
 * Refinements `Array#find|duplicates` removed
 
-### Changes
+#### Changes
 * Renamed `AIXM.config.mid_region` to `AIXM.config.region`
 
 ## 0.3.8

data/README.md

@@ -20,7 +20,7 @@ For now, only the parts needed to automize the AIP import of [open flightmaps](h
 This gem is [cryptographically signed](https://guides.rubygems.org/security/#using-gems) in order to assure it hasn't been tampered with. Unless already done, please add the author's public key as a trusted certificate now:
 
 ```
-gem cert --add <(curl -Ls https://raw.github.com/svoop/aixm/master/certs/svoop.pem)
+gem cert --add <(curl -Ls https://raw.github.com/svoop/aixm/main/certs/svoop.pem)
 ```
 
 ### Bundler
@@ -100,19 +100,29 @@ The `:ofmx` schema requires the [region to be set on all core features](https://
 
 ```ruby
 AIXM.ofmx!
-AIXM.region = 'LF'
+AIXM.config.region = 'LF'
 ```
 
 :warning: This setting has no effect when using the `:aixm` schema.
 
+### AIXM.voice_channel_separation
+
+Define which voice channel separation should be used to validate voice communication frequencies.
+
+```ruby
+AIXM.voice_channel_separation = :any   # both 25 and 8.33 kHz (default)
+AIXM.voice_channel_separation = 25     # 25 kHz only
+AIXM.voice_channel_separation = 833    # 8.33 kHz only
+```
+
 ### AIXM.config.mid
 
 In order to insert [OFMX-compliant `mid` attributes](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid) into all `*Uid` elements, you have set the mid configuration option to `true`.
 
 ```ruby
 AIXM.ofmx!
-AIXM.config.mid          # => false - don't insert mid attributes by default
-AIXM.config.mid = true   # => true  - insert mid attributes
+AIXM.config.mid = false   # don't insert mid attributes (default)
+AIXM.config.mid = true    # insert mid attributes
 ```
 
 :warning: This setting has no effect when using the `:aixm` schema.

data/exe/ckmid

@@ -1,13 +1,10 @@
 #!/usr/bin/env ruby
 
-# TODO: hide deprecations unless in gem root until fully complying with Ruby 2.7
-Warning[:deprecated] = Dir.pwd.match? /aixm$/
-
 require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  ruby '>= 2.7'
+  ruby '>= 3.0'
   gem 'aixm', '~> 0'
 end
 

data/exe/mkmid

@@ -1,13 +1,10 @@
 #!/usr/bin/env ruby
 
-# TODO: hide deprecations unless in gem root until fully complying with Ruby 2.7
-Warning[:deprecated] = Dir.pwd.match? /aixm$/
-
 require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  ruby '>= 2.7'
+  ruby '>= 3.0'
   gem 'aixm', '~> 0'
 end
 

data/lib/aixm/association.rb

@@ -187,7 +187,7 @@ module AIXM
             add_block.call(object) if add_block
           end
           instance_exec(object, **options, &association_block) if association_block
-          fail(ArgumentError, "#{object.__class__} not allowed") unless class_names.reduce(false){ |m, c| m || object.is_a?(c.to_class) }
+          fail(ArgumentError, "#{object.__class__} not allowed") unless class_names.any? { |c| object.is_a?(c.to_class) }
           send(attribute).send(:push, object)
           object.instance_variable_set(:"@#{inversion}", self)
           self
@@ -220,7 +220,7 @@ module AIXM
         attr_reader attribute
         # feature= / add_feature
         define_method(:"#{association}=") do |object|
-          fail(ArgumentError, "#{object.__class__} not allowed") unless class_names.reduce(false){ |m, c| m || object.is_a?(c.to_class) }
+          fail(ArgumentError, "#{object.__class__} not allowed") unless class_names.any? { |c| object.is_a?(c.to_class) }
           instance_variable_get(:"@#{attribute}")&.instance_variable_set(:"@#{inversion}", nil)
           instance_variable_set(:"@#{attribute}", object)
           object&.instance_variable_set(:"@#{inversion}", self)
@@ -298,9 +298,7 @@ module AIXM
         self.class.new(
           select do |element|
             if element.kind_of? klass
-              attributes.reduce(true) do |memo, (attribute, value)|
-                memo && element.send(attribute) == value
-              end
+              attributes.all? { |a, v| element.send(a) == v }
             end
           end
         )

data/lib/aixm/component/frequency.rb

@@ -3,7 +3,7 @@ using AIXM::Refinements
 module AIXM
   module Component
 
-    # Frequencies used by a service.
+    # Voice frequencies used by a service.
     #
     # By default, {#reception_f} is set to the same value as {#transmission_f}
     # since most services rely on simplex (aka: non-duplex) two-way
@@ -73,7 +73,7 @@ module AIXM
       end
 
       def transmission_f=(value)
-        fail(ArgumentError, "invalid transmission_f") unless value.is_a? AIXM::F
+        fail(ArgumentError, "invalid transmission_f") unless value.is_a?(AIXM::F) && value.voice?
         @transmission_f = value
       end
 
@@ -83,7 +83,7 @@ module AIXM
       end
 
       def reception_f=(value)
-        fail(ArgumentError, "invalid reception_f") unless value.nil? || value.is_a?(AIXM::F)
+        fail(ArgumentError, "invalid reception_f") unless value.nil? || value.is_a?(AIXM::F) && value.voice?
         @reception_f = value
       end
 

data/lib/aixm/config.rb

@@ -78,6 +78,7 @@ module AIXM
     def initialize_config
       @@config = OpenStruct.new(
         schema: :aixm,
+        voice_channel_separation: :any,
         mid: false,
         inflector: Dry::Inflector.new
       )

data/lib/aixm/f.rb

@@ -64,6 +64,34 @@ module AIXM
       to_s.hash
     end
 
+    # @return [Boolean] whether this frequency is part of the voice airband
+    #   for civil aviation using `AIXM.config.voice_channel_separation`
+    def voice?
+      return false unless unit == :mhz
+      case AIXM.config.voice_channel_separation
+        when 25 then voice_25?
+        when 833 then voice_833?
+        when :any then voice_25? || voice_833?
+        else fail(ArgumentError, "unknown voice channel separation")
+      end
+    end
+
+    private
+
+    # @return [Boolean] whether this frequency is part of the voice airband
+    #   for civil aviation using 25 kHz channel separation
+    def voice_25?
+      return false unless unit == :mhz && freq == freq.round(3) && freq.between?(118, 136.975)
+      ((freq * 1000).round % 25).zero?
+    end
+
+    # @return [Boolean] whether this frequency is part of the voice airband
+    #   for civil aviation using 8.33 kHz channel separation
+    def voice_833?
+      return false unless unit == :mhz && freq == freq.round(3) && freq.between?(118, 136.99)
+      [0.005, 0.01, 0.015].any? { |d| (((freq - d) * 1000).round % 25).zero? }
+    end
+
   end
 
 end

data/lib/aixm/feature/address.rb

@@ -9,7 +9,7 @@ module AIXM
     #   address = AIXM.address(
     #     source: String or nil
     #     type: TYPES
-    #     address: String
+    #     address: AIXM.f (type :radio_frequency) or String (other types)
     #   )
     #   service.remarks = String or nil
     #
@@ -64,8 +64,14 @@ module AIXM
       end
 
       def address=(value)
-        fail(ArgumentError, "invalid address") unless value.is_a? String
-        @address = value&.to_s
+        case type
+        when :radio_frequency
+          fail(ArgumentError, "invalid address frequency") unless value.is_a?(AIXM::F)
+          @address = value
+        else
+          fail(ArgumentError, "invalid address") unless value
+          @address = value.to_s
+        end
       end
 
       def remarks=(value)

data/lib/aixm/feature/obstacle.rb

@@ -130,7 +130,7 @@ module AIXM
 
       # @return [String]
       def inspect
-        %Q(#<#{self.class} xy="#{xy.to_s}" type=#{type.inspect}>)
+        %Q(#<#{self.class} xy="#{xy.to_s}" type=#{type.inspect} name=#{name.inspect}>)
       end
 
       def name=(value)
@@ -238,7 +238,7 @@ module AIXM
         return obstacle_group.to_xml if delegate && obstacle_group && AIXM.ofmx?
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.comment! "Obstacle: [#{type}] #{xy.to_s} #{name}".strip
-        builder.Obs do |obs|
+        builder.Obs({ source: (source if AIXM.ofmx?) }.compact) do |obs|
           obs << to_uid.indent(2)
           obs << obstacle_group.to_uid.indent(2) if obstacle_group && AIXM.ofmx?
           obs.txtName(name) if name

data/lib/aixm/shortcuts.rb

@@ -4,8 +4,8 @@ module AIXM
 
   # Shortcut initializers
   CLASSES.each do |element, class_name|
-    define_singleton_method(element) do |*arguments|
-      class_name.to_class.new(*arguments)
+    define_singleton_method(element) do |*args, **kwargs|
+      class_name.to_class.new(*args, **kwargs)
     end
   end
 

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.3.10".freeze
+  VERSION = "0.3.11".freeze
 end

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Sven Schwyn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ0wCwYDVQQDDARydWJ5
   MRkwFwYKCZImiZPyLGQBGRYJYml0Y2V0ZXJhMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTIwMDMxNDE5NDgwNVoXDTIxMDMxNDE5NDgwNVowPzENMAsGA1UEAwwEcnVi
+  MB4XDTIxMTEwODE0MzIyM1oXDTIyMTEwODE0MzIyM1owPzENMAsGA1UEAwwEcnVi
   eTEZMBcGCgmSJomT8ixkARkWCWJpdGNldGVyYTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4k2DCa8/eAFiak4Kwe
-  0Iu8dk0JfHWeywjVVSNv6PtnQ96B/1jLmw5Wb+xYJSyvG6KEOzEMWA/lqO+nIrdO
-  2LDRxuWojH5GROp/dtQ+SxsWlvui4cs9iBmI5Mj0mc1UgST3UFf60ry8OnyR+E9N
-  RVVZZykAGmxwyAqD1aq5Yt0lZMdvrGnaLWcZdKC99e812pdTN948k8Iw2GJAaNtH
-  Tp17XDfDNBANHjYy9xCqrxvNTfT4Bs43rPA1A77+mkPgI2Vx51u2CWA+K3hP4gAZ
-  F50xqnagzgXSOzCme1mC/sUUmoAAB39g2CuNocWuhv0R3/HeqdwAsA/1XpDF2NfQ
-  zW8CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFDfY
-  gRWUI+J6nX7Po7Zq0zvDopfYMB0GA1UdEQQWMBSBEnJ1YnlAYml0Y2V0ZXJhLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwuD4geNdhpSVNJTtHb
+  fmVAoPxmER4oyGgaVJSidn/OjU5PcpdypMI/WIxfvjfFizq6kQYAsJZbCr6fG+UN
+  2dZGMXcAC/uKQL5nYESjCPJ4IJP/SC+fiiEpxHQk7PNFoiUVRUieUZIAfHZAdnY3
+  ye1/niW7ud0vwKIMrysKWxjgkE0Y6Af1QLzV/6brVRRC5MvHIzYJd8BiSP+wY1O8
+  VElw1f6d90KEz2vaQfX7vCxrzIbvAnYiSvM0AIPy/zigTqpW6w3w4sQxQj81oQ9U
+  9vDYtQzXj0c9VrSLvb0DgiGug2cU2bDjA4L3cBE1szX4tbfo8syYqMq51/kTGDxW
+  YNUCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJ8r
+  wy1HraZDqg3Khf9UonMWMtJUMB0GA1UdEQQWMBSBEnJ1YnlAYml0Y2V0ZXJhLmNv
   bTAdBgNVHRIEFjAUgRJydWJ5QGJpdGNldGVyYS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAFsTSBbxIkTdppL8yFl0KglyUMq9DjkMwvz7ORJzHMfw1S2OmXMYnJ5fSXFu
-  C/9puwYMdD6V3THyqc1Rhj6RRZ/576MDwIXMgOETQfPTT6jNE+p4cRougDrQ32aV
-  29WIAY21/o0FBuJZqxLDRTu6O7AHrjFnv7Kkpr1oYiR9G4MNEihyNt909nHnSixC
-  qn5dLDjawWVvAz5oeD1sE0Kyp6CDY8i3NfBu4aqz8uAbaEJh3jpY5NW2Lv++s7hf
-  EUqN8dad5Oosf9hYbfFXPzkJIIGiKMS4e1cbnAr/vadELoccfEN9tSlLuW/voNqA
-  2635TmaVXxUEgIOzRhGlE1+frXI=
+  ggEBACI7lJKRbnRjz0T4Wb9jH4SE0A2yaHAoBzj96luVDjNyoRT3688trEZS75Sg
+  GKfChxqKncBrSpxJ0YfWbymNHfUrKhcdSifJ/TtUrTasm6LSnJYLOnLKDO3v8eL3
+  gRTq8a5wA7Xtijx3MJEyzdeUh7N+UMKuPps/flPgH5yabUxgxrvuhrXF7Z96nrsP
+  EOmNMTc8H7wo4BAKfuMcI/Gh2oCf+tAhr0bGsXyBikmJ6XA45mrOMgv19M1+aMpn
+  1+2Y1+i+4jd1B7qxIgOLxQTNIJiwE0sqU1itFfuesfgUACS7M0IV9u9Bp4hBGNEw
+  5JcY2h7owdMxXIvgk1oakgldFJc=
   -----END CERTIFICATE-----
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -284,11 +284,11 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/svoop/aixm
-  changelog_uri: https://github.com/svoop/aixm/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/svoop/aixm/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/svoop/aixm
   documentation_uri: https://www.rubydoc.info/gems/aixm
   bug_tracker_uri: https://github.com/svoop/aixm/issues
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - AIXM/OFMX Builder
@@ -303,15 +303,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.30
+signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information
 test_files: []