From 14293524ec5a72e6a0bfb7f89be95235f28c9312 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Tue, 12 Nov 2019 16:34:09 +0100 Subject: [PATCH 1/3] Updates to the modules Core, Construction, Building, Generics, and WaterBody --- CityGML/Schema/building.xsd | 12 +---- CityGML/Schema/cityGMLBase.xsd | 4 +- CityGML/Schema/construction.xsd | 93 ++------------------------------- CityGML/Schema/generics.xsd | 7 +++ CityGML/Schema/waterBody.xsd | 22 -------- 5 files changed, 13 insertions(+), 125 deletions(-) diff --git a/CityGML/Schema/building.xsd b/CityGML/Schema/building.xsd index cd3f89a..3f6c6ae 100644 --- a/CityGML/Schema/building.xsd +++ b/CityGML/Schema/building.xsd @@ -473,14 +473,6 @@ - - - List of possible elements considered to capture a vertical geometry for measuring the room height. - - - - - [INSPIRE] Vertical distance (measured or estimated) between a low reference and a high reference. @@ -488,12 +480,12 @@ - + [INSPIRE] Element used as the high reference. - + [INSPIRE] Element as the low reference. diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd index 1291a0f..c764d16 100644 --- a/CityGML/Schema/cityGMLBase.xsd +++ b/CityGML/Schema/cityGMLBase.xsd @@ -117,9 +117,7 @@ - - - + diff --git a/CityGML/Schema/construction.xsd b/CityGML/Schema/construction.xsd index 7ad9785..9b50d46 100644 --- a/CityGML/Schema/construction.xsd +++ b/CityGML/Schema/construction.xsd @@ -297,7 +297,7 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - + [INSPIRE] Element where the elevation was measured. @@ -314,93 +314,6 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - - - [INSPIRE] List of possible elements considered to capture a vertical geometry. - - - - - [INSPIRE] The elevation has been captured at the level of the maximum extent of the above ground envelope of the construction. - - - - - [INSPIRE] The elevation has been captured at the bottom of the usable part of the construction. - - - - - [INSPIRE] The elevation has been captured at the entrance of the construction, generally the bottom of entrance door. - - - - - [INSPIRE] The elevation has been captured at eave level, anywhere between the lowest and the highest eave levels of the construction. - - - - - [INSPIRE] The elevation has been captured at ground level, anywhere between the lowest and the highest ground points of the construction. - - - - - [INSPIRE] The elevation has been captured at roof level, anywhere between the lowest edge roof level and the top of the construction. - - - - - [INSPIRE] The elevation has been captured at roof edge level, anywhere between the lowest and the highest roof edges of the construction. - - - - - [INSPIRE] The elevation has been captured at the highest eave level of the construction. - - - - - [INSPIRE] The elevation has been captured at the highest ground point of the construction. - - - - - [INSPIRE] The elevation has been captured at the highest point of the construction, including the installations, such as chimneys and antennas. - - - - - [INSPIRE] The elevation has been captured at the highest roof edge level of the construction. - - - - - [INSPIRE] The elevation has been captured at the lowest eave level of the construction. - - - - - [INSPIRE] The elevation has been captured at the level of the lowest floor above ground. - - - - - [INSPIRE] The elevation has been captured at the lowest ground point level of the construction. - - - - - [INSPIRE] The elevation has been captured at the lowest roof edge level of the construction. - - - - - [INSPIRE] The elevation has been captured at the top level of the construction. - - - - @@ -452,12 +365,12 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst - + [INSPIRE] Element used as the high reference. - + [INSPIRE] Element as the low reference. diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd index 04430d4..b5d2f74 100644 --- a/CityGML/Schema/generics.xsd +++ b/CityGML/Schema/generics.xsd @@ -14,6 +14,7 @@ + SIG3D: Value of the Generic Attribute. @@ -37,6 +38,7 @@ + SIG3D: Value of the Generic Attribute. @@ -60,6 +62,7 @@ + SIG3D: Codespace idcentifier of the Generic AttributeSet. @@ -168,6 +171,7 @@ + SIG3D: Value of the Generic Attribute. @@ -191,6 +195,7 @@ + SIG3D: Value of the Generic Attribute. @@ -214,6 +219,7 @@ + SIG3D: Value of the Generic Attribute. @@ -237,6 +243,7 @@ + SIG3D: Value of the Generic Attribute. diff --git a/CityGML/Schema/waterBody.xsd b/CityGML/Schema/waterBody.xsd index b87cd01..cf39239 100644 --- a/CityGML/Schema/waterBody.xsd +++ b/CityGML/Schema/waterBody.xsd @@ -61,28 +61,6 @@ - - - - SIG3D: Exterior or interior boundary surface, which provides imaginary boundaries, used to describe parts of the outer shell of WaterBody. - - - - - - - - - - - - - - - - - - From 52deda60069f7ee05cd6c3fcabde2ace4ff34464 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Tue, 12 Nov 2019 16:41:23 +0100 Subject: [PATCH 2/3] Updated ShapeChange configuration file --- CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml index 372bba5..cf017cb 100644 --- a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml +++ b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml @@ -60,8 +60,6 @@ - - From 1189a7b8db328a7538c66e48d13272c230811366 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Tue, 12 Nov 2019 16:42:44 +0100 Subject: [PATCH 3/3] Updated ShapeChange configuration file --- CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml index cf017cb..8f4678f 100644 --- a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml +++ b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml @@ -72,9 +72,6 @@ - - -