aixm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273c3a151ac0b4c91488692c47918ba3ca36e044e4d1392ba48b98d2ad45f08e
-  data.tar.gz: 4dca28d512bd61ea981ea7e24889e6796b5eeab8ee950e7859bb4b6604848d50
+  metadata.gz: cf1e96e454dba0f43522ac3f8253c34a4f5b209498b410449521b2f9f935f624
+  data.tar.gz: ad46225ec28030c43792f854bf1b1bfe4197217c5d45a5400a1e1f74ffa3c2ca
 SHA512:
-  metadata.gz: 87471ca95b1590688987f08d7c40c910f63395cb2ab109947acd8be0d28ad704e4a7ff82facb3c510253349dc083de93866f91cc9f750472ef8782019f36a628
-  data.tar.gz: f1004c94f130cdb333863701746b20eaa23fd36e7ddabfc60c37ad156d49c1f30753663bdcc2a32a60cc8ff3d462f6ad8b23ec649d0d0a4be4d9e3a1bb322463
+  metadata.gz: 672feb31e6a816e8d9c38a2f491833464d669c58f1ccec81ef776f449a3573eea31a263b822e1a88f70f80ea8864865f3c4127df16433f3d5d66430e6b6df93f
+  data.tar.gz: 81b8b9e9dcd1cf088607380915adaa08cac8a43b4837fe124f47ef81dc4a2de428f5babfb6e64efe6c14961652bbf60c0242c3fd56bcc8c1974aa1bc97b9afb1

data/CHANGELOG.md

@@ -1,18 +1,27 @@
+## 0.2.3
+
+* Breaking minor changes:
+  * VOR types renamed from :vor to :conventional and :doppler_vor to :doppler
+  * NBR types added
+  * Marker types added
+* Minor changes:
+  * "mid" attributes on all navigational aid features
+
 ## 0.2.2
 
 * Minor changes:
-  * Fix bad error classes
+  * Bad error classes fixed
   * Allow navigational aids without name
 
 ## 0.2.1
 
 * Major changes:
-  * Fix DVOR and VORDME confusion
-  * Add schedule to navigational aids
+  * DVOR and VORDME confusion fixed
+  * Schedule added to navigational aids
   * VOR can be associated with DME (-> VOR/DME) or TACAN (-> VORTAC) now
-  * `to_xml` has been renamed to `to_aixm` everywhere
+  * `to_xml` renamed to `to_aixm` everywhere
 * Minor changes:
-  * Remove :other from all value lists
+  * Removed :other from all value lists
 
 ## 0.2.0
 

data/README.md

@@ -138,6 +138,7 @@ ndb = AIXM.ndb(
   name: String
   xy: AIXM.xy
   z: AIXM.z or nil
+  type: :en_route, :locator or :marine
   f: AIXM.f
 )
 ndb.schedule = AIXM.schedule
@@ -155,6 +156,7 @@ marker = AIXM.marker(
   name: String
   xy: AIXM.xy
   z: AIXM.z or nil
+  type: :outer, :middle, :inner or :backcourse
 )
 marker.schedule = AIXM.schedule
 marker.remarks = String
@@ -182,7 +184,7 @@ vor = AIXM.vor(
   name: String
   xy: AIXM.xy
   z: AIXM.z or nil  
-  type: :vor or :doppler_vor
+  type: :conventional or :doppler
   f: AIXM.f
   north: :geographic or :grid or :magnetic
 )

data/lib/aixm/feature/navigational_aid/designated_point.rb

@@ -46,7 +46,7 @@ module AIXM
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.DpnUid({ newEntity: (true if extensions >> :ofm) }.compact) do |dpnuid|
+          builder.DpnUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |dpnuid|
             dpnuid.codeId(id)
             dpnuid.geoLat(xy.lat(format_for(*extensions)))
             dpnuid.geoLong(xy.long(format_for(*extensions)))

data/lib/aixm/feature/navigational_aid/dme.rb

@@ -39,7 +39,7 @@ module AIXM
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.DmeUid({ newEntity: (true if extensions >> :ofm) }.compact) do |dmeuid|
+          builder.DmeUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |dmeuid|
             dmeuid.codeId(id)
             dmeuid.geoLat(xy.lat(format_for(*extensions)))
             dmeuid.geoLong(xy.long(format_for(*extensions)))

data/lib/aixm/feature/navigational_aid/marker.rb

@@ -5,23 +5,47 @@ module AIXM
       ##
       # Marker (marker beacons) operate on 75 MHz.
       #
+      # Types:
+      # * +:outer+ (+:O+) - outer marker
+      # * +:middle+ (+:M+) - middle marker
+      # * +:inner+ (+:I+) - inner marker
+      # * +:backcourse+ (+:C+) - backcourse marker
+      #
       # https://en.wikipedia.org/wiki/Marker_beacon
       class Marker < Base
         using AIXM::Refinements
 
+        TYPES = {
+          O: :outer,
+          M: :middle,
+          I: :inner,
+          C: :backcourse
+        }
+
+        attr_reader :type
+
         public_class_method :new
 
         # TODO: Marker require an associated ILS
-        def initialize(**args)
+        def initialize(id:, name:, xy:, z: nil, type:)
+          super(id: id, name: name, xy: xy, z: z)
+          self.type = type
           warn("WARNING: Maker is not fully implemented yet due to the lack of ILS")
-          super
+        end
+
+        def type=(value)
+          @type = TYPES.lookup(value&.to_sym, nil) || fail(ArgumentError, "invalid type")
+        end
+
+        def type_key
+          TYPES.key(type)
         end
 
         ##
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.MkrUid({ newEntity: (true if extensions >> :ofm) }.compact) do |mkruid|
+          builder.MkrUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |mkruid|
             mkruid.codeId(id)
             mkruid.geoLat(xy.lat(format_for(*extensions)))
             mkruid.geoLong(xy.long(format_for(*extensions)))
@@ -35,6 +59,7 @@ module AIXM
           builder.Mkr do |mkr|
             mkr << to_uid(*extensions).indent(2)
             mkr.OrgUid
+            mkr.codePsnIls(type_key.to_s)
             mkr.valFreq(75)
             mkr.uomFreq('MHZ')
             mkr.txtName(name) if name

data/lib/aixm/feature/navigational_aid/ndb.rb

@@ -6,17 +6,36 @@ module AIXM
       # NDB (non-directional beacon) operate in the frequency band between
       # 190 kHz and 1750 kHz.
       #
+      # Types:
+      # * +:en_route+ (+:B+) - high powered NDB
+      # * +:locator+ (+:L+) - locator (low powered NDB)
+      # * +:marine+ (+:M+) - marine beacon
+      #
       # https://en.wikipedia.org/wiki/Non-directional_beacon
       class NDB < Base
         using AIXM::Refinements
 
-        attr_reader :f
+        TYPES = {
+          B: :en_route,
+          L: :locator,
+          M: :marine
+        }.freeze
+
+        attr_reader :type, :f
 
         public_class_method :new
 
-        def initialize(id:, name:, xy:, z: nil, f:)
+        def initialize(id:, name:, xy:, z: nil, type:, f:)
           super(id: id, name: name, xy: xy, z: z)
-          self.f = f
+          self.type, self.f = type, f
+        end
+
+        def type=(value)
+          @type = TYPES.lookup(value&.to_sym, nil) || fail(ArgumentError, "invalid type")
+        end
+
+        def type_key
+          TYPES.key(type)
         end
 
         def f=(value)
@@ -34,7 +53,7 @@ module AIXM
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.NdbUid({ newEntity: (true if extensions >> :ofm) }.compact) do |ndbuid|
+          builder.NdbUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |ndbuid|
             ndbuid.codeId(id)
             ndbuid.geoLat(xy.lat(format_for(*extensions)))
             ndbuid.geoLong(xy.long(format_for(*extensions)))
@@ -51,6 +70,7 @@ module AIXM
             ndb.txtName(name) if name
             ndb.valFreq(f.freq.trim)
             ndb.uomFreq(f.unit.upcase.to_s)
+            ndb.codeClass(type_key.to_s)
             ndb.codeDatum('WGE')
             if z
               ndb.valElev(z.alt)

data/lib/aixm/feature/navigational_aid/tacan.rb

@@ -17,7 +17,7 @@ module AIXM
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.TcnUid({ newEntity: (true if extensions >> :ofm) }.compact) do |tcnuid|
+          builder.TcnUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |tcnuid|
             tcnuid.codeId(id)
             tcnuid.geoLat(xy.lat(format_for(*extensions)))
             tcnuid.geoLong(xy.long(format_for(*extensions)))

data/lib/aixm/feature/navigational_aid/vor.rb

@@ -7,7 +7,7 @@ module AIXM
       # 108.00 Mhz to 117.95 MHz. Two type of VORs exist:
       #
       # Types:
-      # * +:vor+ (+:VOR+) - standard VOR
+      # * +:vor+ (+:VOR+) - conventional VOR (also known as CVOR)
       # * +:doppler_vor+ (+:DVOR+) - Doppler VOR
       #
       # North types:
@@ -22,8 +22,8 @@ module AIXM
         using AIXM::Refinements
 
         TYPES = {
-          VOR: :vor,
-          DVOR: :doppler_vor
+          VOR: :conventional,
+          DVOR: :doppler
         }.freeze
 
         NORTHS = {
@@ -90,7 +90,7 @@ module AIXM
         # Render UID markup
         def to_uid(*extensions)
           builder = Builder::XmlMarkup.new(indent: 2)
-          builder.VorUid({ newEntity: (true if extensions >> :ofm) }.compact) do |voruid|
+          builder.VorUid({ mid: to_digest, newEntity: (true if extensions >> :ofm) }.compact) do |voruid|
             voruid.codeId(id)
             voruid.geoLat(xy.lat(format_for(*extensions)))
             voruid.geoLong(xy.long(format_for(*extensions)))

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 end

data/spec/factory.rb

@@ -105,7 +105,8 @@ module AIXM
           id: '---',
           name: 'MARKER NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
-          z: AIXM.z(500, :qnh)
+          z: AIXM.z(500, :qnh),
+          type: :outer
         ).tap do |marker|
           marker.schedule = AIXM::H24
           marker.remarks = 'marker navaid'
@@ -118,6 +119,7 @@ module AIXM
           name: 'NDB NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
           z: AIXM.z(500, :qnh),
+          type: :en_route,
           f: AIXM.f(555, :khz)
         ).tap do |ndb|
           ndb.schedule = AIXM::H24
@@ -144,7 +146,7 @@ module AIXM
           name: 'VOR NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
           z: AIXM.z(500, :qnh),
-          type: :vor,
+          type: :conventional,
           f: AIXM.f(111, :mhz),
           north: :geographic
         ).tap do |vor|
@@ -153,28 +155,13 @@ module AIXM
         end
       end
 
-      def dvor
-        AIXM.vor(
-          id: 'DVV',
-          name: 'DOPPLER-VOR NAVAID',
-          xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
-          z: AIXM.z(500, :qnh),
-          type: :doppler_vor,
-          f: AIXM.f(111, :mhz),
-          north: :geographic
-        ).tap do |doppler_vor|
-          doppler_vor.schedule = AIXM::H24
-          doppler_vor.remarks = 'doppler-vor navaid'
-        end
-      end
-
       def vordme
         AIXM.vor(
           id: 'VDD',
           name: 'VOR/DME NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
           z: AIXM.z(500, :qnh),
-          type: :vor,
+          type: :conventional,
           f: AIXM.f(111, :mhz),
           north: :geographic
         ).tap do |vordme|
@@ -190,7 +177,7 @@ module AIXM
           name: 'VORTAC NAVAID',
           xy: AIXM.xy(lat: %q(47°51'33"N), long: %q(007°33'36"E)),
           z: AIXM.z(500, :qnh),
-          type: :vor,
+          type: :conventional,
           f: AIXM.f(111, :mhz),
           north: :geographic
         ).tap do |vortac|
@@ -211,7 +198,6 @@ module AIXM
           document.features << AIXM::Factory.ndb
           document.features << AIXM::Factory.tacan
           document.features << AIXM::Factory.vor
-          document.features << AIXM::Factory.dvor
           document.features << AIXM::Factory.vordme
           document.features << AIXM::Factory.vortac
         end

data/spec/lib/aixm/document_spec.rb

@@ -158,7 +158,7 @@ describe AIXM::Document do
           </Abd>
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
-            <DpnUid>
+            <DpnUid mid="5317882">
               <codeId>DDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -176,7 +176,7 @@ describe AIXM::Document do
           </Dpn>
           <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
-            <DmeUid>
+            <DmeUid mid="537506748">
               <codeId>MMM</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -192,14 +192,15 @@ describe AIXM::Document do
             </Dtt>
             <txtRmk>dme navaid</txtRmk>
           </Dme>
-          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
+          <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
           <Mkr>
-            <MkrUid>
+            <MkrUid mid="300437209">
               <codeId>---</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </MkrUid>
             <OrgUid/>
+            <codePsnIls>O</codePsnIls>
             <valFreq>75</valFreq>
             <uomFreq>MHZ</uomFreq>
             <txtName>MARKER NAVAID</txtName>
@@ -211,9 +212,9 @@ describe AIXM::Document do
             </Mtt>
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
-          <!-- NavigationalAid: [NDB] NDB NAVAID -->
+          <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
           <Ndb>
-            <NdbUid>
+            <NdbUid mid="782114926">
               <codeId>NNN</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -222,6 +223,7 @@ describe AIXM::Document do
             <txtName>NDB NAVAID</txtName>
             <valFreq>555</valFreq>
             <uomFreq>KHZ</uomFreq>
+            <codeClass>B</codeClass>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -232,7 +234,7 @@ describe AIXM::Document do
           </Ndb>
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn>
-            <TcnUid>
+            <TcnUid mid="648449590">
               <codeId>TTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -250,7 +252,7 @@ describe AIXM::Document do
           </Tcn>
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
-            <VorUid>
+            <VorUid mid="904391566">
               <codeId>VVV</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -269,30 +271,9 @@ describe AIXM::Document do
             </Vtt>
             <txtRmk>vor navaid</txtRmk>
           </Vor>
-          <!-- NavigationalAid: [VOR:DVOR] DOPPLER-VOR NAVAID -->
-          <Vor>
-            <VorUid>
-              <codeId>DVV</codeId>
-              <geoLat>475133.00N</geoLat>
-              <geoLong>0073336.00E</geoLong>
-            </VorUid>
-            <OrgUid/>
-            <txtName>DOPPLER-VOR NAVAID</txtName>
-            <codeType>DVOR</codeType>
-            <valFreq>111</valFreq>
-            <uomFreq>MHZ</uomFreq>
-            <codeTypeNorth>TRUE</codeTypeNorth>
-            <codeDatum>WGE</codeDatum>
-            <valElev>500</valElev>
-            <uomDistVer>FT</uomDistVer>
-            <Vtt>
-              <codeWorkHr>H24</codeWorkHr>
-            </Vtt>
-            <txtRmk>doppler-vor navaid</txtRmk>
-          </Vor>
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
           <Vor>
-            <VorUid>
+            <VorUid mid="428844269">
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -313,13 +294,13 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid>
+            <DmeUid mid="284278140">
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </DmeUid>
             <OrgUid/>
-            <VorUid>
+            <VorUid mid="428844269">
               <codeId>VDD</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -336,7 +317,7 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
           <Vor>
-            <VorUid>
+            <VorUid mid="305713874">
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -357,13 +338,13 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid>
+            <TcnUid mid="595472802">
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
             </TcnUid>
             <OrgUid/>
-            <VorUid>
+            <VorUid mid="305713874">
               <codeId>VTT</codeId>
               <geoLat>475133.00N</geoLat>
               <geoLong>0073336.00E</geoLong>
@@ -489,7 +470,7 @@ describe AIXM::Document do
           </Abd>
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
-            <DpnUid newEntity="true">
+            <DpnUid mid="5317882" newEntity="true">
               <codeId>DDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -507,7 +488,7 @@ describe AIXM::Document do
           </Dpn>
           <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
-            <DmeUid newEntity="true">
+            <DmeUid mid="537506748" newEntity="true">
               <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -523,14 +504,15 @@ describe AIXM::Document do
             </Dtt>
             <txtRmk>dme navaid</txtRmk>
           </Dme>
-          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
+          <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
           <Mkr>
-            <MkrUid newEntity="true">
+            <MkrUid mid="300437209" newEntity="true">
               <codeId>---</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </MkrUid>
             <OrgUid/>
+            <codePsnIls>O</codePsnIls>
             <valFreq>75</valFreq>
             <uomFreq>MHZ</uomFreq>
             <txtName>MARKER NAVAID</txtName>
@@ -542,9 +524,9 @@ describe AIXM::Document do
             </Mtt>
             <txtRmk>marker navaid</txtRmk>
           </Mkr>
-          <!-- NavigationalAid: [NDB] NDB NAVAID -->
+          <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
           <Ndb>
-            <NdbUid newEntity="true">
+            <NdbUid mid="782114926" newEntity="true">
               <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -553,6 +535,7 @@ describe AIXM::Document do
             <txtName>NDB NAVAID</txtName>
             <valFreq>555</valFreq>
             <uomFreq>KHZ</uomFreq>
+            <codeClass>B</codeClass>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -563,7 +546,7 @@ describe AIXM::Document do
           </Ndb>
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn>
-            <TcnUid newEntity="true">
+            <TcnUid mid="648449590" newEntity="true">
               <codeId>TTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -581,7 +564,7 @@ describe AIXM::Document do
           </Tcn>
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="904391566" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -600,30 +583,9 @@ describe AIXM::Document do
             </Vtt>
             <txtRmk>vor navaid</txtRmk>
           </Vor>
-          <!-- NavigationalAid: [VOR:DVOR] DOPPLER-VOR NAVAID -->
-          <Vor>
-            <VorUid newEntity="true">
-              <codeId>DVV</codeId>
-              <geoLat>47.85916667N</geoLat>
-              <geoLong>7.56000000E</geoLong>
-            </VorUid>
-            <OrgUid/>
-            <txtName>DOPPLER-VOR NAVAID</txtName>
-            <codeType>DVOR</codeType>
-            <valFreq>111</valFreq>
-            <uomFreq>MHZ</uomFreq>
-            <codeTypeNorth>TRUE</codeTypeNorth>
-            <codeDatum>WGE</codeDatum>
-            <valElev>500</valElev>
-            <uomDistVer>FT</uomDistVer>
-            <Vtt>
-              <codeWorkHr>H24</codeWorkHr>
-            </Vtt>
-            <txtRmk>doppler-vor navaid</txtRmk>
-          </Vor>
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="428844269" newEntity="true">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -644,13 +606,13 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid newEntity="true">
+            <DmeUid mid="284278140" newEntity="true">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </DmeUid>
             <OrgUid/>
-            <VorUid newEntity="true">
+            <VorUid mid="428844269" newEntity="true">
               <codeId>VDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -667,7 +629,7 @@ describe AIXM::Document do
           </Dme>
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="305713874" newEntity="true">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -688,13 +650,13 @@ describe AIXM::Document do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid newEntity="true">
+            <TcnUid mid="595472802" newEntity="true">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </TcnUid>
             <OrgUid/>
-            <VorUid newEntity="true">
+            <VorUid mid="305713874" newEntity="true">
               <codeId>VTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>

data/spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb

@@ -6,8 +6,12 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
       AIXM::Factory.designated_point
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "DesignatedPoint:ICAO"
       end
     end
@@ -23,7 +27,7 @@ describe AIXM::Feature::NavigationalAid::DesignatedPoint do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [DesignatedPoint:ICAO] DESIGNATED POINT NAVAID -->
           <Dpn>
-            <DpnUid newEntity="true">
+            <DpnUid mid="#{digest}" newEntity="true">
               <codeId>DDD</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>

data/spec/lib/aixm/feature/navigational_aid/dme_spec.rb

@@ -6,8 +6,12 @@ describe AIXM::Feature::NavigationalAid::DME do
       AIXM::Factory.dme
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "DME"
       end
     end
@@ -23,7 +27,7 @@ describe AIXM::Feature::NavigationalAid::DME do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [DME] DME NAVAID -->
           <Dme>
-            <DmeUid newEntity="true">
+            <DmeUid mid="#{digest}" newEntity="true">
               <codeId>MMM</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>

data/spec/lib/aixm/feature/navigational_aid/marker_spec.rb

@@ -1,34 +1,39 @@
 require_relative '../../../../spec_helper'
 
 describe AIXM::Feature::NavigationalAid::Marker do
-  context "complete" do
+  context "complete outer marker" do
     subject do
       AIXM::Factory.marker
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
-        subject.kind.must_equal "Marker"
+      it "must return class/type combo" do
+        subject.kind.must_equal "Marker:O"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 371155747
+        subject.to_digest.must_equal 300437209
       end
     end
 
     describe :to_aixm do
       it "must build correct XML with OFM extension" do
         subject.to_aixm(:ofm).must_equal <<~END
-          <!-- NavigationalAid: [Marker] MARKER NAVAID -->
+          <!-- NavigationalAid: [Marker:O] MARKER NAVAID -->
           <Mkr>
-            <MkrUid newEntity="true">
+            <MkrUid mid="#{digest}" newEntity="true">
               <codeId>---</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </MkrUid>
             <OrgUid/>
+            <codePsnIls>O</codePsnIls>
             <valFreq>75</valFreq>
             <uomFreq>MHZ</uomFreq>
             <txtName>MARKER NAVAID</txtName>
@@ -44,4 +49,83 @@ describe AIXM::Feature::NavigationalAid::Marker do
       end
     end
   end
+
+  context "complete middle marker" do
+    subject do
+      AIXM::Factory.marker.tap do |marker|
+        marker.type = :middle
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "Marker:M"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML" do
+        subject.to_aixm.must_match %r(<codePsnIls>M</codePsnIls>)
+      end
+    end
+  end
+  context "complete middle marker" do
+    subject do
+      AIXM::Factory.marker.tap do |marker|
+        marker.type = :middle
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "Marker:M"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML" do
+        subject.to_aixm.must_match %r(<codePsnIls>M</codePsnIls>)
+      end
+    end
+  end
+
+  context "complete inner marker" do
+    subject do
+      AIXM::Factory.marker.tap do |marker|
+        marker.type = :inner
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "Marker:I"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML" do
+        subject.to_aixm.must_match %r(<codePsnIls>I</codePsnIls>)
+      end
+    end
+  end
+
+  context "complete backcourse marker" do
+    subject do
+      AIXM::Factory.marker.tap do |marker|
+        marker.type = :backcourse
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "Marker:C"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML" do
+        subject.to_aixm.must_match %r(<codePsnIls>C</codePsnIls>)
+      end
+    end
+  end
 end

data/spec/lib/aixm/feature/navigational_aid/ndb_spec.rb

@@ -7,33 +7,38 @@ describe AIXM::Feature::NavigationalAid::NDB do
     end
 
     it "won't accept invalid arguments" do
-      -> { AIXM.ndb(id: 'N', name: 'NDB', xy: AIXM::Factory.xy, f: 0) }.must_raise ArgumentError
+      -> { AIXM.ndb(id: 'N', name: 'NDB', xy: AIXM::Factory.xy, type: :foo, f: f) }.must_raise ArgumentError
+      -> { AIXM.ndb(id: 'N', name: 'NDB', xy: AIXM::Factory.xy, type: :en_route, f: 0) }.must_raise ArgumentError
     end
   end
 
-  context "complete" do
+  context "complete en-route NDB" do
     subject do
       AIXM::Factory.ndb
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
-        subject.kind.must_equal "NDB"
+      it "must return class/type combo" do
+        subject.kind.must_equal "NDB:B"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 387748611
+        subject.to_digest.must_equal 782114926
       end
     end
 
     describe :to_aixm do
       it "must build correct XML with OFM extension" do
         subject.to_aixm(:ofm).must_equal <<~END
-          <!-- NavigationalAid: [NDB] NDB NAVAID -->
+          <!-- NavigationalAid: [NDB:B] NDB NAVAID -->
           <Ndb>
-            <NdbUid newEntity="true">
+            <NdbUid mid="#{digest}" newEntity="true">
               <codeId>NNN</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -42,6 +47,7 @@ describe AIXM::Feature::NavigationalAid::NDB do
             <txtName>NDB NAVAID</txtName>
             <valFreq>555</valFreq>
             <uomFreq>KHZ</uomFreq>
+            <codeClass>B</codeClass>
             <codeDatum>WGE</codeDatum>
             <valElev>500</valElev>
             <uomDistVer>FT</uomDistVer>
@@ -54,4 +60,44 @@ describe AIXM::Feature::NavigationalAid::NDB do
       end
     end
   end
+
+  context "complete locator NDB" do
+    subject do
+      AIXM::Factory.ndb.tap do |ndb|
+        ndb.type = :locator
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "NDB:L"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML with OFM extension" do
+        subject.to_aixm(:ofm).must_match %r(<codeClass>L</codeClass>)
+      end
+    end
+  end
+
+  context "complete marine NDB" do
+    subject do
+      AIXM::Factory.ndb.tap do |ndb|
+        ndb.type = :marine
+      end
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "NDB:M"
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML with OFM extension" do
+        subject.to_aixm(:ofm).must_match %r(<codeClass>M</codeClass>)
+      end
+    end
+  end
 end

data/spec/lib/aixm/feature/navigational_aid/tacan_spec.rb

@@ -6,8 +6,12 @@ describe AIXM::Feature::NavigationalAid::TACAN do
       AIXM::Factory.tacan
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "TACAN"
       end
     end
@@ -23,7 +27,7 @@ describe AIXM::Feature::NavigationalAid::TACAN do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [TACAN] TACAN NAVAID -->
           <Tcn>
-            <TcnUid newEntity="true">
+            <TcnUid mid="#{digest}" newEntity="true">
               <codeId>TTT</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>

data/spec/lib/aixm/feature/navigational_aid/vor_spec.rb

@@ -8,25 +8,29 @@ describe AIXM::Feature::NavigationalAid::VOR do
 
     it "won't accept invalid arguments" do
       -> { AIXM.vor(id: 'V', name: 'VOR', xy: AIXM::Factory.xy, type: :foo, f: f, north: :geographic) }.must_raise ArgumentError
-      -> { AIXM.vor(id: 'V', name: 'VOR', xy: AIXM::Factory.xy, type: :vor, f: 0, north: :geographic) }.must_raise ArgumentError
-      -> { AIXM.vor(id: 'V', name: 'VOR', xy: AIXM::Factory.xy, type: :vor, f: f, north: :foobar) }.must_raise ArgumentError
+      -> { AIXM.vor(id: 'V', name: 'VOR', xy: AIXM::Factory.xy, type: :conventional, f: 0, north: :geographic) }.must_raise ArgumentError
+      -> { AIXM.vor(id: 'V', name: 'VOR', xy: AIXM::Factory.xy, type: :conventional, f: f, north: :foobar) }.must_raise ArgumentError
     end
   end
 
-  context "complete VOR" do
+  context "complete conventional VOR" do
     subject do
       AIXM::Factory.vor
     end
 
+    let :digest do
+      subject.to_digest
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "VOR:VOR"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 152119936
+        subject.to_digest.must_equal 904391566
       end
     end
 
@@ -35,7 +39,7 @@ describe AIXM::Feature::NavigationalAid::VOR do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [VOR:VOR] VOR NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="#{digest}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -59,6 +63,58 @@ describe AIXM::Feature::NavigationalAid::VOR do
     end
   end
 
+  context "complete Doppler VOR" do
+    subject do
+      AIXM::Factory.vor.tap do |vor|
+        vor.type = :doppler
+      end
+    end
+
+    let :digest do
+      subject.to_digest
+    end
+
+    describe :kind do
+      it "must return class/type combo" do
+        subject.kind.must_equal "VOR:DVOR"
+      end
+    end
+
+    describe :to_digest do
+      it "must return digest of payload" do
+        subject.to_digest.must_equal 293163781
+      end
+    end
+
+    describe :to_aixm do
+      it "must build correct XML of VOR with OFM extension" do
+        subject.to_aixm(:ofm).must_equal <<~END
+          <!-- NavigationalAid: [VOR:DVOR] VOR NAVAID -->
+          <Vor>
+            <VorUid mid="#{digest}" newEntity="true">
+              <codeId>VVV</codeId>
+              <geoLat>47.85916667N</geoLat>
+              <geoLong>7.56000000E</geoLong>
+            </VorUid>
+            <OrgUid/>
+            <txtName>VOR NAVAID</txtName>
+            <codeType>DVOR</codeType>
+            <valFreq>111</valFreq>
+            <uomFreq>MHZ</uomFreq>
+            <codeTypeNorth>TRUE</codeTypeNorth>
+            <codeDatum>WGE</codeDatum>
+            <valElev>500</valElev>
+            <uomDistVer>FT</uomDistVer>
+            <Vtt>
+              <codeWorkHr>H24</codeWorkHr>
+            </Vtt>
+            <txtRmk>vor navaid</txtRmk>
+          </Vor>
+        END
+      end
+    end
+  end
+
   context "complete VOR/DME" do
     subject do
       AIXM::Factory.vor.tap do |vor|
@@ -68,15 +124,19 @@ describe AIXM::Feature::NavigationalAid::VOR do
       end
     end
 
+    let :digests do
+      [subject.to_digest, subject.dme.to_digest]
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "VOR:VOR"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 863096858
+        subject.to_digest.must_equal 604205702
       end
     end
 
@@ -85,7 +145,7 @@ describe AIXM::Feature::NavigationalAid::VOR do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [VOR:VOR] VOR/DME NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="#{digests.first}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -106,13 +166,13 @@ describe AIXM::Feature::NavigationalAid::VOR do
           </Vor>
           <!-- NavigationalAid: [DME] VOR/DME NAVAID -->
           <Dme>
-            <DmeUid newEntity="true">
+            <DmeUid mid="#{digests.last}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </DmeUid>
             <OrgUid/>
-            <VorUid newEntity="true">
+            <VorUid mid="#{digests.first}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -141,15 +201,19 @@ describe AIXM::Feature::NavigationalAid::VOR do
       end
     end
 
+    let :digests do
+      [subject.to_digest, subject.tacan.to_digest]
+    end
+
     describe :kind do
-      it "must return class or type" do
+      it "must return class/type combo" do
         subject.kind.must_equal "VOR:VOR"
       end
     end
 
     describe :to_digest do
       it "must return digest of payload" do
-        subject.to_digest.must_equal 458371299
+        subject.to_digest.must_equal 339710051
       end
     end
 
@@ -158,7 +222,7 @@ describe AIXM::Feature::NavigationalAid::VOR do
         subject.to_aixm(:ofm).must_equal <<~END
           <!-- NavigationalAid: [VOR:VOR] VORTAC NAVAID -->
           <Vor>
-            <VorUid newEntity="true">
+            <VorUid mid="#{digests.first}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
@@ -179,13 +243,13 @@ describe AIXM::Feature::NavigationalAid::VOR do
           </Vor>
           <!-- NavigationalAid: [TACAN] VORTAC NAVAID -->
           <Tcn>
-            <TcnUid newEntity="true">
+            <TcnUid mid="#{digests.last}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>
             </TcnUid>
             <OrgUid/>
-            <VorUid newEntity="true">
+            <VorUid mid="#{digests.first}" newEntity="true">
               <codeId>VVV</codeId>
               <geoLat>47.85916667N</geoLat>
               <geoLong>7.56000000E</geoLong>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler