From a890203243044402b3316a87881dcca36210eb4f Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Wed, 2 Oct 2019 08:51:00 +0200 Subject: [PATCH 1/2] Implemented issues #10, #68, #71, #73, #76, #78, #85, and #86, as well as #22 from Encodings --- CityGML/Schema/appearance.xsd | 77 +------ CityGML/Schema/building.xsd | 7 - CityGML/Schema/cityGMLBase.xsd | 213 +++++++++++------- CityGML/Schema/construction.xsd | 23 +- CityGML/Schema/generics.xsd | 43 ++-- CityGML/Schema/transportation.xsd | 27 +-- CityGML/Schema/waterBody.xsd | 12 - ...apeChangeConfigurationFile_CityGML_3.0.xml | 15 +- 8 files changed, 166 insertions(+), 251 deletions(-) diff --git a/CityGML/Schema/appearance.xsd b/CityGML/Schema/appearance.xsd index d7087ec..376ba3d 100644 --- a/CityGML/Schema/appearance.xsd +++ b/CityGML/Schema/appearance.xsd @@ -2,42 +2,15 @@ - - - - SIG3D: Abstract superclass of X3DMaterial and AbstractTexture - - - - - - - - - SIG3D: Indicates whether the X3DMaterial, GeoreferencedTexture or, ParametrizedTexture is assigned to the front side or back side of the surface - - - - - - - - - - - - - - - + SIG3D: Abstract super class of ParameterizedTexture and GeoreferencedTexture - + @@ -89,48 +62,6 @@ - - - - SIG3D: Named container for all AbstractSurfaceData - - - - - - - - - SIG3D: Theme name for all surfaceDataMembers. A theme is a catagory defining the semantics of the referenced surfaceDataMembers (e.g. infrared radiation, - - - - - SIG3D: List of surface data properties for the current appearance theme - - - - - - - - - - - - - - - - - - - - - - - - @@ -340,14 +271,14 @@ - + SIG3D: Definition of material properties based on X3D standard. - + diff --git a/CityGML/Schema/building.xsd b/CityGML/Schema/building.xsd index 6371e6f..cd3f89a 100644 --- a/CityGML/Schema/building.xsd +++ b/CityGML/Schema/building.xsd @@ -533,13 +533,6 @@ - - - - con:AbstractConstructionSurface - - - diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd index 71ca6eb..1a21a0d 100644 --- a/CityGML/Schema/cityGMLBase.xsd +++ b/CityGML/Schema/cityGMLBase.xsd @@ -1,11 +1,8 @@ - - + - - @@ -43,14 +40,14 @@ AbstractCityObject relative to the surrounding terrain. - + - + @@ -86,6 +83,17 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + + @@ -184,6 +192,13 @@ AbstractCityObject relative to the surrounding terrain. + + + + core:bounds + + + Relation to a LOD0 point geometry of AbstractSpace. @@ -214,13 +229,6 @@ AbstractCityObject relative to the surrounding terrain. Relation to a LOD2 curve geometry of AbstractSpace. - - - - core:bounds - - - Relation to a LOD3 solid geometry of AbstractSpace. @@ -248,6 +256,33 @@ AbstractCityObject relative to the surrounding terrain. + + + + SIG3D: Abstract superclass of X3DMaterial and AbstractTexture + + + + + + + + + SIG3D: Indicates whether the X3DMaterial, GeoreferencedTexture or, ParametrizedTexture is assigned to the front side or back side of the surface + + + + + + + + + + + + + + @@ -350,6 +385,48 @@ AbstractCityObject relative to the surrounding terrain. + + + + SIG3D: Named container for all AbstractSurfaceData + + + + + + + + + SIG3D: Theme name for all surfaceDataMembers. A theme is a catagory defining the semantics of the referenced surfaceDataMembers (e.g. infrared radiation, + + + + + SIG3D: List of surface data properties for the current appearance theme + + + + + + + + + + + + + + + + + + + + + + + + @@ -380,7 +457,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -429,13 +506,7 @@ AbstractCityObject relative to the surrounding terrain. - - - - RelationType - - - + @@ -500,53 +571,45 @@ AbstractCityObject relative to the surrounding terrain. - - + SIG3D: A geometric representation where the shape is stored only once as a prototypical geometry, for example a tree or other vegetation object, a traffic light or a traffic sign. This prototypic geometry object can be re-used or referenced many times, wherever the corresponding feature occurs in the 3D city model. - - - - - - SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object. - - - - - SIG3D: Mime type of the referenced external geometric object (attribute libraryObject). - - - - - SIG3D: External link to a prototype geometry. - - - - - SIG3D: Base point of the object in the world coordinate system. - - - - - SIG3D: Geometry of the prototype, specified in a local coordinate system. - - - - - - - + + + + SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object. + + + + + SIG3D: Mime type of the referenced external geometric object (attribute libraryObject). + + + + + SIG3D: External link to a prototype geometry. + + + + + SIG3D: Base point of the object in the world coordinate system. + + + + + SIG3D: Geometry of the prototype, specified in a local coordinate system. + + + + - + - - @@ -558,20 +621,8 @@ AbstractCityObject relative to the surrounding terrain. - - - - IntervalValue - - - - - - - OccupantTypeValue - - - + + @@ -583,13 +634,7 @@ AbstractCityObject relative to the surrounding terrain. - - - - QualifiedAreaValue - - - + @@ -601,13 +646,7 @@ AbstractCityObject relative to the surrounding terrain. - - - - QualifiedVolumeValue - - - + diff --git a/CityGML/Schema/construction.xsd b/CityGML/Schema/construction.xsd index f58b897..7ad9785 100644 --- a/CityGML/Schema/construction.xsd +++ b/CityGML/Schema/construction.xsd @@ -1,7 +1,6 @@ - + - @@ -46,7 +45,6 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - @@ -66,7 +64,6 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - @@ -234,13 +231,7 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - - - - EventValue - - - + @@ -260,7 +251,9 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - + + + SIG3D: Relation between Door and Address. @@ -535,7 +528,7 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - + @@ -655,7 +648,9 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - + + + diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd index 9a3a85c..f258d08 100644 --- a/CityGML/Schema/generics.xsd +++ b/CityGML/Schema/generics.xsd @@ -5,25 +5,14 @@ - - - - - - - - - - - - + SIG3D: Generic Attribute of type "date". - + @@ -39,14 +28,14 @@ - + SIG3D: Generic Attribute of type "double". - + @@ -62,21 +51,21 @@ - + SIG3D: Set of Generic Attributes. - + SIG3D: Codespace idcentifier of the Generic AttributeSet. - + @@ -91,7 +80,7 @@ - + @@ -187,14 +176,14 @@ - + SIG3D: Generic Attribute of type "integer". - + @@ -210,14 +199,14 @@ - + SIG3D: Generic Attribute of type "Measure" (double-attribute with explicit specification of a unit-of-measurement). - + @@ -233,14 +222,14 @@ - + SIG3D: Generic Attribute of type "string". - + @@ -256,14 +245,14 @@ - + SIG3D: Generic Attribute of type "URI". - + diff --git a/CityGML/Schema/transportation.xsd b/CityGML/Schema/transportation.xsd index 013355a..cee63a2 100644 --- a/CityGML/Schema/transportation.xsd +++ b/CityGML/Schema/transportation.xsd @@ -11,6 +11,7 @@ + @@ -48,12 +49,6 @@ SIG3D: Actual usage of AuxiliaryTrafficSpace as given by the relevant national regulations, information communities, or specific applications. - - - SIG3D: Surface material covering the AuxiliaryTrafficSpace as given by the relevant national regulations, information communities or specific applications. - - - @@ -309,6 +304,7 @@ + @@ -346,11 +342,6 @@ SIG3D: Actual usage of TrafficSpace as given by the relevant national regulations, information communities, or specific applications. - - - SIG3D: Surface material covering the TrafficSpace as given by the relevant national regulations, information communities, or specific applications. - - @@ -366,18 +357,6 @@ - - - - - - - - - - - - @@ -496,7 +475,7 @@ - + diff --git a/CityGML/Schema/waterBody.xsd b/CityGML/Schema/waterBody.xsd index 2f87e7b..b87cd01 100644 --- a/CityGML/Schema/waterBody.xsd +++ b/CityGML/Schema/waterBody.xsd @@ -49,18 +49,6 @@ SIG3D: Actual usage of WaterBody as given by the relevant national regulations, information communities, or specific applications. - - - - - - - - - - - - diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml index 518ae39..ba57ea5 100644 --- a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml +++ b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml @@ -7,7 +7,7 @@ - + @@ -21,15 +21,16 @@ - + - + - + + @@ -70,7 +71,7 @@ - + @@ -79,7 +80,7 @@ From 72b0c9e9f946bf144eb8fd1fdc09ab4b99748964 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Mon, 7 Oct 2019 10:43:54 +0200 Subject: [PATCH 2/2] Implemented issues opengeospatial/CityGML-3.0CM#68 and opengeospatial/CityGML-3.0CM#91 --- CityGML/Schema/appearance.xsd | 77 +++++++++++++- CityGML/Schema/cityGMLBase.xsd | 187 ++++++++++++++++++--------------- CityGML/Schema/dynamizer.xsd | 4 +- CityGML/Schema/generics.xsd | 47 ++++++--- CityGML/Schema/pointCloud.xsd | 4 +- CityGML/Schema/versioning.xsd | 8 +- 6 files changed, 213 insertions(+), 114 deletions(-) diff --git a/CityGML/Schema/appearance.xsd b/CityGML/Schema/appearance.xsd index 376ba3d..d8c74ac 100644 --- a/CityGML/Schema/appearance.xsd +++ b/CityGML/Schema/appearance.xsd @@ -2,15 +2,42 @@ + + + + SIG3D: Abstract superclass of X3DMaterial and AbstractTexture + + + + + + + + + SIG3D: Indicates whether the X3DMaterial, GeoreferencedTexture or, ParametrizedTexture is assigned to the front side or back side of the surface + + + + + + + + + + + + + + - + SIG3D: Abstract super class of ParameterizedTexture and GeoreferencedTexture - + @@ -62,6 +89,48 @@ + + + + SIG3D: Named container for all AbstractSurfaceData + + + + + + + + + SIG3D: Theme name for all surfaceDataMembers. A theme is a catagory defining the semantics of the referenced surfaceDataMembers (e.g. infrared radiation, + + + + + SIG3D: List of surface data properties for the current appearance theme + + + + + + + + + + + + + + + + + + + + + + + + @@ -271,14 +340,14 @@ - + SIG3D: Definition of material properties based on X3D standard. - + diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd index 1a21a0d..91d9c74 100644 --- a/CityGML/Schema/cityGMLBase.xsd +++ b/CityGML/Schema/cityGMLBase.xsd @@ -1,10 +1,25 @@ - - - - + + + + + + + + + + + + + + + + + + + @@ -40,7 +55,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -48,7 +63,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -61,6 +76,24 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + + + + + + + + + @@ -83,11 +116,9 @@ AbstractCityObject relative to the surrounding terrain. - - - - - + + + @@ -166,7 +197,7 @@ AbstractCityObject relative to the surrounding terrain. SIG 3D: Relation to intersection curve(s) between an LOD3 AbstractPhysicalSpace and a terrain (LOD1 or LOD2 or LOD3). - + @@ -179,6 +210,24 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + + + + + + + + + @@ -256,33 +305,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - SIG3D: Abstract superclass of X3DMaterial and AbstractTexture - - - - - - - - - SIG3D: Indicates whether the X3DMaterial, GeoreferencedTexture or, ParametrizedTexture is assigned to the front side or back side of the surface - - - - - - - - - - - - - - @@ -317,7 +339,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -348,6 +370,42 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -385,48 +443,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - SIG3D: Named container for all AbstractSurfaceData - - - - - - - - - SIG3D: Theme name for all surfaceDataMembers. A theme is a catagory defining the semantics of the referenced surfaceDataMembers (e.g. infrared radiation, - - - - - SIG3D: List of surface data properties for the current appearance theme - - - - - - - - - - - - - - - - - - - - - - - - @@ -457,7 +473,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -469,7 +485,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -481,7 +497,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -603,7 +619,6 @@ AbstractCityObject relative to the surrounding terrain. SIG3D: Geometry of the prototype, specified in a local coordinate system. - diff --git a/CityGML/Schema/dynamizer.xsd b/CityGML/Schema/dynamizer.xsd index 72d8d72..fa6f66b 100644 --- a/CityGML/Schema/dynamizer.xsd +++ b/CityGML/Schema/dynamizer.xsd @@ -75,10 +75,10 @@ - + - + diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd index f258d08..4ed3e10 100644 --- a/CityGML/Schema/generics.xsd +++ b/CityGML/Schema/generics.xsd @@ -5,14 +5,29 @@ - + + + + + + + + + + + + + + + + SIG3D: Generic Attribute of type "date". - + @@ -28,14 +43,14 @@ - + SIG3D: Generic Attribute of type "double". - + @@ -51,21 +66,21 @@ - + SIG3D: Set of Generic Attributes. - + SIG3D: Codespace idcentifier of the Generic AttributeSet. - + @@ -80,7 +95,7 @@ - + @@ -176,14 +191,14 @@ - + SIG3D: Generic Attribute of type "integer". - + @@ -199,14 +214,14 @@ - + SIG3D: Generic Attribute of type "Measure" (double-attribute with explicit specification of a unit-of-measurement). - + @@ -222,14 +237,14 @@ - + SIG3D: Generic Attribute of type "string". - + @@ -245,14 +260,14 @@ - + SIG3D: Generic Attribute of type "URI". - + diff --git a/CityGML/Schema/pointCloud.xsd b/CityGML/Schema/pointCloud.xsd index 36d6367..7e34e17 100644 --- a/CityGML/Schema/pointCloud.xsd +++ b/CityGML/Schema/pointCloud.xsd @@ -3,10 +3,10 @@ - + - + diff --git a/CityGML/Schema/versioning.xsd b/CityGML/Schema/versioning.xsd index 7403519..1b923b1 100644 --- a/CityGML/Schema/versioning.xsd +++ b/CityGML/Schema/versioning.xsd @@ -32,10 +32,10 @@ - + - + @@ -63,10 +63,10 @@ - + - +