Skip to content

Commit

Permalink
Merge pull request #25 from TatjanaKutzner/master
Browse files Browse the repository at this point in the history 
Implemented issues opengeospatial/CityGML-3.0CM#68, opengeospatial/CityGML-3.0CM#80, opengeospatial/CityGML-3.0CM#86, and opengeospatial/CityGML-3.0CM#92
  • Loading branch information
@3DXScape
3DXScape authored Oct 18, 2019
2 parents 01dba89 + ac021b1 commit 1e8cc5b
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 91 deletions.
128 changes: 84 additions & 44 deletions CityGML/Schema/cityGMLBase.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,21 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
</complexType>
<element abstract="true" name="AbstractGenericAttribute" substitutionGroup="gml:AbstractObject" type="core:AbstractGenericAttributeType"/>
<complexType abstract="true" name="AbstractGenericAttributeType">
<sequence/>
<sequence>
<element name="name" type="string"/>
</sequence>
</complexType>
<complexType name="AbstractGenericAttributePropertyType">
<sequence>
<element ref="core:AbstractGenericAttribute"/>
</sequence>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractLogicalSpace" type="anyType"/>
<element abstract="true" name="AbstractLogicalSpace" substitutionGroup="core:AbstractSpace" type="core:AbstractLogicalSpaceType"/>
<element abstract="true" name="AbstractLogicalSpace" substitutionGroup="core:AbstractSpace" type="core:AbstractLogicalSpaceType">
<annotation>
<documentation>A logical space is a space that is not bounded by physical surfaces but is defined according to thematic considerations.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractLogicalSpaceType">
<complexContent>
<extension base="core:AbstractSpaceType">
Expand All @@ -144,7 +150,11 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractOccupiedSpace" type="anyType"/>
<element abstract="true" name="AbstractOccupiedSpace" substitutionGroup="core:AbstractPhysicalSpace" type="core:AbstractOccupiedSpaceType"/>
<element abstract="true" name="AbstractOccupiedSpace" substitutionGroup="core:AbstractPhysicalSpace" type="core:AbstractOccupiedSpaceType">
<annotation>
<documentation>An occupied space represents a physical volumetric object that is partially or entirely filled with matter.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractOccupiedSpaceType">
<complexContent>
<extension base="core:AbstractPhysicalSpaceType">
Expand Down Expand Up @@ -177,7 +187,11 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractPhysicalSpace" type="anyType"/>
<element abstract="true" name="AbstractPhysicalSpace" substitutionGroup="core:AbstractSpace" type="core:AbstractPhysicalSpaceType"/>
<element abstract="true" name="AbstractPhysicalSpace" substitutionGroup="core:AbstractSpace" type="core:AbstractPhysicalSpaceType">
<annotation>
<documentation>A physical space is a space that is fully or partially bounded by physical objects.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractPhysicalSpaceType">
<complexContent>
<extension base="core:AbstractSpaceType">
Expand Down Expand Up @@ -229,7 +243,11 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractSpace" type="anyType"/>
<element abstract="true" name="AbstractSpace" substitutionGroup="core:AbstractCityObject" type="core:AbstractSpaceType"/>
<element abstract="true" name="AbstractSpace" substitutionGroup="core:AbstractCityObject" type="core:AbstractSpaceType">
<annotation>
<documentation>A Space is an entity of volumetric extent in the real world.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractSpaceType">
<complexContent>
<extension base="core:AbstractCityObjectType">
Expand Down Expand Up @@ -306,17 +324,30 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractThematicSurface" type="anyType"/>
<element abstract="true" name="AbstractThematicSurface" substitutionGroup="core:AbstractCityObject" type="core:AbstractThematicSurfaceType"/>
<element abstract="true" name="AbstractThematicSurface" substitutionGroup="core:AbstractCityObject" type="core:AbstractThematicSurfaceType">
<annotation>
<documentation>A Space Boundary is an entity with areal extent in the real world.
Space Boundaries are objects that bound a Space. They also realize the contact between adjacent spaces.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractThematicSurfaceType">
<complexContent>
<extension base="core:AbstractCityObjectType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="bounds" type="core:AbstractSpacePropertyType">
<annotation>
<appinfo>
<reversePropertyName xmlns="http://www.opengis.net/gml/3.2">core:boundary</reversePropertyName>
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="area" type="core:QualifiedAreaPropertyType"/>
<element minOccurs="0" name="lod0MultiCurve" type="gml:MultiCurvePropertyType">
<annotation>
<documentation>Relation to a LOD0 curve geometry of AbstractSpace.</documentation>
</annotation>
</element>
<element minOccurs="0" name="lod0MultiSurface" type="gml:MultiSurfacePropertyType"/>
<element minOccurs="0" name="lod1MultiSurface" type="gml:MultiSurfacePropertyType">
<annotation>
<documentation>Relation to a LOD1 surface geometry of AbstractSpaceBoundary.</documentation>
Expand All @@ -332,13 +363,6 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<documentation>Relation to a LOD3 surface geometry of AbstractSpaceBoundary.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="bounds" type="core:AbstractSpacePropertyType">
<annotation>
<appinfo>
<reversePropertyName xmlns="http://www.opengis.net/gml/3.2">core:boundary</reversePropertyName>
</appinfo>
</annotation>
</element>
<element minOccurs="0" name="pointCloud" type="core:AbstractPointCloudPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractThematicSurface"/>
</sequence>
Expand All @@ -353,7 +377,11 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractUnoccupiedSpace" type="anyType"/>
<element abstract="true" name="AbstractUnoccupiedSpace" substitutionGroup="core:AbstractPhysicalSpace" type="core:AbstractUnoccupiedSpaceType"/>
<element abstract="true" name="AbstractUnoccupiedSpace" substitutionGroup="core:AbstractPhysicalSpace" type="core:AbstractUnoccupiedSpaceType">
<annotation>
<documentation>An unoccupied space represents physical volumetric entity that is entirely or mostly free of matter.</documentation>
</annotation>
</element>
<complexType abstract="true" name="AbstractUnoccupiedSpaceType">
<complexContent>
<extension base="core:AbstractPhysicalSpaceType">
Expand Down Expand Up @@ -522,6 +550,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<complexContent>
<extension base="gml:AbstractGMLType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="genericAttribute" type="core:AbstractGenericAttributePropertyType"/>
<element name="relationType" type="gml:CodeType"/>
<element name="relatedTo" type="core:AbstractCityObjectPropertyType"/>
</sequence>
Expand All @@ -536,7 +565,11 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfClosureSurface" type="anyType"/>
<element name="ClosureSurface" substitutionGroup="core:AbstractThematicSurface" type="core:ClosureSurfaceType"/>
<element name="ClosureSurface" substitutionGroup="core:AbstractThematicSurface" type="core:ClosureSurfaceType">
<annotation>
<documentation>SIG3D: Exterior or interior boundary surface providing virtual boundaries, typically used to seal holes in volumetric objects.</documentation>
</annotation>
</element>
<complexType name="ClosureSurfaceType">
<complexContent>
<extension base="core:AbstractThematicSurfaceType">
Expand Down Expand Up @@ -587,44 +620,51 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
<element ref="core:ExternalReference"/>
</sequence>
</complexType>
<element name="ImplicitGeometry" substitutionGroup="gml:AbstractObject" type="core:ImplicitGeometryType">
<element name="ImplicitGeometry" substitutionGroup="gml:AbstractGML" type="core:ImplicitGeometryType">
<annotation>
<documentation>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.</documentation>
</annotation>
</element>
<complexType name="ImplicitGeometryType">
<sequence>
<element name="transformationMatrix" type="core:TransformationMatrix4x4Type">
<annotation>
<documentation>SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object.</documentation>
</annotation>
</element>
<element minOccurs="0" name="mimeType" type="gml:CodeType">
<annotation>
<documentation>SIG3D: Mime type of the referenced external geometric object (attribute libraryObject).</documentation>
</annotation>
</element>
<element minOccurs="0" name="libraryObject" type="anyURI">
<annotation>
<documentation>SIG3D: External link to a prototype geometry.</documentation>
</annotation>
</element>
<element name="referencePoint" type="gml:PointPropertyType">
<annotation>
<documentation>SIG3D: Base point of the object in the world coordinate system.</documentation>
</annotation>
</element>
<element minOccurs="0" name="relativeGMLGeometry" type="gml:GeometryPropertyType">
<annotation>
<documentation>SIG3D: Geometry of the prototype, specified in a local coordinate system.</documentation>
</annotation>
</element>
</sequence>
<complexContent>
<extension base="gml:AbstractGMLType">
<sequence>
<element name="transformationMatrix" type="core:TransformationMatrix4x4Type">
<annotation>
<documentation>SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object.</documentation>
</annotation>
</element>
<element minOccurs="0" name="mimeType" type="gml:CodeType">
<annotation>
<documentation>SIG3D: Mime type of the referenced external geometric object (attribute libraryObject).</documentation>
</annotation>
</element>
<element minOccurs="0" name="libraryObject" type="anyURI">
<annotation>
<documentation>SIG3D: External link to a prototype geometry.</documentation>
</annotation>
</element>
<element name="referencePoint" type="gml:PointPropertyType">
<annotation>
<documentation>SIG3D: Base point of the object in the world coordinate system.</documentation>
</annotation>
</element>
<element minOccurs="0" name="relativeGMLGeometry" type="gml:GeometryPropertyType">
<annotation>
<documentation>SIG3D: Geometry of the prototype, specified in a local coordinate system.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="appearance" type="core:AbstractAppearancePropertyType"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="ImplicitGeometryPropertyType">
<sequence>
<sequence minOccurs="0">
<element ref="core:ImplicitGeometry"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<simpleType name="IntegerBetween0and3Type">
<restriction base="integer">
Expand Down
Loading

0 comments on commit 1e8cc5b

Please sign in to comment.