aixm 0.3.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d86771a98ab156be9da1487e7e2e11615bcd63590824108717a51f07c044e241
-  data.tar.gz: b6fc6d7c2803169145153d434f1675f161be6ae731b54eb1d53b6d2fbcf4807b
+  metadata.gz: 2f4efdae60e160732c8f30262673f01b49d6dd53d5c5e9bc2d8c395cf696ccae
+  data.tar.gz: 7b129a858e6c6d0eb7545d4a32910243e7a8ecd00a8895698f4ae69fcaed33f2
 SHA512:
-  metadata.gz: e537adc538ba520a2f0e891da01ccb13e768a5e183c8a042fbe3bf55f63bfc9f2a66125cf6a19b1882e7d646d8c9b0f848fc551f095a24323f24216d9a8036a1
-  data.tar.gz: 5a3884e00a329f243835648bce2bc13f1cd0ae701113dc89a86f23e83ebe9a82abf4af7a5c6aa87a8f22b1d7c49bc94fd222b2752a5a9bef42276936def12e60
+  metadata.gz: 98115e7b0f93f82e976235045afdff88b3b6a99b256620de733b4b4741ffa7fb769e6bb92aae86657d6ae57b5744aef5df82a634b22adb5ae81b9db18a7c1531
+  data.tar.gz: fd3bf40b77d4cfef51465b4e1806382465a4eee86abd8c74c3639763a627653a7832696395bab9673dd6433458bef8474871b7dcd121533891df3c911a429baf

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.0
+
+#### Breaking Changes
+* Move `Ase->txtLocalType` up into `AseUid` for OFMX
+
+#### Additions
+* Add `AIXM::Component::Geometry::RhumbLine`
+
 ## 0.3.11
 
 #### Breaking Changes

data/lib/aixm/classes.rb

@@ -25,10 +25,11 @@ module AIXM
     layer: 'AIXM::Component::Layer',
     geometry: 'AIXM::Component::Geometry',
     vertical_limit: 'AIXM::Component::VerticalLimit',
+    point: 'AIXM::Component::Geometry::Point',
+    rhumb_line: 'AIXM::Component::Geometry::RhumbLine',
     arc: 'AIXM::Component::Geometry::Arc',
-    border: 'AIXM::Component::Geometry::Border',
     circle: 'AIXM::Component::Geometry::Circle',
-    point: 'AIXM::Component::Geometry::Point',
+    border: 'AIXM::Component::Geometry::Border',
     dme: 'AIXM::Feature::NavigationalAid::DME',
     designated_point: 'AIXM::Feature::NavigationalAid::DesignatedPoint',
     marker: 'AIXM::Feature::NavigationalAid::Marker',

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

@@ -17,7 +17,7 @@ module AIXM
         include AIXM::Association
 
         # @!method geometry
-        #   @return [AIXM::Component::Geometry] geometry the arc belongs to
+        #   @return [AIXM::Component::Geometry] geometry this segment belongs to
         belongs_to :geometry, as: :segment
 
         # @return [AIXM::XY] center point

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

@@ -4,7 +4,8 @@ module AIXM
   module Component
     class Geometry
 
-      # Points are defined by {#xy} coordinates.
+      # Either an individual point or the starting point of a great circle
+      # line. Defined by {#xy} coordinates.
       #
       # ===Cheat Sheet in Pseudo Code:
       #   point = AIXM.point(
@@ -16,7 +17,7 @@ module AIXM
         include AIXM::Association
 
         # @!method geometry
-        #   @return [AIXM::Component::Geometry] geometry the arc belongs to
+        #   @return [AIXM::Component::Geometry] geometry this segment belongs to
         belongs_to :geometry, as: :segment
 
         # @return [AIXM::XY] (starting) point

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

@@ -0,0 +1,54 @@
+using AIXM::Refinements
+
+module AIXM
+  module Component
+    class Geometry
+
+      # Starting point of a rhumb line which describes a spiral on a sphere
+      # crossing all meridians at the same angle. Defined by {#xy} coordinates.
+      #
+      # ===Cheat Sheet in Pseudo Code:
+      #   point = AIXM.rhumb_line(
+      #     xy: AIXM.xy
+      #   )
+      #
+      # @see https://gitlab.com/openflightmaps/ofmx/wikis/Airspace#rhumb-line
+      class RhumbLine
+        include AIXM::Association
+
+        # @!method geometry
+        #   @return [AIXM::Component::Geometry] geometry this segment belongs to
+        belongs_to :geometry, as: :segment
+
+        # @return [AIXM::XY] (starting) point
+        attr_reader :xy
+
+        def initialize(xy:)
+          self.xy = xy
+        end
+
+        # @return [String]
+        def inspect
+          %Q(#<#{self.class} xy="#{xy}">)
+        end
+
+        def xy=(value)
+          fail(ArgumentError, "invalid xy") unless value.is_a? AIXM::XY
+          @xy = value
+        end
+
+        # @return [String] AIXM or OFMX markup
+        def to_xml
+          builder = Builder::XmlMarkup.new(indent: 2)
+          builder.Avx do |avx|
+            avx.codeType('RHL')
+            avx.geoLat(xy.lat(AIXM.schema))
+            avx.geoLong(xy.long(AIXM.schema))
+            avx.codeDatum('WGE')
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/aixm/component/geometry.rb

@@ -31,16 +31,18 @@ module AIXM
 
       # @!method segments
       #   @return [Array<AIXM::Component::Geometry::Point,
+      #     AIXM::Component::Geometry::RhumbLine
       #     AIXM::Component::Geometry::Arc,
-      #     AIXM::Component::Geometry::Border,
-      #     AIXM::Component::Geometry::Circle>] points, arcs, borders or circle
+      #     AIXM::Component::Geometry::Circle,
+      #     AIXM::Component::Geometry::Border>] points, rhumb lines, arcs, borders or circle
       # @!method add_segment(segment)
       #   @param segment [AIXM::Component::Geometry::Point,
+      #     AIXM::Component::Geometry::RhumbLine,
       #     AIXM::Component::Geometry::Arc,
-      #     AIXM::Component::Geometry::Border,
-      #     AIXM::Component::Geometry::Circle]
+      #     AIXM::Component::Geometry::Circle,
+      #     AIXM::Component::Geometry::Border]
       #   @return [self]
-      has_many :segments, accept: %i(point arc border circle)
+      has_many :segments, accept: %i(point rhumb_line arc circle border)
 
       # @!method airspace
       #   @return [AIXM::Feature::Airspace] airspace the geometry defines

data/lib/aixm/component/runway.rb

@@ -116,7 +116,7 @@ module AIXM
         @length = if value
           fail(ArgumentError, "invalid length") unless value.is_a?(AIXM::D) && value.dist > 0
           fail(ArgumentError, "invalid length unit") if width && width.unit != value.unit
-          @length = value
+          value
         end
       end
 
@@ -124,7 +124,7 @@ module AIXM
         @width = if value
           fail(ArgumentError, "invalid width") unless value.is_a?(AIXM::D)  && value.dist > 0
           fail(ArgumentError, "invalid width unit") if length && length.unit != value.unit
-          @width = value
+          value
         end
       end
 

data/lib/aixm/component/timetable.rb

@@ -45,7 +45,9 @@ module AIXM
       end
 
       def code=(value)
-        @code = CODES.lookup(value&.to_s&.to_sym, nil) || fail(ArgumentError, "invalid code")
+        @code = if value
+          CODES.lookup(value&.to_s&.to_sym, nil) || fail(ArgumentError, "invalid code")
+        end
       end
 
       def remarks=(value)

data/lib/aixm/config.rb

@@ -9,8 +9,8 @@ module AIXM
     },
     ofmx: {
       version: '0',
-      namespace: 'http://schema.openflightmaps.org/0/OFMX-Snapshot.xsd',
-      xsd: Pathname(__dir__).join('..', '..', 'schemas', 'ofmx', '0', 'OFMX-Snapshot.xsd'),
+      namespace: 'http://schema.openflightmaps.org/0.1/OFMX-Snapshot.xsd',
+      xsd: Pathname(__dir__).join('..', '..', 'schemas', 'ofmx', '0.1', 'OFMX-Snapshot.xsd'),
       root: 'OFMX-Snapshot'
     }
   }.freeze

data/lib/aixm/document.rb

@@ -61,6 +61,10 @@ module AIXM
     # Compare all ungrouped obstacles and create new obstacle groups whose
     # members are located within +max_distance+ pairwise.
     #
+    # @note OFMX requires every obstacle, even single ones, to be part of an
+    #   obstacle group which has a region assigned. For this to work, you must
+    #   assure every obstacle has a region assigned when using this method.
+    #
     # @param max_distance [AIXM::D] max distance between obstacle group member
     #   pairs (default: 1 NM)
     # @return [Integer] number of obstacle groups added

data/lib/aixm/feature/airspace.rb

@@ -145,6 +145,7 @@ module AIXM
         builder.tag!(as, ({ region: (region if AIXM.ofmx?) }.compact)) do |tag|
           tag.codeType(TYPES.key(type).to_s)
           tag.codeId(id)
+          tag.txtLocalType(local_type) if AIXM.ofmx? && local_type && local_type != name
         end
       end
       memoize :to_uid
@@ -166,7 +167,7 @@ module AIXM
         builder.comment! "Airspace: [#{TYPES.key(type)}] #{name || :UNNAMED}"
         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.txtLocalType(local_type) if AIXM.aixm? && local_type && local_type != name
           ase.txtName(name) if name
           unless layered?
             ase << layers.first.to_xml.indent(2)

data/lib/aixm/feature/obstacle.rb

@@ -33,9 +33,11 @@ module AIXM
     # See {AIXM::Feature::ObstacleGroup} for how to define physical links
     # between two obstacles (e.g. cables between powerline towers).
     #
-    # Please note: Accuracies (+xy_accuracy+ and +z_accuracy+) set on an
-    # obstacle group are implicitly applied to all obstacles of the group
-    # unless they have their own, different accuracies set.
+    # 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. On the other hand, if the obstacle
+    # group has no +source+ set, it will inherit this value from the first
+    # obstacle in the group.
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Obstacle
     class Obstacle < Feature
@@ -218,6 +220,11 @@ module AIXM
       end
       private :link_type=
 
+      # @return [Boolean] whether part of an obstacle group
+      def grouped?
+        obstacle_group && obstacle_group.obstacles.count > 1
+      end
+
       # @return [Boolean] whether obstacle is linked to another one
       def linked?
         !!linked_to
@@ -225,8 +232,10 @@ module AIXM
 
       # @return [String] UID markup
       def to_uid(as: :ObsUid)
+        obstacle_group = self.obstacle_group || singleton_obstacle_group
         builder = Builder::XmlMarkup.new(indent: 2)
-        builder.tag!(as, { region: (region if AIXM.ofmx?) }.compact) do |tag|
+        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
@@ -235,19 +244,19 @@ module AIXM
 
       # @return [String] AIXM or OFMX markup
       def to_xml(delegate: true)
-        return obstacle_group.to_xml if delegate && obstacle_group && AIXM.ofmx?
+        obstacle_group = 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 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
           if AIXM.ofmx?
             obs.codeType(TYPES.key(type).to_s)
           else
             obs.txtDescrType(TYPES.key(type).to_s)
           end
-          obs.codeGroup(obstacle_group ? 'Y' : 'N') if AIXM.aixm?
+          obs.codeGroup(grouped? ? 'Y' : 'N')
           if AIXM.ofmx?
             obs.codeLgt(lighting ? 'Y' : 'N') unless lighting.nil?
             obs.codeMarking(marking ? 'Y' : 'N') unless marking.nil?
@@ -257,14 +266,13 @@ module AIXM
           obs.txtDescrLgt(lighting_remarks) if lighting_remarks
           obs.txtDescrMarking(marking_remarks) if marking_remarks
           obs.codeDatum('WGE')
-          if accuracy = (xy_accuracy || (obstacle_group&.xy_accuracy if AIXM.aixm?))
-            obs.valGeoAccuracy(accuracy.dist.trim)
-            obs.uomGeoAccuracy(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)
-          if accuracy = (z_accuracy || (obstacle_group&.z_accuracy if AIXM.aixm?))
-            obs.valElevAccuracy(accuracy.to_ft.dist.round)
-            obs.uomElevAccuracy('FT') if AIXM.ofmx?
+          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')
@@ -276,7 +284,7 @@ module AIXM
               obs.valRadius(radius.dist.trim)
               obs.uomRadius(radius.unit.upcase.to_s)
             end
-            if linked?
+            if grouped? && linked?
               obs << linked_to.to_uid(as: :ObsUidLink).indent(2)
               obs.codeLinkType(LINK_TYPES.key(link_type).to_s)
             end
@@ -287,6 +295,14 @@ module AIXM
         end
       end
 
+      private
+
+      # OFMX requires single, ungrouped obstacles to be the only member of a
+      # singleton obstacle group.
+      def singleton_obstacle_group
+        AIXM.obstacle_group(region: region).add_obstacle self
+      end
+
     end
   end
 end

data/lib/aixm/feature/obstacle_group.rb

@@ -6,11 +6,6 @@ module AIXM
     # Groups of obstacles which consist of either linked (e.g. power line
     # towers) or unlinked (e.g. wind turbines) members.
     #
-    # Obstacle group should contain at least two obstacles. However, if the
-    # details of each obstacle of the group are unknown, you may add only one
-    # virtual obstacle to the group and mention the number of real obstacles
-    # in it's remarks.
-    #
     # ===Cheat Sheet in Pseudo Code:
     #   obstacle_group = AIXM.obstacle_group(
     #     source: String or nil        # see remarks below
@@ -35,9 +30,11 @@ module AIXM
     #     link_type: LINK_TYPES
     #   )
     #
-    # Please note: Accuracies (+xy_accuracy+ and +z_accuracy+) set on an
-    # obstacle group are implicitly applied to all obstacles of the group
-    # unless they have their own, different accuracies set.
+    # 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. On the other hand, if the obstacle
+    # group has no +source+ set, it will inherit this value from the first
+    # obstacle in the group.
     #
     # @see https://gitlab.com/openflightmaps/ofmx/wikis/Obstacle
     class ObstacleGroup < Feature
@@ -113,6 +110,7 @@ module AIXM
       def to_uid
         builder = Builder::XmlMarkup.new(indent: 2)
         builder.OgrUid({ region: (region if AIXM.ofmx?) }.compact) do |ogr_uid|
+          ogr_uid.txtName(name)
           ogr_uid.geoLat(obstacles.first.xy.lat(AIXM.schema))
           ogr_uid.geoLong(obstacles.first.xy.long(AIXM.schema))
         end
@@ -126,7 +124,6 @@ module AIXM
           builder.comment! "Obstacle group: #{name}".strip
           builder.Ogr({ source: (source if AIXM.ofmx?) }.compact) do |ogr|
             ogr << to_uid.indent(2)
-            ogr.txtName(name)
             ogr.codeDatum('WGE')
             if xy_accuracy
               ogr.valGeoAccuracy(xy_accuracy.dist.trim)

data/lib/aixm/version.rb

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

data/lib/aixm/xy.rb

@@ -4,6 +4,14 @@ module AIXM
 
   # Geographical coordinates
   #
+  # ===Warning!
+  # Coordinate tuples can be noted in mathematical order (XY = longitude first,
+  # latitude second) or in (more common) geographical order (YX = latitude
+  # first, longitude second). However you sort the attributes, make sure not
+  # to flip them by accident.
+  #
+  # See https://en.wikipedia.org/wiki/Geographic_coordinate_system
+  #
   # ===Recognized notations:
   # * DD - examples: 12.12345678 (north or east), -12.12345678 (south or west)
   # * DMS - examples: 11°22'33.44"N, 1112233.44W,

data/lib/aixm.rb

@@ -36,9 +36,10 @@ require_relative 'aixm/component/service'
 require_relative 'aixm/component/frequency'
 require_relative 'aixm/component/geometry'
 require_relative 'aixm/component/geometry/point'
+require_relative 'aixm/component/geometry/rhumb_line'
 require_relative 'aixm/component/geometry/arc'
-require_relative 'aixm/component/geometry/border'
 require_relative 'aixm/component/geometry/circle'
+require_relative 'aixm/component/geometry/border'
 require_relative 'aixm/component/layer'
 require_relative 'aixm/component/vertical_limit'
 require_relative 'aixm/component/timetable'

data/schemas/ofmx/{0 → 0.1}/OFMX-DataTypes.xsd

@@ -1900,7 +1900,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <xsd:simpleType name="codeIdDesigPtBase">
     <xsd:restriction base="alphanumeric">
       <xsd:minLength value="1"/>
-      <xsd:maxLength value="5"/>
+      <xsd:maxLength value="10"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="codeIdDesigPt">
@@ -3403,7 +3403,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:enumeration value="VFR-RP"/>
       <xsd:enumeration value="VFR-MRP"/>
       <xsd:enumeration value="VFR-ENR"/>
-      <xsd:enumeration value="VFR-GLD"/>
+      <xsd:enumeration value="VFR-GLDR"/>
+      <xsd:enumeration value="VFR-HELI"/>
+      <xsd:enumeration value="TOWN"/>
+      <xsd:enumeration value="MOUNTAIN-TOP"/>
+      <xsd:enumeration value="MOUNTAIN-PASS"/>
       <xsd:enumeration value="OTHER"/>
     </xsd:restriction>
   </xsd:simpleType>
@@ -4436,6 +4440,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
+  <xsd:simpleType name="codeCodingModeBase">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="CONST"/>
+      <xsd:enumeration value="PARA"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="codeCodingMode">
+    <xsd:annotation>
+      <xsd:documentation>A code for coding mode: Constant or Parametrized.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="codeCodingModeBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:simpleType name="dateMonthDayBase">
     <xsd:restriction base="xsd:string">
       <xsd:pattern value="(((0[1-9])|(1[0-9])|(2[0-9]))\-((0[1-9])|10|11|12))|(30\-(01|03|04|05|06|07|08|09|10|11|12))|(31\-(01|03|05|07|08|10|12))|SDLST|EDLST"/>
@@ -4496,6 +4516,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
+  <xsd:simpleType name="lineBase">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="-?((0\d|1[0-7])\d\.\d{8}|180\.0{8}),-?([0-8]\d\.\d{8}|90\.0{8})( -?((0\d|1[0-7])\d\.\d{8}|180\.0{8}),-?([0-8]\d\.\d{8}|90\.0{8}))+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="line">
+    <xsd:annotation>
+      <xsd:documentation>A line or polygon.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="lineBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:simpleType name="bezierCurveBase">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="-?((0\d|1[0-7])\d\.\d{8}|180\.0{8}),-?([0-8]\d\.\d{8}|90\.0{8})(( -?((0\d|1[0-7])\d\.\d{8}|180\.0{8}),-?([0-8]\d\.\d{8}|90\.0{8})){3})+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="bezierCurve">
+    <xsd:annotation>
+      <xsd:documentation>An open or closed Bézier curve.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="bezierCurveBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:simpleType name="noNumberBase">
     <xsd:restriction base="xsd:decimal">
       <xsd:pattern value="\d{1,4}"/>

data/schemas/ofmx/{0 → 0.1}/OFMX-Features.xsd

@@ -1295,11 +1295,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Airspace is requiring for FPL-MSG the use of Unit contact address</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="txtLocalType" type="txtName" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>Local type designator</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="txtName" type="txtName" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Name</xsd:documentation>
@@ -1423,6 +1418,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Coded identifier</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="txtLocalType" type="txtName" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Local type designator</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
     </xsd:sequence>
     <xsd:attribute ref="mid"/>
     <xsd:attribute ref="region" use="required"/>
@@ -1877,6 +1877,26 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Name</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="valElev" type="valDistVer" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Elevation</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="uomElev" type="uomElev" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Unit of measurement [elevation]</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="valTrueBrg" type="valAngleBrg" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>True bearing</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="valMagBrg" type="valAngleBrg" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Magnetic bearing</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="txtRmk" type="txtRmk" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Remark</xsd:documentation>
@@ -2648,6 +2668,56 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Unit of measurement [minimum eye height over threshold]</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="codeRearTakeOffSectorAvbl" type="codeYesNo" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Rear take-off sector available?</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="valRearTakeOffSectorTrueBrg" type="valAngleBrg" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>True bearing of rear take-off sector</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="valRearTakeOffSectorSlopeAngle" type="valAngle" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Rear take-off sector slope angle</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="codeCodingMode" type="codeCodingMode" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Coding mode</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="geoLatIap" type="geoLat" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Initial approach point latitude</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="geoLongIap" type="geoLong" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Initial approach point longitude</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="valAltIap" type="valDistVer" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Initial approach point altitude</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="uomAltIap" type="uomDistVer" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Unit of measurement [initial approach point altitude]</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="bezierSectorExtent" type="bezierCurve" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Longitude</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="bezierSectorCentreLine" type="bezierCurve" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Longitude</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="txtRmk" type="txtRmk" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Remark</xsd:documentation>
@@ -3016,6 +3086,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Width</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="valMaxDim" type="valDistHorz" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Largest overall dimension as defined in ICAO annex 14</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="uomDim" type="uomDistHorz" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Unit of measurement [horizontal dimension]</xsd:documentation>
@@ -5450,11 +5525,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>a version of Obstacle group</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="txtName" type="txtName">
-        <xsd:annotation>
-          <xsd:documentation>Name</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="codeDatum" type="codeDatum">
         <xsd:annotation>
           <xsd:documentation>Datum</xsd:documentation>
@@ -5493,6 +5563,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:documentation>Obstacle group - UID</xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
+      <xsd:element name="txtName" type="txtName">
+        <xsd:annotation>
+          <xsd:documentation>Name</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="geoLat" type="geoLat">
         <xsd:annotation>
           <xsd:documentation>Group reference point latitude</xsd:documentation>
@@ -5517,11 +5592,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>a version of Obstacle</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="OgrUid" type="ObstacleGroupUidType" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>a version of Obstacle group</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="txtName" type="txtName" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Name</xsd:documentation>
@@ -5537,6 +5607,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Type details</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="codeGroup" type="codeYesNo" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Group of obstacles</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="codeLgt" type="codeYesNo" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Lighted</xsd:documentation>
@@ -5562,31 +5637,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Datum</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="valGeoAccuracy" type="valDistHorz" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>Geographical accuracy</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="uomGeoAccuracy" type="uomDistHorz" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>Unit of measurement [geographical accuracy]</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="valElev" type="valDistVer">
         <xsd:annotation>
           <xsd:documentation>Elevation</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="valElevAccuracy" type="valDistVer" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>Elevation accuracy</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="uomElevAccuracy" type="uomElev" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>Unit of measurement [elevation accuracy]</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="valHgt" type="valDistVer" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Height</xsd:documentation>
@@ -5660,6 +5715,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:documentation>Obstacle - UID</xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
+      <xsd:element name="OgrUid" type="ObstacleGroupUidType">
+        <xsd:annotation>
+          <xsd:documentation>a version of Obstacle group</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="geoLat" type="geoLat">
         <xsd:annotation>
           <xsd:documentation>Latitude</xsd:documentation>
@@ -5672,7 +5732,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute ref="mid"/>
-    <xsd:attribute ref="region" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="OilType">
     <xsd:annotation>
@@ -8601,12 +8660,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             </xsd:element>
             <xsd:element name="dateValidWef" type="dateMonthDay">
               <xsd:annotation>
-                <xsd:documentation>Yearly start date</xsd:documentation>
+                <xsd:documentation>(Yearly) start date</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="dateYearValidWef" type="dateYear" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Year of start date</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="dateValidTil" type="dateMonthDay">
               <xsd:annotation>
-                <xsd:documentation>Yearly end date</xsd:documentation>
+                <xsd:documentation>(Yearly) end date</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="dateYearValidTil" type="dateYear" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Year of end date</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="codeDay" type="codeDay">
@@ -8693,12 +8762,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             </xsd:element>
             <xsd:element name="dateValidWef" type="dateMonthDay">
               <xsd:annotation>
-                <xsd:documentation>Yearly start date</xsd:documentation>
+                <xsd:documentation>(Yearly) start date</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="dateYearValidWef" type="dateYear" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Year of start date</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="dateValidTil" type="dateMonthDay">
               <xsd:annotation>
-                <xsd:documentation>Yearly end date</xsd:documentation>
+                <xsd:documentation>(Yearly) end date</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="dateYearValidTil" type="dateYear" minOccurs="0">
+              <xsd:annotation>
+                <xsd:documentation>Year of end date</xsd:documentation>
               </xsd:annotation>
             </xsd:element>
             <xsd:element name="codeDay" type="codeDay">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Sven Schwyn
@@ -30,7 +30,7 @@ cert_chain:
   1+2Y1+i+4jd1B7qxIgOLxQTNIJiwE0sqU1itFfuesfgUACS7M0IV9u9Bp4hBGNEw
   5JcY2h7owdMxXIvgk1oakgldFJc=
   -----END CERTIFICATE-----
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -231,6 +231,7 @@ files:
 - lib/aixm/component/geometry/border.rb
 - lib/aixm/component/geometry/circle.rb
 - lib/aixm/component/geometry/point.rb
+- lib/aixm/component/geometry/rhumb_line.rb
 - lib/aixm/component/helipad.rb
 - lib/aixm/component/layer.rb
 - lib/aixm/component/lighting.rb
@@ -274,11 +275,11 @@ files:
 - schemas/aixm/4.5/AIXM-DataTypes.xsd
 - schemas/aixm/4.5/AIXM-Features.xsd
 - schemas/aixm/4.5/AIXM-Snapshot.xsd
-- schemas/ofmx/0/OFMX-CSV-Obstacle.json
-- schemas/ofmx/0/OFMX-CSV.json
-- schemas/ofmx/0/OFMX-DataTypes.xsd
-- schemas/ofmx/0/OFMX-Features.xsd
-- schemas/ofmx/0/OFMX-Snapshot.xsd
+- schemas/ofmx/0.1/OFMX-CSV-Obstacle.json
+- schemas/ofmx/0.1/OFMX-CSV.json
+- schemas/ofmx/0.1/OFMX-DataTypes.xsd
+- schemas/ofmx/0.1/OFMX-Features.xsd
+- schemas/ofmx/0.1/OFMX-Snapshot.xsd
 homepage: https://github.com/svoop/aixm
 licenses:
 - MIT
@@ -310,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information