Skip to content

Commit

Permalink
Implemented issues #22, #53, #54, and #55
Browse files Browse the repository at this point in the history
  • Loading branch information
@TatjanaKutzner
TatjanaKutzner committed Mar 13, 2019
1 parent a186015 commit e202fdd
Show file tree
Hide file tree
Showing 11 changed files with 312 additions and 182 deletions.
6 changes: 3 additions & 3 deletions CityGML/Schema/appearance.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<documentation>SIG3D: Theme name for all surfaceDataMembers. A theme is a catagory defining the semantics of the referenced surfaceDataMembers (e.g. infrared radiation,</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="surfaceDataMember">
<element maxOccurs="unbounded" minOccurs="0" name="surfaceData">
<annotation>
<documentation>SIG3D: List of surface data properties for the current appearance theme</documentation>
</annotation>
Expand Down Expand Up @@ -194,7 +194,7 @@
<complexContent>
<extension base="app:AbstractTextureType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="target" type="app:TextureAssociationPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="textureParameterization" type="app:TextureAssociationPropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" ref="app:AbstractGenericApplicationPropertyOfParameterizedTexture"/>
</sequence>
</extension>
Expand Down Expand Up @@ -273,7 +273,7 @@
<documentation>SIG3D: Link to the geometry object to be textured.</documentation>
</annotation>
</element>
<element name="target" type="app:AbstractTextureParameterizationPropertyType"/>
<element name="textureParameterization" type="app:AbstractTextureParameterizationPropertyType"/>
</sequence>
</extension>
</complexContent>
Expand Down
22 changes: 11 additions & 11 deletions CityGML/Schema/bridge.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
<documentation>SIG3D: Indicates wether a bridge is movable to allow passages for ships (e.g. turnable bridge, liftable bridge)</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="bridgeConstruction">
<element maxOccurs="unbounded" minOccurs="0" name="bridgeConstructiveElement">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeConstructionElement</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="brid:BridgeConstructionElement"/>
<element ref="brid:BridgeConstructiveElement"/>
</sequence>
</extension>
</complexContent>
Expand All @@ -61,7 +61,7 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="interiorBridgeRoom">
<element maxOccurs="unbounded" minOccurs="0" name="bridgeRoom">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeRoom</documentation>
</annotation>
Expand Down Expand Up @@ -140,13 +140,13 @@
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBridgeConstructionElement" type="anyType"/>
<element name="BridgeConstructionElement" substitutionGroup="con:AbstractConstructiveElement" type="brid:BridgeConstructionElementType">
<element abstract="true" name="AbstractGenericApplicationPropertyOfBridgeConstructiveElement" type="anyType"/>
<element name="BridgeConstructiveElement" substitutionGroup="con:AbstractConstructiveElement" type="brid:BridgeConstructiveElementType">
<annotation>
<documentation>SIG3D: Element of a bridge which is essential from a structural point of view.</documentation>
</annotation>
</element>
<complexType name="BridgeConstructionElementType">
<complexType name="BridgeConstructiveElementType">
<complexContent>
<extension base="con:AbstractConstructiveElementType">
<sequence>
Expand All @@ -165,14 +165,14 @@
<documentation>SIG3D: Actual usage of BridgeConstructionElement as given by the relevant national regulations, information communities, or specific applications.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="brid:AbstractGenericApplicationPropertyOfBridgeConstructionElement"/>
<element maxOccurs="unbounded" minOccurs="0" ref="brid:AbstractGenericApplicationPropertyOfBridgeConstructiveElement"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="BridgeConstructionElementPropertyType">
<complexType name="BridgeConstructiveElementPropertyType">
<sequence minOccurs="0">
<element ref="brid:BridgeConstructionElement"/>
<element ref="brid:BridgeConstructiveElement"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
Expand Down Expand Up @@ -298,7 +298,7 @@
<documentation>SIG3D: Actual usage of BridgeRoom as given by the relevant national regulations, information communities, or specific applications.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="interiorFurniture">
<element maxOccurs="unbounded" minOccurs="0" name="bridgeFurniture">
<annotation>
<documentation>SIG3D: Relation between BridgeRoom and BridgeFurniture</documentation>
<appinfo>
Expand All @@ -314,7 +314,7 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="bridgeRoomInstallation">
<element maxOccurs="unbounded" minOccurs="0" name="bridgeInstallation">
<annotation>
<documentation>SIG3D: Relation between BridgeRoom and BridgegInstallation</documentation>
<appinfo>
Expand Down
109 changes: 58 additions & 51 deletions CityGML/Schema/building.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="interiorRoom">
<element maxOccurs="unbounded" minOccurs="0" name="buildingRoom">
<annotation>
<documentation>SIG3D: Relation between Building or BuildingPart and Room.</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="bldg:Room"/>
<element ref="bldg:BuildingRoom"/>
</sequence>
</extension>
</complexContent>
Expand Down Expand Up @@ -154,14 +154,14 @@
<documentation>Defines an order among the building unit objects, e.g. for sorting storeys.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="buildingSubdivisionConstructiveElement" type="gml:ReferenceType">
<element maxOccurs="unbounded" minOccurs="0" name="buildingConstructiveElement" type="gml:ReferenceType">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:BuildingConstructiveElement</targetElement>
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="buildingSubdivisionFurniture">
<element maxOccurs="unbounded" minOccurs="0" name="buildingFurniture">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:BuildingFurniture</targetElement>
Expand All @@ -176,7 +176,7 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="buildingSubdivisionInstallation">
<element maxOccurs="unbounded" minOccurs="0" name="buildingInstallation">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:BuildingInstallation</targetElement>
Expand All @@ -191,10 +191,10 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="room" type="gml:ReferenceType">
<element maxOccurs="unbounded" minOccurs="0" name="buildingRoom" type="gml:ReferenceType">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:Room</targetElement>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:BuildingRoom</targetElement>
</appinfo>
</annotation>
</element>
Expand Down Expand Up @@ -364,48 +364,13 @@
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBuildingUnit" type="anyType"/>
<element name="BuildingUnit" substitutionGroup="bldg:AbstractBuildingSubdivision" type="bldg:BuildingUnitType">
<annotation>
<documentation>This object corresponds to "BuildingUnit" from INSPIRE: A semantic object for representing subdivisions of a building with their own lockable access from the outside or from a common area (i.e. not from another BuildingUnit), which are atomic, functionally independent, and may be separately sold, rented out, inherited, etc. [INSPIRE D2.8.III.2_v3.0].</documentation>
</annotation>
</element>
<complexType name="BuildingUnitType">
<complexContent>
<extension base="bldg:AbstractBuildingSubdivisionType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="storey" type="gml:ReferenceType">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:Storey</targetElement>
<reversePropertyName xmlns="http://www.opengis.net/gml/3.2">bldg:buildingUnit</reversePropertyName>
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="address" type="core:AddressPropertyType">
<annotation>
<documentation>SIG3D: Relation between BuildingUnit and Address.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfBuildingUnit"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="BuildingUnitPropertyType">
<sequence minOccurs="0">
<element ref="bldg:BuildingUnit"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfRoom" type="anyType"/>
<element name="Room" substitutionGroup="core:AbstractUnoccupiedSpace" type="bldg:RoomType">
<element abstract="true" name="AbstractGenericApplicationPropertyOfBuildingRoom" type="anyType"/>
<element name="BuildingRoom" substitutionGroup="core:AbstractUnoccupiedSpace" type="bldg:BuildingRoomType">
<annotation>
<documentation>A semantic object for modelling the free space inside a building. This object corresponds to "Room" in CityGML 2.0. The inherited attribute spaceType allows for defining the closedness of a room. A room with ceiling, for instance, would be defined as closed, whereas an room representing an atrium would be defined as open or semi-open.</documentation>
</annotation>
</element>
<complexType name="RoomType">
<complexType name="BuildingRoomType">
<complexContent>
<extension base="core:AbstractUnoccupiedSpaceType">
<sequence>
Expand Down Expand Up @@ -439,7 +404,7 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="interiorFurniture">
<element maxOccurs="unbounded" minOccurs="0" name="buildingFurniture">
<annotation>
<documentation>SIG3D: Relation between Room and BuildingFurniture</documentation>
<appinfo>
Expand All @@ -455,7 +420,7 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="roomInstallation">
<element maxOccurs="unbounded" minOccurs="0" name="buildingInstallation">
<annotation>
<documentation>SIG3D: Relation between Room and IntBuildingInstallation</documentation>
<appinfo>
Expand All @@ -471,14 +436,49 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfRoom"/>
<element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfBuildingRoom"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="RoomPropertyType">
<complexType name="BuildingRoomPropertyType">
<sequence minOccurs="0">
<element ref="bldg:Room"/>
<element ref="bldg:BuildingRoom"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBuildingUnit" type="anyType"/>
<element name="BuildingUnit" substitutionGroup="bldg:AbstractBuildingSubdivision" type="bldg:BuildingUnitType">
<annotation>
<documentation>This object corresponds to "BuildingUnit" from INSPIRE: A semantic object for representing subdivisions of a building with their own lockable access from the outside or from a common area (i.e. not from another BuildingUnit), which are atomic, functionally independent, and may be separately sold, rented out, inherited, etc. [INSPIRE D2.8.III.2_v3.0].</documentation>
</annotation>
</element>
<complexType name="BuildingUnitType">
<complexContent>
<extension base="bldg:AbstractBuildingSubdivisionType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="storey" type="gml:ReferenceType">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">bldg:Storey</targetElement>
<reversePropertyName xmlns="http://www.opengis.net/gml/3.2">bldg:buildingUnit</reversePropertyName>
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="address" type="core:AddressPropertyType">
<annotation>
<documentation>SIG3D: Relation between BuildingUnit and Address.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfBuildingUnit"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="BuildingUnitPropertyType">
<sequence minOccurs="0">
<element ref="bldg:BuildingUnit"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
Expand All @@ -500,7 +500,7 @@
<complexContent>
<extension base="gml:AbstractGMLType">
<sequence>
<element name="heightReference" type="bldg:RoomElevationReferenceValueType">
<element name="highReference" type="bldg:RoomElevationReferenceValueType">
<annotation>
<documentation>[INSPIRE] Element used as the high reference.</documentation>
</annotation>
Expand Down Expand Up @@ -549,6 +549,13 @@
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="constructionSurface" type="gml:ReferenceType">
<annotation>
<appinfo>
<targetElement xmlns="http://www.opengis.net/gml/3.2">con:AbstractConstructionSurface</targetElement>
</appinfo>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfStorey"/>
</sequence>
</extension>
Expand Down
Loading

0 comments on commit e202fdd

Please sign in to comment.