From 3ca2564f3d646e40fc91c200fa382a41b1704538 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Thu, 6 Dec 2018 18:27:38 +0100 Subject: [PATCH 1/3] Proposals covering several issues #22, #9, #32 A more detailed description will follow --- CityGML/Schema/bridge.xsd | 185 ++------ CityGML/Schema/building.xsd | 335 ++++---------- CityGML/Schema/cityFurniture.xsd | 31 +- CityGML/Schema/cityGMLBase.xsd | 425 ++++++------------ CityGML/Schema/cityObjectGroup.xsd | 23 +- CityGML/Schema/construction.xsd | 171 +++---- CityGML/Schema/generics.xsd | 82 +--- CityGML/Schema/landUse.xsd | 23 +- CityGML/Schema/pointCloud.xsd | 26 ++ CityGML/Schema/relief.xsd | 8 +- CityGML/Schema/transportation.xsd | 4 +- CityGML/Schema/tunnel.xsd | 280 ++++-------- CityGML/Schema/vegetation.xsd | 24 +- CityGML/Schema/waterBody.xsd | 23 +- ...apeChangeConfigurationFile_CityGML_3.0.xml | 1 + 15 files changed, 459 insertions(+), 1182 deletions(-) create mode 100644 CityGML/Schema/pointCloud.xsd diff --git a/CityGML/Schema/bridge.xsd b/CityGML/Schema/bridge.xsd index d5f6d1a..727f61f 100644 --- a/CityGML/Schema/bridge.xsd +++ b/CityGML/Schema/bridge.xsd @@ -4,23 +4,14 @@ - - - - - - - - - - + - SIG3D: Civil engineering works that affords passage to pedestrians, animals, vehicles, and service(s) above obstacles or between two points at a height above ground (cf. ISO 6707-1). + SIG3D: Abstract superclass of Bridge and BridgePart - + - + @@ -70,7 +61,6 @@ - SIG3D: Relation between Bridge or BridgePart and BridgeRoom @@ -102,37 +92,27 @@ - - - [INSPIRE] Status of the construction. - - - - - Date of completion of a construction. - - - - - Date of renovation of a construction. - - - - - Date of demolition of a construction. - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - [INSPIRE] Height above ground. - - - + + + + + + + + + + + + + + + SIG3D: Civil engineering works that affords passage to pedestrians, animals, vehicles, and service(s) above obstacles or between two points at a height above ground (cf. ISO 6707-1). + + + + + + Relation between Bridge and BridgePart. @@ -272,126 +252,15 @@ - + SIG3D: A bridge part is a sub-division of a Bridge that is homogeneous related to its physical, functional or temporal aspects and may be considered as a bridge. - + - - - SIG3D: Classification of the actual usage of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Specified function of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Actual usage of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Indicates wether a bridge is movable to allow passages for ships (e.g. turnable bridge, liftable bridge) - - - - - SIG3D: Relation between Bridge or BridgePart and BridgeConstructionElement - - - - - - - - - - - - - - SIG3D: Relation between Bridge or BridgePart and BridgeInstallation - - - - - - - - - - - - - - - SIG3D: Relation between Bridge or BridgePart and BridgeRoom - - - - - - - - - - - - - - - - - - - - - - - - - SIG3D: Relation between Bridge or BridgePart and Address - - - - - - [INSPIRE] Status of the construction. - - - - - Date of completion of a construction. - - - - - Date of renovation of a construction. - - - - - Date of demolition of a construction. - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - [INSPIRE] Height above ground. - - - diff --git a/CityGML/Schema/building.xsd b/CityGML/Schema/building.xsd index f4e9a92..af1511e 100644 --- a/CityGML/Schema/building.xsd +++ b/CityGML/Schema/building.xsd @@ -4,102 +4,14 @@ - - - - - - - - - - - - The abstract superclass for representing various types of subdivisions a building can contain. The superclass provides several attributes for providing specific information about the subdivision such as the function and usage, the height, the space type (i.e., whether the subdivision is closed, open or semi-open) and the number of occupants. - - - - - - - - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - Defines an order among the building unit objects, e.g. for sorting storeys. - - - - - - bldg:BuildingConstructiveElement - - - - - - - bldg:BuildingFurniture - - - - - - - - - - - - - - - bldg:BuildingInstallation - - - - - - - - - - - - - - - bldg:Room - - - - - - - - - - - - - - - - - + - SIG3D: A free-standing, self-supporting construction that is roofed, usually walled, and can be entered by humans and is normally designed to stand permanently in one place. It is intended for human occupancy (for example: a place of work or recreation), habitation and/or shelter of humans, animals or things. + SIG3D: Abstract superclass of Building and BuildingPart. - + - + @@ -166,7 +78,6 @@ - SIG3D: Relation between Building or BuildingPart and Room. @@ -209,37 +120,106 @@ - + + + + + + + + + + + + + + + The abstract superclass for representing various types of subdivisions a building can contain. The superclass provides several attributes for providing specific information about the subdivision such as the function and usage, the height, the space type (i.e., whether the subdivision is closed, open or semi-open) and the number of occupants. + + + + + + + + + + - [INSPIRE] Status of the construction. + [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - + - Date of completion of a construction. + Defines an order among the building unit objects, e.g. for sorting storeys. - + - Date of renovation of a construction. + + bldg:BuildingConstructiveElement + - + - Date of demolition of a construction. + + bldg:BuildingFurniture + + + + + + + + + - + - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). + + bldg:BuildingInstallation + + + + + + + + + - + - [INSPIRE] Height above ground. + + bldg:Room + - + + + + + + + + + + + + + + + + SIG3D: A free-standing, self-supporting construction that is roofed, usually walled, and can be entered by humans and is normally designed to stand permanently in one place. It is intended for human occupancy (for example: a place of work or recreation), habitation and/or shelter of humans, animals or things. + + + + + + Relation between Building and BuildingPart. @@ -363,154 +343,15 @@ - + SIG3D: A BuildingPart is a sub-division of a Building that is homogeneous related to its physical, functional, or temporal aspects and may be considered as a Building. - + - - - SIG3D: Classification of Building or BuildingPart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Specified function of Building or BuildingPart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Actual usage of Building or BuildingPart as given by the relevant national regulations, information communities, or specific applications. - - - - - bSI: Basic configuration of the roof in terms of the different roof shapes. - - - - - SIG3D: Number of storeys mainly above ground. - - - - - SIG3D: Number of storeys mainly below ground. - - - - - SIG3D: List of heights for each storey above ground. - - - - - SIG3D: List of heights for each storey below ground. - - - - - - - - - - - - - - - - SIG3D: Relation between Building or BuildingPart and BuildingInstallation. - - - - - - - - - - - - - - - SIG3D: Relation between Building or BuildingPart and Room. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SIG3D: Relation between Building or BuildingPart and Address - - - - - - [INSPIRE] Status of the construction. - - - - - Date of completion of a construction. - - - - - Date of renovation of a construction. - - - - - Date of demolition of a construction. - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - [INSPIRE] Height above ground. - - - diff --git a/CityGML/Schema/cityFurniture.xsd b/CityGML/Schema/cityFurniture.xsd index 097fa83..068465b 100644 --- a/CityGML/Schema/cityFurniture.xsd +++ b/CityGML/Schema/cityFurniture.xsd @@ -3,14 +3,14 @@ - + City furniture is a collective term for objects and pieces of equipment installed on streets and roads for various purposes. It includes benches, traffic barriers, bollards, post boxes, phone boxes, streetlamps, traffic lights, traffic signs, bus stops, tram stops, taxi stands, public lavatories, fountains, watering troughs, memorials, public sculptures, and waste receptacles. [Wikipedia] - + @@ -27,11 +27,6 @@ Actual usage of CityFurniture as given by the relevant national regulations, information communities, or specific applications. [SIG3D] - - - The space occupied by this city furniture. One city furniture can occupy one space at maximum. - - @@ -44,26 +39,4 @@ - - - - A space occupied by a city furniture. - - - - - - - - - - - - - - - - - - diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd index 04fcc65..dba81da 100644 --- a/CityGML/Schema/cityGMLBase.xsd +++ b/CityGML/Schema/cityGMLBase.xsd @@ -1,28 +1,12 @@ - + + - - - - - - - - - - - - - - - - - @@ -34,7 +18,13 @@ - + + + + core:AbstractCityObject + + + SIG3D: Vertical position of the @@ -46,6 +36,13 @@ AbstractCityObject relative to the surrounding terrain. SIG3D: Vertical position of the AbstractCityObject relative to a surrounding water surface. + + + + core:AbstractCityObject + + + @@ -118,6 +115,18 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + + + Relation to LOD1 implicit geometry of AbstractOccupiedSpace. @@ -166,7 +175,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). - + @@ -192,7 +201,6 @@ AbstractCityObject relative to the surrounding terrain. Degree of openness of an abstract space. - Relation to a LOD0 point geometry of AbstractSpace. @@ -263,7 +271,6 @@ AbstractCityObject relative to the surrounding terrain. - Relation to a LOD0 curve geometry of AbstractSpace. @@ -303,23 +310,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - @@ -331,14 +321,14 @@ AbstractCityObject relative to the surrounding terrain. - + - + @@ -351,24 +341,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - - @@ -387,46 +359,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - SIG3D: Abstract super class of Window and Door - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -464,18 +396,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - @@ -494,7 +414,7 @@ AbstractCityObject relative to the surrounding terrain. - + @@ -549,6 +469,30 @@ AbstractCityObject relative to the surrounding terrain. + + + + + + + + + + core:AbstractCityObject + + + + + + + + + + + + + + @@ -601,54 +545,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -703,28 +599,28 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + SIG3D: Enumeration of the CityObject property relativeToTerrain. @@ -794,36 +690,6 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -843,70 +709,37 @@ AbstractCityObject relative to the surrounding terrain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SIG3D: 2x2 Transformation matrix (z-rotation and scaling) @@ -931,4 +764,44 @@ AbstractCityObject relative to the surrounding terrain. + + + + SIG3D: Abstract super class of Window and Door + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CityGML/Schema/cityObjectGroup.xsd b/CityGML/Schema/cityObjectGroup.xsd index fd9b279..b825111 100644 --- a/CityGML/Schema/cityObjectGroup.xsd +++ b/CityGML/Schema/cityObjectGroup.xsd @@ -3,14 +3,14 @@ - + SIG3D: Aggregation of city objects according to user defined criteria (e.g. grouping of rooms belonging to a certain storey). - + @@ -47,7 +47,6 @@ SIG3D: Reference to an AbstractCityObject related to the aggregation as a whole (e.g. the corresponding building object for the aggregation of rooms to a storey). - @@ -60,24 +59,6 @@ - - - - - - - - - - - - - - - - - - SIG3D: Specification of a CityObject and its specific role in a CityObjectGroup. diff --git a/CityGML/Schema/construction.xsd b/CityGML/Schema/construction.xsd index d1c7a4f..58d5cc4 100644 --- a/CityGML/Schema/construction.xsd +++ b/CityGML/Schema/construction.xsd @@ -1,38 +1,57 @@ - + - - - - - - - - - - - - - - - - - - - + + + An object, manufactured by humans from construction materials, which is connected to earth and intended to be permanent. A connection with the ground also exists when the construction rests by its own weight on the ground or is moveable limited on stationary rails or if the construction  is intended to be used mainly stationary. +Note: Everything that is covered by other CityGML modules, e.g. Transportation or Water body, is not an +AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConstruction. + + + - + - + + + [INSPIRE] Status of the construction. + + + + + Date of completion of a construction. + + + + + Date of renovation of a construction. + + + + + Date of demolition of a construction. + + + + + [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). + + + + + [INSPIRE] Height above ground. + + + - + - + @@ -55,46 +74,12 @@ - - - - SIG3D: Abstract superclass of Window and Door. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -203,33 +188,15 @@ - - - - - - - - - - - - - - - - - - - + ISO 6707-1: Construction for closing an opening intended primarily for access or egress or both. - + @@ -249,10 +216,10 @@ - + - + @@ -496,50 +463,18 @@ - + Every construction which is not covered by any of the other subclasses of AbstractConstruction. - + - - - [INSPIRE] Status of the construction. - - - - - Date of completion of a construction. - - - - - Date of renovation of a construction. - - - - - Date of demolition of a construction. - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - [INSPIRE] Height above ground. - - - - @@ -648,14 +583,14 @@ - + SIG3D: Construction for closing an opening in a wall or roof, primarily intended to admit light and/or provide ventilation (cf. ISO 6707). - + @@ -670,10 +605,10 @@ - + - + diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd index 0a7d160..9a3a85c 100644 --- a/CityGML/Schema/generics.xsd +++ b/CityGML/Schema/generics.xsd @@ -86,60 +86,19 @@ - - + + - + - + - + - - - - - - - - - SIG3D: Representation of a real wold city object which does not fit to any of the specific CityGML / ADE classes. - - - - - - - - - SIG3D: Classification of the actual usage of GenericCityObject as given by the relevant national regulations, information communities or specific applications. - - - - - SIG3D: Specified function of GenericCityObject as given by the relevant national regulations, information communities or specific applications. - - - - - SIG3D: Actual usage of GenericCityObject as given by the relevant national regulations, information communities or specific applications. - - - - - - - - - - - - - - + @@ -150,6 +109,9 @@ + + + @@ -168,6 +130,9 @@ + + + @@ -180,29 +145,15 @@ - - - - - - - - - - - - - - - - - + + + @@ -221,6 +172,9 @@ + + + diff --git a/CityGML/Schema/landUse.xsd b/CityGML/Schema/landUse.xsd index 4440608..7ca807f 100644 --- a/CityGML/Schema/landUse.xsd +++ b/CityGML/Schema/landUse.xsd @@ -3,14 +3,14 @@ - + SIG3D: Object describing an area of the earth's surface dedicated to a specific land use or having a specific land cover with or without vegetation, such as sand, rock, mud flats, forest, grasslands, etc (i.e. the physical appearance). - + @@ -27,7 +27,6 @@ SIG3D: Actual usage of LandUse as given by the relevant national regulations, information communities or specific applications. - @@ -40,22 +39,4 @@ - - - - - - - - - - - - - - - - - - diff --git a/CityGML/Schema/pointCloud.xsd b/CityGML/Schema/pointCloud.xsd new file mode 100644 index 0000000..8922d06 --- /dev/null +++ b/CityGML/Schema/pointCloud.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CityGML/Schema/relief.xsd b/CityGML/Schema/relief.xsd index 9133f71..ded3621 100644 --- a/CityGML/Schema/relief.xsd +++ b/CityGML/Schema/relief.xsd @@ -3,14 +3,14 @@ - + SIG3D: Abstract superclass of TINRelief, MassPointRelief, RasterRelief and BreaklineRelief - + @@ -120,14 +120,14 @@ - + SIG3D: Feature aggregating the relief components which belong together. - + diff --git a/CityGML/Schema/transportation.xsd b/CityGML/Schema/transportation.xsd index a539143..00df486 100644 --- a/CityGML/Schema/transportation.xsd +++ b/CityGML/Schema/transportation.xsd @@ -379,14 +379,14 @@ - + SIG3D: Aggregation of TrafficSpaces and AuxiliaryTrafficSpaces, e.g the different lanes of a multi-lane road. - + diff --git a/CityGML/Schema/tunnel.xsd b/CityGML/Schema/tunnel.xsd index a7891f3..e856de4 100644 --- a/CityGML/Schema/tunnel.xsd +++ b/CityGML/Schema/tunnel.xsd @@ -4,92 +4,14 @@ - - - - - - - - - - + - SIG3D: A HollowSpace represents a volume bounded actually or theoretically. HollowSpaces are volumes that provide for certain functions within a tunnel. + SIG3D: Abstract superclass of Tunnel and TunnelPart - + - - - - - SIG3D: Classification of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Specified function of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Actual usage of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Relation between HollowSpace and TunnelFurniture. - - tun:TunnelFurniture - - - - - - - - - - - - - - SIG3D: Relation between HollowSpace and TunnelInstallation. - - tun:TunnelInstallation - - - - - - - - - - - - - - - - - - - - - - - - - - - SIG3D: horizontal or sloping enclosed passage way of some length, mainly underground or underwater (cf. ISO 6707-1). - - - - - + @@ -131,7 +53,6 @@ - SIG3D: Relation between Tunnel or TunnelPart and HollowSpace. @@ -158,37 +79,96 @@ - - - [INSPIRE] Status of the construction. - - - + + + + + + + + + + + + + + + SIG3D: A HollowSpace represents a volume bounded actually or theoretically. HollowSpaces are volumes that provide for certain functions within a tunnel. + + + + + + + - Date of completion of a construction. + SIG3D: Classification of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - + - Date of renovation of a construction. + SIG3D: Specified function of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - + - Date of demolition of a construction. + SIG3D: Actual usage of HollowSpace as given by the relevant national regulations, information communities, or specific applications. - + - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). + SIG3D: Relation between HollowSpace and TunnelFurniture. + + tun:TunnelFurniture + + + + + + + + + - + - [INSPIRE] Height above ground. + SIG3D: Relation between HollowSpace and TunnelInstallation. + + tun:TunnelInstallation + + + + + + + + + - + + + + + + + + + + + + + + + + SIG3D: horizontal or sloping enclosed passage way of some length, mainly underground or underwater (cf. ISO 6707-1). + + + + + + Relation between Tunnel and TunnelPart. @@ -312,113 +292,15 @@ - + SIG3D: A tunnel part is a sub-division of a Tunnel that is homogeneous related to its physical, functional, or temporal aspects and may be considered as a Tunnel. - + - - - SIG3D: Classification of the actual usage of Tunnel or TunnelPart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Specified function of Tunnel or TunnelPart as given by the relevant national regulations, information communities, or specific applications. - - - - - SIG3D: Actual usage of Tunnel or TunnelPart as given by the relevant national regulations, information communities, or specific applications. - - - - - - - - - - - - - - - - SIG3D: Relation between Tunnel or TunnelPart and TunnelInstallation. - - - - - - - - - - - - - - - SIG3D: Relation between Tunnel or TunnelPart and HollowSpace. - - - - - - - - - - - - - - - - - - - - - - - - - - [INSPIRE] Status of the construction. - - - - - Date of completion of a construction. - - - - - Date of renovation of a construction. - - - - - Date of demolition of a construction. - - - - - [INSPIRE] Vertically-constrained dimensional property consisting of an absolute measure referenced to a well-defined surface which is commonly taken as origin (geoïd, water level, etc.). - - - - - [INSPIRE] Height above ground. - - - diff --git a/CityGML/Schema/vegetation.xsd b/CityGML/Schema/vegetation.xsd index 834fd55..7e706b3 100644 --- a/CityGML/Schema/vegetation.xsd +++ b/CityGML/Schema/vegetation.xsd @@ -3,14 +3,14 @@ - + SIG3D: Abstract super class of SolitaryVegetationObject and PlantCover - + @@ -54,7 +54,6 @@ SIG3D: Average value of the heights of the grown-up plants - @@ -112,7 +111,6 @@ SIG3D: Maximal diameter of the crown. - @@ -125,22 +123,4 @@ - - - - - - - - - - - - - - - - - - diff --git a/CityGML/Schema/waterBody.xsd b/CityGML/Schema/waterBody.xsd index 8ddc504..b87cd01 100644 --- a/CityGML/Schema/waterBody.xsd +++ b/CityGML/Schema/waterBody.xsd @@ -25,14 +25,14 @@ - + SIG3D: Any significant accumulation of water, usually covering a part of the Earth - + @@ -49,7 +49,6 @@ SIG3D: Actual usage of WaterBody as given by the relevant national regulations, information communities, or specific applications. - @@ -106,24 +105,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml index 112fece..c9302fb 100644 --- a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml +++ b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml @@ -15,6 +15,7 @@ + From 1476c44a942ae33e516372d513269c6503ab8543 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Fri, 7 Dec 2018 17:02:50 +0100 Subject: [PATCH 2/3] New sample files which validate against the newest xsds --- CityGML/Examples/Building_CityGML_3.0.xml | 272 ---------------- .../Building_CityGML_3.0_withNewFeatures.xml | 299 ------------------ CityGML/Examples/CityGML_v2.gml | 241 ++++++++++++++ ...ityGML_2.0.xml => CityGML_v2_extended.gml} | 0 CityGML/Examples/CityGML_v3.gml | 241 ++++++++++++++ CityGML/Examples/CityGML_v3_extended.gml | 267 ++++++++++++++++ 6 files changed, 749 insertions(+), 571 deletions(-) delete mode 100644 CityGML/Examples/Building_CityGML_3.0.xml delete mode 100644 CityGML/Examples/Building_CityGML_3.0_withNewFeatures.xml create mode 100644 CityGML/Examples/CityGML_v2.gml rename CityGML/Examples/{Building_CityGML_2.0.xml => CityGML_v2_extended.gml} (100%) create mode 100644 CityGML/Examples/CityGML_v3.gml create mode 100644 CityGML/Examples/CityGML_v3_extended.gml diff --git a/CityGML/Examples/Building_CityGML_3.0.xml b/CityGML/Examples/Building_CityGML_3.0.xml deleted file mode 100644 index 1891240..0000000 --- a/CityGML/Examples/Building_CityGML_3.0.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - LoD2_4490_5322_1_BY - - - 4490655.500 5322005.280 548.470 - 4490671.290 5322017.800 557.020 - - - - - DEBY_LOD2_5744682 - 2014-10-08T09:00:00 - - - urn:adv:oid:DEBYvAAAAAAS3QeS - http://repository.gdi-de.org/schemas/adv/citygml/fdv/art.htm#_9100 - - - - - StandLK - 2014-07-28 - - - - - Gemeindeschluessel - 09175128 - - - 31001_9998 - 3100 - - - - - - - - - - - 4490663.450 5322007.590 555.191 4490663.250 5322006.210 554.643 4490666.840 5322005.700 554.642 4490669.800 5322005.280 554.641 4490670.002 5322006.703 555.206 4490670.649 5322011.271 557.020 4490656.141 5322013.320 557.020 4490655.500 5322008.750 555.206 4490663.450 5322007.590 555.191 - - - - - - - - - - - - - - - - - 4490664.850 5322016.660 548.470 4490664.850 5322016.660 555.241 4490664.850 5322016.700 555.226 4490664.850 5322016.700 548.470 4490664.850 5322016.660 548.470 - - - - - - - - - - - - - - - - - 4490664.850 5322016.700 548.470 4490664.850 5322016.700 555.226 4490671.290 5322015.790 555.226 4490671.290 5322015.790 548.470 4490664.850 5322016.700 548.470 - - - - - - - - - - - - - - - - - 4490656.770 5322017.800 548.470 4490656.770 5322017.800 555.242 4490664.850 5322016.660 555.241 4490664.850 5322016.660 548.470 4490656.770 5322017.800 548.470 - - - - - - - - - - - - - - - - - 4490663.250 5322006.210 548.470 4490663.250 5322006.210 554.643 4490663.450 5322007.590 555.191 4490663.450 5322007.590 548.470 4490663.250 5322006.210 548.470 - - - - - - - - - - - - - - - - - 4490663.450 5322007.590 548.470 4490663.450 5322007.590 555.191 4490655.500 5322008.750 555.206 4490655.500 5322008.750 548.470 4490663.450 5322007.590 548.470 - - - - - - - - - - - - - - - - - 4490670.002 5322006.703 555.206 4490669.800 5322005.280 554.641 4490669.800 5322005.280 548.470 4490670.002 5322006.703 548.470 4490670.649 5322011.271 548.470 4490671.290 5322015.790 548.470 4490671.290 5322015.790 555.226 4490670.649 5322011.271 557.020 4490670.002 5322006.703 555.206 - - - - - - - - - - - - - - - - - 4490666.840 5322005.700 548.470 4490669.800 5322005.280 548.470 4490669.800 5322005.280 554.641 4490666.840 5322005.700 554.642 4490663.250 5322006.210 554.643 4490663.250 5322006.210 548.470 4490666.840 5322005.700 548.470 - - - - - - - - - - - - - - - - - 4490670.649 5322011.271 557.020 4490671.290 5322015.790 555.226 4490664.850 5322016.700 555.226 4490664.850 5322016.660 555.241 4490656.770 5322017.800 555.242 4490656.141 5322013.320 557.020 4490670.649 5322011.271 557.020 - - - - - - - - - - - - - - - - - 4490655.500 5322008.750 555.206 4490656.141 5322013.320 557.020 4490656.770 5322017.800 555.242 4490656.770 5322017.800 548.470 4490656.141 5322013.320 548.470 4490655.500 5322008.750 548.470 4490655.500 5322008.750 555.206 - - - - - - - - - - - - - - - - - 4490670.649 5322011.271 548.470 4490670.002 5322006.703 548.470 4490669.800 5322005.280 548.470 4490666.840 5322005.700 548.470 4490663.250 5322006.210 548.470 4490663.450 5322007.590 548.470 4490655.500 5322008.750 548.470 4490656.141 5322013.320 548.470 4490656.770 5322017.800 548.470 4490664.850 5322016.660 548.470 4490664.850 5322016.700 548.470 4490671.290 5322015.790 548.470 4490670.649 5322011.271 548.470 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - Germany - - Moosach - - Am Hang 15 - - - - - -
- - - - highestRoofEdge - lowestGroundPoint - measured - 8.55 - - - - - - diff --git a/CityGML/Examples/Building_CityGML_3.0_withNewFeatures.xml b/CityGML/Examples/Building_CityGML_3.0_withNewFeatures.xml deleted file mode 100644 index 0066fb2..0000000 --- a/CityGML/Examples/Building_CityGML_3.0_withNewFeatures.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - LoD2_4490_5322_1_BY - - - 4490655.500 5322005.280 548.470 - 4490671.290 5322017.800 557.020 - - - - - DEBY_LOD2_5744682 - 2014-10-08T09:00:00 - - - urn:adv:oid:DEBYvAAAAAAS3QeS - http://repository.gdi-de.org/schemas/adv/citygml/fdv/art.htm#_9100 - http://www.w3.org/2002/07/owl#sameAs - - - - - StandLK - 2014-07-28 - - - - - Gemeindeschluessel - 09175128 - - - 31001_9998 - 3100 - - - - - - - - - - - 4490663.450 5322007.590 555.191 4490663.250 5322006.210 554.643 4490666.840 5322005.700 554.642 4490669.800 5322005.280 554.641 4490670.002 5322006.703 555.206 4490670.649 5322011.271 557.020 4490656.141 5322013.320 557.020 4490655.500 5322008.750 555.206 4490663.450 5322007.590 555.191 - - - - - - - - - - - - - - - - - 4490664.850 5322016.660 548.470 4490664.850 5322016.660 555.241 4490664.850 5322016.700 555.226 4490664.850 5322016.700 548.470 4490664.850 5322016.660 548.470 - - - - - - - - - - - - - - - - - 4490664.850 5322016.700 548.470 4490664.850 5322016.700 555.226 4490671.290 5322015.790 555.226 4490671.290 5322015.790 548.470 4490664.850 5322016.700 548.470 - - - - - - - - - - - - - - - - - 4490656.770 5322017.800 548.470 4490656.770 5322017.800 555.242 4490664.850 5322016.660 555.241 4490664.850 5322016.660 548.470 4490656.770 5322017.800 548.470 - - - - - - - - - - - - - - - - - 4490663.250 5322006.210 548.470 4490663.250 5322006.210 554.643 4490663.450 5322007.590 555.191 4490663.450 5322007.590 548.470 4490663.250 5322006.210 548.470 - - - - - - - - - - - - - - - - - 4490663.450 5322007.590 548.470 4490663.450 5322007.590 555.191 4490655.500 5322008.750 555.206 4490655.500 5322008.750 548.470 4490663.450 5322007.590 548.470 - - - - - - - - - - - - - - - - - 4490670.002 5322006.703 555.206 4490669.800 5322005.280 554.641 4490669.800 5322005.280 548.470 4490670.002 5322006.703 548.470 4490670.649 5322011.271 548.470 4490671.290 5322015.790 548.470 4490671.290 5322015.790 555.226 4490670.649 5322011.271 557.020 4490670.002 5322006.703 555.206 - - - - - - - - - - - - - - - - - 4490666.840 5322005.700 548.470 4490669.800 5322005.280 548.470 4490669.800 5322005.280 554.641 4490666.840 5322005.700 554.642 4490663.250 5322006.210 554.643 4490663.250 5322006.210 548.470 4490666.840 5322005.700 548.470 - - - - - - - - - - - - - - - - - 4490670.649 5322011.271 557.020 4490671.290 5322015.790 555.226 4490664.850 5322016.700 555.226 4490664.850 5322016.660 555.241 4490656.770 5322017.800 555.242 4490656.141 5322013.320 557.020 4490670.649 5322011.271 557.020 - - - - - - - - - - - - - - - - - 4490655.500 5322008.750 555.206 4490656.141 5322013.320 557.020 4490656.770 5322017.800 555.242 4490656.770 5322017.800 548.470 4490656.141 5322013.320 548.470 4490655.500 5322008.750 548.470 4490655.500 5322008.750 555.206 - - - - - - - - - - - - - - - - - 4490670.649 5322011.271 548.470 4490670.002 5322006.703 548.470 4490669.800 5322005.280 548.470 4490666.840 5322005.700 548.470 4490663.250 5322006.210 548.470 4490663.450 5322007.590 548.470 4490655.500 5322008.750 548.470 4490656.141 5322013.320 548.470 4490656.770 5322017.800 548.470 4490664.850 5322016.660 548.470 4490664.850 5322016.700 548.470 4490671.290 5322015.790 548.470 4490670.649 5322011.271 548.470 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - application/octet-strem - http://www.gis.bgu.tum.de/pointcloudfile.las - epsg:31468 - - - - - -
- - - - Germany - - Moosach - - Am Hang 15 - - - - - -
- - - - apartment - - - - - - - - - - - - - - - - - - - highestRoofEdge - lowestGroundPoint - measured - 8.55 - - - - - - diff --git a/CityGML/Examples/CityGML_v2.gml b/CityGML/Examples/CityGML_v2.gml new file mode 100644 index 0000000..dadcf6c --- /dev/null +++ b/CityGML/Examples/CityGML_v2.gml @@ -0,0 +1,241 @@ + + + LoD2_4490_5322_1_BY + + + 4490655.500 5322005.280 548.470 + 4490671.290 5322017.800 557.020 + + + + + DEBY_LOD2_5744682 + 2014-10-08 + 31001_9998 + 3100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 555.191 4490663.250 5322006.210 554.643 4490666.840 5322005.700 554.642 4490669.800 5322005.280 554.641 4490670.002 5322006.703 555.206 4490670.649 5322011.271 557.020 4490656.141 5322013.320 557.020 4490655.500 5322008.750 555.206 4490663.450 5322007.590 555.191 + + + + + + + + + + + + + + + + + 4490664.850 5322016.660 548.470 4490664.850 5322016.660 555.241 4490664.850 5322016.700 555.226 4490664.850 5322016.700 548.470 4490664.850 5322016.660 548.470 + + + + + + + + + + + + + + + + + 4490664.850 5322016.700 548.470 4490664.850 5322016.700 555.226 4490671.290 5322015.790 555.226 4490671.290 5322015.790 548.470 4490664.850 5322016.700 548.470 + + + + + + + + + + + + + + + + + 4490656.770 5322017.800 548.470 4490656.770 5322017.800 555.242 4490664.850 5322016.660 555.241 4490664.850 5322016.660 548.470 4490656.770 5322017.800 548.470 + + + + + + + + + + + + + + + + + 4490663.250 5322006.210 548.470 4490663.250 5322006.210 554.643 4490663.450 5322007.590 555.191 4490663.450 5322007.590 548.470 4490663.250 5322006.210 548.470 + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 548.470 4490663.450 5322007.590 555.191 4490655.500 5322008.750 555.206 4490655.500 5322008.750 548.470 4490663.450 5322007.590 548.470 + + + + + + + + + + + + + + + + + 4490670.002 5322006.703 555.206 4490669.800 5322005.280 554.641 4490669.800 5322005.280 548.470 4490670.002 5322006.703 548.470 4490670.649 5322011.271 548.470 4490671.290 5322015.790 548.470 4490671.290 5322015.790 555.226 4490670.649 5322011.271 557.020 4490670.002 5322006.703 555.206 + + + + + + + + + + + + + + + + + 4490666.840 5322005.700 548.470 4490669.800 5322005.280 548.470 4490669.800 5322005.280 554.641 4490666.840 5322005.700 554.642 4490663.250 5322006.210 554.643 4490663.250 5322006.210 548.470 4490666.840 5322005.700 548.470 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 557.020 4490671.290 5322015.790 555.226 4490664.850 5322016.700 555.226 4490664.850 5322016.660 555.241 4490656.770 5322017.800 555.242 4490656.141 5322013.320 557.020 4490670.649 5322011.271 557.020 + + + + + + + + + + + + + + + + + 4490655.500 5322008.750 555.206 4490656.141 5322013.320 557.020 4490656.770 5322017.800 555.242 4490656.770 5322017.800 548.470 4490656.141 5322013.320 548.470 4490655.500 5322008.750 548.470 4490655.500 5322008.750 555.206 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 548.470 4490670.002 5322006.703 548.470 4490669.800 5322005.280 548.470 4490666.840 5322005.700 548.470 4490663.250 5322006.210 548.470 4490663.450 5322007.590 548.470 4490655.500 5322008.750 548.470 4490656.141 5322013.320 548.470 4490656.770 5322017.800 548.470 4490664.850 5322016.660 548.470 4490664.850 5322016.700 548.470 4490671.290 5322015.790 548.470 4490670.649 5322011.271 548.470 + + + + + + + + + +
+ + + + Germany + + Moosach + + Am Hang 15 + + + + + +
+ + + + diff --git a/CityGML/Examples/Building_CityGML_2.0.xml b/CityGML/Examples/CityGML_v2_extended.gml similarity index 100% rename from CityGML/Examples/Building_CityGML_2.0.xml rename to CityGML/Examples/CityGML_v2_extended.gml diff --git a/CityGML/Examples/CityGML_v3.gml b/CityGML/Examples/CityGML_v3.gml new file mode 100644 index 0000000..2ef5ab0 --- /dev/null +++ b/CityGML/Examples/CityGML_v3.gml @@ -0,0 +1,241 @@ + + + LoD2_4490_5322_1_BY + + + 4490655.500 5322005.280 548.470 + 4490671.290 5322017.800 557.020 + + + + + DEBY_LOD2_5744682 + 2014-10-08T00:00:00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 555.191 4490663.250 5322006.210 554.643 4490666.840 5322005.700 554.642 4490669.800 5322005.280 554.641 4490670.002 5322006.703 555.206 4490670.649 5322011.271 557.020 4490656.141 5322013.320 557.020 4490655.500 5322008.750 555.206 4490663.450 5322007.590 555.191 + + + + + + + + + + + + + + + + + 4490664.850 5322016.660 548.470 4490664.850 5322016.660 555.241 4490664.850 5322016.700 555.226 4490664.850 5322016.700 548.470 4490664.850 5322016.660 548.470 + + + + + + + + + + + + + + + + + 4490664.850 5322016.700 548.470 4490664.850 5322016.700 555.226 4490671.290 5322015.790 555.226 4490671.290 5322015.790 548.470 4490664.850 5322016.700 548.470 + + + + + + + + + + + + + + + + + 4490656.770 5322017.800 548.470 4490656.770 5322017.800 555.242 4490664.850 5322016.660 555.241 4490664.850 5322016.660 548.470 4490656.770 5322017.800 548.470 + + + + + + + + + + + + + + + + + 4490663.250 5322006.210 548.470 4490663.250 5322006.210 554.643 4490663.450 5322007.590 555.191 4490663.450 5322007.590 548.470 4490663.250 5322006.210 548.470 + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 548.470 4490663.450 5322007.590 555.191 4490655.500 5322008.750 555.206 4490655.500 5322008.750 548.470 4490663.450 5322007.590 548.470 + + + + + + + + + + + + + + + + + 4490670.002 5322006.703 555.206 4490669.800 5322005.280 554.641 4490669.800 5322005.280 548.470 4490670.002 5322006.703 548.470 4490670.649 5322011.271 548.470 4490671.290 5322015.790 548.470 4490671.290 5322015.790 555.226 4490670.649 5322011.271 557.020 4490670.002 5322006.703 555.206 + + + + + + + + + + + + + + + + + 4490666.840 5322005.700 548.470 4490669.800 5322005.280 548.470 4490669.800 5322005.280 554.641 4490666.840 5322005.700 554.642 4490663.250 5322006.210 554.643 4490663.250 5322006.210 548.470 4490666.840 5322005.700 548.470 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 557.020 4490671.290 5322015.790 555.226 4490664.850 5322016.700 555.226 4490664.850 5322016.660 555.241 4490656.770 5322017.800 555.242 4490656.141 5322013.320 557.020 4490670.649 5322011.271 557.020 + + + + + + + + + + + + + + + + + 4490655.500 5322008.750 555.206 4490656.141 5322013.320 557.020 4490656.770 5322017.800 555.242 4490656.770 5322017.800 548.470 4490656.141 5322013.320 548.470 4490655.500 5322008.750 548.470 4490655.500 5322008.750 555.206 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 548.470 4490670.002 5322006.703 548.470 4490669.800 5322005.280 548.470 4490666.840 5322005.700 548.470 4490663.250 5322006.210 548.470 4490663.450 5322007.590 548.470 4490655.500 5322008.750 548.470 4490656.141 5322013.320 548.470 4490656.770 5322017.800 548.470 4490664.850 5322016.660 548.470 4490664.850 5322016.700 548.470 4490671.290 5322015.790 548.470 4490670.649 5322011.271 548.470 + + + + + + + + + 31001_9998 + 3100 + +
+ + + + Germany + + Moosach + + Am Hang 15 + + + + + +
+ + + + diff --git a/CityGML/Examples/CityGML_v3_extended.gml b/CityGML/Examples/CityGML_v3_extended.gml new file mode 100644 index 0000000..18869a2 --- /dev/null +++ b/CityGML/Examples/CityGML_v3_extended.gml @@ -0,0 +1,267 @@ + + + LoD2_4490_5322_1_BY + + + 4490655.500 5322005.280 548.470 + 4490671.290 5322017.800 557.020 + + + + + DEBY_LOD2_5744682 + 2014-10-08T00:00:00 + + + urn:adv:oid:DEBYvAAAAAAS3QeS + http://repository.gdi-de.org/schemas/adv/citygml/fdv/art.htm#_9100 + + + + + StandLK + 2014-07-28 + + + + + Gemeindeschluessel + 09175128 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 555.191 4490663.250 5322006.210 554.643 4490666.840 5322005.700 554.642 4490669.800 5322005.280 554.641 4490670.002 5322006.703 555.206 4490670.649 5322011.271 557.020 4490656.141 5322013.320 557.020 4490655.500 5322008.750 555.206 4490663.450 5322007.590 555.191 + + + + + + + + + + + + + + + + + 4490664.850 5322016.660 548.470 4490664.850 5322016.660 555.241 4490664.850 5322016.700 555.226 4490664.850 5322016.700 548.470 4490664.850 5322016.660 548.470 + + + + + + + + + + + + + + + + + 4490664.850 5322016.700 548.470 4490664.850 5322016.700 555.226 4490671.290 5322015.790 555.226 4490671.290 5322015.790 548.470 4490664.850 5322016.700 548.470 + + + + + + + + + + + + + + + + + 4490656.770 5322017.800 548.470 4490656.770 5322017.800 555.242 4490664.850 5322016.660 555.241 4490664.850 5322016.660 548.470 4490656.770 5322017.800 548.470 + + + + + + + + + + + + + + + + + 4490663.250 5322006.210 548.470 4490663.250 5322006.210 554.643 4490663.450 5322007.590 555.191 4490663.450 5322007.590 548.470 4490663.250 5322006.210 548.470 + + + + + + + + + + + + + + + + + 4490663.450 5322007.590 548.470 4490663.450 5322007.590 555.191 4490655.500 5322008.750 555.206 4490655.500 5322008.750 548.470 4490663.450 5322007.590 548.470 + + + + + + + + + + + + + + + + + 4490670.002 5322006.703 555.206 4490669.800 5322005.280 554.641 4490669.800 5322005.280 548.470 4490670.002 5322006.703 548.470 4490670.649 5322011.271 548.470 4490671.290 5322015.790 548.470 4490671.290 5322015.790 555.226 4490670.649 5322011.271 557.020 4490670.002 5322006.703 555.206 + + + + + + + + + + + + + + + + + 4490666.840 5322005.700 548.470 4490669.800 5322005.280 548.470 4490669.800 5322005.280 554.641 4490666.840 5322005.700 554.642 4490663.250 5322006.210 554.643 4490663.250 5322006.210 548.470 4490666.840 5322005.700 548.470 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 557.020 4490671.290 5322015.790 555.226 4490664.850 5322016.700 555.226 4490664.850 5322016.660 555.241 4490656.770 5322017.800 555.242 4490656.141 5322013.320 557.020 4490670.649 5322011.271 557.020 + + + + + + + + + + + + + + + + + 4490655.500 5322008.750 555.206 4490656.141 5322013.320 557.020 4490656.770 5322017.800 555.242 4490656.770 5322017.800 548.470 4490656.141 5322013.320 548.470 4490655.500 5322008.750 548.470 4490655.500 5322008.750 555.206 + + + + + + + + + + + + + + + + + 4490670.649 5322011.271 548.470 4490670.002 5322006.703 548.470 4490669.800 5322005.280 548.470 4490666.840 5322005.700 548.470 4490663.250 5322006.210 548.470 4490663.450 5322007.590 548.470 4490655.500 5322008.750 548.470 4490656.141 5322013.320 548.470 4490656.770 5322017.800 548.470 4490664.850 5322016.660 548.470 4490664.850 5322016.700 548.470 4490671.290 5322015.790 548.470 4490670.649 5322011.271 548.470 + + + + + + + + + + + highestRoofEdge + lowestGroundPoint + measured + 8.55 + + + 31001_9998 + 3100 + +
+ + + + Germany + + Moosach + + Am Hang 15 + + + + + +
+ + + + From 7a203e46246ce9794c8dd0aa08e995b2e87993a6 Mon Sep 17 00:00:00 2001 From: TatjanaKutzner Date: Tue, 11 Dec 2018 11:46:37 -0500 Subject: [PATCH 3/3] Updated schema location references for easier validation --- CityGML/Examples/CityGML_v3.gml | 2 +- CityGML/Examples/CityGML_v3_extended.gml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CityGML/Examples/CityGML_v3.gml b/CityGML/Examples/CityGML_v3.gml index 2ef5ab0..6af7213 100644 --- a/CityGML/Examples/CityGML_v3.gml +++ b/CityGML/Examples/CityGML_v3.gml @@ -1,5 +1,5 @@ - + LoD2_4490_5322_1_BY diff --git a/CityGML/Examples/CityGML_v3_extended.gml b/CityGML/Examples/CityGML_v3_extended.gml index 18869a2..092020d 100644 --- a/CityGML/Examples/CityGML_v3_extended.gml +++ b/CityGML/Examples/CityGML_v3_extended.gml @@ -1,5 +1,5 @@ - + LoD2_4490_5322_1_BY @@ -235,7 +235,7 @@ - + highestRoofEdge lowestGroundPoint