ogc-gml 1.0.4 → 1.2.0

data/lib/ogc/gml/angle.rb

@@ -2,17 +2,14 @@
 
 require "lutaml/model"
 
-require_relative "measure"
-require_relative "unit_of_measure"
-
 module Ogc
   module Gml
     class Angle < UnitOfMeasure
       attribute :content, Measure
 
       xml do
-        root "greenwichLongitude"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "greenwichLongitude"
+        namespace Namespace
 
         map_attribute "uom", to: :uom
         map_content to: :content

data/lib/ogc/gml/arc.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "arc_string"
 
 module Ogc
   module Gml
     class Arc < ArcString
       xml do
-        root "Arc"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Arc"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/arc_by_bulge.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "vector"
-require_relative "arc"
 
 module Ogc
   module Gml
@@ -11,8 +9,8 @@ module Ogc
       attribute :normal, Vector
 
       xml do
-        root "ArcByBulge"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ArcByBulge"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/arc_by_center_point.rb

@@ -2,11 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "angle"
-require_relative "direct_position"
-require_relative "length"
-require_relative "arc"
-
 module Ogc
   module Gml
     class ArcByCenterPoint < Arc
@@ -20,8 +15,8 @@ module Ogc
       attribute :end_angle, Angle
 
       xml do
-        root "ArcByCenterPoint"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ArcByCenterPoint"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/arc_string.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "coordinates"
-require_relative "direct_position_list"
-require_relative "direct_position"
-require_relative "point_property"
-require_relative "abstract_curve_segment"
-
 module Ogc
   module Gml
     class ArcString < AbstractCurveSegment
@@ -20,8 +14,8 @@ module Ogc
       attribute :coordinates, Coordinates
 
       xml do
-        root "ArcString"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ArcString"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/arc_string_by_bulge.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "vector"
-require_relative "arc_string"
 
 module Ogc
   module Gml
@@ -11,8 +9,8 @@ module Ogc
       attribute :normal, Vector, collection: true
 
       xml do
-        root "ArcStringByBulge"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "ArcStringByBulge"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/array.rb

@@ -2,23 +2,16 @@
 
 require "lutaml/model"
 
-require_relative "array_association"
-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 Array < AbstractTopology
       attribute :members, ArrayAssociation
 
       xml do
-        root "Array"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Array"
+        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/array_association.rb

@@ -9,8 +9,8 @@ module Ogc
       attribute :abstract_object, :string, collection: true
 
       xml do
-        root "members"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "members"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         map_element "AbstractObject", to: :abstract_object

data/lib/ogc/gml/association_role.rb

@@ -6,16 +6,16 @@ module Ogc
   module Gml
     class AssociationRole < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
 
       xml do
-        root "member"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "member"
+        namespace Namespace
 
         map_attribute "owns", to: :owns
         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
       end
     end
   end

data/lib/ogc/gml/b_spline.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "bezier"
 
 module Ogc
   module Gml
     class BSpline < Bezier
       xml do
-        root "BSpline"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "BSpline"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/bag.rb

@@ -2,14 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "array_association"
-require_relative "association_role"
-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 Bag < AbstractTopology
@@ -17,10 +9,10 @@ module Ogc
       attribute :members, ArrayAssociation
 
       xml do
-        root "Bag"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Bag"
+        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/base_unit.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 BaseUnit < AbstractTopology
@@ -19,10 +12,10 @@ module Ogc
       attribute :units_system, Reference
 
       xml do
-        root "BaseUnit"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "BaseUnit"
+        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/bezier.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "coordinates"
-require_relative "direct_position_list"
-require_relative "knot_property"
-require_relative "point_property"
-require_relative "abstract_curve_segment"
-
 module Ogc
   module Gml
     class Bezier < AbstractCurveSegment
@@ -23,8 +17,8 @@ module Ogc
       attribute :knot, KnotProperty, collection: true
 
       xml do
-        root "Bezier"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Bezier"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/boolean.rb

@@ -9,8 +9,8 @@ module Ogc
       attribute :nil_reason, :string
 
       xml do
-        root "Boolean"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Boolean"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "nilReason", to: :nil_reason

data/lib/ogc/gml/bounding_shape.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "envelope"
-
 module Ogc
   module Gml
     class BoundingShape < Lutaml::Model::Serializable
@@ -12,8 +10,8 @@ module Ogc
       attribute :null, :string
 
       xml do
-        root "boundedBy"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "boundedBy"
+        namespace Namespace
 
         map_attribute "nilReason", to: :nil_reason
         map_element "Envelope", to: :envelope

data/lib/ogc/gml/cartesian_cs.rb

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

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

data/lib/ogc/gml/category.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-
 module Ogc
   module Gml
     class Category < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :nil_reason, :string
 
       xml do
-        root "Category"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Category"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "nilReason", to: :nil_reason

data/lib/ogc/gml/category_extent.rb

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

data/lib/ogc/gml/circle.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "arc_string"
 
 module Ogc
   module Gml
     class Circle < Arc
       xml do
-        root "Circle"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Circle"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/circle_by_center_point.rb

@@ -2,13 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "coordinates"
-require_relative "direct_position_list"
-require_relative "direct_position"
-require_relative "length"
-require_relative "point_property"
-require_relative "abstract_curve_segment"
-
 module Ogc
   module Gml
     class CircleByCenterPoint < AbstractCurveSegment
@@ -22,8 +15,8 @@ module Ogc
       attribute :radius, Length
 
       xml do
-        root "CircleByCenterPoint"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CircleByCenterPoint"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/clothoid.rb

@@ -2,9 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "ref_location"
-require_relative "abstract_curve_segment"
-
 module Ogc
   module Gml
     class Clothoid < AbstractCurveSegment
@@ -15,8 +12,8 @@ module Ogc
       attribute :end_parameter, :float
 
       xml do
-        root "Clothoid"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Clothoid"
+        namespace Namespace
 
         map_attribute "numDerivativesAtStart", to: :num_derivatives_at_start
         map_attribute "numDerivativesAtEnd", to: :num_derivatives_at_end

data/lib/ogc/gml/code.rb

@@ -9,8 +9,8 @@ module Ogc
       attribute :code_space, :string
 
       xml do
-        root "LocationKeyWord"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "LocationKeyWord"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "codeSpace", to: :code_space

data/lib/ogc/gml/code_or_nil_reason_list.rb

@@ -9,8 +9,8 @@ module Ogc
       attribute :code_space, :string
 
       xml do
-        root "CategoryList"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CategoryList"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "codeSpace", to: :code_space

data/lib/ogc/gml/code_with_authority.rb

@@ -2,8 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-
 module Ogc
   module Gml
     class CodeWithAuthority < Lutaml::Model::Serializable
@@ -11,8 +9,8 @@ module Ogc
       attribute :code_space, :string
 
       xml do
-        root "derivedCRSType"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "derivedCRSType"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "codeSpace", to: :code_space

data/lib/ogc/gml/composite_curve.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "curve_property"
-require_relative "abstract_geometric_aggregate"
 
 module Ogc
   module Gml
@@ -10,10 +8,10 @@ module Ogc
       attribute :curve_member, CurveProperty, collection: true
 
       xml do
-        root "CompositeCurve"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CompositeCurve"
+        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/composite_solid.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "solid_property"
-require_relative "abstract_geometric_aggregate"
 
 module Ogc
   module Gml
@@ -10,10 +8,10 @@ module Ogc
       attribute :solid_member, SolidProperty, collection: true
 
       xml do
-        root "CompositeSolid"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CompositeSolid"
+        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/composite_surface.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "surface_property"
-require_relative "abstract_geometric_aggregate"
 
 module Ogc
   module Gml
@@ -10,10 +8,10 @@ module Ogc
       attribute :surface_member, SurfaceProperty, collection: true
 
       xml do
-        root "CompositeSurface"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CompositeSurface"
+        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/composite_value.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 CompositeValue < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
       attribute :description, :string
@@ -23,10 +16,10 @@ module Ogc
       attribute :value_components, ValueArrayProperty
 
       xml do
-        root "CompositeValue"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CompositeValue"
+        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/compound_crs.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "single_crs_property"
-require_relative "abstract_crs"
 
 module Ogc
   module Gml
@@ -11,10 +9,10 @@ module Ogc
       attribute :component_reference_system, SingleCRSProperty, collection: true
 
       xml do
-        root "CompoundCRS"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "CompoundCRS"
+        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