diff --git a/src/main/resources/input/BRO/xsd/www.broservices.nl/BRO-COMMON-20190321/brocommon/3.0/brocommon.xsd b/src/main/resources/input/BRO/xsd/www.broservices.nl/BRO-COMMON-20190321/brocommon/3.0/brocommon.xsd
index 626e46b75..b997e6ab2 100644
--- a/src/main/resources/input/BRO/xsd/www.broservices.nl/BRO-COMMON-20190321/brocommon/3.0/brocommon.xsd
+++ b/src/main/resources/input/BRO/xsd/www.broservices.nl/BRO-COMMON-20190321/brocommon/3.0/brocommon.xsd
@@ -1,113 +1,145 @@
+
+ version="3.0.8">
-
+
+
- This XSD describes the complex types, simple types common to the entire BRO.
- Version:2.5.6
- Changes compared to Version:2.5.5:
- - Added CorrectionTypeType and CorrectionRequestType.
- - Definitions grouped by simpleTypes and complexTypes.
- - Definitions ordered alphabetically within group.
- Version:2.5.7:
- - New design for operations and messages with less operations and logic based on SourceDocumentTypes.
- Version:3.0.1
- - standardizedLocation, deliveredLocation optional.
- Version:3.0.2
- - RegistrationObject, DeregisteredObject, Enumeration Wrappers.
- Version:3.0.3
- - OrganizationType.
- Version:3.0.4
- - Added AbstractDispatchCharacteristicsRequestType.
- - Removed attribute requestReference from complexType DispatchCharacteristicsRequest.
- - Split CharacteristicsType into broId and CommonCharacteristics.
- - Added root element AbstractCharacteristics.
- - Added AbstractCharacteristicsType.
+ This XSD describes the complex types, simple types common to the entire BRO.
+ Version:2.5.6 Changes compared to Version:2.5.5:
+ - Added CorrectionTypeType and CorrectionRequestType.
+ - Definitions grouped by simpleTypes and complexTypes.
+ - Definitions ordered alphabetically within group.
+ Version:2.5.7:
+ - New design for operations and messages with less operations and logic based on SourceDocumentTypes.
+ Version:3.0.1
+ - standardizedLocation, deliveredLocation optional.
+ Version:3.0.2
+ - RegistrationObject, DeregisteredObject, Enumeration Wrappers.
+ Version:3.0.3
+ - OrganizationType.
+ Version:3.0.4
+ - Added AbstractDispatchCharacteristicsRequestType.
+ - Removed attribute requestReference from complexType DispatchCharacteristicsRequest.
+ - Split CharacteristicsType into broId and CommonCharacteristics.
+ - Added root element AbstractCharacteristics.
+ - Added AbstractCharacteristicsType.
+ Version:3.0.5
+ - Added MeasureNillableType, which is similar to gml:MeasureType but with an optional rather than a required attribute uom.
+ Version:3.0.6
+ - support for curve, surface in kenset delivered location and multipoint in kenset and object standardized location
+ - Added StandardizedGeometryType (Point or MultiPoint)
+ - Added DeliveredGeometryType (Point, Curve or Surface)
+ - Added AbstractCharacteristicsV2, AbstractCharacteristicsV2Type and CommonCharacteristicsV2 group
+ - Added StandardizedLocationV2Type
+ Version:3.0.7
+ - support for (Multi)Polygon in standardized geometry
+ - Added Surface and MultiSurface to DeliveredGeometryType
+ - Added Surface and MultiSurface to StandardizedGeometryType
+ - Added DeliveredGeometry and StandardizedGeometry element and propertyType
+ Version:3.0.8
+ - changed layout
+ - Added gml:Polygon to DeliveredGeometryType
+ - Added gml:MultiGeometry to StandardizedGeometryType:
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -128,15 +160,15 @@
-
-
+
+
-
-
+
+
@@ -145,7 +177,7 @@
deprecated; use root element AbstractCharacteristics and complexType AbstractCharacteristicsType to derive RO-specific Characteristics instead.
-
+
@@ -154,21 +186,30 @@
deprecated; use root element AbstractCharacteristics and complexType AbstractCharacteristicsType to derive RO-specific Characteristics instead.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
Definition: De entiteit AbstractCharacteristics bevat de registratieobject onafhankelijke kengegevens van een registratieobject dat niet uit registratie is genomen.
@@ -183,46 +224,61 @@
+
+
+ Definition: De entiteit AbstractCharacteristicsV2 bevat de registratieobject onafhankelijke kengegevens van een registratieobject dat niet uit registratie is genomen.
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -231,8 +287,8 @@
-
-
+
+
@@ -240,58 +296,59 @@
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -302,47 +359,47 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -351,10 +408,10 @@
-
-
-
-
+
+
+
+
@@ -362,35 +419,95 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Definition: ToDo: zie inleiding catalogus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Definition: ToDo: zie inleiding catalogus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Definition: Datatype voor een meetwaarde die mogelijk geen waarde heeft.
+Explanation: Het attribute uom moet aanwezig zijn als een gegeven met dit datatype een waarde heeft. Het attribute uom mag niet aanwezig zijn als een gegeven met dit datatype geen waarde heeft en wel een attribuut nil="true".
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd b/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd
index 5593a8b02..84f0f805f 100644
--- a/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd
+++ b/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/gml/3.2/gml-profile.xsd
@@ -1,101 +1,37 @@
+
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:gml="http://www.opengis.net/gml/3.2"
+ targetNamespace="http://www.opengis.net/gml/3.2"
+ elementFormDefault="qualified"
+ version="0.0.4-3.2.1">
+
- GML 3.2.1 profile for BRO.
- Based on: gml:AbstractFeature, gml:ReferenceType, gml:PointPropertyType, gml:EnvelopeType, gml:MeasureType, gml:TimeInstantPropertyType, (gml:CodeWithAuthorityType)
- 0.0.2: anyURI toegevoegd aan TimePositionUnion
+ GML 3.2.1 profile for BRO. 0.0.1-3.2.1: Based on gml:AbstractFeature, gml:ReferenceType, gml:PointPropertyType, gml:EnvelopeType, gml:MeasureType, gml:TimeInstantPropertyType, (gml:CodeWithAuthorityType)
+ GML 3.2.1 profile for BRO. 0.0.2-3.2.1: anyURI toegevoegd aan TimePositionUnion
+ GML 3.2.1 profile for BRO. 0.0.3-3.2.1: June 2021: Added gml:BoundingShapeType, CurvePropertyType, MultiPointPropertyType, MultiSuMultiSurfacePropertyTyperface; Adjusted SurfaceType
+ GML 3.2.1 profile for BRO. 0.0.4-3.2.1: November 2023: Added GeometryPropertyType, Solid, MultiCurve, MultiSolid and MultiGeometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -103,13 +39,6 @@
-
-
-
-
@@ -117,80 +46,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -198,47 +57,105 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
@@ -246,9 +163,47 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -258,16 +213,17 @@
-
-
+
+
+
+
-
@@ -278,78 +234,149 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
+If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -359,17 +386,154 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ gml:CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A curve segment defines a homogeneous segment of a curve. The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3. The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism. All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.
+
+
+
+
+ gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.
+
+
+
+
+ A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ An ArcString is a curve segment that uses three-point circular arc interpolation ("circularArc3Points"). The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be 2 * numArc + 1. The content model follows the general pattern for the encoding of curve segments.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -380,25 +544,18 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -408,25 +565,378 @@
-
-
+
+
+
+
+ A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another. patches encapsulates the patches of the surface.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.
+
+
+
+
+ gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.
+
+
+
+
+
+
+
+ A surface patch defines a homogenuous portion of a surface. The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface. All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.
+
+
+
+
+
+
+ A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The AbstractSolid element is the abstract head of the substituition group for all (continuous) solid elements.
+
+
+
+
+ gml:AbstractSolidType is an abstraction of a solid to support the different levels of complexity. The solid may always be viewed as a geometric primitive, i.e. is contiguous.
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSolid.
+
+
+
+
+ A property that has a solid as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+ A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces as specified in ISO 19107:2003, 6.3.18. exterior specifies the outer boundary, interior the inner boundary of the solid.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A shell is used to represent a single connected component of a solid boundary as specified in ISO 19107:2003, 6.3.8.
+Every gml:surfaceMember references or contains one surface, i.e. any element which is substitutable for gml:AbstractSurface. In the context of a shell, the surfaces describe the boundary of the solid.
+If provided, the aggregationType attribute shall have the value "set".
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.
+
+
+
+
+ A property with the content model of gml:ShellPropertyType encapsulates a shell to represent a component of a solid boundary.
+
+
+
+
+
+
+
+
+
+
+
+ gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.
+
+
+
+
+
+
+
+
+
+
+
+ A GML Object Collection is any GML Object with a property element in its content model whose content model is derived by extension from gml:AbstractMemberType. In addition, the complex type describing the content model of the GML Object Collection may also include a reference to the attribute group gml:AggregationAttributeGroup to provide additional information about the semantics of the object collection. This information may be used by applications to group GML objects, and optionally to order and index them. The allowed values for the aggregationType attribute are defined by gml:AggregationType. See 8.4 of ISO/IEC 11404:1996 for the meaning of the values in the enumeration.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiPoint consists of one or more gml:Points.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a Point via the XLink-attributes or contains the Point element.
+
+
+
+
+ A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiCurve is defined by one or more gml:AbstractCurves.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
+
-
-
--->
-
+
+
+
+
+
+
+
+
+
+
+
+
+ A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiSolid is defined by one or more gml:AbstractSolids.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element, which is substitutable for gml:AbstractSolid.
+
+
+
+
+ A property that has a collection of solids as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gml:MultiGeometry is a collection of one or more GML geometry objects of arbitrary type.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a geometry element via the XLink-attributes or contains the geometry element.
+
+
+
+
+ A property that has a geometric aggregate as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
diff --git a/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/profile/gml/1.0/gml-profile.xsd b/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/profile/gml/1.0/gml-profile.xsd
index 5593a8b02..84f0f805f 100644
--- a/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/profile/gml/1.0/gml-profile.xsd
+++ b/src/main/resources/input/BRO/xsd/www.opengis.net/GML321-BROPROFILE/profile/gml/1.0/gml-profile.xsd
@@ -1,101 +1,37 @@
+
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:gml="http://www.opengis.net/gml/3.2"
+ targetNamespace="http://www.opengis.net/gml/3.2"
+ elementFormDefault="qualified"
+ version="0.0.4-3.2.1">
+
- GML 3.2.1 profile for BRO.
- Based on: gml:AbstractFeature, gml:ReferenceType, gml:PointPropertyType, gml:EnvelopeType, gml:MeasureType, gml:TimeInstantPropertyType, (gml:CodeWithAuthorityType)
- 0.0.2: anyURI toegevoegd aan TimePositionUnion
+ GML 3.2.1 profile for BRO. 0.0.1-3.2.1: Based on gml:AbstractFeature, gml:ReferenceType, gml:PointPropertyType, gml:EnvelopeType, gml:MeasureType, gml:TimeInstantPropertyType, (gml:CodeWithAuthorityType)
+ GML 3.2.1 profile for BRO. 0.0.2-3.2.1: anyURI toegevoegd aan TimePositionUnion
+ GML 3.2.1 profile for BRO. 0.0.3-3.2.1: June 2021: Added gml:BoundingShapeType, CurvePropertyType, MultiPointPropertyType, MultiSuMultiSurfacePropertyTyperface; Adjusted SurfaceType
+ GML 3.2.1 profile for BRO. 0.0.4-3.2.1: November 2023: Added GeometryPropertyType, Solid, MultiCurve, MultiSolid and MultiGeometry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -103,13 +39,6 @@
-
-
-
-
@@ -117,80 +46,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -198,47 +57,105 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
@@ -246,9 +163,47 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -258,16 +213,17 @@
-
-
+
+
+
+
-
@@ -278,78 +234,149 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A geometric property may either be any geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same or another document). Note that either the reference or the contained element shall be given, but not both or none.
+If a feature has a property that takes a geometry element as its value, this is called a geometry property. A generic type for such a geometry property is GeometryPropertyType.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -359,17 +386,154 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ gml:CurveInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A curve segment defines a homogeneous segment of a curve. The attributes numDerivativesAtStart, numDerivativesAtEnd and numDerivativesInterior specify the type of continuity as specified in ISO 19107:2003, 6.4.9.3. The AbstractCurveSegment element is the abstract head of the substituition group for all curve segment elements, i.e. continuous segments of the same interpolation mechanism. All curve segments shall have an attribute interpolation with type gml:CurveInterpolationType specifying the curve interpolation mechanism used for this segment. This mechanism uses the control points and control parameters to determine the position of this curve segment.
+
+
+
+
+ gml:CurveSegmentArrayPropertyType is a container for an array of curve segments.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element contains a list of curve segments. The order of the elements is significant and shall be preserved when processing the array.
+
+
+
+
+ A property that has a curve as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+ An ArcString is a curve segment that uses three-point circular arc interpolation ("circularArc3Points"). The number of arcs in the arc string may be explicitly stated in the attribute numArc. The number of control points in the arc string shall be 2 * numArc + 1. The content model follows the general pattern for the encoding of curve segments.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -380,25 +544,18 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -408,25 +565,378 @@
-
-
+
+
+
+
+ A Surface is a 2-dimensional primitive and is composed of one or more surface patches as specified in ISO 19107:2003, 6.3.17.1. The surface patches are connected to one another. patches encapsulates the patches of the surface.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The patches property element contains the sequence of surface patches. The order of the elements is significant and shall be preserved when processing the array.
+
+
+
+
+ gml:SurfacePatchArrayPropertyType is a container for a sequence of surface patches.
+
+
+
+
+
+
+
+ A surface patch defines a homogenuous portion of a surface. The AbstractSurfacePatch element is the abstract head of the substituition group for all surface patch elements describing a continuous portion of a surface. All surface patches shall have an attribute interpolation (declared in the types derived from gml:AbstractSurfacePatchType) specifying the interpolation mechanism used for the patch using gml:SurfaceInterpolationType.
+
+
+
+
+
+
+ A gml:PolygonPatch is a surface patch that is defined by a set of boundary curves and an underlying surface to which these curves adhere. The curves shall be coplanar and the polygon uses planar interpolation in its interior. interpolation is fixed to "planar", i.e. an interpolation shall return points on a single plane. The boundary of the patch shall be contained within that plane.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gml:SurfaceInterpolationType is a list of codes that may be used to identify the interpolation mechanisms specified by an application schema.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The AbstractSolid element is the abstract head of the substituition group for all (continuous) solid elements.
+
+
+
+
+ gml:AbstractSolidType is an abstraction of a solid to support the different levels of complexity. The solid may always be viewed as a geometric primitive, i.e. is contiguous.
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a solid via the XLink-attributes or contains the solid element. solidProperty is the predefined property which may be used by GML Application Schemas whenever a GML feature has a property with a value that is substitutable for AbstractSolid.
+
+
+
+
+ A property that has a solid as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+ A solid is the basis for 3-dimensional geometry. The extent of a solid is defined by the boundary surfaces as specified in ISO 19107:2003, 6.3.18. exterior specifies the outer boundary, interior the inner boundary of the solid.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A shell is used to represent a single connected component of a solid boundary as specified in ISO 19107:2003, 6.3.8.
+Every gml:surfaceMember references or contains one surface, i.e. any element which is substitutable for gml:AbstractSurface. In the context of a shell, the surfaces describe the boundary of the solid.
+If provided, the aggregationType attribute shall have the value "set".
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a surface via the XLink-attributes or contains the surface element. A surface element is any element, which is substitutable for gml:AbstractSurface.
+
+
+
+
+ A property with the content model of gml:ShellPropertyType encapsulates a shell to represent a component of a solid boundary.
+
+
+
+
+
+
+
+
+
+
+
+ gml:AbstractGeometricAggregate is the abstract head of the substitution group for all geometric aggregates.
+
+
+
+
+
+
+
+
+
+
+
+ A GML Object Collection is any GML Object with a property element in its content model whose content model is derived by extension from gml:AbstractMemberType. In addition, the complex type describing the content model of the GML Object Collection may also include a reference to the attribute group gml:AggregationAttributeGroup to provide additional information about the semantics of the object collection. This information may be used by applications to group GML objects, and optionally to order and index them. The allowed values for the aggregationType attribute are defined by gml:AggregationType. See 8.4 of ISO/IEC 11404:1996 for the meaning of the values in the enumeration.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiPoint consists of one or more gml:Points.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a Point via the XLink-attributes or contains the Point element.
+
+
+
+
+ A property that has a collection of points as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiCurve is defined by one or more gml:AbstractCurves.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A property that has a collection of curves as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ A gml:MultiSurface is defined by one or more gml:AbstractSurfaces.
+
-
-
--->
-
+
+
+
+
+
+
+
+
+
+
+
+
+ A property that has a collection of surfaces as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A gml:MultiSolid is defined by one or more gml:AbstractSolids.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a solid via the XLink-attributes or contains the solid element. A solid element is any element, which is substitutable for gml:AbstractSolid.
+
+
+
+
+ A property that has a collection of solids as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gml:MultiGeometry is a collection of one or more GML geometry objects of arbitrary type.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This property element either references a geometry element via the XLink-attributes or contains the geometry element.
+
+
+
+
+ A property that has a geometric aggregate as its value domain may either be an appropriate geometry element encapsulated in an element of this type or an XLink reference to a remote geometry element (where remote includes geometry elements located elsewhere in the same document). Either the reference or the contained element shall be given, but neither both nor none.
+
+
+
+
+
+
+
diff --git a/src/main/resources/input/DSO/xsd/cm-dso-cim-ow.xml b/src/main/resources/input/DSO/xsd/cm-dso-cim-ow.xml
index af8e7082d..4368e75e7 100644
--- a/src/main/resources/input/DSO/xsd/cm-dso-cim-ow.xml
+++ b/src/main/resources/input/DSO/xsd/cm-dso-cim-ow.xml
@@ -27,7 +27,7 @@ This file is generated by an embedded jscript directly from UML
EAID_FA28690A_FB2F_44ee_A54F_35133469F3AF
- #OW-Aanlevering
+ #global_class_OW-aanlevering_OW-Aanlevering
@@ -37,7 +37,7 @@ This file is generated by an embedded jscript directly from UML
EAID_15F16AB0_EC24_411c_9624_092BED363B0B
- #OW-Aanleveringpakket
+ #global_class_OW-aanlevering_OW-Aanleveringpakket
@@ -47,7 +47,7 @@ This file is generated by an embedded jscript directly from UML
EAID_754F6C62_0F9E_40a4_9461_95D85C8AA058
- #WijzigPakket
+ #global_class_Wijziginstructie_WijzigPakket
@@ -57,7 +57,7 @@ This file is generated by an embedded jscript directly from UML
EAID_BB6D8BFA_DDFC_4c34_AEFA_704F3DE6B4F2
- #OP-objectAnnotatie
+ #global_class_Datatypen Algemeen_OP-objectAnnotatie
@@ -67,7 +67,7 @@ This file is generated by an embedded jscript directly from UML
EAID_682E9EEB_1E33_4e6b_AA2E_F91DD2574DEA
- #OW-object
+ #global_class_Datatypen Algemeen_OW-object
@@ -77,7 +77,7 @@ This file is generated by an embedded jscript directly from UML
EAID_F2580189_BC07_46f9_AAC6_947742A7F52E
- #Identificatie
+ #global_class_Datatypen Algemeen_Identificatie
@@ -87,17 +87,7 @@ This file is generated by an embedded jscript directly from UML
EAID_1BBF2542_A489_4825_867C_00C8AD6C08B6
- #WaardeEenheid
-
-
-
-
- Waardelijst
- false
- EAID_246B5D1D_8A38_4ab7_B635_974DE27BBC1B
-
-
- #Waardelijst
+ #global_class_Datatypen Algemeen_WaardeEenheid
@@ -107,7 +97,7 @@ This file is generated by an embedded jscript directly from UML
EAID_ED0AA65A_41CD_4a57_A569_ECC5B6C17492
- #OW-status
+ #global_class_Datatypen Algemeen_OW-status
@@ -117,7 +107,7 @@ This file is generated by an embedded jscript directly from UML
EAID_38866376_4C7B_43a2_8D1E_05159AC82374
- #Beperkingengebied
+ #global_class_GebiedsAanwijzing_Beperkingengebied
@@ -127,7 +117,7 @@ This file is generated by an embedded jscript directly from UML
EAID_2C6CC5A6_984D_45b3_9947_2805BCA96A2F
- #Gebiedsaanwijzing
+ #global_class_GebiedsAanwijzing_Gebiedsaanwijzing
@@ -137,7 +127,7 @@ This file is generated by an embedded jscript directly from UML
EAID_41F5DE99_A744_4d40_AD57_1A19CFF58B44
- #Bodem
+ #global_class_GebiedsAanwijzing_Bodem
@@ -147,7 +137,7 @@ This file is generated by an embedded jscript directly from UML
EAID_F3447282_8E76_47c4_8443_D65D44AB101C
- #Bouw
+ #global_class_GebiedsAanwijzing_Bouw
@@ -157,7 +147,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A0C27BED_C344_4e24_9FF4_9A232DB301FA
- #Defensie
+ #global_class_GebiedsAanwijzing_Defensie
@@ -167,7 +157,7 @@ This file is generated by an embedded jscript directly from UML
EAID_CB7908BA_7AA0_4e1c_8DA8_F576C5B29E6E
- #Energievoorziening
+ #global_class_GebiedsAanwijzing_Energievoorziening
@@ -177,7 +167,7 @@ This file is generated by an embedded jscript directly from UML
EAID_96A4EC05_422E_440f_97A1_7F3C2DEE44CA
- #Erfgoed
+ #global_class_GebiedsAanwijzing_Erfgoed
@@ -187,7 +177,7 @@ This file is generated by an embedded jscript directly from UML
EAID_6BE7D2E0_F47E_4ad1_A7B4_22EF1000AEC7
- #ExterneVeiligheid
+ #global_class_GebiedsAanwijzing_ExterneVeiligheid
@@ -197,7 +187,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A760F601_CE37_442d_AB44_B2649D157066
- #Functie
+ #global_class_GebiedsAanwijzing_Functie
@@ -207,7 +197,7 @@ This file is generated by an embedded jscript directly from UML
EAID_D730EF03_91D3_4cbc_9896_E9A9B7700D56
- #Geluid
+ #global_class_GebiedsAanwijzing_Geluid
@@ -217,7 +207,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A56212FD_D78B_4d4b_8DCA_0E4647E44F0A
- #Geur
+ #global_class_GebiedsAanwijzing_Geur
@@ -227,7 +217,7 @@ This file is generated by an embedded jscript directly from UML
EAID_9866CFE5_3E80_4c76_BDAB_AA1A7096041E
- #Landschap
+ #global_class_GebiedsAanwijzing_Landschap
@@ -237,7 +227,7 @@ This file is generated by an embedded jscript directly from UML
EAID_15ADCED3_359E_4635_9BB3_F3E6C2AE1809
- #Leiding
+ #global_class_GebiedsAanwijzing_Leiding
@@ -247,7 +237,7 @@ This file is generated by an embedded jscript directly from UML
EAID_CDDA9E8B_6BD8_4b82_B71C_A035FEC307A4
- #Lucht
+ #global_class_GebiedsAanwijzing_Lucht
@@ -257,7 +247,7 @@ This file is generated by an embedded jscript directly from UML
EAID_95A325B9_14EC_4177_97EE_48A116D7A41D
- #Mijnbouw
+ #global_class_GebiedsAanwijzing_Mijnbouw
@@ -267,7 +257,7 @@ This file is generated by an embedded jscript directly from UML
EAID_75F80A6D_A795_4b8b_ADF0_AAFC8210CECE
- #Natuur
+ #global_class_GebiedsAanwijzing_Natuur
@@ -277,7 +267,7 @@ This file is generated by an embedded jscript directly from UML
EAID_3DC6C42A_0C97_4407_A12C_BBFBCBD83E97
- #Recreatie
+ #global_class_GebiedsAanwijzing_Recreatie
@@ -287,7 +277,7 @@ This file is generated by an embedded jscript directly from UML
EAID_38EDB553_1D14_43ce_92AA_3D9E09C950B9
- #RuimtelijkGebruik
+ #global_class_GebiedsAanwijzing_RuimtelijkGebruik
@@ -297,7 +287,7 @@ This file is generated by an embedded jscript directly from UML
EAID_4B5FDC5C_6F6A_4439_A3A5_F83224438D58
- #Verkeer
+ #global_class_GebiedsAanwijzing_Verkeer
@@ -307,7 +297,7 @@ This file is generated by an embedded jscript directly from UML
EAID_614E210C_00E5_475f_A6D5_3C0B9FB1096B
- #Water en watersysteem
+ #global_class_GebiedsAanwijzing_Water en watersysteem
@@ -317,7 +307,7 @@ This file is generated by an embedded jscript directly from UML
EAID_5FB72FEE_2184_4b58_9A45_9F12CE9BFCF1
- #Beperkingengebiedgroep
+ #global_class_GebiedsAanwijzing_Beperkingengebiedgroep
@@ -327,7 +317,7 @@ This file is generated by an embedded jscript directly from UML
EAID_72C64A3B_21AB_4202_A943_786BF399B081
- #Bodemgroep
+ #global_class_GebiedsAanwijzing_Bodemgroep
@@ -337,7 +327,7 @@ This file is generated by an embedded jscript directly from UML
EAID_90F53BDD_F8B5_44de_AE57_60C7B56A7191
- #Bouwgroep
+ #global_class_GebiedsAanwijzing_Bouwgroep
@@ -347,7 +337,7 @@ This file is generated by an embedded jscript directly from UML
EAID_8B77F220_4E94_4987_869D_3186E435ED8A
- #Defensiegroep
+ #global_class_GebiedsAanwijzing_Defensiegroep
@@ -357,7 +347,7 @@ This file is generated by an embedded jscript directly from UML
EAID_33B5B0BF_8280_434b_A7CE_DC8C39DD9EF1
- #Energievoorzieninggroep
+ #global_class_GebiedsAanwijzing_Energievoorzieninggroep
@@ -367,7 +357,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A9839246_9B33_4df5_AA51_B542EE48BC17
- #Erfgoedgroep
+ #global_class_GebiedsAanwijzing_Erfgoedgroep
@@ -377,7 +367,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A6AF0789_68B0_4d89_8A39_75509C92F2DC
- #Externeveiligheidgroep
+ #global_class_GebiedsAanwijzing_Externeveiligheidgroep
@@ -387,7 +377,7 @@ This file is generated by an embedded jscript directly from UML
EAID_94C87291_EAE6_4507_8FF9_1AFFEE67EE93
- #Functiegroep
+ #global_class_GebiedsAanwijzing_Functiegroep
@@ -397,7 +387,7 @@ This file is generated by an embedded jscript directly from UML
EAID_5B88080D_F038_44a1_A3BD_2AA1F845FFB5
- #Geluidgroep
+ #global_class_GebiedsAanwijzing_Geluidgroep
@@ -407,7 +397,7 @@ This file is generated by an embedded jscript directly from UML
EAID_F4CA62DD_D1AE_48e0_AA4F_C494656F0FAB
- #Geurgroep
+ #global_class_GebiedsAanwijzing_Geurgroep
@@ -417,7 +407,7 @@ This file is generated by an embedded jscript directly from UML
EAID_A7464866_CC4D_4bd3_9A04_5B57D5EE5D37
- #Landschapgroep
+ #global_class_GebiedsAanwijzing_Landschapgroep
@@ -427,7 +417,7 @@ This file is generated by an embedded jscript directly from UML
EAID_CC6C128A_E3E6_49b2_A0B8_39FB595D687F
- #Leidinggroep
+ #global_class_GebiedsAanwijzing_Leidinggroep
@@ -437,7 +427,7 @@ This file is generated by an embedded jscript directly from UML
EAID_B4CE7F32_6C40_43d3_A4F8_1D10A1C2A712
- #Luchtgroep
+ #global_class_GebiedsAanwijzing_Luchtgroep
@@ -447,7 +437,7 @@ This file is generated by an embedded jscript directly from UML
EAID_B9A0069D_1C79_46bb_BCD7_81E5C9B249E3
- #Mijnbouwgroep
+ #global_class_GebiedsAanwijzing_Mijnbouwgroep
@@ -457,7 +447,7 @@ This file is generated by an embedded jscript directly from UML
EAID_B172F4BE_D08E_4303_B46F_59D04A426D0D
- #Natuurgroep
+ #global_class_GebiedsAanwijzing_Natuurgroep
@@ -467,7 +457,7 @@ This file is generated by an embedded jscript directly from UML
EAID_32EAA2CF_0C93_4316_9F16_DEEDB9CF1B2B
- #Recreatiegroep
+ #global_class_GebiedsAanwijzing_Recreatiegroep
@@ -477,7 +467,7 @@ This file is generated by an embedded jscript directly from UML
EAID_DA5EBB01_DE88_4229_8087_557C1EFA1486
- #Ruimtelijkgebruikgroep
+ #global_class_GebiedsAanwijzing_Ruimtelijkgebruikgroep
@@ -487,7 +477,7 @@ This file is generated by an embedded jscript directly from UML
EAID_64656BA5_7568_4cbb_B4B4_B1C768036F05
- #Verkeergroep
+ #global_class_GebiedsAanwijzing_Verkeergroep
@@ -497,7 +487,7 @@ This file is generated by an embedded jscript directly from UML
EAID_AAC1633A_3888_4b27_8208_0F5CF4E573A9
- #Water-en-watersysteemgroep
+ #global_class_GebiedsAanwijzing_Water-en-watersysteemgroep
@@ -507,7 +497,7 @@ This file is generated by an embedded jscript directly from UML
EAID_2ADF64EE_FC4E_4973_8963_D11BFE07E049
- #Kaartextent
+ #global_class_Kaart_Kaartextent
@@ -517,7 +507,7 @@ This file is generated by an embedded jscript directly from UML
EAID_CA3AF416_E758_4976_8CD7_17F128156186
- #Kaart
+ #global_class_Kaart_Kaart
@@ -527,7 +517,7 @@ This file is generated by an embedded jscript directly from UML
EAID_CAF7BFC4_B43D_4f5a_8B32_64DCCAAEBBC7
- #Kaartlaag
+ #global_class_Kaart_Kaartlaag
@@ -537,7 +527,7 @@ This file is generated by an embedded jscript directly from UML
EAID_8DF21334_4B64_4151_A104_C0DDB416CFA3
- #Ambtsgebied
+ #global_class_Locatie_Ambtsgebied
@@ -547,7 +537,7 @@ This file is generated by an embedded jscript directly from UML
EAID_0E419B52_9153_4772_82CB_AD4B5563C11F
- #BestuurlijkeGrenzenVerwijzing
+ #global_class_Locatie_BestuurlijkeGrenzenVerwijzing
@@ -557,7 +547,7 @@ This file is generated by an embedded jscript directly from UML
EAID_23445257_E1F2_4839_8F63_320568A0DAA6
- #Lijn
+ #global_class_Locatie_Lijn
@@ -567,7 +557,7 @@ This file is generated by an embedded jscript directly from UML
EAID_515AE1C7_84B6_4d1f_B5FC_5530AFDA1FEA
- #Lijnengroep
+ #global_class_Locatie_Lijnengroep
@@ -577,7 +567,7 @@ This file is generated by an embedded jscript directly from UML
EAID_8E3C9FCC_CE33_4011_A195_3764059FBD5E
- #Punt
+ #global_class_Locatie_Punt
@@ -587,7 +577,7 @@ This file is generated by an embedded jscript directly from UML
EAID_C72326A6_0AC9_450b_A79D_2DA3B4FF8E24
- #Puntengroep
+ #global_class_Locatie_Puntengroep
@@ -597,7 +587,7 @@ This file is generated by an embedded jscript directly from UML
EAID_9AC7936F_26E4_4a3b_B6A5_15FA7A46F233
- #Gebied
+ #global_class_Locatie_Gebied
@@ -607,7 +597,7 @@ This file is generated by an embedded jscript directly from UML
EAID_7B02C4A5_DBDC_434f_A998_ACD912042BED
- #Locatie
+ #global_class_Locatie_Locatie
@@ -617,7 +607,7 @@ This file is generated by an embedded jscript directly from UML
EAID_FA6DF457_6BEB_4ffd_B10D_5FC4F41C8E1E
- #Gebiedengroep
+ #global_class_Locatie_Gebiedengroep
@@ -627,7 +617,7 @@ This file is generated by an embedded jscript directly from UML
EAID_825C0DF1_95F5_4f2f_A48F_9FEE70088096
- #LijnOfMultilijn
+ #global_class_Locatie_LijnOfMultilijn
@@ -637,7 +627,7 @@ This file is generated by an embedded jscript directly from UML
EAID_2B882C47_7025_485b_9637_94BB006989E9
- #PuntOfMultipunt
+ #global_class_Locatie_PuntOfMultipunt
@@ -647,7 +637,7 @@ This file is generated by an embedded jscript directly from UML
EAID_52423CFC_5814_44f3_9D15_B32F7ADDBD69
- #VlakOfMultivlak
+ #global_class_Locatie_VlakOfMultivlak
@@ -657,7 +647,7 @@ This file is generated by an embedded jscript directly from UML
EAID_414B31B3_F8F0_477d_AB74_B190B00CF3E0
- #Bron
+ #global_class_Locatie_Bron
@@ -667,7 +657,7 @@ This file is generated by an embedded jscript directly from UML
EAID_4FB96120_DB22_49d7_91B5_6A04B8C95D6E
- #Pons
+ #global_class_Pons_Pons
@@ -677,7 +667,7 @@ This file is generated by an embedded jscript directly from UML
EAID_1A095D5D_8A7C_48a9_88E5_15731E9E9EA1
- #Instructieregel
+ #global_class_Regel_Instructieregel
@@ -687,7 +677,7 @@ This file is generated by an embedded jscript directly from UML
EAID_049749D7_5EF6_41a1_8D70_B385ABD3C741
- #Omgevingswaarderegel
+ #global_class_Regel_Omgevingswaarderegel
@@ -697,7 +687,7 @@ This file is generated by an embedded jscript directly from UML
EAID_F95C63CD_88A7_40e7_ACE1_3F8CA5BE0B60
- #Regel voor iedereen
+ #global_class_Regel_Regel voor iedereen
@@ -707,7 +697,7 @@ This file is generated by an embedded jscript directly from UML
EAID_16713C96_2244_47c8_9039_71B344F76B30
- #ActiviteitLocatieaanduiding
+ #global_class_Regel_ActiviteitLocatieaanduiding
@@ -717,7 +707,7 @@ This file is generated by an embedded jscript directly from UML
EAID_30A38485_407D_4001_9A32_CF95508B8788
- #RegeltekstAnnotatie
+ #global_class_Regel_RegeltekstAnnotatie
@@ -727,7 +717,7 @@ This file is generated by an embedded jscript directly from UML
EAID_1DACE941_091C_491d_8A87_CFA8A73D9D78
- #Juridische regel
+ #global_class_Regel_Juridische regel
@@ -737,7 +727,7 @@ This file is generated by an embedded jscript directly from UML
EAID_92E68E87_4517_48bf_8589_A21A5B5DBEFB
- #Activiteitregelkwalificatie
+ #global_class_Regel_Activiteitregelkwalificatie
@@ -747,7 +737,7 @@ This file is generated by an embedded jscript directly from UML
EAID_0EEA6D2D_9F80_4476_A9DF_B1EC470D87DA
- #Adressaat
+ #global_class_Regel_Adressaat
@@ -757,7 +747,7 @@ This file is generated by an embedded jscript directly from UML
EAID_DDD20426_0F56_47bc_B218_CD161BF14B81
- #Idealisatie
+ #global_class_Regel_Idealisatie
@@ -767,7 +757,7 @@ This file is generated by an embedded jscript directly from UML
EAID_2E42A07B_5764_4ab9_AA49_2B42520E29AF
- #Instrument
+ #global_class_Regel_Instrument
@@ -777,7 +767,7 @@ This file is generated by an embedded jscript directly from UML
EAID_696E76F8_BADA_4d51_9DFD_D04024BA0BCB
- #Thema
+ #global_class_Regel_Thema
@@ -787,7 +777,7 @@ This file is generated by an embedded jscript directly from UML
EAID_55119ED8_A21C_40c6_A445_A93A0734F82E
- #Norm
+ #global_class_RegelsOpLocatie_Norm
@@ -797,7 +787,7 @@ This file is generated by an embedded jscript directly from UML
EAID_FD038804_E061_4d0b_BFDC_B81FF6074AEC
- #Normwaarde
+ #global_class_RegelsOpLocatie_Normwaarde
@@ -807,7 +797,7 @@ This file is generated by an embedded jscript directly from UML
EAID_7B4AEACF_A800_452d_B2F3_56BF2E482AC0
- #Omgevingsnorm
+ #global_class_RegelsOpLocatie_Omgevingsnorm
@@ -817,7 +807,7 @@ This file is generated by an embedded jscript directly from UML
EAID_399DF1C1_7381_478d_A350_28E8CFA05D9F
- #Omgevingswaarde
+ #global_class_RegelsOpLocatie_Omgevingswaarde
@@ -827,7 +817,7 @@ This file is generated by an embedded jscript directly from UML
EAID_BAE746DF_02D7_4939_9526_17FAA0F9E230
- #Activiteit
+ #global_class_RegelsOpLocatie_Activiteit
@@ -837,7 +827,7 @@ This file is generated by an embedded jscript directly from UML
EAID_ED6A4A70_5FD2_455b_ADE9_22E82B3596FD
- #Activiteitengroep
+ #global_class_RegelsOpLocatie_Activiteitengroep
@@ -847,7 +837,7 @@ This file is generated by an embedded jscript directly from UML
EAID_760AA864_CC8A_44dd_B46E_BBAFA779E4D0
- #Eenheid
+ #global_class_RegelsOpLocatie_Eenheid
@@ -857,7 +847,7 @@ This file is generated by an embedded jscript directly from UML
EAID_3065EA3E_8791_4c0b_8EF2_1CB2801A3AE7
- #Typenorm
+ #global_class_RegelsOpLocatie_Typenorm
@@ -867,7 +857,7 @@ This file is generated by an embedded jscript directly from UML
EAID_269A57E1_2AE0_4971_A30B_D451475DEC3D
- #Omgevingsnormgroep
+ #global_class_RegelsOpLocatie_Omgevingsnormgroep
@@ -877,7 +867,7 @@ This file is generated by an embedded jscript directly from UML
EAID_67D588C7_8A15_4383_9165_14DC2F2857B6
- #Omgevingswaardegroep
+ #global_class_RegelsOpLocatie_Omgevingswaardegroep
@@ -887,7 +877,7 @@ This file is generated by an embedded jscript directly from UML
EAID_273591D9_79E0_43c0_8DBC_5C63F6624520
- #SymbolisatieItem
+ #global_class_Symbolisatie_SymbolisatieItem
@@ -897,7 +887,7 @@ This file is generated by an embedded jscript directly from UML
EAID_1D4478D9_5E37_4019_A4C7_414579D3D543
- #Hoofdlijn
+ #global_class_VrijeTekst_Hoofdlijn
@@ -907,9 +897,9 @@ This file is generated by an embedded jscript directly from UML
EAID_8609BDDF_6E6D_4732_9DB0_80CF7AE3CEF9
- #VrijetekstAnnotatie
+ #global_class_VrijeTekst_VrijetekstAnnotatie
-
+
\ No newline at end of file
diff --git a/src/main/resources/input/DSO/xsd/cm-dso-cim-tr.xml b/src/main/resources/input/DSO/xsd/cm-dso-cim-tr.xml
index 73516548e..d6819fa6b 100644
--- a/src/main/resources/input/DSO/xsd/cm-dso-cim-tr.xml
+++ b/src/main/resources/input/DSO/xsd/cm-dso-cim-tr.xml
@@ -24,402 +24,412 @@ This file is generated by an embedded jscript directly from UML
Aansluitpunt
false
- EAID_9F222F89_11D2_4f9f_9A99_522BE8B81C8D
+ EAID_B76942EA_7F6E_4b7b_A91F_A1C8D1BA9B6C
- #Aansluitpunt
+ #global_class_CIMTR_Aansluitpunt
Bedrijfsregel
false
- EAID_F3D067B3_43CA_4679_B0B6_B6606C2086AF
+ EAID_564827BF_D78D_4c94_9D56_8AC6F2C05731
- #Bedrijfsregel
+ #global_class_CIMTR_Bedrijfsregel
Bijlagedefinitie
false
- EAID_68577C8D_379B_4f0e_92EF_EC5CE55B2155
+ EAID_6341C790_F543_47a9_A00E_C51C4DD17D74
- #Bijlagedefinitie
+ #global_class_CIMTR_Bijlagedefinitie
Conclusie
false
- EAID_6E8B34BE_53DC_4e90_ACD6_2A2082EB2469
+ EAID_8A3B127E_A789_42b4_8D1C_01C0154AD0A0
- #Conclusie
+ #global_class_CIMTR_Conclusie
+
+
+
+
+ Conclusie
+ false
+ EAID_0AB3EBF2_1837_4a11_B5D7_51436A628482
+
+
+ #global_class_CIMTR_Conclusie
Conversieregel
false
- EAID_A9BB789A_01AB_4f7a_B114_ED4F042ED5FC
+ EAID_345E39F0_FD85_4da4_AC5E_960E15AB43AC
- #Conversieregel
+ #global_class_CIMTR_Conversieregel
Feit
false
- EAID_7F2D2004_ECD7_457b_9AC1_EA9E177D9688
+ EAID_397E3EF0_8668_4025_93B5_0C47D154491C
- #Feit
+ #global_class_CIMTR_Feit
Geoverwijzing
false
- EAID_582D6139_6B41_4b32_9B39_78F6B282EDF0
+ EAID_0AA6AF97_C7FA_4065_AC8A_00680BF716B6
- #Geoverwijzing
+ #global_class_CIMTR_Geoverwijzing
Grondslag
false
- EAID_6D505D69_B7FE_4ceb_9BAD_531C9AED046C
+ EAID_F3206F58_45BA_453a_91D2_A0D1FB04D2B8
- #Grondslag
+ #global_class_CIMTR_Grondslag
Impliciet antwoord
false
- EAID_1CE0785F_5CC0_4af2_9C68_416C9A1A2F44
+ EAID_5D9D03F3_C431_44c0_BFF6_287F5F62930C
- #Impliciet antwoord
+ #global_class_CIMTR_Impliciet antwoord
Indienbaar
false
- EAID_973EBB52_B15A_403a_B37B_E76E7F56D7F3
+ EAID_C9DB5033_A843_4889_9EED_D9AA6D9C8059
- #Indienbaar
+ #global_class_CIMTR_Indienbaar
Indieningsvereiste
false
- EAID_16B42F3A_F128_4257_9A8A_E0EC45D93F35
+ EAID_78DE0E65_80A8_4ea9_9FF0_2943C3799581
- #Indieningsvereiste
+ #global_class_CIMTR_Indieningsvereiste
Indieningsvereisten
false
- EAID_BAE9038A_0FAD_4d89_BEE9_24771CCFE232
+ EAID_C72968B7_125A_4291_9EBF_A61633BF3857
- #Indieningsvereisten
+ #global_class_CIMTR_Indieningsvereisten
Interactieregel
false
- EAID_6D5117BE_B2EF_44e8_B915_F977010CF3D1
+ EAID_AA07528A_7DF1_4870_9D34_E25410188C87
- #Interactieregel
+ #global_class_CIMTR_Interactieregel
Invoergegeven
false
- EAID_732E3A3E_E488_4038_B075_2F3586E935F0
+ EAID_8ADD9066_60BF_4dc9_8EBE_6C820F86A0C1
- #Invoergegeven
+ #global_class_CIMTR_Invoergegeven
Maatregel
false
- EAID_025C7816_E47A_4b28_A6BC_97B676F1CE15
+ EAID_FD54A86F_47C3_466b_9962_7F85D3ACC15D
- #Maatregel
+ #global_class_CIMTR_Maatregel
Maatregelen op maat
false
- EAID_E6C12178_09CD_4ede_9CC8_13B31B35733F
+ EAID_9DB966D5_FFBD_4dd4_8CC5_52B33A2AC831
- #Maatregelen op maat
+ #global_class_CIMTR_Maatregelen op maat
Regelbeheerobject
false
- EAID_4DC4871C_8972_4097_951C_EADF640DA99A
+ EAID_FC793823_F01B_41eb_A63A_9ACA858F8140
- #Regelbeheerobject
+ #global_class_CIMTR_Regelbeheerobject
Registerbevraging
false
- EAID_47D0D37D_A445_4f56_AE55_EA6F5CFFC93A
+ EAID_B968CD09_4FE4_4f54_AD84_5E2726512641
- #Registerbevraging
+ #global_class_CIMTR_Registerbevraging
Registerbevraging API-profiel
false
- EAID_31BEF94C_2BC9_48a1_B73B_FC83B053EDDF
+ EAID_0D091AE5_81A4_4876_8EF1_D542AD86588B
- #Registerbevraging API-profiel
+ #global_class_CIMTR_Registerbevraging API-profiel
Registerbevraging GGS
false
- EAID_28AC98CD_99F4_4855_B583_0ADA7B4399E1
+ EAID_915E074D_6E76_4f99_BBBC_32A8B7396704
- #Registerbevraging GGS
+ #global_class_CIMTR_Registerbevraging GGS
Toepasbare activiteit
false
- EAID_9ED6B869_D746_47ae_9B42_D7B8F994FCB1
+ EAID_1661CA70_3581_4706_B257_86CF8FE2DC00
- #Toepasbare activiteit
+ #global_class_CIMTR_Toepasbare activiteit
Toepasbare regel
false
- EAID_9959ADCF_7001_404d_8955_5EBC9CD0ED68
+ EAID_10DDDEC9_B854_45a2_96B8_5C7C22B0D342
- #Toepasbare regel
+ #global_class_CIMTR_Toepasbare regel
Toepasbare Regelset
false
- EAID_81FB34A3_E9FC_4c4f_AB1A_911C8997BB4A
+ EAID_CA831FC6_7E9F_4582_A90C_03AFCA2CB001
- #Toepasbare Regelset
+ #global_class_CIMTR_Toepasbare Regelset
Uitkomst
false
- EAID_6959BE85_2B7D_4a27_B1E0_5AD4BDF2ED1F
+ EAID_D66A1F67_5892_4662_9AB2_D434A66DD96B
- #Uitkomst
+ #global_class_CIMTR_Uitkomst
Uitkomst herbruikbare beslissing
false
- EAID_89F5A94C_4B32_4618_9ECB_D295A2C6B14F
+ EAID_53B91AB9_212F_4ea5_8E43_374DF4E2D292
- #Uitkomst herbruikbare beslissing
+ #global_class_CIMTR_Uitkomst herbruikbare beslissing
Uitvoeringsregel
false
- EAID_1AC1BF24_61BB_496f_945B_17CDE656023B
+ EAID_44D672F6_3A61_4a89_9739_21D543E4AD5F
- #Uitvoeringsregel
+ #global_class_CIMTR_Uitvoeringsregel
Vaste waarde
false
- EAID_E92EA88C_57DB_4542_9EEB_A9BEAA6058F7
+ EAID_EFFF3667_96AA_4543_9429_9C3E99B4033C
- #Vaste waarde
+ #global_class_CIMTR_Vaste waarde
Vraagdefinitie
false
- EAID_3E9C1225_C762_4cd2_8DAA_E90D503C0C8D
+ EAID_94C883D9_BE14_4d20_873C_D4F5298B0323
- #Vraagdefinitie
+ #global_class_CIMTR_Vraagdefinitie
Werkzaamheid
false
- EAID_D53EB5D9_4DB8_4f53_BBF5_19B9B96F51D5
+ EAID_B7F616DF_33A1_4a3f_8B6F_A2ABE7DAADB1
- #Werkzaamheid
+ #global_class_CIMTR_Werkzaamheid
Afnamepunt
false
- EAID_85CD40AA_2E38_4451_9A55_7F766A7216BF
+ EAID_6B8262B1_16CF_40fc_8F89_92C50BCCEC8E
- #Afnamepunt
+ #global_class_CIMTR_Afnamepunt
- Maatregeltype
+ Maatregel
false
- EAID_87317D3F_3DB7_43af_A620_F62359A1DBE9
+ EAID_EF26C69D_D969_4c52_A333_FE73A86A2B41
- #Maatregeltype
+ #global_class_CIMTR_Maatregel
ToestemmingTypering
false
- EAID_FC644F9B_7137_43e2_91B5_554660CB1CA0
+ EAID_3BA3E7C8_92DD_40a0_92A8_8807B9C95EFF
- #ToestemmingTypering
+ #global_class_CIMTR_ToestemmingTypering
Bestuurslaag
false
- EAID_86391974_2CED_4aa6_A4A2_977A4FCD6307
+ EAID_542B6A54_6AE0_481d_AF93_FD4A1806CC69
- #Bestuurslaag
+ #global_class_CIMTR_Bestuurslaag
Context
false
- EAID_FF8D1F61_240E_478d_937A_E0D4B85BA856
+ EAID_F787A4D4_93F8_4496_AC6E_B91F071F3DFD
- #Context
+ #global_class_CIMTR_Context
DocumentTypeGeneriek
false
- EAID_B3E7B3ED_72AC_41bf_8FD8_CFEA4C4D22F3
+ EAID_0154C947_D768_4bf6_921B_76DD07CF866A
- #DocumentTypeGeneriek
+ #global_class_CIMTR_DocumentTypeGeneriek
Gegevenstype
false
- EAID_BE5CB330_B49F_49ae_A39F_D559EBEF5648
+ EAID_90458481_34DD_494c_944A_5D06548F146F
- #Gegevenstype
+ #global_class_CIMTR_Gegevenstype
Register
false
- EAID_A0F61FC4_03F8_4f20_AE9C_13B8C46C04C1
+ EAID_BDECDF19_F5B4_4e43_AE41_82132F32DFA2
- #Register
+ #global_class_CIMTR_Register
Typering
false
- EAID_E02FEF79_C639_40ef_BF1A_495A76FA67F2
+ EAID_210EB619_A21A_4414_B4A6_ACB930A61505
- #Typering
+ #global_class_CIMTR_Typering
Uitkomsttype
false
- EAID_DFCD4532_DDD8_4c68_9F82_3C0020D71111
+ EAID_534B7846_C0B9_4476_B641_E9EF6D9D6D51
- #Uitkomsttype
+ #global_class_CIMTR_Uitkomsttype
Identificatie
false
- EAID_E1E6379B_AE0C_4b67_B119_8A6EC6E70E98
+ EAID_FAEBA01F_742E_4692_A0AC_090BA4126ABA
- #Identificatie
+ #global_class_CIMTR_Identificatie
-
+
\ No newline at end of file
diff --git a/src/main/resources/input/KING/props/KING.xlsx b/src/main/resources/input/KING/props/KING.xlsx
index 3f6e0bd8b..0fb7d8626 100644
Binary files a/src/main/resources/input/KING/props/KING.xlsx and b/src/main/resources/input/KING/props/KING.xlsx differ