ogc-gml 1.0.4 → 1.2.0

data/lib/ogc/gml/multi_surface.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "abstract_geometric_aggregate"
-require_relative "surface_array_property"
-require_relative "surface_property"
 
 module Ogc
   module Gml
@@ -12,10 +9,10 @@ module Ogc
       attribute :surface_members, SurfaceArrayProperty
 
       xml do
-        root "MultiSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "MultiSurface"
+        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/multi_surface_property.rb

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

data/lib/ogc/gml/namespace.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Ogc
+  module Gml
+    # Default namespace for GML 3.2
+    # This is the primary namespace used by this library
+    Namespace = Gml32Namespace
+  end
+end

data/lib/ogc/gml/namespaces/gml_31_namespace.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "lutaml/xml/namespace"
+
+module Ogc
+  module Gml
+    # GML 3.1.1 namespace (http://www.opengis.net/gml) - no version suffix
+    class Gml31Namespace < Lutaml::Xml::Namespace
+      uri "http://www.opengis.net/gml"
+      prefix_default "gml"
+      element_form_default :qualified
+    end
+  end
+end

data/lib/ogc/gml/namespaces/gml_32_namespace.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "lutaml/xml/namespace"
+
+module Ogc
+  module Gml
+    # GML 3.2 namespace (http://www.opengis.net/gml/3.2)
+    class Gml32Namespace < Lutaml::Xml::Namespace
+      uri "http://www.opengis.net/gml/3.2"
+      prefix_default "gml"
+      element_form_default :qualified
+    end
+  end
+end

data/lib/ogc/gml/node.rb

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

@@ -2,27 +2,21 @@
 
 require "lutaml/model"
 
-# require_relative "edge"
-require_relative "node"
-
 module Ogc
   module Gml
-    class Edge < Lutaml::Model::Serializable
-    end
-
     class NodeOrEdgeProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
       attribute :node, Node
       attribute :edge, Edge
 
       xml do
-        root "NodeOrEdgePropertyType"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "NodeOrEdgePropertyType"
+        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 "Node", to: :node
         map_element "Edge", to: :edge

data/lib/ogc/gml/node_property.rb

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

data/lib/ogc/gml/oblique_cartesian_cs.rb

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

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

data/lib/ogc/gml/observation.rb

@@ -2,18 +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 "procedure_property"
-require_relative "reference"
-require_relative "result"
-require_relative "target_property"
-require_relative "time_primitive_property"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class Observation < AbstractTopology
@@ -25,10 +13,10 @@ module Ogc
       attribute :result_of, Result
 
       xml do
-        root "Observation"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Observation"
+        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/offset_curve.rb

@@ -2,11 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "curve_property"
-require_relative "length"
-require_relative "vector"
-require_relative "abstract_curve_segment"
-
 module Ogc
   module Gml
     class OffsetCurve < AbstractCurveSegment
@@ -15,8 +10,8 @@ module Ogc
       attribute :ref_direction, Vector
 
       xml do
-        root "OffsetCurve"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "OffsetCurve"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/operation_method.rb

@@ -2,14 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "abstract_general_operation_parameter_property"
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "formula_citation"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class OperationMethod < AbstractTopology
@@ -18,13 +10,14 @@ module Ogc
       attribute :formula, Code
       attribute :source_dimensions, :integer
       attribute :target_dimensions, :integer
-      attribute :parameter, AbstractGeneralOperationParameterProperty, collection: true
+      attribute :parameter, AbstractGeneralOperationParameterProperty,
+                collection: true
 
       xml do
-        root "OperationMethod"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "OperationMethod"
+        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/operation_method_property.rb

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

data/lib/ogc/gml/operation_parameter.rb

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

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "abstract_general_operation_parameter_property"
-require_relative "abstract_general_operation_parameter"
 
 module Ogc
   module Gml
     class OperationParameterGroup < AbstractGeneralOperationParameter
       attribute :maximum_occurs, :integer
-      attribute :parameter, AbstractGeneralOperationParameterProperty, collection: true
+      attribute :parameter, AbstractGeneralOperationParameterProperty,
+                collection: true
 
       xml do
-        root "OperationParameterGroup"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "OperationParameterGroup"
+        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/operation_parameter_group_property.rb

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

data/lib/ogc/gml/operation_parameter_property.rb

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

data/lib/ogc/gml/operation_property.rb

@@ -2,21 +2,19 @@
 
 require "lutaml/model"
 
-require_relative "abstract_coordinate_operation"
-
 module Ogc
   module Gml
     class OperationProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :abstract_operation, AbstractCoordinateOperation
 
       xml do
-        root "operationRef"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "operationRef"
+        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 "AbstractOperation", to: :abstract_operation
       end
     end

data/lib/ogc/gml/orientable_curve.rb

@@ -2,19 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-# require_relative "curve_property"
-require_relative "meta_data_property"
-require_relative "reference"
-
 module Ogc
   module Gml
-    class CurveProperty < Lutaml::Model::Serializable
-    end
-
     class OrientableCurve < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :srs_name, :string
       attribute :srs_dimension, :integer
       attribute :axis_labels, :string
@@ -28,10 +19,10 @@ module Ogc
       attribute :base_curve, CurveProperty
 
       xml do
-        root "OrientableCurve"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "OrientableCurve"
+        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/orientable_surface.rb

@@ -2,16 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "surface_property"
-
 module Ogc
   module Gml
     class OrientableSurface < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :srs_name, :string
       attribute :srs_dimension, :integer
       attribute :axis_labels, :string
@@ -25,10 +19,10 @@ module Ogc
       attribute :base_surface, SurfaceProperty
 
       xml do
-        root "OrientableSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "OrientableSurface"
+        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/parameter_value.rb

@@ -2,11 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "dms_angle"
-require_relative "measure_list"
-require_relative "measure"
-require_relative "operation_parameter_property"
-
 module Ogc
   module Gml
     class ParameterValue < Lutaml::Model::Serializable
@@ -21,8 +16,8 @@ module Ogc
       attribute :operation_parameter, OperationParameterProperty
 
       xml do
-        root "ParameterValue"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ParameterValue"
+        namespace Namespace
 
         map_element "value", to: :value
         map_element "dmsAngleValue", to: :dms_angle_value

data/lib/ogc/gml/parameter_value_group.rb

@@ -2,18 +2,16 @@
 
 require "lutaml/model"
 
-require_relative "abstract_general_parameter_value_property"
-require_relative "reference"
-
 module Ogc
   module Gml
     class ParameterValueGroup < Lutaml::Model::Serializable
-      attribute :parameter_value, AbstractGeneralParameterValueProperty, collection: true
+      attribute :parameter_value, AbstractGeneralParameterValueProperty,
+                collection: true
       attribute :group, Reference
 
       xml do
-        root "ParameterValueGroup"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ParameterValueGroup"
+        namespace Namespace
 
         map_element "parameterValue", to: :parameter_value
         map_element "group", to: :group

data/lib/ogc/gml/pass_through_operation.rb

@@ -2,25 +2,16 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "coordinate_operation_accuracy"
-require_relative "coordinate_operation_property"
-require_relative "crs_property"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "concatenated_operation"
-
 module Ogc
   module Gml
     class PassThroughOperation < ConcatenatedOperation
       attribute :modified_coordinate, :integer, collection: true
 
       xml do
-        root "PassThroughOperation"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "PassThroughOperation"
+        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
@@ -31,7 +22,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
         map_element "modifiedCoordinate", to: :modified_coordinate