ogc-gml 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae1a7a4159d716b936fc4480ea4b4c6a9f9c80a20e824209715d694007a55c4
-  data.tar.gz: 57e48dad5ff718ef31a5b9aeaf37702945488644b5ca368bab4d1cb70bed1011
+  metadata.gz: 85394869fbff7b7cac85c5d8ca435c1876b34dde2edb5936e1c05d88dc4fa36e
+  data.tar.gz: 85a6bed6c6f6c0e9c78ab57b616eac56a4ea7fe5aba9fed0464da454041b2263
 SHA512:
-  metadata.gz: 3b4f3c386f2183e9ca1961a2fc6c4df5edec14603287ec899e68986448ff21841f5841f7f3bf6e6a0db6c301ba2147787599d3a63b9333e1506bbe572137e7dc
-  data.tar.gz: 85754d659e5924121b3e0966f40970915266c39e2beb9125494eba9616fb0ea18f080ad46bbd9fb098c6c1e9e2ed2d672dbc2dc5767dca334651379b8c5d758f
+  metadata.gz: 893f2fcf43800b1049274ce83f2a73804768c82ccba372e831a940a1a592c3eb3033696af4b4ed1b0143587c00db7e68b0004df26ac42eac9e1f483e685b17a3
+  data.tar.gz: 3e32002b943e8c4c09876f0ee94c9328670fca33385a5c5efcf3de5af4ff1a8c01e326fb9d2c449349f95f9ff32797c9b79000b01286ac55f46c4a0b30421b52

data/.github/workflows/release.yml

@@ -2,6 +2,11 @@
 # See https://github.com/metanorma/cimas
 name: release
 
+permissions:
+  contents: write
+  packages: write
+  id-token: write
+
 on:
   workflow_dispatch:
     inputs:

data/.rubocop.yml

@@ -1,4 +1,6 @@
-inherit_from: .rubocop_todo.yml
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
+  - .rubocop_todo.yml
 
 plugins:
 - rubocop-performance
@@ -10,11 +12,3 @@ AllCops:
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
-    - 'Gemfile'
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  EnforcedStyle: double_quotes
-

data/.rubocop_todo.yml

@@ -1,29 +1,100 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-03-19 18:08:26 UTC using RuboCop version 1.74.0.
+# on 2026-03-21 03:02:47 UTC using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
 Gemspec/RequiredRubyVersion:
   Exclude:
     - 'ogc-gml.gemspec'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'profile_canon_detailed.rb'
+
+# Offense count: 33
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'profile_canon.rb'
+    - 'profile_canon_detailed.rb'
+    - 'spec/ogc/gml/composite_curve_spec.rb'
+    - 'spec/ogc/gml/curve_spec.rb'
+    - 'spec/ogc/gml/dictionary_spec.rb'
+    - 'spec/ogc/gml/envelope_spec.rb'
+    - 'spec/ogc/gml/line_string_spec.rb'
+    - 'spec/ogc/gml/multi_curve_spec.rb'
+    - 'spec/ogc/gml/multi_point_spec.rb'
+    - 'spec/ogc/gml/multi_surface_spec.rb'
+    - 'spec/ogc/gml/point_spec.rb'
+    - 'spec/ogc/gml/polygon_spec.rb'
+    - 'spec/ogc/gml/surface_spec.rb'
+
+# Offense count: 20
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator, EnforcedStyleForRationalLiterals.
+# SupportedStylesForExponentOperator: space, no_space
+# SupportedStylesForRationalLiterals: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'profile_canon.rb'
+    - 'profile_canon_detailed.rb'
+
 # Offense count: 12
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 10
+  Max: 11
 
 # Offense count: 2
 RSpec/RepeatedDescription:
   Exclude:
     - 'spec/ogc/gml/polygon_spec.rb'
 
-# Offense count: 323
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
-  Enabled: false
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowOnlyRestArgument, UseAnonymousForwarding, RedundantRestArgumentNames, RedundantKeywordRestArgumentNames, RedundantBlockArgumentNames.
+# RedundantRestArgumentNames: args, arguments
+# RedundantKeywordRestArgumentNames: kwargs, options, opts
+# RedundantBlockArgumentNames: blk, block, proc
+Style/ArgumentsForwarding:
+  Exclude:
+    - 'lib/ogc/gml/versioned_model.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantParentheses:
+  Exclude:
+    - 'profile_canon.rb'
+
+# Offense count: 17
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'profile_canon.rb'
+    - 'profile_canon_detailed.rb'
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method
+Style/SymbolProc:
+  Exclude:
+    - 'profile_canon.rb'
+    - 'profile_canon_detailed.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
+Style/TrailingCommaInHashLiteral:
+  Exclude:
+    - 'spec/spec_helper.rb'

data/Gemfile

@@ -5,12 +5,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ogc-gml.gemspec
 gemspec
 
-gem "equivalent-xml"
-gem "pry"
+gem "canon"
+gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
 gem "rake"
 gem "rspec"
 gem "rubocop"
 gem "rubocop-performance"
 gem "rubocop-rake"
 gem "rubocop-rspec"
-gem "xml-c14n"

data/README.adoc

@@ -23,6 +23,7 @@ And then execute:
 [source,bash]
 ----
 $ bundle install
+$ git submodule update --init --recursive
 ----
 
 == Usage

data/lib/ogc/gml/abstract_continuous_coverage.rb

@@ -14,10 +14,10 @@ module Ogc
       attribute :coverage_function, CoverageFunction
 
       xml do
-        root "AbstractContinuousCoverage"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractContinuousCoverage"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_coordinate_operation.rb

@@ -13,15 +13,16 @@ module Ogc
       attribute :domain_of_validity, :string
       attribute :scope, :string, collection: true
       attribute :operation_version, :string
-      attribute :coordinate_operation_accuracy, CoordinateOperationAccuracy, collection: true
+      attribute :coordinate_operation_accuracy, CoordinateOperationAccuracy,
+                collection: true
       attribute :source_crs, CRSProperty
       attribute :target_crs, CRSProperty
 
       xml do
-        root "AbstractOperation"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractOperation"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference
@@ -31,7 +32,8 @@ module Ogc
         map_element "domainOfValidity", to: :domain_of_validity
         map_element "scope", to: :scope
         map_element "operationVersion", to: :operation_version
-        map_element "coordinateOperationAccuracy", to: :coordinate_operation_accuracy
+        map_element "coordinateOperationAccuracy",
+                    to: :coordinate_operation_accuracy
         map_element "sourceCRS", to: :source_crs
         map_element "targetCRS", to: :target_crs
       end

data/lib/ogc/gml/abstract_coordinate_system.rb

@@ -7,11 +7,12 @@ require_relative "code_with_authority"
 require_relative "coordinate_system_axis_property"
 require_relative "meta_data_property"
 require_relative "reference"
+require_relative "identifier"
 
 module Ogc
   module Gml
     class AbstractCoordinateSystem < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
       attribute :description, :string
@@ -22,10 +23,10 @@ module Ogc
       attribute :axis, CoordinateSystemAxisProperty, collection: true
 
       xml do
-        root "AbstractCoordinateSystem"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractCoordinateSystem"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_attribute "aggregationType", to: :aggregation_type
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description

data/lib/ogc/gml/abstract_coverage.rb

@@ -16,10 +16,10 @@ module Ogc
       attribute :range_set, RangeSet
 
       xml do
-        root "AbstractCoverage"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractCoverage"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_crs.rb

@@ -16,10 +16,10 @@ module Ogc
       attribute :scope, :string, collection: true
 
       xml do
-        root "AbstractSingleCRS"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractSingleCRS"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_curve.rb

@@ -7,10 +7,10 @@ module Ogc
   module Gml
     class AbstractCurve < AbstractGeometricPrimitive
       xml do
-        root "AbstractCurve"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractCurve"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_attribute "srsName", to: :srs_name
         map_attribute "srsDimension", to: :srs_dimension
         map_attribute "axisLabels", to: :axis_labels

data/lib/ogc/gml/abstract_curve_segment.rb

@@ -10,8 +10,8 @@ module Ogc
       attribute :num_derivative_interior, :integer # , default: -> { "0" }
 
       xml do
-        root "AbstractCurveSegment"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractCurveSegment"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/abstract_datum.rb

@@ -18,10 +18,10 @@ module Ogc
       attribute :realization_epoch, :date
 
       xml do
-        root "AbstractDatum"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractDatum"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_feature.rb

@@ -17,10 +17,10 @@ module Ogc
       attribute :location, LocationProperty
 
       xml do
-        root "AbstractFeature"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractFeature"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_feature_collection.rb

@@ -16,10 +16,10 @@ module Ogc
       attribute :feature_members, FeatureArrayProperty
 
       xml do
-        root "AbstractFeatureCollection"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractFeatureCollection"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_general_conversion.rb

@@ -15,13 +15,14 @@ module Ogc
       attribute :remarks, :string
       attribute :domain_of_validity, :string
       attribute :scope, :string, collection: true
-      attribute :coordinate_operation_accuracy, CoordinateOperationAccuracy, collection: true
+      attribute :coordinate_operation_accuracy, CoordinateOperationAccuracy,
+                collection: true
 
       xml do
-        root "AbstractGeneralConversion"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeneralConversion"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference
@@ -30,7 +31,8 @@ module Ogc
         map_element "remarks", to: :remarks
         map_element "domainOfValidity", to: :domain_of_validity
         map_element "scope", to: :scope
-        map_element "coordinateOperationAccuracy", to: :coordinate_operation_accuracy
+        map_element "coordinateOperationAccuracy",
+                    to: :coordinate_operation_accuracy
       end
     end
   end

data/lib/ogc/gml/abstract_general_derived_crs.rb

@@ -10,10 +10,10 @@ module Ogc
       attribute :conversion, GeneralConversionProperty
 
       xml do
-        root "AbstractGeneralDerivedCRS"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeneralDerivedCRS"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_general_operation_parameter.rb

@@ -10,10 +10,10 @@ module Ogc
       attribute :minimum_occurs, :integer
 
       xml do
-        root "AbstractGeneralOperationParameter"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeneralOperationParameter"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_general_operation_parameter_property.rb

@@ -6,18 +6,26 @@ require_relative "abstract_general_operation_parameter"
 
 module Ogc
   module Gml
+    class RemoteSchema < Lutaml::Model::Type::String
+      xml do
+        namespace Namespace
+      end
+    end
+
     class AbstractGeneralOperationParameterProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
-      attribute :abstract_general_operation_parameter, AbstractGeneralOperationParameter
+      attribute :remote_schema, RemoteSchema
+      attribute :abstract_general_operation_parameter,
+                AbstractGeneralOperationParameter
 
       xml do
-        root "generalOperationParameter"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "generalOperationParameter"
+        namespace Namespace
 
         map_attribute "nilReason", to: :nil_reason
-        map_attribute "remoteSchema", to: :remote_schema, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
-        map_element "AbstractGeneralOperationParameter", to: :abstract_general_operation_parameter
+        map_attribute "remoteSchema", to: :remote_schema
+        map_element "AbstractGeneralOperationParameter",
+                    to: :abstract_general_operation_parameter
       end
     end
   end

data/lib/ogc/gml/abstract_general_parameter_value.rb

@@ -6,8 +6,8 @@ module Ogc
   module Gml
     class AbstractGeneralParameterValue < Lutaml::Model::Serializable
       xml do
-        root "AbstractGeneralParameterValue"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeneralParameterValue"
+        namespace Namespace
       end
     end
   end

data/lib/ogc/gml/abstract_general_parameter_value_property.rb

@@ -10,10 +10,11 @@ module Ogc
       attribute :abstract_general_parameter_value, AbstractGeneralParameterValue
 
       xml do
-        root "includesValue"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "includesValue"
+        namespace Namespace
 
-        map_element "AbstractGeneralParameterValue", to: :abstract_general_parameter_value
+        map_element "AbstractGeneralParameterValue",
+                    to: :abstract_general_parameter_value
       end
     end
   end

data/lib/ogc/gml/abstract_general_transformation.rb

@@ -7,10 +7,10 @@ module Ogc
   module Gml
     class AbstractGeneralTransformation < AbstractCoordinateOperation
       xml do
-        root "AbstractGeneralTransformation"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeneralTransformation"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference
@@ -20,7 +20,8 @@ module Ogc
         map_element "domainOfValidity", to: :domain_of_validity
         map_element "scope", to: :scope
         map_element "operationVersion", to: :operation_version
-        map_element "coordinateOperationAccuracy", to: :coordinate_operation_accuracy
+        map_element "coordinateOperationAccuracy",
+                    to: :coordinate_operation_accuracy
         map_element "sourceCRS", to: :source_crs
         map_element "targetCRS", to: :target_crs
       end

data/lib/ogc/gml/abstract_geometric_aggregate.rb

@@ -9,10 +9,10 @@ module Ogc
       attribute :aggregation_type, :string
 
       xml do
-        root "AbstractGeometricAggregate"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeometricAggregate"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_attribute "srsName", to: :srs_name
         map_attribute "srsDimension", to: :srs_dimension
         map_attribute "axisLabels", to: :axis_labels

data/lib/ogc/gml/abstract_geometric_primitive.rb

@@ -6,11 +6,12 @@ require_relative "code"
 require_relative "code_with_authority"
 require_relative "meta_data_property"
 require_relative "reference"
+require_relative "identifier"
 
 module Ogc
   module Gml
     class AbstractGeometricPrimitive < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :srs_name, :string
       attribute :srs_dimension, :integer
       attribute :axis_labels, :string
@@ -22,10 +23,10 @@ module Ogc
       attribute :name, Code, collection: true
 
       xml do
-        root "AbstractGeometricPrimitive"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGeometricPrimitive"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_attribute "srsName", to: :srs_name
         map_attribute "srsDimension", to: :srs_dimension
         map_attribute "axisLabels", to: :axis_labels

data/lib/ogc/gml/abstract_geometry.rb

@@ -7,10 +7,10 @@ module Ogc
   module Gml
     class AbstractGeometry < AbstractGeometricPrimitive
       xml do
-        root "AbstractImplicitGeometry"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractImplicitGeometry"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_attribute "srsName", to: :srs_name
         map_attribute "srsDimension", to: :srs_dimension
         map_attribute "axisLabels", to: :axis_labels

data/lib/ogc/gml/abstract_gml.rb

@@ -12,10 +12,10 @@ module Ogc
   module Gml
     class AbstractGML < AbstractTopology
       xml do
-        root "AbstractGML"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGML"
+        namespace Namespace
 
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description
         map_element "descriptionReference", to: :description_reference

data/lib/ogc/gml/abstract_gridded_surface.rb

@@ -10,8 +10,8 @@ module Ogc
       attribute :columns, :integer
 
       xml do
-        root "AbstractGriddedSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractGriddedSurface"
+        namespace Namespace
 
         map_attribute "aggregationType", to: :aggregation_type
         map_attribute "rows", to: :rows

data/lib/ogc/gml/abstract_meta_data.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
+require_relative "identifier"
 
 module Ogc
   module Gml
     class AbstractMetaData < Lutaml::Model::Serializable
       attribute :content, :string
-      attribute :id, :string
+      attribute :id, Identifier
 
       xml do
-        root "AbstractMetaData"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractMetaData"
+        namespace Namespace
 
         map_content to: :content
-        map_attribute "id", to: :id, prefix: "gml", namespace: "http://www.opengis.net/gml/3.2"
+        map_attribute "id", to: :id, form: :qualified
       end
     end
   end

data/lib/ogc/gml/abstract_parametric_curve_surface.rb

@@ -8,8 +8,8 @@ module Ogc
       attribute :aggregation_type, :string
 
       xml do
-        root "AbstractParametricCurveSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractParametricCurveSurface"
+        namespace Namespace
 
         map_attribute "aggregationType", to: :aggregation_type
       end

data/lib/ogc/gml/abstract_ring.rb

@@ -6,8 +6,8 @@ module Ogc
   module Gml
     class AbstractRing < Lutaml::Model::Serializable
       xml do
-        root "AbstractRing"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "AbstractRing"
+        namespace Namespace
       end
     end
   end