From 0c730f52abda383f028b5b1874d30100a2bfb3f1 Mon Sep 17 00:00:00 2001
From: "rushikesh.padsala" <rushikesh.padsala@hft-stuttgart.de>
Date: Sat, 9 Jan 2021 17:50:16 +0100
Subject: [PATCH] Updated tags for all XSDs
---
public/FWEArea/v2.1/XSD/FWEArea.xsd | 77 ++++++++++++---------
public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd | 6 +-
public/FWELanduse/v2.1/XSD/FWELanduse.xsd | 71 +++++++++++--------
public/FWESystem/v2.1/XSD/FWESystem.xsd | 73 +++++++++++--------
4 files changed, 133 insertions(+), 94 deletions(-)
diff --git a/public/FWEArea/v2.1/XSD/FWEArea.xsd b/public/FWEArea/v2.1/XSD/FWEArea.xsd
index 661e663..d8c938a 100644
--- a/public/FWEArea/v2.1/XSD/FWEArea.xsd
+++ b/public/FWEArea/v2.1/XSD/FWEArea.xsd
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEA="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" xmlns:FWEL="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" version="2.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEA="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" xmlns:FWEL="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:gml="http://www.opengis.net/gml" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" version="2.1">
<annotation>
<documentation>This introduces a new city object "FWEArea" as a part of the CityGML FWE ADE developed in the IN-SOURCE project.</documentation>
</annotation>
<import namespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://shapechange.net/resources/schema/ShapeChangeAppinfo.xsd"/>
<import namespace="http://www.opengis.net/citygml/2.0" schemaLocation="http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd"/>
<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
<!--XML Schema document created by ShapeChange - http://shapechange.net/-->
@@ -11,36 +12,37 @@
<complexContent>
<extension base="gml:AbstractFeatureType">
<sequence>
- <element minOccurs="0" name="surveyYear" type="integer"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="surveyYear" type="integer"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
<element minOccurs="0" name="population" type="integer"/>
<element minOccurs="0" name="buildingFootrpintArea" type="gml:AreaType"/>
<element minOccurs="0" name="settlementArea" type="gml:AreaType"/>
<element minOccurs="0" name="openPlotArea" type="gml:AreaType"/>
+ <element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
<element minOccurs="0" name="trafficArea" type="gml:AreaType"/>
<element minOccurs="0" name="vegetationArea" type="gml:AreaType"/>
<element minOccurs="0" name="waterBodyArea" type="gml:AreaType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="foodSurveyProperties">
- <complexType>
- <sequence>
- <element ref="FWEA:FoodSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEA:FoodSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="energySurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWEA:EnergySurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="waterSurvey" type="FWEA:WaterSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="waterSurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWEA:WaterSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="energySurvey" type="FWEA:EnergySurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
</sequence>
</extension>
@@ -81,22 +83,33 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="FWEArea" substitutionGroup="core:_CityObject" type="FWEA:FWEAreaType"/>
+ <element name="FWEArea" substitutionGroup="core:_CityObject" type="FWEA:FWEAreaType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="topLevel">true</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
<complexType name="FWEAreaType">
<complexContent>
- <extension base="core:AbstractCityObjectType">
+ <extension base="core:_CityObjectType">
<sequence>
- <element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
- <element minOccurs="0" name="fweAreaName" type="string"/>
- <element minOccurs="0" name="fweSystemName" type="string"/>
- <element minOccurs="0" name="lod0MultiSurface" type="gml:MultiSurfacePropertyType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="areaSurveyProperties">
- <complexType>
- <sequence>
- <element ref="FWEA:AreaSurvey"/>
- </sequence>
- </complexType>
+ <element minOccurs="0" name="fweAreaName" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ </appinfo>
+ </annotation>
</element>
+ <element minOccurs="0" name="fweSystemName" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element minOccurs="0" name="lod0MultiSurface" type="gml:MultiSurfacePropertyType"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="consistsOfFWEsurvey" type="FWEA:AreaSurveyPropertyType"/>
</sequence>
</extension>
</complexContent>
diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index c40517e..73ca641 100644
--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
@@ -11,10 +11,10 @@
<complexContent>
<extension base="gml:AbstractFeatureType">
<sequence>
- <element minOccurs="0" name="surveyYear" type="integer"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="surveyYear" type="integer"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
- <element minOccurs="0" name="population" type="positiveInteger"/>
+ <element minOccurs="0" name="occupants" type="integer"/>
<element minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
<element minOccurs="0" name="totalFloorArea" type="gml:AreaType"/>
<element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEB:FoodSurveyPropertyType">
@@ -138,7 +138,7 @@
</appinfo>
</annotation>
</element>
- <element name="consistsOfBuildingSurveyTypes" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType">
+ <element name="consistsOfFWEsurvey" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType">
<annotation>
<appinfo>
<taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
diff --git a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
index 01a2849..ec53bed 100644
--- a/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
+++ b/public/FWELanduse/v2.1/XSD/FWELanduse.xsd
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEB="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" xmlns:FWEL="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" xmlns:gml="http://www.opengis.net/gml" xmlns:luse="http://www.opengis.net/citygml/landuse/2.0" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" version="2.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEB="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD" xmlns:FWEL="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" xmlns:gml="http://www.opengis.net/gml" xmlns:luse="http://www.opengis.net/citygml/landuse/2.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" version="2.1">
<annotation>
<documentation>This is the FWE ADE for CityGML landuse datasets developed in the IN-SOURCE project.</documentation>
</annotation>
<import namespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://shapechange.net/resources/schema/ShapeChangeAppinfo.xsd"/>
<import namespace="http://www.opengis.net/citygml/landuse/2.0" schemaLocation="http://schemas.opengis.net/citygml/landuse/2.0/landUse.xsd"/>
<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
<!--XML Schema document created by ShapeChange - http://shapechange.net/-->
@@ -74,46 +75,58 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="surfaceArea" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="gml:AreaType"/>
- <element name="fweAreaName" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="string"/>
- <element name="fweSystemName" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="string"/>
- <element name="landUseSurveyProperties" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse">
- <complexType>
- <sequence>
- <element ref="FWEL:LandUseSurvey"/>
- </sequence>
- </complexType>
+ <element name="fweAreaName" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="fweSystemName" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
+ <element name="consistsOfFWEsurvey" substitutionGroup="luse:_GenericApplicationPropertyOfLandUse" type="FWEL:LandUseSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
<element name="LandUseSurvey" substitutionGroup="gml:_Feature" type="FWEL:LandUseSurveyType"/>
<complexType name="LandUseSurveyType">
<complexContent>
<extension base="gml:AbstractFeatureType">
<sequence>
- <element minOccurs="0" name="surveyYear" type="integer"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="surveyYear" type="integer"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
<element minOccurs="0" name="population" type="integer"/>
<element minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="foodSurveyProperties">
- <complexType>
- <sequence>
- <element ref="FWEL:FoodSurvey"/>
- </sequence>
- </complexType>
+ <element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEL:FoodSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="waterSurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWEL:WaterSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="waterSurvey" type="FWEL:WaterSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="energySurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWEL:EnergySurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="energySurvey" type="FWEL:EnergySurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
</sequence>
</extension>
diff --git a/public/FWESystem/v2.1/XSD/FWESystem.xsd b/public/FWESystem/v2.1/XSD/FWESystem.xsd
index 03fd8a5..aaf7bbb 100644
--- a/public/FWESystem/v2.1/XSD/FWESystem.xsd
+++ b/public/FWESystem/v2.1/XSD/FWESystem.xsd
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEA="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" xmlns:FWES="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWESystem/v2.1/XSD" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWESystem/v2.1/XSD" version="2.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEA="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD" xmlns:FWES="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWESystem/v2.1/XSD" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:gml="http://www.opengis.net/gml" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWESystem/v2.1/XSD" version="2.1">
<annotation>
<documentation>This introduces a new city object "FWESystem" as a part of the CityGML FWE ADE developed in the IN-SOURCE project.</documentation>
</annotation>
<import namespace="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD"/>
+ <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://shapechange.net/resources/schema/ShapeChangeAppinfo.xsd"/>
<import namespace="http://www.opengis.net/citygml/2.0" schemaLocation="http://schemas.opengis.net/citygml/2.0/cityGMLBase.xsd"/>
<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
<!--XML Schema document created by ShapeChange - http://shapechange.net/-->
@@ -35,20 +36,31 @@
</sequence>
<attributeGroup ref="gml:AssociationAttributeGroup"/>
</complexType>
- <element name="FWESystem" substitutionGroup="core:_CityObject" type="FWES:FWESystemType"/>
+ <element name="FWESystem" substitutionGroup="core:_CityObject" type="FWES:FWESystemType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="topLevel">true</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
<complexType name="FWESystemType">
<complexContent>
- <extension base="core:AbstractCityObjectType">
+ <extension base="core:_CityObjectType">
<sequence>
- <element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
- <element minOccurs="0" name="fweSystemName" type="string"/>
+ <element minOccurs="0" name="fweSystemName" type="string">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+ </appinfo>
+ </annotation>
+ </element>
<element minOccurs="0" name="lod0MultiSurface" type="gml:MultiSurfacePropertyType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="systemSurveyProperties">
- <complexType>
- <sequence>
- <element ref="FWES:SystemSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="consistsOfFWEsurvey" type="FWES:SystemSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
</sequence>
</extension>
@@ -93,36 +105,37 @@
<complexContent>
<extension base="gml:AbstractFeatureType">
<sequence>
- <element minOccurs="0" name="surveyYear" type="integer"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="surveyYear" type="integer"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
<element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
<element minOccurs="0" name="population" type="integer"/>
<element minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
<element minOccurs="0" name="settlementArea" type="gml:AreaType"/>
<element minOccurs="0" name="openPlotArea" type="gml:AreaType"/>
+ <element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
<element minOccurs="0" name="trafficArea" type="gml:AreaType"/>
<element minOccurs="0" name="vegetationArea" type="gml:AreaType"/>
<element minOccurs="0" name="waterBodyArea" type="gml:AreaType"/>
- <element maxOccurs="unbounded" minOccurs="0" name="foodSurveyProperties">
- <complexType>
- <sequence>
- <element ref="FWES:FoodSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWES:FoodSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="waterSurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWES:WaterSurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="waterSurvey" type="FWES:WaterSurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
- <element minOccurs="0" name="energySurveyProperty">
- <complexType>
- <sequence>
- <element ref="FWES:EnergySurvey"/>
- </sequence>
- </complexType>
+ <element maxOccurs="unbounded" minOccurs="0" name="energySurvey" type="FWES:EnergySurveyPropertyType">
+ <annotation>
+ <appinfo>
+ <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+ </appinfo>
+ </annotation>
</element>
</sequence>
</extension>
--
GitLab