ogc-gml 1.0.4 → 1.2.0

data/lib/ogc/gml/topo_curve.rb

@@ -2,16 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "directed_edge_property"
-require_relative "meta_data_property"
-require_relative "reference"
-
 module Ogc
   module Gml
     class TopoCurve < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
       attribute :description, :string
@@ -21,10 +15,10 @@ module Ogc
       attribute :directed_edge, DirectedEdgeProperty, collection: true
 
       xml do
-        root "TopoCurve"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoCurve"
+        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/topo_curve_property.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "topo_curve"
-
 module Ogc
   module Gml
     class TopoCurveProperty < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :topo_curve, TopoCurve
 
       xml do
-        root "topoCurveProperty"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoCurveProperty"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "TopoCurve", to: :topo_curve

data/lib/ogc/gml/topo_point.rb

@@ -2,23 +2,16 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "directed_node_property"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class TopoPoint < AbstractTopology
       attribute :directed_node, DirectedNodeProperty
 
       xml do
-        root "TopoPoint"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoPoint"
+        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/topo_point_property.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "topo_point"
-
 module Ogc
   module Gml
     class TopoPointProperty < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :topo_point, TopoPoint
 
       xml do
-        root "topoPointProperty"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoPointProperty"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "TopoPoint", to: :topo_point

data/lib/ogc/gml/topo_primitive_array_association.rb

@@ -2,17 +2,16 @@
 
 require "lutaml/model"
 
-require_relative "abstract_topo_primitive"
-
 module Ogc
   module Gml
     class TopoPrimitiveArrayAssociation < Lutaml::Model::Serializable
       attribute :owns, :boolean, default: -> { false }
-      attribute :abstract_topo_primitive, AbstractTopoPrimitive, collection: true
+      attribute :abstract_topo_primitive, AbstractTopoPrimitive,
+                collection: true
 
       xml do
-        root "topoPrimitiveMembers"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoPrimitiveMembers"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "AbstractTopoPrimitive", to: :abstract_topo_primitive

data/lib/ogc/gml/topo_primitive_member.rb

@@ -2,22 +2,20 @@
 
 require "lutaml/model"
 
-require_relative "abstract_topo_primitive"
-
 module Ogc
   module Gml
     class TopoPrimitiveMember < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
       attribute :abstract_topo_primitive, AbstractTopoPrimitive
 
       xml do
-        root "topoPrimitiveMember"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoPrimitiveMember"
+        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_attribute "remoteSchema", to: :remote_schema
         map_attribute "owns", to: :owns
         map_element "AbstractTopoPrimitive", to: :abstract_topo_primitive
       end

data/lib/ogc/gml/topo_solid.rb

@@ -2,21 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-# require_relative "directed_face_property"
-require_relative "meta_data_property"
-require_relative "node_or_edge_property"
-require_relative "reference"
-require_relative "solid_property"
-
 module Ogc
   module Gml
-    class DirectedFaceProperty < Lutaml::Model::Serializable
-    end
-
     class TopoSolid < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :universal, :boolean, default: -> { false }
       attribute :meta_data_property, MetaDataProperty, collection: true
@@ -29,10 +18,10 @@ module Ogc
       attribute :solid_property, SolidProperty
 
       xml do
-        root "TopoSolid"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoSolid"
+        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_attribute "universal", to: :universal
         map_element "metaDataProperty", to: :meta_data_property

data/lib/ogc/gml/topo_solid_property.rb

@@ -2,22 +2,20 @@
 
 require "lutaml/model"
 
-require_relative "topo_solid"
-
 module Ogc
   module Gml
     class TopoSolidProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
       attribute :topo_solid, TopoSolid
 
       xml do
-        root "TopoSolidPropertyType"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoSolidPropertyType"
+        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_attribute "remoteSchema", to: :remote_schema
         map_attribute "owns", to: :owns
         map_element "TopoSolid", to: :topo_solid
       end

data/lib/ogc/gml/topo_surface.rb

@@ -2,16 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "directed_face_property"
-require_relative "meta_data_property"
-require_relative "reference"
-
 module Ogc
   module Gml
     class TopoSurface < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
       attribute :description, :string
@@ -21,10 +15,10 @@ module Ogc
       attribute :directed_face, DirectedFaceProperty, collection: true
 
       xml do
-        root "TopoSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoSurface"
+        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/topo_surface_property.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "topo_surface"
-
 module Ogc
   module Gml
     class TopoSurfaceProperty < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :topo_surface, TopoSurface
 
       xml do
-        root "topoSurfaceProperty"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoSurfaceProperty"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "TopoSurface", to: :topo_surface

data/lib/ogc/gml/topo_volume.rb

@@ -2,29 +2,24 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "directed_topo_solid_property"
-require_relative "meta_data_property"
-require_relative "reference"
-
 module Ogc
   module Gml
     class TopoVolume < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
       attribute :description, :string
       attribute :description_reference, Reference
       attribute :identifier, CodeWithAuthority
       attribute :name, Code, collection: true
-      attribute :directed_topo_solid, DirectedTopoSolidProperty, collection: true
+      attribute :directed_topo_solid, DirectedTopoSolidProperty,
+                collection: true
 
       xml do
-        root "TopoVolume"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoVolume"
+        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/topo_volume_property.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "topo_volume"
-
 module Ogc
   module Gml
     class TopoVolumeProperty < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :topo_volume, TopoVolume
 
       xml do
-        root "topoVolumeProperty"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "topoVolumeProperty"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "TopoVolume", to: :topo_volume

data/lib/ogc/gml/transformation.rb

@@ -2,27 +2,18 @@
 
 require "lutaml/model"
 
-require_relative "abstract_general_parameter_value_property"
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "coordinate_operation_accuracy"
-require_relative "crs_property"
-require_relative "meta_data_property"
-require_relative "operation_method_property"
-require_relative "reference"
-require_relative "abstract_general_transformation"
-
 module Ogc
   module Gml
     class Transformation < AbstractGeneralTransformation
-      attribute :method, OperationMethodProperty
-      attribute :parameter_value, AbstractGeneralParameterValueProperty, collection: true
+      attribute :operation_method, OperationMethodProperty
+      attribute :parameter_value, AbstractGeneralParameterValueProperty,
+                collection: true
 
       xml do
-        root "Transformation"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Transformation"
+        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
@@ -32,10 +23,11 @@ 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
-        map_element "method", to: :method
+        map_element "method", to: :operation_method
         map_element "parameterValue", to: :parameter_value
       end
     end

data/lib/ogc/gml/transformation_property.rb

@@ -2,21 +2,19 @@
 
 require "lutaml/model"
 
-require_relative "transformation"
-
 module Ogc
   module Gml
     class TransformationProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :transformation, Transformation
 
       xml do
-        root "transformationRef"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "transformationRef"
+        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_attribute "remoteSchema", to: :remote_schema
         map_element "Transformation", to: :transformation
       end
     end

data/lib/ogc/gml/triangle.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "shell_property"
-
 module Ogc
   module Gml
     class Triangle < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :exterior, ShellProperty
 
       xml do
-        root "Triangle"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Triangle"
+        namespace Namespace
 
         map_attribute "interpolation", to: :interpolation
         map_element "exterior", to: :exterior

data/lib/ogc/gml/unit_definition.rb

@@ -2,13 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "string_or_ref"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class UnitDefinition < AbstractTopology
@@ -18,10 +11,10 @@ module Ogc
       attribute :catalog_symbol, Code
 
       xml do
-        root "UnitDefinition"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "UnitDefinition"
+        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/unit_of_measure.rb

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

data/lib/ogc/gml/user_defined_cs.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "abstract_coordinate_system"
 
 module Ogc
   module Gml
     class UserDefinedCS < AbstractCoordinateSystem
       xml do
-        root "UserDefinedCS"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "UserDefinedCS"
+        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/user_defined_cs_property.rb

@@ -2,21 +2,19 @@
 
 require "lutaml/model"
 
-require_relative "user_defined_cs"
-
 module Ogc
   module Gml
     class UserDefinedCSProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :user_defined_cs, UserDefinedCS
 
       xml do
-        root "userDefinedCSRef"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "userDefinedCSRef"
+        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_attribute "remoteSchema", to: :remote_schema
         map_element "UserDefinedCS", to: :user_defined_cs
       end
     end

data/lib/ogc/gml/value_array.rb

@@ -2,17 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "value_array_property"
-require_relative "value_property"
-
 module Ogc
   module Gml
     class ValueArray < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :code_space, :string
       attribute :uom, :string
@@ -25,10 +18,10 @@ module Ogc
       attribute :value_components, ValueArrayProperty
 
       xml do
-        root "ValueArray"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ValueArray"
+        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_attribute "codeSpace", to: :code_space
         map_attribute "uom", to: :uom

data/lib/ogc/gml/value_array_property.rb

@@ -2,9 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "abstract_geometry"
-require_relative "abstract_time_object"
-
 module Ogc
   module Gml
     class ValueArrayProperty < Lutaml::Model::Serializable
@@ -15,8 +12,8 @@ module Ogc
       attribute :null, :string, collection: true
 
       xml do
-        root "valueComponents"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "valueComponents"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "AbstractValue", to: :abstract_value

data/lib/ogc/gml/value_property.rb

@@ -2,14 +2,11 @@
 
 require "lutaml/model"
 
-require_relative "abstract_geometry"
-require_relative "abstract_time_object"
-
 module Ogc
   module Gml
     class ValueProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
       attribute :abstract_value, :string
       attribute :abstract_geometry, AbstractGeometry
@@ -17,11 +14,11 @@ module Ogc
       attribute :null, :string
 
       xml do
-        root "valueComponent"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "valueComponent"
+        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_attribute "remoteSchema", to: :remote_schema
         map_attribute "owns", to: :owns
         map_element "AbstractValue", to: :abstract_value
         map_element "AbstractGeometry", to: :abstract_geometry

data/lib/ogc/gml/vector.rb

@@ -2,16 +2,14 @@
 
 require "lutaml/model"
 
-require_relative "direct_position"
-
 module Ogc
   module Gml
     class Vector < Lutaml::Model::Serializable
       attribute :content, DirectPosition
 
       xml do
-        root "vector"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "vector"
+        namespace Namespace
 
         map_content to: :content
       end

data/lib/ogc/gml/version.rb

@@ -2,6 +2,6 @@
 
 module Ogc
   module Gml
-    VERSION = "1.0.4"
+    VERSION = "1.2.0"
   end
 end

data/lib/ogc/gml/vertical_crs.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "vertical_cs_property"
-require_relative "vertical_datum_property"
-require_relative "abstract_crs"
 
 module Ogc
   module Gml
@@ -12,10 +9,10 @@ module Ogc
       attribute :vertical_datum, VerticalDatumProperty
 
       xml do
-        root "VerticalCRS"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "VerticalCRS"
+        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