Commit 713134ba authored by Claus Nagel's avatar Claus Nagel
Browse files

0.3.0pre: intermediate commit to make changes persistent

do not update to this revision.
parent 5315090d
......@@ -5,10 +5,10 @@
<!-- 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"
attributeFormDefault="unqualified">
<xs:schema jaxb:version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 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"/>
<!-- ========================================================================================= -->
......@@ -30,7 +30,13 @@
<!-- ========================================================================================= -->
<xs:element name="_VegetationObject" type="AbstractVegetationObjectType" substitutionGroup="core:_CityObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfVegetationObject" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfVegetationObject" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:complexType name="PlantCoverType">
<xs:annotation>
......@@ -59,7 +65,13 @@
<!-- ========================================================================================= -->
<xs:element name="PlantCover" type="PlantCoverType" substitutionGroup="_VegetationObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfPlantCover" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfPlantCover" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:simpleType name="PlantCoverClassType">
<xs:annotation>
......@@ -110,7 +122,13 @@
<!-- ========================================================================================= -->
<xs:element name="SolitaryVegetationObject" type="SolitaryVegetationObjectType" substitutionGroup="_VegetationObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfSolitaryVegetationObject" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfSolitaryVegetationObject" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:simpleType name="PlantClassType">
<xs:annotation>
......
......@@ -5,10 +5,10 @@
<!-- 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 jaxb:version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" 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"/>
<!-- ========================================================================================= -->
......@@ -31,7 +31,13 @@
<!-- ========================================================================================= -->
<xs:element name="_WaterObject" type="AbstractWaterObjectType" substitutionGroup="core:_CityObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterObject" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterObject" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:complexType name="WaterBodyType">
<xs:annotation>
......@@ -62,7 +68,13 @@
<!-- ========================================================================================= -->
<xs:element name="WaterBody" type="WaterBodyType" substitutionGroup="_WaterObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterBody" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterBody" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:simpleType name="WaterBodyClassType">
<xs:annotation>
......@@ -124,7 +136,13 @@
<xs:element name="_WaterBoundarySurface" type="AbstractWaterBoundarySurfaceType" abstract="true"
substitutionGroup="core:_CityObject"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterBoundarySurface" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterBoundarySurface" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:simpleType name="WaterLevelType">
<xs:annotation>
......@@ -154,7 +172,13 @@
<!-- ========================================================================================= -->
<xs:element name="WaterSurface" type="WaterSurfaceType" substitutionGroup="_WaterBoundarySurface"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterSurface" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterSurface" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:complexType name="WaterGroundSurfaceType">
<xs:annotation>
......@@ -173,7 +197,13 @@
<!-- ========================================================================================= -->
<xs:element name="WaterGroundSurface" type="WaterGroundSurfaceType" substitutionGroup="_WaterBoundarySurface"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterGroundSurface" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterGroundSurface" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
<xs:complexType name="WaterClosureSurfaceType">
<xs:annotation>
......@@ -192,6 +222,12 @@
<!-- ========================================================================================= -->
<xs:element name="WaterClosureSurface" type="WaterClosureSurfaceType" substitutionGroup="_WaterBoundarySurface"/>
<!-- ========================================================================================= -->
<xs:element name="_GenericApplicationPropertyOfWaterClosureSurface" type="xs:anyType" abstract="true"/>
<xs:element name="_GenericApplicationPropertyOfWaterClosureSurface" type="xs:anyType" abstract="true">
<xs:annotation>
<xs:appinfo>
<jaxb:dom/>
</xs:appinfo>
</xs:annotation>
</xs:element>
<!-- ========================================================================================= -->
</xs:schema>
......@@ -7,7 +7,7 @@
<!-- globalBindings do impact all schema files imported/included by the CityGML schema as well.
Therefore, the following settings in globalBindings also influence the mapping of
GML and xAl schema files. -->
<jaxb:globalBindings generateIsSetMethod="true" underscoreBinding="asCharInWord" />
<jaxb:globalBindings generateIsSetMethod="true" underscoreBinding="asCharInWord"/>
</jaxb:bindings>
<!-- ============= -->
......@@ -36,7 +36,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='_AbstractBuildingType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
......@@ -45,7 +45,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='RoomType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
......@@ -54,7 +54,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='WaterBodyType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
......@@ -98,7 +98,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='AbstractBuildingType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
......@@ -107,7 +107,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='RoomType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>
......@@ -203,7 +203,7 @@
a renaming is necessary -->
<jaxb:bindings node="//xs:complexType[@name='WaterBodyType']">
<jaxb:bindings node=".//xs:element[@name='boundedBy']">
<jaxb:property name="boundedBySurfaces"/>
<jaxb:property name="boundedBySurface"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings>
......@@ -276,4 +276,5 @@
<jaxb:package name="org.citygml4j.jaxb.smil20.language"/>
</jaxb:schemaBindings>
</jaxb:bindings>
</jaxb:bindings>
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