aixm 0.3.8 → 0.3.10

data/lib/aixm/memoize.rb

@@ -0,0 +1,89 @@
+module AIXM
+
+  # Memoize the return value of a specific method across multiple instances for
+  # the duration of a block.
+  #
+  # The method signature is taken into account, therefore calls of the same
+  # method with different positional and/or keyword arguments are cached
+  # independently. On the other hand, when calling the method with a block,
+  # no memoization is performed at all.
+  #
+  # @example
+  #   class Either
+  #     include AIXM::Memoize
+  #
+  #     def either(argument=nil, keyword: nil, &block)
+  #       $entropy || argument || keyword || (block.call if block)
+  #     end
+  #     memoize :either
+  #   end
+  #
+  #   a, b, c = Either.new, Either.new, Either.new
+  #
+  #   # No memoization before the block
+  #   $entropy = nil
+  #   a.either(1)                 # => 1
+  #   b.either(keyword: 2)        # => 2
+  #   c.either { 3 }              # => 3
+  #   $entropy = :not_nil
+  #   a.either(1)                 # => :not_nil
+  #   b.either(keyword: 2)        # => :not_nil
+  #   c.either { 3 }              # => :not_nil
+  #
+  #   # Memoization inside the block
+  #   AIXM::Memoize.method :either do
+  #     $entropy = nil
+  #     a.either(1)                 # => 1
+  #     b.either(keyword: 2)        # => 2
+  #     c.either { 3 }              # => 3
+  #     $entropy = :not_nil
+  #     a.either(1)                 # => 1          (memoized)
+  #     b.either(keyword: 2)        # => 2          (memoized)
+  #     c.either { 3 }              # => :not_nil   (cannot be memoized)
+  #   end
+  #
+  #   # No memoization after the block
+  #   $entropy = nil
+  #   a.either(1)                 # => 1
+  #   $entropy = :not_nil
+  #   a.either(1)                 # => :not_nil
+  module Memoize
+    module ClassMethods
+      def memoize(method)
+        unmemoized_method = :"unmemoized_#{method}"
+        alias_method unmemoized_method, method
+        define_method method do |*args, **kargs, &block|
+          if block || !AIXM::Memoize.cache
+            send(unmemoized_method, *args, **kargs, &block)
+          else
+            id = object_id.hash ^ args.hash ^ kargs.hash
+            if AIXM::Memoize.cache.has_key?(id)
+              AIXM::Memoize.cache[id]
+            else
+              AIXM::Memoize.cache[id] = send(unmemoized_method, *args, **kargs, &block)
+            end
+          end
+        end
+      end
+    end
+
+    class << self
+      def included(base)
+        base.extend(ClassMethods)
+        @cache = {}
+      end
+
+      def method(method)
+        @method = method
+        @cache[@method] = {}
+        yield
+      ensure
+        @method = nil
+      end
+
+      def cache
+        (@cache[@method] ||= {}) if @method
+      end
+    end
+  end
+end

data/lib/aixm/object.rb

@@ -0,0 +1,9 @@
+# This monkey patch is necessary because some classes have to introduce
+# attributes named +class+ (e.g. for airspace classes as described by
+# +AIXM::Component::Layer+) which clash with this core method. Other parts
+# such as +AIXM::Association+ need the original implementation for introspection
+# which is why this alias +Object#__class__+ makes it globally and consistently
+# available again.
+class Object
+  alias_method :__class__, :class
+end

data/lib/aixm/payload_hash.rb

@@ -0,0 +1,114 @@
+using AIXM::Refinements
+
+module AIXM
+
+  # Calculate OFMX-compliant payload hashes.
+  #
+  # @example with XML fragment string
+  #   xml = '<xml><a></a></xml>'
+  #   AIXM::PayloadHash.new(xml).to_uuid
+  #
+  # @example with Nokogiri fragment
+  #   document = File.open("file.xml") { Nokogiri::XML(_1) }
+  #   AIXM::PayloadHash.new(document).to_uuid
+  #
+  # @see https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid
+  class PayloadHash
+    IGNORED_ATTRIBUTES = %w(mid source).freeze
+
+    # @param fragment [Nokogiri::XML::DocumentFragment, Nokogiri::XML::Element, String] XML fragment
+    def initialize(fragment)
+      @fragment = case fragment
+        when Nokogiri::XML::DocumentFragment then fragment
+        when Nokogiri::XML::Element, String then Nokogiri::XML.fragment(fragment)
+        else fail ArgumentError
+      end
+    end
+
+    # @return [String] UUIDv3
+    def to_uuid
+      uuid_for payload_array
+    end
+
+    private
+
+    def payload_array
+      @fragment.css('*').each_with_object([]) do |element, array|
+        array << element.name.sub(/\A(\w+Uid)\w+/, '\1')   # remove name extension
+        element.attributes.sort.each do |name, attribute|
+          array.push(name, attribute.value) unless IGNORED_ATTRIBUTES.include? name
+        end
+        array << element.child.text if element.children.one? && element.child.text?
+        array << '' if element.children.none?
+      end
+    end
+
+    def uuid_for(array)
+      ::Digest::MD5.hexdigest(array.flatten.map(&:to_s).join('|')).unpack("a8a4a4a4a12").join("-")
+    end
+
+    # Insert OFMX-compliant payload hashes as mid attributes into an XML
+    # document.
+    #
+    # Keep in mind: If you pass a Nokogiri::XML::Document, the mid attributes
+    # are added into this document. In order to leave the original document
+    # untouched, you have to `dup` it.
+    #
+    # @example with XML string
+    #   string = '<OFMX-Snapshot><Ahp><AhpUid></AhpUid></Ahp></OFMX-Snapshot>'
+    #   converter = AIXM::PayloadHash::Mid.new(string)
+    #   converter.insert_mid.to_xml   # returns XML as String
+    #
+    # @example with Nokogiri document
+    #   document = File.open("file.ofmx") { Nokogiri::XML(_1) }
+    #   converter = AIXM::PayloadHash::Mid.new(document)
+    #   converter.insert_mid.to_xml   # returns XML as String
+    #   document.to_xml               # returns XML as String as well
+    #
+    # @see https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid
+    class Mid
+
+      # @param document [Nokogiri::XML::Document, String] XML document
+      def initialize(document)
+        @document = case document
+          when Nokogiri::XML::Document then document
+          when String then Nokogiri::XML(document)
+          else fail ArgumentError
+        end
+      end
+
+      # Insert or update mid attributes on all *Uid elements
+      #
+      # @return [self]
+      def insert_mid
+        uid_elements.each do |element|
+          element['mid'] = AIXM::PayloadHash.new(element).to_uuid
+        end
+        self
+      end
+
+      # Check mid attributes on all *Uid elements
+      #
+      # @return [Array<String>] array of errors found
+      def check_mid
+        uid_elements.each_with_object([]) do |element, errors|
+          unless element['mid'] == (uuid = AIXM::PayloadHash.new(element).to_uuid)
+            errors << "#{element.line}: ERROR: Element '#{element.name}': mid should be #{uuid}"
+          end
+        end
+      end
+
+      # @return [String] XML document as XML string
+      def to_xml
+        @document.to_xml
+      end
+
+      private
+
+      def uid_elements
+        @document.xpath('//*[contains(local-name(), "Uid")]')
+      end
+    end
+  end
+
+end

data/lib/aixm/refinements.rb

@@ -30,22 +30,6 @@ module AIXM
       end
     end
 
-    # @!method to_uuid
-    #   Builds a UUID version 3 digest from the Array payload.
-    #
-    #   @example
-    #     ['foo', :bar, nil, [123]].to_uuid
-    #     # => "a68e9aae-81ef-c6f1-d954-2eefe2820c50"
-    #
-    #   @note This is a refinement for +Array+
-    #   @return [String] UUID version 3
-    refine Array do
-      def to_uuid
-        ::Digest::MD5.hexdigest(flatten.map(&:to_s).join('|')).unpack("a8a4a4a4a12").join("-")
-      end
-    end
-
-
     # @!method to_dms(padding=3)
     #   Convert DD angle to DMS with the degrees zero padded to +padding+
     #   length.
@@ -138,8 +122,8 @@ module AIXM
     #   Same as +Object#then+ but only applied if the condition is true.
     #
     #   @example
-    #     "foobar".then_if(false) { |s| s.gsub(/o/, 'i') }   # => "foobar"
-    #     "foobar".then_if(true) { |s| s.gsub(/o/, 'i') }    # => "fiibar"
+    #     "foobar".then_if(false) { _1.gsub(/o/, 'i') }   # => "foobar"
+    #     "foobar".then_if(true) { _1.gsub(/o/, 'i') }    # => "fiibar"
     #
     #   @note This is a refinement for +Object+
     #   @return [Object]
@@ -162,83 +146,52 @@ module AIXM
       end
     end
 
-    # @!method indent(number)
-    #   Indent every line of a string with +number+ spaces.
+    # @!method to_class
+    #   Convert string to class
     #
     #   @example
-    #     "foo\nbar".indent(2)
-    #     # => "  foo\n  bar"
+    #     "AIXM::Feature::NavigationalAid".to_class
+    #     # => AIXM::Feature::NavigationalAid
     #
     #   @note This is a refinement for +String+
-    #   @param number [Integer] number of spaces
-    #   @return [String] line indended string
     refine String do
-      def indent(number)
-        whitespace = ' ' * number
-        gsub(/^/, whitespace)
+      def to_class
+        Object.const_get(self)
       end
     end
 
-    # @!method payload_hash(region:, element:)
-    #   Calculate the UUIDv3 hash of an AIXM/OFMX XML string.
+    # @!method inflect
+    #   Apply inflections from the +dry-inflector+ gem
     #
-    #   A word of warning: This is a minimalistic implementation for the AIXM
-    #   gem and won't work unless the following conditions are met:
-    #   * the XML string must be AIXM/OFMX
-    #   * the XML string must be valid
-    #   * the XML string must be pretty-printed
-    #
-    #   @example from https://github.com/openflightmaps/ofmx/wiki/Functions
-    #     xml.payload_hash(region: 'LF', element: 'Ser')
-    #     # => "269b1f18-cabe-3c9e-1d71-48a7414a4cb9"
+    #   @example
+    #     s = "AIXM::Feature::NavigationalAid"
+    #     s.inflect(:demodulize, :tableize, :pluralize)
+    #     # => "navigational_aids"
     #
+    #   @see https://www.rubydoc.info/gems/dry-inflector
     #   @note This is a refinement for +String+
-    #   @param region [String] OFMX region (e.g. "LF")
-    #   @param element [String] tag to calculate the payload hash for (default:
-    #     first element in the string)
-    #   @return [String] UUIDv3
-    #   @raise [ArgumentError] if the given element is not found or no element
-    #     at all
     refine String do
-      def payload_hash(region:, element: nil)
-        element = $1 if element.nil? && match(/<([^?].*?)[\s>]/)
-        fail(ArgumentError, "no element found") unless element
-        fail(ArgumentError, "element `#{element}' not found") unless match? /<#{element}[\s>]/
-        gsub(%r((?:mid|source)="[^"]*"), '').   # remove existing mid and source attributes
-          sub(%r(\A.*?(?=<#{element}))m, '').   # remove everything before first <element>
-          sub(%r(</#{element}>.*\z)m, '').   # remove everything after and including first </element>
-          sub(%r(\A(<\w+Uid)\w+), '\1').   # remove Uid name extension
-          scan(%r(<([\w-]+)([^>]*)>([^<]*))).each_with_object([region.upcase]) do |(e, a, t), m|
-            m << e << a.scan(%r(([\w-]+)="([^"]*)")).sort.flatten << t
-          end.
-          flatten.
-          keep_if { |s| s.match?(/[^[:space:]]/m) }.
-          compact.
-          to_uuid
+      def inflect(*inflections)
+        inflections.inject(self) do |memo, inflection|
+          AIXM.config.inflector.send(inflection, memo)
+        end
       end
     end
 
-    # @!method insert_payload_hash(region:, element:)
-    #   Calculate the UUIDv3 hash of an AIXM/OFMX XML string and insert it into
-    #   the AIXM/OFMX XML string as an mid attribute.
+    # @!method indent(number)
+    #   Indent every line of a string with +number+ spaces.
     #
-    #   If the region is explicitly set to +nil+ or false, the AIXM/OFMX string
-    #   is returned unchanged.
+    #   @example
+    #     "foo\nbar".indent(2)
+    #     # => "  foo\n  bar"
     #
     #   @note This is a refinement for +String+
-    #   @see String#payload_hash
-    #   @param region [String] OFMX region (e.g. "LF")
-    #   @param element [String] tag to calculate the payload hash for (default:
-    #     first element in the string)
-    #   @return [String] AIXM/OFMX XML with UUIDv3 inserted as mid attribute
-    #   @raise [ArgumentError] if the given element is not found or no element
-    #     at all
+    #   @param number [Integer] number of spaces
+    #   @return [String] line indended string
     refine String do
-      def insert_payload_hash(region:, element: nil)
-        return self unless region
-        element = $1 if element.nil? && match(/<([^?].*?)[\s>]/)
-        hash = payload_hash(region: region, element: element)
-        sub(/(<#{element})([^>]*?)(\s+mid=".*?")?/, %Q(\\1 mid="#{hash}"\\2))
+      def indent(number)
+        whitespace = ' ' * number
+        gsub(/^/, whitespace)
       end
     end
 

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|
+  # Shortcut initializers
+  CLASSES.each do |element, class_name|
     define_singleton_method(element) do |*arguments|
-      klass.new(*arguments)
+      class_name.to_class.new(*arguments)
     end
   end
 

data/lib/aixm/version.rb

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

data/lib/aixm/xy.rb

@@ -19,7 +19,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/schemas/ofmx/0/OFMX-Features.xsd

@@ -45,6 +45,11 @@ 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>
@@ -122,6 +127,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="AerodromeHeliportCollocationUidType">
     <xsd:annotation>
@@ -157,6 +163,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="AerodromeHeliportNavaidUidType">
     <xsd:annotation>
@@ -214,6 +221,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="AerodromeHeliportObstacleUidType">
     <xsd:annotation>
@@ -249,6 +257,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="AerodromeHeliportServiceUidType">
     <xsd:annotation>
@@ -511,6 +520,7 @@ 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="AerodromeHeliportUsageType">
     <xsd:annotation>
@@ -547,6 +557,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:complexType>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="AerodromeHeliportUsageUidType">
     <xsd:annotation>
@@ -637,6 +648,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="AeronauticalGroundLightUidType">
     <xsd:annotation>
@@ -705,6 +717,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="AirspaceAssociationUidType">
     <xsd:annotation>
@@ -761,6 +774,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="AirspaceAssocUidType">
     <xsd:annotation>
@@ -802,6 +816,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="AirspaceAuthorityUidType">
     <xsd:annotation>
@@ -870,6 +885,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:element>
       </xsd:choice>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="AirspaceBorderUidType">
     <xsd:annotation>
@@ -1114,6 +1130,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="AirspaceCorridorUidType">
     <xsd:annotation>
@@ -1171,6 +1188,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="AirspaceDerivedGeometryUidType">
     <xsd:annotation>
@@ -1201,6 +1219,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="AirspaceObstacleUidType">
     <xsd:annotation>
@@ -1236,6 +1255,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="AirspaceServiceUidType">
     <xsd:annotation>
@@ -1405,6 +1425,7 @@ 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="ApronGeometryPointType">
     <xsd:annotation>
@@ -1495,6 +1516,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="ApronGeometryUidType">
     <xsd:annotation>
@@ -1550,6 +1572,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="ApronLightingSystemUidType">
     <xsd:annotation>
@@ -1614,6 +1637,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="ApronUidType">
     <xsd:annotation>
@@ -1672,6 +1696,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="CheckpointUidType">
     <xsd:annotation>
@@ -1719,6 +1744,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="CruisingLevelsColumnUidType">
     <xsd:annotation>
@@ -1769,6 +1795,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="CruisingLevelsTableUidType">
     <xsd:annotation>
@@ -1880,6 +1907,7 @@ 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="DirectFlightClassType">
     <xsd:annotation>
@@ -1980,6 +2008,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="DmeLimitationUidType">
     <xsd:annotation>
@@ -2160,6 +2189,7 @@ 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="DmeUsageLimitationType">
     <xsd:annotation>
@@ -2178,6 +2208,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
       <xsd:element name="UsageLimit" type="NavaidLimitationType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="DmeUsageLimitationUidType">
     <xsd:annotation>
@@ -2213,6 +2244,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="EnrouteRouteUidType">
     <xsd:annotation>
@@ -2293,6 +2325,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="FatoCentreLinePositionUidType">
     <xsd:annotation>
@@ -2366,6 +2399,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="FatoDirectionApproachLightingUidType">
     <xsd:annotation>
@@ -2411,6 +2445,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="FatoDirectionDeclaredDistanceUidType">
     <xsd:annotation>
@@ -2486,6 +2521,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="FatoDirectionObstacleUidType">
     <xsd:annotation>
@@ -2521,6 +2557,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="FatoDirectionStarUidType">
     <xsd:annotation>
@@ -2617,6 +2654,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="FatoDirectionUidType">
     <xsd:annotation>
@@ -2685,6 +2723,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="FatoLightingSystemUidType">
     <xsd:annotation>
@@ -2769,6 +2808,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="FatoOldUidType">
     <xsd:annotation>
@@ -2873,6 +2913,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="FatoProtectionAreaGeometryUidType">
     <xsd:annotation>
@@ -2929,6 +2970,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="FatoProtectionAreaUidType">
     <xsd:annotation>
@@ -3014,6 +3056,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
     </xsd:sequence>
     <xsd:attribute ref="mid"/>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="FatoUidType">
     <xsd:annotation>
@@ -3393,6 +3436,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="FrequencyUidType">
     <xsd:annotation>
@@ -3433,6 +3477,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="FuelUidType">
     <xsd:annotation>
@@ -3533,6 +3578,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="GateStandUidType">
     <xsd:annotation>
@@ -3578,6 +3624,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="GeographicalBorderUidType">
     <xsd:annotation>
@@ -3661,6 +3708,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="GroundServiceAddressUidType">
     <xsd:annotation>
@@ -3721,6 +3769,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="GroundServiceUidType">
     <xsd:annotation>
@@ -3756,6 +3805,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="HoldingProcedureServiceUidType">
     <xsd:annotation>
@@ -3801,6 +3851,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="HoldingProcedureUidType">
     <xsd:annotation>
@@ -4122,6 +4173,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="InstrumentApproachServiceUidType">
     <xsd:annotation>
@@ -4209,6 +4261,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="InstrumentApproachUidType">
     <xsd:annotation>
@@ -4259,6 +4312,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="InstrumentApproachUsageConditionUidType">
     <xsd:annotation>
@@ -4491,6 +4545,7 @@ 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="MlsAzimuthType">
     <xsd:annotation>
@@ -4744,6 +4799,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="MlsUidType">
     <xsd:annotation>
@@ -4796,6 +4852,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="MsaGroupUidType">
     <xsd:annotation>
@@ -4880,6 +4937,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="NavaidAngularReferenceUidType">
     <xsd:annotation>
@@ -4946,6 +5004,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="NavaidDistanceIndicationUidType">
     <xsd:annotation>
@@ -5087,6 +5146,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="NdbLimitationUidType">
     <xsd:annotation>
@@ -5262,6 +5322,7 @@ 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="NdbUsageLimitationType">
     <xsd:annotation>
@@ -5280,6 +5341,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
       <xsd:element name="UsageLimit" type="NavaidLimitationType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="NdbUsageLimitationUidType">
     <xsd:annotation>
@@ -5315,6 +5377,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="NitrogenUidType">
     <xsd:annotation>
@@ -5387,6 +5450,11 @@ 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>
@@ -5425,11 +5493,6 @@ 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>
@@ -5442,6 +5505,7 @@ 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="ObstacleType">
     <xsd:annotation>
@@ -5453,6 +5517,11 @@ 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>
@@ -5468,11 +5537,6 @@ 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>
@@ -5498,11 +5562,31 @@ 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>
@@ -5569,17 +5653,13 @@ 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>
       <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>
@@ -5592,6 +5672,7 @@ 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>
@@ -5614,6 +5695,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="OilUidType">
     <xsd:annotation>
@@ -5654,6 +5736,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="OrganisationAuthorityAddressUidType">
     <xsd:annotation>
@@ -5694,6 +5777,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="OrganisationAuthorityAssociationUidType">
     <xsd:annotation>
@@ -5758,6 +5842,7 @@ 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="OxygenType">
     <xsd:annotation>
@@ -5775,6 +5860,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="OxygenUidType">
     <xsd:annotation>
@@ -5815,6 +5901,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="PassengerFacilityUidType">
     <xsd:annotation>
@@ -6108,6 +6195,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="RouteSegmentServiceUidType">
     <xsd:annotation>
@@ -6308,6 +6396,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="RouteSegmentUidType">
     <xsd:annotation>
@@ -6355,6 +6444,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="RouteSegmentUsageUidType">
     <xsd:annotation>
@@ -6445,6 +6535,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="RunwayCentreLinePositionUidType">
     <xsd:annotation>
@@ -6510,6 +6601,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="RunwayDirectionApproachLightingSystemUidType">
     <xsd:annotation>
@@ -6555,6 +6647,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="RunwayDirectionDeclaredDistanceUidType">
     <xsd:annotation>
@@ -6625,6 +6718,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="RunwayDirectionLightingSystemUidType">
     <xsd:annotation>
@@ -6690,6 +6784,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="RunwayDirectionObstacleUidType">
     <xsd:annotation>
@@ -6725,6 +6820,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="RunwayDirectionStarUidType">
     <xsd:annotation>
@@ -6856,6 +6952,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="RunwayDirectionUidType">
     <xsd:annotation>
@@ -6964,6 +7061,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="RunwayProtectionAreaGeometryUidType">
     <xsd:annotation>
@@ -7020,6 +7118,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="RunwayProtectionAreaUidType">
     <xsd:annotation>
@@ -7123,6 +7222,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="RunwayUidType">
     <xsd:annotation>
@@ -7269,6 +7369,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="SidServiceUidType">
     <xsd:annotation>
@@ -7346,6 +7447,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="SidUidType">
     <xsd:annotation>
@@ -7396,6 +7498,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="SidUsageUidType">
     <xsd:annotation>
@@ -7436,6 +7539,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="SignificantPointAirspaceUidType">
     <xsd:annotation>
@@ -7478,6 +7582,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="SpecialDateUidType">
     <xsd:annotation>
@@ -7608,6 +7713,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="SpecialNavigationSystemStationUidType">
     <xsd:annotation>
@@ -7653,6 +7759,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="SpecialNavigationSystemUidType">
     <xsd:annotation>
@@ -7701,6 +7808,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="StarServiceUidType">
     <xsd:annotation>
@@ -7766,6 +7874,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="StarUidType">
     <xsd:annotation>
@@ -7816,6 +7925,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="StarUsageUidType">
     <xsd:annotation>
@@ -7894,6 +8004,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="StopwayUidType">
     <xsd:annotation>
@@ -7965,6 +8076,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="TacanLimitationUidType">
     <xsd:annotation>
@@ -8150,6 +8262,7 @@ 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="TacanUsageLimitationType">
     <xsd:annotation>
@@ -8168,6 +8281,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
       <xsd:element name="UsageLimit" type="NavaidLimitationType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="TacanUsageLimitationUidType">
     <xsd:annotation>
@@ -8258,6 +8372,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="TaxiwayCentreLinePositionUidType">
     <xsd:annotation>
@@ -8308,6 +8423,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="TaxiwayHoldingPositionUidType">
     <xsd:annotation>
@@ -8363,6 +8479,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="TaxiwayLightingSystemUidType">
     <xsd:annotation>
@@ -8436,6 +8553,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="TaxiwayUidType">
     <xsd:annotation>
@@ -8733,6 +8851,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="TlofGeometryUidType">
     <xsd:annotation>
@@ -8788,6 +8907,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="TlofLightingSystemUidType">
     <xsd:annotation>
@@ -8896,6 +9016,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="TlofSafeAreaGeometryUidType">
     <xsd:annotation>
@@ -8952,6 +9073,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="TlofSafeAreaUidType">
     <xsd:annotation>
@@ -9090,6 +9212,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="TlofUidType">
     <xsd:annotation>
@@ -9155,6 +9278,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="TrafficFlowRestrictionUidType">
     <xsd:annotation>
@@ -9190,6 +9314,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="UnitAssociationUidType">
     <xsd:annotation>
@@ -9235,6 +9360,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="UnitContactAddressUidType">
     <xsd:annotation>
@@ -9279,11 +9405,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Organisation unit providing services is located at Aerodrome / Heliport</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:element name="codeType" type="codeTypeUnit">
-        <xsd:annotation>
-          <xsd:documentation>Type</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
       <xsd:element name="codeClass" type="codeClassUnit">
         <xsd:annotation>
           <xsd:documentation>Classification</xsd:documentation>
@@ -9327,8 +9448,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
           <xsd:documentation>Name</xsd:documentation>
         </xsd:annotation>
       </xsd:element>
+      <xsd:element name="codeType" type="codeTypeUnit">
+        <xsd:annotation>
+          <xsd:documentation>Type</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
     </xsd:sequence>
     <xsd:attribute ref="mid"/>
+    <xsd:attribute ref="region" use="required"/>
   </xsd:complexType>
   <xsd:complexType name="VorLimitationType">
     <xsd:annotation>
@@ -9387,6 +9514,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="VorLimitationUidType">
     <xsd:annotation>
@@ -9577,6 +9705,7 @@ 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="VorUsageLimitationType">
     <xsd:annotation>
@@ -9595,6 +9724,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </xsd:element>
       <xsd:element name="UsageLimit" type="NavaidLimitationType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="VorUsageLimitationUidType">
     <xsd:annotation>
@@ -9674,6 +9804,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </xsd:complexType>
       </xsd:element>
     </xsd:sequence>
+    <xsd:attribute ref="source"/>
   </xsd:complexType>
   <xsd:complexType name="LabelMarkerUidType">
     <xsd:annotation>
@@ -9692,6 +9823,7 @@ 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:group name="SectorOfCircle">
     <xsd:sequence>