aixm 0.3.7 → 1.0.0

data/lib/aixm/shortcuts.rb

@@ -1,48 +1,11 @@
-module AIXM
+using AIXM::Refinements
 
-  # List of shorthand names and their corresponding AIXM classes
-  CLASSES = {
-    document: Document,
-    xy: XY,
-    z: Z,
-    d: D,
-    f: F,
-    a: A,
-    w: W,
-    p: P,
-    address: Feature::Address,
-    organisation: Feature::Organisation,
-    unit: Feature::Unit,
-    service: Feature::Service,
-    frequency: Component::Frequency,
-    airport: Feature::Airport,
-    runway: Component::Runway,
-    fato: Component::FATO,
-    helipad: Component::Helipad,
-    surface: Component::Surface,
-    lighting: Component::Lighting,
-    airspace: Feature::Airspace,
-    layer: Component::Layer,
-    geometry: Component::Geometry,
-    vertical_limits: Component::VerticalLimits,
-    arc: Component::Geometry::Arc,
-    border: Component::Geometry::Border,
-    circle: Component::Geometry::Circle,
-    point: Component::Geometry::Point,
-    dme: Feature::NavigationalAid::DME,
-    designated_point: Feature::NavigationalAid::DesignatedPoint,
-    marker: Feature::NavigationalAid::Marker,
-    tacan: Feature::NavigationalAid::TACAN,
-    ndb: Feature::NavigationalAid::NDB,
-    vor: Feature::NavigationalAid::VOR,
-    obstacle: Feature::Obstacle,
-    obstacle_group: Feature::ObstacleGroup,
-    timetable: Component::Timetable
-  }.freeze
+module AIXM
 
-  CLASSES.each do |element, klass|
-    define_singleton_method(element) do |*arguments|
-      klass.new(*arguments)
+  # Shortcut initializers
+  CLASSES.each do |element, class_name|
+    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.7".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,
@@ -19,7 +27,7 @@ module AIXM
   # * +AIXM::SEC+ - characters recognized as DMS second symbols
   # * +AIXM::DMS_RE+ - regular expression to match DMS coordinate notations
   #
-  # @see https://github.com/openflightmaps/ofmx/wiki/Coordinates
+  # @see https://gitlab.com/openflightmaps/ofmx/wikis/Coordinates
   class XY
     EARTH_RADIUS = 6_371_008.8
 

data/lib/aixm.rb

@@ -1,18 +1,28 @@
-require 'builder'
 require 'ostruct'
 require 'securerandom'
-require 'nokogiri'
 require 'forwardable'
 require 'digest'
 require 'time'
 require 'pathname'
+require 'optparse'
+
+require 'builder'
+require 'nokogiri'
+require 'dry/inflector'
+
+require_relative 'aixm/object'
 
 require_relative 'aixm/version'
-require_relative 'aixm/constants'
 require_relative 'aixm/refinements'
 require_relative 'aixm/config'
 require_relative 'aixm/errors'
 
+require_relative 'aixm/classes'
+require_relative 'aixm/constants'
+require_relative 'aixm/memoize'
+require_relative 'aixm/association'
+require_relative 'aixm/payload_hash'
+
 require_relative 'aixm/document'
 require_relative 'aixm/xy'
 require_relative 'aixm/z'
@@ -22,15 +32,16 @@ require_relative 'aixm/a'
 require_relative 'aixm/w'
 require_relative 'aixm/p'
 
-require_relative 'aixm/component'
+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_limits'
+require_relative 'aixm/component/vertical_limit'
 require_relative 'aixm/component/timetable'
 require_relative 'aixm/component/runway'
 require_relative 'aixm/component/fato'
@@ -42,7 +53,6 @@ require_relative 'aixm/feature'
 require_relative 'aixm/feature/address'
 require_relative 'aixm/feature/organisation'
 require_relative 'aixm/feature/unit'
-require_relative 'aixm/feature/service'
 require_relative 'aixm/feature/airspace'
 require_relative 'aixm/feature/airport'
 require_relative 'aixm/feature/navigational_aid'
@@ -56,3 +66,4 @@ require_relative 'aixm/feature/obstacle'
 require_relative 'aixm/feature/obstacle_group'
 
 require_relative 'aixm/shortcuts'
+require_relative 'aixm/executables'

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}"/>