ogc-gml 1.0.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae1a7a4159d716b936fc4480ea4b4c6a9f9c80a20e824209715d694007a55c4
-  data.tar.gz: 57e48dad5ff718ef31a5b9aeaf37702945488644b5ca368bab4d1cb70bed1011
+  metadata.gz: b8f0d439b67f0cc07b0974172fcb075c253f1e245947dd524a2cb53920529aef
+  data.tar.gz: d2413f431befdf21e5e7aad79fdaceb68be0636b49034d36dff6adf3777aeb9c
 SHA512:
-  metadata.gz: 3b4f3c386f2183e9ca1961a2fc6c4df5edec14603287ec899e68986448ff21841f5841f7f3bf6e6a0db6c301ba2147787599d3a63b9333e1506bbe572137e7dc
-  data.tar.gz: 85754d659e5924121b3e0966f40970915266c39e2beb9125494eba9616fb0ea18f080ad46bbd9fb098c6c1e9e2ed2d672dbc2dc5767dca334651379b8c5d758f
+  metadata.gz: c0f302d4a94cbce0011ac7bf7991879d24e8e37fe04c08002078de0e55f9ea19c1795f2edc02217bcff16fd287662c2e80c423f7753aeee2b7f72838f43c5cbd
+  data.tar.gz: 76fa53ef24147b5b69d68e27c336f577c19201b940a0cdbe187e3bddf170c9c5d2544c8dc4512018e6e82c2621d76eea0913d3468f360d000e5f6a00b3e0a491

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/CLAUDE.md

@@ -0,0 +1,139 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+This is a Ruby gem for parsing and generating OGC GML 3.2 (Geography Markup Language) data. It provides Ruby objects that map to GML schema elements, using the `lutaml-model` library for XML serialization/deserialization.
+
+GML 3.1.1 documents are NOT parsed by these models (different namespace and schema). Multi-version support is planned on lutaml-model's register system (namespace-bound contexts per version, the plurimath/mml pattern); the i-UR 3.1.1 fixtures are skipped in specs until the gml_31 register mappings are generated.
+
+## Commands
+
+```bash
+# Install dependencies (includes git submodule initialization)
+git submodule update --init --recursive
+bundle install
+
+# Run all tests
+bundle exec rake spec
+# or
+bundle exec rspec
+
+# Run a single test file
+bundle exec rspec spec/ogc/gml/point_spec.rb
+
+# Run a specific test
+bundle exec rspec spec/ogc/gml/point_spec.rb:18
+
+# Run linter
+bundle exec rubocop
+
+# Run linter with auto-fix
+bundle exec rubocop -A
+
+# Run default task (tests + linting)
+bundle exec rake
+
+# Start interactive console
+bin/console
+```
+
+## Architecture
+
+The codebase follows a consistent pattern where each GML element is represented by a Ruby class:
+
+- **Location**: All model classes are in `lib/ogc/gml/` with one class per file
+- **Entry point**: `lib/ogc/gml.rb` registers `autoload` entries for every class; there is no `require_relative` graph (removing it fixed the circular-require warnings of issue #21). Never add `require_relative` for internal library code — add an autoload entry in `lib/ogc/gml.rb`.
+- **One class per file, opened first**: mutually recursive schema types rely on the class keyword executing before any cyclic constant reference. Do not embed duplicate or stub class definitions in other files (the old cycle-dodge shells broke autoload resolution).
+- **Namespace**: `lib/ogc/gml/namespace.rb` aliases `Namespace = Gml32Namespace`; the version namespace classes live in `lib/ogc/gml/namespaces/`
+
+### Class Hierarchy
+
+Classes inherit from abstract base classes that mirror the GML schema:
+
+```
+Lutaml::Model::Serializable
+└── AbstractGml
+    ├── AbstractFeature (features, collections)
+    ├── AbstractGeometry ← AbstractGeometricPrimitive
+    │   ├── Point, LineString, Curve, Surface, Solid, etc.
+    │   └── Multi* aggregate types
+    ├── AbstractCRS (coordinate reference systems)
+    ├── AbstractDatum, AbstractCoordinateSystem
+    └── AbstractTime* (temporal types)
+```
+
+### XML Mapping Pattern
+
+Each class defines its XML structure using the `xml` block:
+
+```ruby
+class Point < AbstractGeometry
+  attribute :pos, DirectPosition
+  attribute :coordinates, Coordinates
+
+  xml do
+    element "Point"
+    namespace Namespace  # References the Gml::Namespace constant
+
+    # gml:id is a namespace-qualified global attribute
+    map_attribute "id", to: :id, form: :qualified
+    # Local attributes are unqualified in the GML schema
+    map_attribute "srsName", to: :srs_name
+
+    map_element "pos", to: :pos
+    map_element "coordinates", to: :coordinates
+  end
+end
+```
+
+### Namespace Configuration
+
+The namespace classes (`lib/ogc/gml/namespaces/gml_32_namespace.rb`) configure the GML namespace:
+
+```ruby
+class Gml32Namespace < Lutaml::Xml::Namespace
+  uri "http://www.opengis.net/gml/3.2"
+  prefix_default "gml"
+  element_form_default :qualified
+  # NO attribute_form_default here: GML declares attributeFormDefault="unqualified".
+  # Qualifying the schema-wide default serialized invalid gml:srsName (issue #22).
+  # Only per-rule form: :qualified on gml:id attributes.
+end
+```
+
+## Testing
+
+Tests use RSpec with the `canon` gem for XML comparison. The main pattern is round-trip testing:
+
+```ruby
+it "round-trips Point-epsg3045.xml" do
+  input = file_contents("Point-epsg3045.xml")
+  output = described_class.from_xml(input).to_xml(
+    prefix: true,      # Include namespace prefixes
+    pretty: true,      # Format with indentation
+    declaration: true  # Include XML declaration
+  )
+  expect(SpecHelpers.remove_xml_comments(output))
+    .to be_xml_equivalent_to(SpecHelpers.remove_xml_comments(input))
+end
+```
+
+- `SpecHelpers.remove_xml_comments` (in `spec/spec_helper.rb`) is the shared comment-stripper.
+- Strict attribute-form assertions live in `spec/ogc/gml/point_spec.rb` (gml:id prefixed; srsName/srsDimension never prefixed) and `spec/ogc/gml/gml3*_namespace_spec.rb`. Canon compares attributes loosely (lutaml/canon#155), so prefix regressions are only caught by these strict specs.
+- RSpec semantics: `pending "reason"` inside an example body STILL EXECUTES the body; use `skip "reason"` when the body must not run (this once turned "pending" 3.1.1 round-trips into a multi-minute suite freeze).
+
+Test fixtures are located in:
+- `spec/fixtures/ets-gml32/` - GML test suite from OGC ETS for GML 3.2 (git submodule)
+- `spec/fixtures/geospatial_jp_iur_3.1/` - Japanese i-UR codelist data (GML 3.1.1; round-trips skipped pending gml_31 register support)
+
+## Dependencies
+
+- **lutaml-model**: XML serialization framework (`~> 0.8.20` — first release with source-namespace-preserving serialization, which round-trip fidelity relies on)
+- **nokogiri**: XML parsing
+- **canon**: XML comparison for tests (dev dependency in Gemfile, not gemspec)
+
+## Known upstream issues
+
+- lutaml-model#754: lenient parsing of out-of-namespace documents silently drops `gml:description` content; resolution is strict expanded-name parsing with register-based multi-version support, never local-name fallbacks.

data/Gemfile

@@ -5,12 +5,10 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ogc-gml.gemspec
 gemspec
 
-gem "equivalent-xml"
-gem "pry"
+gem "canon"
 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
@@ -45,10 +46,10 @@ For example:
 gml_data = File.read('spec/fixtures/geospatial_jp_iur_3.1/Bridge_class.xml')
 gml = Ogc::Gml::Dictionary.from_xml(gml_data)
 
-# Access the loaded GML Dictionary
-gml_dictionary = gml.dictionary
-gml_dictionary.features.each do |feature|
-  puts feature.name
+# Access the loaded GML Dictionary entries
+gml.dictionary_entry.each do |entry|
+  definition = entry.definition
+  puts "#{definition.name.first&.content}: #{definition.description}"
 end
 ----
 

data/lib/ogc/gml/abstract_continuous_coverage.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "coverage_function"
-require_relative "abstract_coverage"
 
 module Ogc
   module Gml
@@ -14,10 +12,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

@@ -2,10 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "coordinate_operation_accuracy"
-require_relative "crs_property"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class AbstractCoordinateOperation < AbstractTopology
@@ -13,15 +9,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 +28,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

@@ -2,16 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "coordinate_system_axis_property"
-require_relative "meta_data_property"
-require_relative "reference"
-
 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 +16,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

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "bounding_shape"
-require_relative "domain_set"
-require_relative "location_property"
-require_relative "range_set"
-require_relative "abstract_topology"
 
 module Ogc
   module Gml
@@ -16,10 +11,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

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class AbstractCRS < AbstractTopology
@@ -16,10 +10,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

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "abstract_geometric_primitive"
 
 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

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class AbstractDatum < AbstractTopology
@@ -18,10 +12,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

@@ -2,14 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "bounding_shape"
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "location_property"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class AbstractFeature < AbstractTopology
@@ -17,10 +9,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

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "bounding_shape"
-require_relative "feature_array_property"
-require_relative "feature_property"
-require_relative "location_property"
-require_relative "abstract_topology"
 
 module Ogc
   module Gml
@@ -16,10 +11,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

@@ -2,26 +2,20 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "coordinate_operation_accuracy"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class AbstractGeneralConversion < AbstractTopology
       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 +24,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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "general_conversion_property"
-require_relative "abstract_crs"
 
 module Ogc
   module Gml
@@ -10,10 +8,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