Skip to content

Commit

Permalink
Merge branch 'editor-model-updates'
Browse files Browse the repository at this point in the history
  • Loading branch information
@clausnagel
clausnagel committed Dec 17, 2018
2 parents b0a2d01 + d73e0c6 commit 609af9f
Show file tree
Hide file tree
Showing 21 changed files with 1,208 additions and 1,753 deletions.
272 changes: 0 additions & 272 deletions CityGML/Examples/Building_CityGML_3.0.xml
View file

This file was deleted.

299 changes: 0 additions & 299 deletions CityGML/Examples/Building_CityGML_3.0_withNewFeatures.xml
View file

This file was deleted.

241 changes: 241 additions & 0 deletions CityGML/Examples/CityGML_v2.gml
View file

Large diffs are not rendered by default.

0 CityGML/Examples/Building_CityGML_2.0.xml → CityGML/Examples/CityGML_v2_extended.gml
View file
File renamed without changes.
241 changes: 241 additions & 0 deletions CityGML/Examples/CityGML_v3.gml
View file

Large diffs are not rendered by default.

267 changes: 267 additions & 0 deletions CityGML/Examples/CityGML_v3_extended.gml
View file

Large diffs are not rendered by default.

185 changes: 27 additions & 158 deletions CityGML/Schema/bridge.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,14 @@
<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
<!--XML Schema document created by ShapeChange - http://shapechange.net/-->
<element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractBridge" type="anyType"/>
<complexType name="AbstractBridgePropertyType">
<choice minOccurs="0">
<element ref="brid:Bridge"/>
<element ref="brid:BridgePart"/>
</choice>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBridge" type="anyType"/>
<element name="Bridge" substitutionGroup="core:AbstractTopLevelCityObject" type="brid:BridgeType">
<element abstract="true" name="AbstractBridge" substitutionGroup="con:AbstractConstruction" type="brid:AbstractBridgeType">
<annotation>
<documentation>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).</documentation>
<documentation>SIG3D: Abstract superclass of Bridge and BridgePart</documentation>
</annotation>
</element>
<complexType name="BridgeType">
<complexType abstract="true" name="AbstractBridgeType">
<complexContent>
<extension base="core:AbstractTopLevelCityObjectType">
<extension base="con:AbstractConstructionType">
<sequence>
<element minOccurs="0" name="class" type="gml:CodeType">
<annotation>
Expand Down Expand Up @@ -70,7 +61,6 @@
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" name="bridgeSpace" type="con:ConstructionSpacePropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="interiorBridgeRoom">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeRoom</documentation>
Expand Down Expand Up @@ -102,37 +92,27 @@
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="brid:AbstractGenericApplicationPropertyOfAbstractBridge"/>
<element minOccurs="0" name="conditionOfConstruction" type="con:ConditionOfConstructionValueType">
<annotation>
<documentation>[INSPIRE] Status of the construction.</documentation>
</annotation>
</element>
<element minOccurs="0" name="dateOfConstruction" type="date">
<annotation>
<documentation>Date of completion of a construction.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="dateOfRenovation" type="date">
<annotation>
<documentation>Date of renovation of a construction.</documentation>
</annotation>
</element>
<element minOccurs="0" name="dateOfDemolition" type="date">
<annotation>
<documentation>Date of demolition of a construction.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="elevation" type="con:ElevationPropertyType">
<annotation>
<documentation>[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.).</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="heightAboveGround" type="con:HeightAboveGroundPropertyType">
<annotation>
<documentation>[INSPIRE] Height above ground.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfAbstractConstruction"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="AbstractBridgePropertyType">
<sequence minOccurs="0">
<element ref="brid:AbstractBridge"/>
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBridge" type="anyType"/>
<element name="Bridge" substitutionGroup="brid:AbstractBridge" type="brid:BridgeType">
<annotation>
<documentation>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).</documentation>
</annotation>
</element>
<complexType name="BridgeType">
<complexContent>
<extension base="brid:AbstractBridgeType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="bridgePart">
<annotation>
<documentation>Relation between Bridge and BridgePart.</documentation>
Expand Down Expand Up @@ -272,126 +252,15 @@
<attributeGroup ref="gml:OwnershipAttributeGroup"/>
</complexType>
<element abstract="true" name="AbstractGenericApplicationPropertyOfBridgePart" type="anyType"/>
<element name="BridgePart" substitutionGroup="core:AbstractCityObject" type="brid:BridgePartType">
<element name="BridgePart" substitutionGroup="brid:AbstractBridge" type="brid:BridgePartType">
<annotation>
<documentation>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.</documentation>
</annotation>
</element>
<complexType name="BridgePartType">
<complexContent>
<extension base="core:AbstractCityObjectType">
<extension base="brid:AbstractBridgeType">
<sequence>
<element minOccurs="0" name="class" type="gml:CodeType">
<annotation>
<documentation>SIG3D: Classification of the actual usage of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType">
<annotation>
<documentation>SIG3D: Specified function of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType">
<annotation>
<documentation>SIG3D: Actual usage of Bridge or BridgePart as given by the relevant national regulations, information communities, or specific applications.</documentation>
</annotation>
</element>
<element default="false" minOccurs="0" name="isMovable" type="boolean">
<annotation>
<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">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeConstructionElement</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="brid:BridgeConstructionElement"/>
</sequence>
</extension>
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="bridgeInstallation">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeInstallation</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="brid:BridgeInstallation"/>
</sequence>
</extension>
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" name="bridgeSpace" type="con:ConstructionSpacePropertyType"/>
<element maxOccurs="unbounded" minOccurs="0" name="interiorBridgeRoom">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and BridgeRoom</documentation>
</annotation>
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="brid:BridgeRoom"/>
</sequence>
</extension>
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="bridgeFurniture">
<complexType>
<complexContent>
<extension base="gml:AbstractFeatureMemberType">
<sequence>
<element ref="brid:BridgeFurniture"/>
</sequence>
</extension>
</complexContent>
</complexType>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="address" type="core:AddressPropertyType">
<annotation>
<documentation>SIG3D: Relation between Bridge or BridgePart and Address</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="brid:AbstractGenericApplicationPropertyOfAbstractBridge"/>
<element minOccurs="0" name="conditionOfConstruction" type="con:ConditionOfConstructionValueType">
<annotation>
<documentation>[INSPIRE] Status of the construction.</documentation>
</annotation>
</element>
<element minOccurs="0" name="dateOfConstruction" type="date">
<annotation>
<documentation>Date of completion of a construction.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="dateOfRenovation" type="date">
<annotation>
<documentation>Date of renovation of a construction.</documentation>
</annotation>
</element>
<element minOccurs="0" name="dateOfDemolition" type="date">
<annotation>
<documentation>Date of demolition of a construction.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="elevation" type="con:ElevationPropertyType">
<annotation>
<documentation>[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.).</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" name="heightAboveGround" type="con:HeightAboveGroundPropertyType">
<annotation>
<documentation>[INSPIRE] Height above ground.</documentation>
</annotation>
</element>
<element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfAbstractConstruction"/>
<element maxOccurs="unbounded" minOccurs="0" ref="brid:AbstractGenericApplicationPropertyOfBridgePart"/>
</sequence>
</extension>
Expand Down
Loading

0 comments on commit 609af9f

Please sign in to comment.