Commit 3c8fe882 authored by Claus Nagel's avatar Claus Nagel
Browse files

prepare release of 2.0ea

parent 69272f9d
......@@ -5,8 +5,9 @@
<!-- Prof. Dr. Thomas H. Kolbe, Institute for Geodesy and Geoinformation Science, Technical University of Berlin -->
<!-- For further information see: www.citygml.org -->
<!-- For the history of changes and additions to this CityGML schema see file history.txt -->
<xs:schema xmlns="http://www.opengis.net/citygml/vegetation/1.0" xmlns:core="http://www.opengis.net/citygml/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.opengis.net/citygml/vegetation/1.0" elementFormDefault="qualified"
<xs:schema xmlns="http://www.opengis.net/citygml/vegetation/1.0" xmlns:core="http://www.opengis.net/citygml/1.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml"
targetNamespace="http://www.opengis.net/citygml/vegetation/1.0" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:import namespace="http://www.opengis.net/gml" schemaLocation="../../GML/3.1.1/base/gml.xsd"/>
<xs:import namespace="http://www.opengis.net/citygml/1.0" schemaLocation="cityGMLBase.xsd"/>
......@@ -15,8 +16,8 @@
<!-- ========================================================================================= -->
<xs:complexType name="AbstractVegetationObjectType" abstract="true">
<xs:annotation>
<xs:documentation>Type describing the abstract superclass for vegetation objects. A subclass is either a SolitaryVegetationObject or a PlantCover.
</xs:documentation>
<xs:documentation>Type describing the abstract superclass for vegetation objects. A subclass is either a
SolitaryVegetationObject or a PlantCover. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="core:AbstractCityObjectType">
......@@ -33,8 +34,9 @@
<!-- ========================================================================================= -->
<xs:complexType name="PlantCoverType">
<xs:annotation>
<xs:documentation>Type describing Plant Covers resp. Biotopes. As subclass of _CityObject, a VegetationObject inherits all attributes and relations,
in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing Plant Covers resp. Biotopes. As subclass of _CityObject, a VegetationObject inherits all
attributes and relations, in particular an id, names, external references, and generalization relations.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractVegetationObjectType">
......@@ -61,26 +63,27 @@
<!-- ========================================================================================= -->
<xs:simpleType name="PlantCoverClassType">
<xs:annotation>
<xs:documentation>Class of a PlantCover. The values of this type are defined in the XML file PlantCoverClassType.xml, according to the dictionary
concept of GML3. </xs:documentation>
<xs:documentation>Class of a PlantCover. The values of this type are defined in the XML file PlantCoverClassType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:simpleType name="PlantCoverFunctionType">
<xs:annotation>
<xs:documentation>Function of a PlantCover. The values of this type are defined in the XML file PlantCoverFunctionType.xml, according to the
dictionary concept of GML3. </xs:documentation>
<xs:documentation>Function of a PlantCover. The values of this type are defined in the XML file PlantCoverFunctionType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:complexType name="SolitaryVegetationObjectType">
<xs:annotation>
<xs:documentation>Type describing solitary vegetation objects, e.g., trees. Its geometry is either defined explicitly by a GML 3 geometry with
absolute coordinates, or in the case of multiple occurences of the same vegetation object, implicitly by a reference to a shape definition and a
transformation. The shape definition may be given in an external file. As subclass of _CityObject, a SolitaryVegetationObject inherits all
attributes and relations, in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing solitary vegetation objects, e.g., trees. Its geometry is either defined explicitly by a
GML 3 geometry with absolute coordinates, or in the case of multiple occurences of the same vegetation object, implicitly
by a reference to a shape definition and a transformation. The shape definition may be given in an external file. As
subclass of _CityObject, a SolitaryVegetationObject inherits all attributes and relations, in particular an id, names,
external references, and generalization relations. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractVegetationObjectType">
......@@ -111,24 +114,24 @@
<!-- ========================================================================================= -->
<xs:simpleType name="PlantClassType">
<xs:annotation>
<xs:documentation>Class of a SolitaryVegetationObject. The values of this type are defined in the XML file PlantClassType.xml, according to the
dictionary concept of GML3. </xs:documentation>
<xs:documentation>Class of a SolitaryVegetationObject. The values of this type are defined in the XML file
PlantClassType.xml, according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:simpleType name="PlantFunctionType">
<xs:annotation>
<xs:documentation>Function of a PlantType. The values of this type are defined in the XML file PlantFunctionType.xml, according to the dictionary
concept of GML3. </xs:documentation>
<xs:documentation>Function of a PlantType. The values of this type are defined in the XML file PlantFunctionType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:simpleType name="SpeciesType">
<xs:annotation>
<xs:documentation>Type of a Species. The values of this type are defined in the XML file SpeciesType.xml, according to the dictionary concept of
GML3. </xs:documentation>
<xs:documentation>Type of a Species. The values of this type are defined in the XML file SpeciesType.xml, according to the
dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
......
......@@ -5,9 +5,9 @@
<!-- Prof. Dr. Thomas H. Kolbe, Institute for Geodesy and Geoinformation Science, Technical University of Berlin -->
<!-- For further information see: www.citygml.org -->
<!-- For the history of changes and additions to this CityGML schema see file history.txt -->
<xs:schema xmlns="http://www.opengis.net/citygml/waterbody/1.0" xmlns:core="http://www.opengis.net/citygml/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:gml="http://www.opengis.net/gml" targetNamespace="http://www.opengis.net/citygml/waterbody/1.0" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:schema xmlns="http://www.opengis.net/citygml/waterbody/1.0" xmlns:core="http://www.opengis.net/citygml/1.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml"
targetNamespace="http://www.opengis.net/citygml/waterbody/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="http://www.opengis.net/gml" schemaLocation="../../GML/3.1.1/base/gml.xsd"/>
<xs:import namespace="http://www.opengis.net/citygml/1.0" schemaLocation="cityGMLBase.xsd"/>
<!-- ========================================================================================= -->
......@@ -15,8 +15,9 @@
<!-- ========================================================================================= -->
<xs:complexType name="AbstractWaterObjectType" abstract="true">
<xs:annotation>
<xs:documentation>Type describing the abstract superclass for water objects. As subclass of _CityObject, a _WaterObject inherits all attributes and
relations, in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing the abstract superclass for water objects. As subclass of _CityObject, a _WaterObject
inherits all attributes and relations, in particular an id, names, external references, and generalization relations.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="core:AbstractCityObjectType">
......@@ -33,8 +34,9 @@
<!-- ========================================================================================= -->
<xs:complexType name="WaterBodyType">
<xs:annotation>
<xs:documentation>Type describing Water Bodies, e.g., lakes, rivers. As subclass of _CityObject, a WaterBody inherits all attributes and relations,
in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing Water Bodies, e.g., lakes, rivers. As subclass of _CityObject, a WaterBody inherits all
attributes and relations, in particular an id, names, external references, and generalization relations.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractWaterObjectType">
......@@ -63,24 +65,24 @@
<!-- ========================================================================================= -->
<xs:simpleType name="WaterBodyClassType">
<xs:annotation>
<xs:documentation>Class of a Water Body. The values of this type are defined in the XML file WaterBodyClassType.xml, according to the dictionary
concept of GML3. </xs:documentation>
<xs:documentation>Class of a Water Body. The values of this type are defined in the XML file WaterBodyClassType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:simpleType name="WaterBodyFunctionType">
<xs:annotation>
<xs:documentation>Function of a Water Body. The values of this type are defined in the XML file WaterBodyFunctionType.xml, according to the
dictionary concept of GML3. </xs:documentation>
<xs:documentation>Function of a Water Body. The values of this type are defined in the XML file WaterBodyFunctionType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:simpleType name="WaterBodyUsageType">
<xs:annotation>
<xs:documentation>Actual usage of a water body. The values of this type are defined in the XML file WaterBodyUsageType.xml, according to the
dictionary concept of GML3. </xs:documentation>
<xs:documentation>Actual usage of a water body. The values of this type are defined in the XML file WaterBodyUsageType.xml,
according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
......@@ -88,8 +90,8 @@
<xs:complexType name="BoundedByWaterSurfacePropertyType">
<xs:annotation>
<xs:documentation>Denotes the relation of a WaterBody to its boundary surfaces, which are of type _WaterBoundarySurface. The
BoundedByWaterSurfacePropertyType element must either carry a reference to a _WaterBoundarySurface object or contain a _WaterBoundarySurface
object inline, but neither both nor none. </xs:documentation>
BoundedByWaterSurfacePropertyType element must either carry a reference to a _WaterBoundarySurface object or contain a
_WaterBoundarySurface object inline, but neither both nor none. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:restriction base="gml:AssociationType">
......@@ -102,7 +104,8 @@
<!-- ========================================================================================= -->
<xs:complexType name="AbstractWaterBoundarySurfaceType" abstract="true">
<xs:annotation>
<xs:documentation>A WaterBoundarySurface is a thematic object which classifies surfaces bounding a water body. </xs:documentation>
<xs:documentation>A WaterBoundarySurface is a thematic object which classifies surfaces bounding a water body.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="core:AbstractCityObjectType">
......@@ -116,24 +119,26 @@
</xs:complexContent>
</xs:complexType>
<!-- ========================================================================================= -->
<xs:element name="_WaterBoundarySurface" type="AbstractWaterBoundarySurfaceType" abstract="true" substitutionGroup="core:_CityObject"/>
<xs:element name="_WaterBoundarySurface" type="AbstractWaterBoundarySurfaceType" abstract="true"
substitutionGroup="core:_CityObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterBoundarySurface" type="xs:anyType" abstract="true"/>
<!-- ========================================================================================= -->
<xs:simpleType name="WaterLevelType">
<xs:annotation>
<xs:documentation>Type for the specification of the level of a water surface. The optional attribute waterLevel of a WaterSurface can be used to
describe the water level, for which the given 3D surface geometry was acquired. This is especially important, when the water body is influenced
by the tide. The values of this type are defined in the XML file WaterLevelType.xml, according to the dictionary concept of GML3.
</xs:documentation>
<xs:documentation>Type for the specification of the level of a water surface. The optional attribute waterLevel of a
WaterSurface can be used to describe the water level, for which the given 3D surface geometry was acquired. This is
especially important, when the water body is influenced by the tide. The values of this type are defined in the XML file
WaterLevelType.xml, according to the dictionary concept of GML3. </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
<!-- ========================================================================================= -->
<xs:complexType name="WaterSurfaceType">
<xs:annotation>
<xs:documentation>Type describing the surface of a water body, which separates the water from the air. As subclass of _CityObject, a WaterSurface
inherits all attributes and relations, in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing the surface of a water body, which separates the water from the air. As subclass of
_CityObject, a WaterSurface inherits all attributes and relations, in particular an id, names, external references, and
generalization relations. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractWaterBoundarySurfaceType">
......@@ -151,9 +156,9 @@
<!-- ========================================================================================= -->
<xs:complexType name="WaterGroundSurfaceType">
<xs:annotation>
<xs:documentation>Type describing the ground surface of a water body, i.e. the boundary to the digital terrain model. As subclass of _CityObject, a
WaterGroundSurface inherits all attributes and relations, in particular an id, names, external references, and generalization relations.
</xs:documentation>
<xs:documentation>Type describing the ground surface of a water body, i.e. the boundary to the digital terrain model. As
subclass of _CityObject, a WaterGroundSurface inherits all attributes and relations, in particular an id, names, external
references, and generalization relations. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractWaterBoundarySurfaceType">
......@@ -170,8 +175,9 @@
<!-- ========================================================================================= -->
<xs:complexType name="WaterClosureSurfaceType">
<xs:annotation>
<xs:documentation>Type describing the closure surface between water bodys. As subclass of _CityObject, a WaterClosureSurface inherits all attributes
and relations, in particular an id, names, external references, and generalization relations. </xs:documentation>
<xs:documentation>Type describing the closure surface between water bodys. As subclass of _CityObject, a WaterClosureSurface
inherits all attributes and relations, in particular an id, names, external references, and generalization relations.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="AbstractWaterBoundarySurfaceType">
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!-- CityGML Version No. 2.0, February 2012 -->
<!-- CityGML - GML 3.1.1 application schema for 3D city models -->
<!-- International encoding standard of the Open Geospatial Consortium, see http://www.opengeospatial.org/standards/citygml -->
<!-- Jointly developed by the Special Interest Group 3D (SIG 3D) of GDI-DE, see http://www.sig3d.org -->
<!-- For further information see: http://www.citygml.org -->
<xs:schema xmlns="http://www.opengis.net/citygml/cityfurniture/2.0" xmlns:core="http://www.opengis.net/citygml/2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml"
targetNamespace="http://www.opengis.net/citygml/cityfurniture/2.0" elementFormDefault="qualified"
attributeFormDefault="unqualified" version="2.0.0">
<xs:annotation>
<xs:documentation>
CityGML is an OGC Standard.
Copyright (c) 2012 Open Geospatial Consortium.
To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
</xs:documentation>
</xs:annotation>
<xs:import namespace="http://www.opengis.net/gml" schemaLocation="../../GML/3.1.1/base/gml.xsd"/>
<xs:import namespace="http://www.opengis.net/citygml/2.0" schemaLocation="cityGMLBase.xsd"/>
<!-- ========================================================================================= -->
<!-- ===================================CityGML CityFurniture module ============================== -->
<!-- ========================================================================================= -->
<xs:complexType name="CityFurnitureType">
<xs:annotation>
<xs:documentation>Type describing city furnitures, like traffic lights, benches, ... As subclass of _CityObject, a
CityFurniture inherits all attributes and relations, in particular an id, names, external references, and generalization
relations. </xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:extension base="core:AbstractCityObjectType">
<xs:sequence>
<xs:element name="class" type="gml:CodeType" minOccurs="0"/>
<xs:element name="function" type="gml:CodeType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="usage" type="gml:CodeType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="lod1Geometry" type="gml:GeometryPropertyType" minOccurs="0"/>
<xs:element name="lod2Geometry" type="gml:GeometryPropertyType" minOccurs="0"/>
<xs:element name="lod3Geometry" type="gml:GeometryPropertyType" minOccurs="0"/>
<xs:element name="lod4Geometry" type="gml:GeometryPropertyType" minOccurs="0"/>
<xs:element name="lod1TerrainIntersection" type="gml:MultiCurvePropertyType" minOccurs="0"/>
<xs:element name="lod2TerrainIntersection" type="gml:MultiCurvePropertyType" minOccurs="0"/>
<xs:element name="lod3TerrainIntersection" type="gml:MultiCurvePropertyType" minOccurs="0"/>
<xs:element name="lod4TerrainIntersection" type="gml:MultiCurvePropertyType" minOccurs="0"/>
<xs:element name="lod1ImplicitRepresentation" type="core:ImplicitRepresentationPropertyType" minOccurs="0"/>
<xs:element name="lod2ImplicitRepresentation" type="core:ImplicitRepresentationPropertyType" minOccurs="0"/>
<xs:element name="lod3ImplicitRepresentation" type="core:ImplicitRepresentationPropertyType" minOccurs="0"/>
<xs:element name="lod4ImplicitRepresentation" type="core:ImplicitRepresentationPropertyType" minOccurs="0"/>
<xs:element ref="_GenericApplicationPropertyOfCityFurniture" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<!-- ========================================================================================= -->
<xs:element name="CityFurniture" type="CityFurnitureType" substitutionGroup="core:_CityObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfCityFurniture" type="xs:anyType" abstract="true"/>
<!-- ========================================================================================= -->
</xs:schema>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -194,7 +194,7 @@ public class ADE_XJC {
BigInteger md5 = new BigInteger("0");
md5 = Util.dir2md5(schema_dir, md5);
if (!md5.toString(16).equals("2678a3edaeddfcae6fc1db92c130d067"))
if (!md5.toString(16).equals("cb039ca82c6cb13d79098aed8cf3843f"))
throw new Exception("Contents of subfolder 'schemas' have been altered. Please restore its original state.");
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment