aixm 0.3.0 → 0.3.1

data/lib/aixm/feature/unit.rb

@@ -9,7 +9,6 @@ module AIXM
     # ===Cheat Sheet in Pseudo Code:
     #   unit = AIXM.unit(
     #     source: String or nil
-    #     region: String or nil (falls back to +AIXM.config.region+)
     #     organisation: AIXM.organisation
     #     name: String
     #     type: TYPES
@@ -58,8 +57,8 @@ module AIXM
       # @return [String, nil] free text remarks
       attr_reader :remarks
 
-      def initialize(source: nil, region: nil, organisation:, name:, type:, class:)
-        super(source: source, region: region)
+      def initialize(source: nil, organisation:, name:, type:, class:)
+        super(source: source)
         self.organisation, self.name, self.type = organisation, name, type
         self.class = binding.local_variable_get(:class)
         @services = []
@@ -123,7 +122,7 @@ module AIXM
       # @return [String] UID markup
       def to_uid
         builder = Builder::XmlMarkup.new(indent: 2)
-        builder.UniUid({ region: (region if AIXM.ofmx?) }.compact) do |uni_uid|
+        builder.UniUid do |uni_uid|
           uni_uid.txtName(name)
         end
       end

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/schemas/ofmx/0/OFMX-CSV-Obstacle.json

@@ -0,0 +1,209 @@
+{
+  "fields": [
+    {
+      "name": "codeId",
+      "type": "integer",
+      "constraints": {
+        "required": true,
+        "unique": true,
+        "minimum": 1
+      }
+    },
+    {
+      "name": "codeType",
+      "type": "string",
+      "constraints": {
+        "required": true,
+        "enum": [
+          "ANTENNA",
+          "BUILDING",
+          "CHIMNEY",
+          "CRANE",
+          "MAST",
+          "TOWER",
+          "TREE",
+          "WINDTURBINE",
+          "OTHER"
+        ]
+      }
+    },
+    {
+      "name": "txtName",
+      "type": "string",
+      "constraints": {
+        "pattern": "[A-Z]*"
+      }
+    },
+    {
+      "name": "codeLgt",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "Y",
+          "N"
+        ]
+      }
+    },
+    {
+      "name": "codeMarking",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "Y",
+          "N"
+        ]
+      }
+    },
+    {
+      "name": "txtDescrLgt",
+      "type": "string"
+    },
+    {
+      "name": "txtDescrMarking",
+      "type": "string"
+    },
+    {
+      "name": "geoLat",
+      "type": "string",
+      "constraints": {
+        "required": true,
+        "pattern": "(([0-8][0-9](\\.\\d{1,8}){0,1}(N|S))|(90(\\.0{1,8}){0,1}(N|S)))"
+      }
+    },
+    {
+      "name": "geoLong",
+      "type": "string",
+      "constraints": {
+        "required": true,
+        "pattern": "((((0[0-9])|(1[0-7]))[0-9](\\.\\d{1,8}){0,1}(E|W))|(180(\\.0{1,8}){0,1}(E|W)))"
+      }
+    },
+    {
+      "name": "valGeoAccuracy",
+      "type": "integer",
+      "constraints": {
+        "minimum": 0
+      }
+    },
+    {
+      "name": "uomGeoAccuracy",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "FT",
+          "KM",
+          "M",
+          "NM"
+        ]
+      }
+    },
+    {
+      "name": "valElev",
+      "type": "integer",
+      "constraints": {
+        "required": true
+      }
+    },
+    {
+      "name": "valElevAccuracy",
+      "type": "integer",
+      "constraints": {
+        "minimum": 0
+      }
+    },
+    {
+      "name": "valHgt",
+      "type": "integer",
+      "constraints": {
+        "minimum": 1
+      }
+    },
+    {
+      "name": "codeHgtAccuracy",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "Y",
+          "N"
+        ]
+      }
+    },
+    {
+      "name": "uomDistVer",
+      "type": "string",
+      "constraints": {
+        "required": true,
+        "enum": [
+          "FT",
+          "M"
+        ]
+      }
+    },
+    {
+      "name": "valRadius",
+      "type": "integer",
+      "constraints": {
+        "minimum": 1
+      }
+    },
+    {
+      "name": "uomRadius",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "FT",
+          "KM",
+          "M",
+          "NM"
+        ]
+      }
+    },
+    {
+      "name": "codeGroupId",
+      "type": "string",
+      "constraints": {
+        "pattern": "(\\d+|[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12})?"
+      }
+    },
+    {
+      "name": "txtGroupName",
+      "type": "string"
+    },
+    {
+      "name": "codeLinkedToId",
+      "type": "integer"
+    },
+    {
+      "name": "codeLinkType",
+      "type": "string",
+      "constraints": {
+        "enum": [
+          "CABLE",
+          "SOLID",
+          "OTHER"
+        ]
+      }
+    },
+    {
+      "name": "datetimeValidWef",
+      "type": "string",
+      "format": "datetime"
+    },
+    {
+      "name": "datetimeValidTil",
+      "type": "string",
+      "format": "datetime"
+    },
+    {
+      "name": "txtRmk",
+      "type": "string"
+    },
+    {
+      "name": "source",
+      "type": "string",
+      "constraints": {
+        "required": true
+      }
+    }
+  ]
+}

data/schemas/ofmx/0/OFMX-CSV.json

@@ -0,0 +1,12 @@
+{
+  "dialect": {
+    "csvddfVersion": 1.2,
+    "header": true,
+    "caseSensitiveHeader": true,
+    "delimiter": ",",
+    "quoteChar": "\"",
+    "doubleQuote": true,
+    "lineTerminator": "\r\n",
+    "skipInitialSpace": false
+  }
+}

data/schemas/ofmx/0/OFMX-DataTypes.xsd

@@ -2,7 +2,7 @@
 <!--
 ********************************************************************************
 
-OFMX 0.1.0 - open flightmaps exchange format
+OFMX XML 0.1.0 - open flightmaps exchange format
 
 This is a fork of AIXM 4.5 to accomodate extensions and backports for
 open flightmaps.
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xsd:annotation>
-    <xsd:documentation>Version: 4.5-1</xsd:documentation>
+    <xsd:documentation>Version: 0.1.0</xsd:documentation>
   </xsd:annotation>
   <!-- OFMX predefined simple data types -->
   <xsd:simpleType name="alpha">
@@ -87,7 +87,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:documentation>Reference to the source AIP document.</xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[A-Z]{2,4}\|(GEN|ENR|AD|AIRAC)\|.{3,}\|\d+\|\d+"/>
+      <xsd:pattern value="[A-Z]{2,4}\|(GEN|ENR|AD|AIRAC)\|.{3,}\|[\d-]+\|\d+"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:simpleType name="codeAcftEngineNoBase">
@@ -284,6 +284,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:enumeration value="TR4"/>
       <xsd:enumeration value="TS-1"/>
       <xsd:enumeration value="RT"/>
+      <xsd:enumeration value="DIESEL"/>
+      <xsd:enumeration value="OCT100"/>
       <xsd:enumeration value="ALL"/>
       <xsd:enumeration value="OTHER"/>
     </xsd:restriction>
@@ -1848,12 +1850,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <xsd:simpleType name="codeIdAdHpBase">
     <xsd:restriction base="alphanumeric">
       <xsd:minLength value="3"/>
-      <xsd:maxLength value="6"/>
+      <xsd:pattern value="([A-Z]{3,4}|[A-Z]{2}[A-Z\d]{4,})"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="codeIdAdHp">
     <xsd:annotation>
-      <xsd:documentation>A coded identifier for an Aerodrome/Heliport.   The rules according to which this identifier should be formed are as follows:  1) If the AD/HP has an ICAO four letter location indicator, this will become the CODE_ID for the Aerodrome/Heliport;  2) If the AD/HP does not have an ICAO four letter location indicator but has an IATA three letter code, then this will become the CODE_ID for the Aerodrome/Heliport;  3) If the AD/HP does not have either an ICAO four letter location indicator or an IATA three letter code, an artificially generated code will be used. This will contain a group of letters and a number. The group of letters could be  the 2 letter code of the State responsible for the Aerodrome/Heliport (or one of these, if there are more than one, like ED and ET for Germany) and the number could  be an integer between 0001 and 9999. </xsd:documentation>
+      <xsd:documentation>A coded identifier for an Aerodrome/Heliport.   The rules according to which this identifier should be formed are as follows:  1) If the AD/HP has an ICAO four letter location indicator, this will become the CODE_ID for the Aerodrome/Heliport;  2) If the AD/HP does not have an ICAO four letter location indicator but has an IATA three letter code, then this will become the CODE_ID for the Aerodrome/Heliport;  3) If the AD/HP does not have either an ICAO four letter location indicator or an IATA three letter code, an artificially generated code will be used. This will contain a group of letters and a number. The group of letters could be the 2 letter code of the State responsible for the Aerodrome/Heliport (or one of these, if there are more than one, like ED and ET for Germany) and the number could  be an integer between 0001 and 9999;  4) As an alternative to 3, it is also possible use the 2 letter code of the State responsible for the Aerodrome/Heliport and add at least four letters and/or numbers to it.</xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
       <xsd:extension base="codeIdAdHpBase">
@@ -3675,6 +3677,46 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
+  <xsd:simpleType name="codeTypeObstacleBase">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="ANTENNA"/>
+      <xsd:enumeration value="BUILDING"/>
+      <xsd:enumeration value="CHIMNEY"/>
+      <xsd:enumeration value="CRANE"/>
+      <xsd:enumeration value="MAST"/>
+      <xsd:enumeration value="TOWER"/>
+      <xsd:enumeration value="TREE"/>
+      <xsd:enumeration value="WINDTURBINE"/>
+      <xsd:enumeration value="OTHER"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="codeTypeObstacle">
+    <xsd:annotation>
+      <xsd:documentation>A code indicating the type of the obstacle.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="codeTypeObstacleBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:simpleType name="codeTypeObstacleLinkBase">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="CABLE"/>
+      <xsd:enumeration value="SOLID"/>
+      <xsd:enumeration value="OTHER"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="codeTypeObstacleLink">
+    <xsd:annotation>
+      <xsd:documentation>A code indicating the type of link between two obstacles.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="codeTypeObstacleLinkBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:simpleType name="codeTypeOpsRwyBase">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="APCH"/>
@@ -4326,6 +4368,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <xsd:simpleType name="codeTypeLabelMarkerBase">
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="TEXT"/>
+      <xsd:enumeration value="FIS-INFO"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="codeTypeLabelMarker">
@@ -4588,6 +4631,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
+  <xsd:simpleType name="txtGroupNameBase">
+    <xsd:restriction base="character2">
+      <xsd:minLength value="1"/>
+      <xsd:maxLength value="100"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="txtGroupName">
+    <xsd:annotation>
+      <xsd:documentation>Name or short description of an obstacle group.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="txtGroupNameBase">
+        <xsd:attributeGroup ref="Changes"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:simpleType name="txtNameBase">
     <xsd:restriction base="character3">
       <xsd:minLength value="1"/>

data/schemas/ofmx/0/OFMX-Features.xsd

@@ -2,7 +2,7 @@
 <!--
 ********************************************************************************
 
-OFMX 0.1.0 - open flightmaps exchange format
+OFMX XML 0.1.0 - open flightmaps exchange format
 
 This is a fork of AIXM 4.5 to accomodate extensions and backports for
 open flightmaps.
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <xsd:annotation>
-    <xsd:documentation>Version: 4.5-1</xsd:documentation>
+    <xsd:documentation>Version: 0.1.0</xsd:documentation>
   </xsd:annotation>
   <xsd:include schemaLocation="OFMX-DataTypes.xsd"/>
   <xsd:attribute name="mid" type="xsd:string">
@@ -45,11 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <xsd:documentation>Optional, could be used to exchange generated UID values</xsd:documentation>
     </xsd:annotation>
   </xsd:attribute>
-  <xsd:attribute name="region" type="codeRegion">
-    <xsd:annotation>
-      <xsd:documentation>Region this feature belongs to</xsd:documentation>
-    </xsd:annotation>
-  </xsd:attribute>
   <xsd:attribute name="source" type="codeSource">
     <xsd:annotation>
       <xsd:documentation>Reference to the source AIP document</xsd:documentation>
@@ -514,7 +509,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="AerodromeHeliportUsageType">
@@ -1392,7 +1386,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute ref="source"/>
-    <xsd:attribute name="classLayers" type="counter"/>
   </xsd:complexType>
   <xsd:complexType name="AirspaceUidType">
     <xsd:annotation>
@@ -1410,7 +1403,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="ApronGeometryPointType">
@@ -1886,7 +1878,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="DirectFlightClassType">
@@ -2167,7 +2158,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="DmeUsageLimitationType">
@@ -4498,7 +4488,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="MlsAzimuthType">
@@ -5270,7 +5259,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="NdbUsageLimitationType">
@@ -5402,21 +5390,31 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Name</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="txtDescrType" type="txtDescr">
+      <xsd:element name="codeType" type="codeTypeObstacle">
         <xsd:annotation>
           <xsd:documentation>Type</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="codeGroup" type="codeYesNo">
+      <xsd:element name="txtDescrType" type="txtDescr" minOccurs="0">
+        <xsd:annotation>
+          <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">
+      <xsd:element name="codeLgt" type="codeYesNo" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Lighted</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="codeMarking" type="codeYesNo" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Marked</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="txtDescrLgt" type="txtDescr" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Type and colour of lighting</xsd:documentation>
@@ -5457,6 +5455,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Height</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="codeHgtAccuracy" type="codeYesNo" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Height accuracy</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="valGeoidUndulation" type="valDistVer" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Geoid undulation</xsd:documentation>
@@ -5467,6 +5470,46 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Unit of measurement [vertical distance]</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="valRadius" type="valDistHorz">
+        <xsd:annotation>
+          <xsd:documentation>Radius</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="uomRadius" type="uomDistHorz">
+        <xsd:annotation>
+          <xsd:documentation>Unit of measurement [radius]</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="codeGroupId" type="uuid" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Group identifier (identical on all group members)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="txtGroupName" type="txtGroupName" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Group name or short description</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ObsUidLink" type="ObstacleUidType" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Another obstacle this one is linked to.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="codeLinkType" type="codeTypeObstacleLink" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Link type</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="datetimeValidWef" type="xsd:dateTime" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Obstacle valid after this date and time.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="datetimeValidTil" type="xsd:dateTime" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Obstacle valid until this date and time.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="valCrc" type="valHex" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Cyclic redundancy check</xsd:documentation>
@@ -5483,6 +5526,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="ObstacleUidType">
     <xsd:annotation>
@@ -5666,7 +5710,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="OxygenType">
@@ -7138,6 +7181,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="ServiceUidType">
     <xsd:annotation>
@@ -7949,6 +7993,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Channel</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="valGhostFreq" type="valFreq" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Frequency of virtual VHF facility</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="uomGhostFreq" type="uomFreq" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Unit of measurement [frequency of virtual VHF facility]</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
       <xsd:element name="valDeclination" type="valAngleMagVar" minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>Station declination</xsd:documentation>
@@ -8048,7 +8102,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="TacanUsageLimitationType">
@@ -9228,7 +9281,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="VorLimitationType">
@@ -9477,7 +9529,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:complexType name="VorUsageLimitationType">
@@ -9546,7 +9597,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Datum</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="ZoomLevel" minOccurs="1" maxOccurs="7">
+      <xsd:element name="ZoomLevel" minOccurs="1" maxOccurs="unbounded">
         <xsd:annotation>
           <xsd:documentation>Divergent position and label value based on the zoom level.</xsd:documentation>
         </xsd:annotation>
@@ -9593,7 +9644,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:annotation>
       </xsd:element>
     </xsd:sequence>
-    <xsd:attribute ref="region" use="required"/>
     <xsd:attribute ref="mid"/>
   </xsd:complexType>
   <xsd:group name="SectorOfCircle">