ogc-gml 1.0.4 → 1.2.0

data/lib/ogc/gml/time_clock.rb

@@ -2,14 +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 "time_calendar_property"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class TimeClock < AbstractTopology
@@ -21,10 +13,10 @@ module Ogc
       attribute :date_basis, TimeCalendarProperty, collection: true
 
       xml do
-        root "TimeClock"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeClock"
+        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/time_coordinate_system.rb

@@ -2,15 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "time_instant_property"
-require_relative "time_interval_length"
-require_relative "time_position"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class TimeCoordinateSystem < AbstractTopology
@@ -21,10 +12,10 @@ module Ogc
       attribute :interval, TimeIntervalLength
 
       xml do
-        root "TimeCoordinateSystem"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeCoordinateSystem"
+        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/time_cs.rb

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

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

data/lib/ogc/gml/time_edge.rb

@@ -2,15 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-require_relative "related_time"
-require_relative "time_node_property"
-require_relative "time_period_property"
-require_relative "abstract_time_topology_primitive"
-
 module Ogc
   module Gml
     class TimeEdge < AbstractTimeTopologyPrimitive
@@ -19,10 +10,10 @@ module Ogc
       attribute :extent, TimePeriodProperty
 
       xml do
-        root "TimeEdge"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeEdge"
+        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/time_edge_property.rb

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

data/lib/ogc/gml/time_instant.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "abstract_time_geometric_primitive"
-require_relative "time_position"
 
 module Ogc
   module Gml
@@ -10,10 +8,10 @@ module Ogc
       attribute :time_position, TimePosition
 
       xml do
-        root "TimeInstant"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeInstant"
+        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 "frame", to: :frame
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description

data/lib/ogc/gml/time_instant_property.rb

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

data/lib/ogc/gml/time_interval_length.rb

@@ -11,8 +11,8 @@ module Ogc
       attribute :factor, :integer
 
       xml do
-        root "timeInterval"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "timeInterval"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "unit", to: :unit

data/lib/ogc/gml/time_node.rb

@@ -1,25 +1,19 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-# require_relative "time_edge_property"
-require_relative "time_instant_property"
-require_relative "abstract_time_topology_primitive"
 
 module Ogc
   module Gml
-    class TimeEdgeProperty < Lutaml::Model::Serializable
-    end
-
     class TimeNode < AbstractTimeTopologyPrimitive
       attribute :previous_edge, TimeEdgeProperty, collection: true
       attribute :next_edge, TimeEdgeProperty, collection: true
       attribute :position, TimeInstantProperty
 
       xml do
-        root "TimeNode"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeNode"
+        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/time_node_property.rb

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

data/lib/ogc/gml/time_ordinal_era.rb

@@ -1,18 +1,9 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "reference"
-require_relative "related_time"
-require_relative "time_node_property"
-# require_relative "time_ordinal_era_property"
-require_relative "time_period_property"
-require_relative "abstract_topology"
 
 module Ogc
   module Gml
-    class TimeOrdinalEraProperty < Lutaml::Model::Serializable
-    end
-
     class TimeOrdinalEra < AbstractTopology
       attribute :remarks, :string
       attribute :related_time, RelatedTime, collection: true
@@ -23,10 +14,10 @@ module Ogc
       attribute :group, Reference
 
       xml do
-        root "TimeOrdinalEra"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeOrdinalEra"
+        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/time_ordinal_era_property.rb

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

data/lib/ogc/gml/time_ordinal_reference_system.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 "time_ordinal_era_property"
-require_relative "abstract_topology"
-
 module Ogc
   module Gml
     class TimeOrdinalReferenceSystem < AbstractTopology
@@ -17,10 +10,10 @@ module Ogc
       attribute :component, TimeOrdinalEraProperty, collection: true
 
       xml do
-        root "TimeOrdinalReferenceSystem"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeOrdinalReferenceSystem"
+        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/time_period.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 require "lutaml/model"
-require_relative "time_instant_property"
-require_relative "time_interval_length"
-require_relative "time_position"
-require_relative "abstract_time_geometric_primitive"
 
 module Ogc
   module Gml
@@ -17,10 +13,10 @@ module Ogc
       attribute :time_interval, TimeIntervalLength
 
       xml do
-        root "TimePeriod"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimePeriod"
+        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 "frame", to: :frame
         map_element "metaDataProperty", to: :meta_data_property
         map_element "description", to: :description

data/lib/ogc/gml/time_period_property.rb

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

data/lib/ogc/gml/time_position.rb

@@ -11,8 +11,8 @@ module Ogc
       attribute :indeterminate_position, :string
 
       xml do
-        root "timePosition"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "timePosition"
+        namespace Namespace
 
         map_content to: :content
         map_attribute "frame", to: :frame

data/lib/ogc/gml/time_primitive_property.rb

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

data/lib/ogc/gml/time_reference_system.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 TimeReferenceSystem < AbstractTopology
@@ -15,10 +9,10 @@ module Ogc
       attribute :domain_of_validity, :string
 
       xml do
-        root "TimeReferenceSystem"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeReferenceSystem"
+        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/time_topology_complex.rb

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

@@ -2,24 +2,23 @@
 
 require "lutaml/model"
 
-require_relative "abstract_time_topology_primitive"
-
 module Ogc
   module Gml
     class TimeTopologyPrimitiveProperty < Lutaml::Model::Serializable
       attribute :nil_reason, :string
-      attribute :remote_schema, :string
+      attribute :remote_schema, RemoteSchema
       attribute :owns, :boolean, default: -> { false }
       attribute :abstract_time_topology_primitive, AbstractTimeTopologyPrimitive
 
       xml do
-        root "TimeTopologyPrimitivePropertyType"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TimeTopologyPrimitivePropertyType"
+        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 "AbstractTimeTopologyPrimitive", to: :abstract_time_topology_primitive
+        map_element "AbstractTimeTopologyPrimitive",
+                    to: :abstract_time_topology_primitive
       end
     end
   end

data/lib/ogc/gml/tin.rb

@@ -2,12 +2,6 @@
 
 require "lutaml/model"
 
-require_relative "control_point"
-require_relative "length"
-require_relative "line_string_segment_array_property"
-require_relative "surface_patch_array_property"
-require_relative "abstract_geometry"
-
 module Ogc
   module Gml
     class Tin < AbstractGeometry
@@ -18,10 +12,10 @@ module Ogc
       attribute :control_point, ControlPoint
 
       xml do
-        root "Tin"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "Tin"
+        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/topo_complex.rb

@@ -2,21 +2,10 @@
 
 require "lutaml/model"
 
-require_relative "code"
-require_relative "code_with_authority"
-require_relative "meta_data_property"
-require_relative "reference"
-# require_relative "topo_complex_property"
-require_relative "topo_primitive_array_association"
-require_relative "topo_primitive_member"
-
 module Ogc
   module Gml
-    class TopoComplexProperty < Lutaml::Model::Serializable
-    end
-
     class TopoComplex < Lutaml::Model::Serializable
-      attribute :id, :string
+      attribute :id, Identifier
       attribute :is_maximal, :boolean, default: -> { false }
       attribute :aggregation_type, :string
       attribute :meta_data_property, MetaDataProperty, collection: true
@@ -31,10 +20,10 @@ module Ogc
       attribute :topo_primitive_members, TopoPrimitiveArrayAssociation
 
       xml do
-        root "TopoComplex"
-        namespace "http://www.opengis.net/gml/3.2", "gml"
+        element "TopoComplex"
+        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 "isMaximal", to: :is_maximal
         map_attribute "aggregationType", to: :aggregation_type
         map_element "metaDataProperty", to: :meta_data_property

data/lib/ogc/gml/topo_complex_property.rb

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