Skip to content
GitLab
Commit 41b1daf8 authored by Rushikesh Padsala's avatar Rushikesh Padsala
Browse files

FWELanduse update and namespace update for all

parent deaaa10b
master Ernst.Gebetsroither-master-patch-03760
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 31 deletions
+45 -31
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMapc2.xml
+ 1
- 1
View file @ 41b1daf8
C2F856C0-7CF8-44a2-909D-5FE890F1976F/EA10.htm;
C2F856C0-7CF8-44a2-909D-5FE890F1976F/EA11.htm;
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMapcc.xml
+ 1
- 1
View file @ 41b1daf8
CC3DFBDE-ECA3-4d88-B468-1EE509B37D77/EA8.htm;
CC3DFBDE-ECA3-4d88-B468-1EE509B37D77/EA9.htm;
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMapf3.xml 0 → 100644
+ 1
- 0
View file @ 41b1daf8
F38A1550-CDD6-4661-9C1F-189451DDE0BC/EA10.htm;
public/FWELanduse/v2.1/XSD/FWELanduse.xsd
+ 28
- 15
View file @ 41b1daf8
<?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">
<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEB="http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWEBuilding/v2.1/XSD" xmlns:FWEL="http://transfer.hft-stuttgart.de/pages/in-source/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/in-source/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://transfer.hft-stuttgart.de/pages/in-source/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"/>
......@@ -20,25 +20,26 @@
<element minOccurs="0" name="residentialElectricityDemandUnit" type="string"/>
<element minOccurs="0" name="electricityPotentialFromPVBuildings" type="double"/>
<element minOccurs="0" name="electricityPotentialFromPVBuildingsUnit" type="string"/>
<element minOccurs="0" name="vegetationCoverCategory" type="gml:CodeType"/>
<element minOccurs="0" name="biomassPrimaryEnergyPotential" type="double"/>
<element minOccurs="0" name="biomassPrimaryEnergyPotentialUnit" type="string"/>
<element minOccurs="0" name="biomassToEnergyWoods" type="double"/>
<element minOccurs="0" name="biomassToEnergyWoodsUnit" type="string"/>
<element minOccurs="0" name="biomassToBiogas" type="double"/>
<element minOccurs="0" name="biomassToBiogasUnit" type="string"/>
<element minOccurs="0" name="biomassToPlantOil" type="double"/>
<element minOccurs="0" name="biomassToPlantOilUnit" type="string"/>
<element minOccurs="0" name="biomassToBioethanol" type="double"/>
<element minOccurs="0" name="biomassToBioethanolUnit" type="string"/>
<element minOccurs="0" name="biomassToResidualSolidFuel" type="double"/>
<element minOccurs="0" name="biomassToResidualSolidFuelUnit" type="string"/>
<element minOccurs="0" name="biomassToSolidFuel" type="double"/>
<element minOccurs="0" name="biomassToSolidFuelUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialForest" type="double"/>
<element minOccurs="0" name="biomassPotentialForestUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialBiogas" type="double"/>
<element minOccurs="0" name="biomassPotentialBiogasUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialPlantOil" type="double"/>
<element minOccurs="0" name="biomassPotentialPlantOilUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialBioethanol" type="double"/>
<element minOccurs="0" name="biomassPotentialBioethanolUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialResidualSolidFuel" type="double"/>
<element minOccurs="0" name="biomassPotentialResidualSolidFuelUnit" type="string"/>
<element minOccurs="0" name="biomassPotentialSolidFuel" type="double"/>
<element minOccurs="0" name="biomassPotentialSolidFuelUnit" type="string"/>
<element minOccurs="0" name="biomassToElectricityPotential" type="double"/>
<element minOccurs="0" name="biomassToElectricityPotentialUnit" type="string"/>
<element minOccurs="0" name="biomassToThermalPotential" type="double"/>
<element minOccurs="0" name="biomassToThermalPotentialUnit" type="string"/>
<element minOccurs="0" name="biomassWeight" type="double"/>
<element minOccurs="0" name="biomassWeightUnit" type="string"/>
</sequence>
</extension>
</complexContent>
......@@ -61,9 +62,15 @@
<element minOccurs="0" name="foodProductionUnit" type="string"/>
<element minOccurs="0" name="foodProductionWaterDemand" type="double"/>
<element minOccurs="0" name="foodProductionWaterDemandUnit" type="string"/>
<element minOccurs="0" name="cropCalorie" type="integer"/>
<element minOccurs="0" name="foodProductionEnergyDemand" type="double"/>
<element minOccurs="0" name="cropCalorieUnit" type="string"/>
<element minOccurs="0" name="foodProductionEngeryDemandUnit" type="string"/>
<element minOccurs="0" name="vegetalCalorie" type="integer"/>
<element minOccurs="0" name="vegetalCalorieUnit" type="string"/>
<element minOccurs="0" name="animalCalorie" type="integer"/>
<element minOccurs="0" name="foodConsumption" type="double"/>
<element minOccurs="0" name="animalCalorieUnit" type="string"/>
<element minOccurs="0" name="foodConsumptionUnit" type="string"/>
</sequence>
</extension>
......@@ -107,6 +114,8 @@
<element minOccurs="0" name="population" type="integer"/>
<element minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
<element minOccurs="0" name="surfaceArea" type="gml:AreaType"/>
<element minOccurs="0" name="soilType" type="gml:CodeType"/>
<element minOccurs="0" name="cropType" type="gml:CodeType"/>
<element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEL:FoodSurveyPropertyType">
<annotation>
<appinfo>
......@@ -152,9 +161,13 @@
<element minOccurs="0" name="domesticWaterWaste" type="double"/>
<element minOccurs="0" name="domesticWaterWasteUnit" type="string"/>
<element minOccurs="0" name="domesticSolidWaste" type="double"/>
<element minOccurs="0" name="irrigationDemand" type="double"/>
<element minOccurs="0" name="domesticSolidWasteUnit" type="string"/>
<element minOccurs="0" name="irrigationDemandUnit" type="string"/>
<element minOccurs="0" name="totalDomesticWaste" type="double"/>
<element minOccurs="0" name="transpirationLoss" type="double"/>
<element minOccurs="0" name="totalDomesticWasteUnit" type="string"/>
<element minOccurs="0" name="transpirationLossUnit" type="string"/>
</sequence>
</extension>
</complexContent>
......
public/FWESystem/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Create tables **************************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Disable Versioning *********************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Drop foreign keys **********************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Enable Versioning **********************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Create tables **************************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/3dcitydb/postgreSQL/DROP_ADE_DB.sql
+ 1
- 1
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:57:11
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:02:06
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Drop foreign keys **********************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWESystem/v2.1/DDL/schema-mapping/schema-mapping.xml
+ 6
- 6
View file @ 41b1daf8
......@@ -8,11 +8,11 @@
</metadata>
<applicationSchemas>
<schema id="FWES" isADERoot="true">
<namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/fwe-ade/FWESystem/v2.1/XSD</namespace>
<namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWESystem/v2.1/XSD</namespace>
</schema>
</applicationSchemas>
<featureTypes>
<featureType id="FWES_EnergySurveyType" table="FWES_energysurvey" objectClassId="40000" path="EnergySurvey" schema="FWES">
<featureType id="FWES_EnergySurveyType" table="FWES_energysurvey" objectClassId="50000" path="EnergySurvey" schema="FWES">
<extension base="FWES_SystemSurveyType">
<join table="FWES_systemsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -31,7 +31,7 @@
<attribute column="biomassthermalpotential" type="double" maxOccurs="1" path="biomassThermalPotential" schema="FWES"/>
<attribute column="biomassthermalpotentialunit" type="string" maxOccurs="1" path="biomassThermalPotentialUnit" schema="FWES"/>
</featureType>
<featureType id="FWES_SystemSurveyType" table="FWES_systemsurvey" objectClassId="40001" path="SystemSurvey" schema="FWES">
<featureType id="FWES_SystemSurveyType" table="FWES_systemsurvey" objectClassId="50001" path="SystemSurvey" schema="FWES">
<extension base="AbstractFeatureType">
<join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -77,7 +77,7 @@
<join table="FWES_energysurvey" fromColumn="id" toColumn="systemsurvey_energysurvey_id" toRole="child"/>
</featureProperty>
</featureType>
<featureType id="FWES_FoodSurveyType" table="FWES_foodsurvey" objectClassId="40002" path="FoodSurvey" schema="FWES">
<featureType id="FWES_FoodSurveyType" table="FWES_foodsurvey" objectClassId="50002" path="FoodSurvey" schema="FWES">
<extension base="FWES_SystemSurveyType">
<join table="FWES_systemsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -98,7 +98,7 @@
<attribute column="foodconsumption" type="double" maxOccurs="1" path="foodConsumption" schema="FWES"/>
<attribute column="foodconsumptionunit" type="string" maxOccurs="1" path="foodConsumptionUnit" schema="FWES"/>
</featureType>
<featureType id="FWES_WaterSurveyType" table="FWES_watersurvey" objectClassId="40003" path="WaterSurvey" schema="FWES">
<featureType id="FWES_WaterSurveyType" table="FWES_watersurvey" objectClassId="50003" path="WaterSurvey" schema="FWES">
<extension base="FWES_SystemSurveyType">
<join table="FWES_systemsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -115,7 +115,7 @@
<attribute column="totaldomesticwasteenergypote" type="double" maxOccurs="1" path="totalDomesticWasteEnergyPotential" schema="FWES"/>
<attribute column="totaldomesticwasteenergypo_1" type="string" maxOccurs="1" path="totalDomesticWasteEnergyPotentialUnit" schema="FWES"/>
</featureType>
<featureType id="FWES_FWESystemType" table="FWES_fwesystem" objectClassId="40004" topLevel="true" path="FWESystem" schema="FWES">
<featureType id="FWES_FWESystemType" table="FWES_fwesystem" objectClassId="50004" topLevel="true" path="FWESystem" schema="FWES">
<extension base="AbstractCityObjectType">
<join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......
public/FWESystem/v2.1/XSD/FWESystem.xsd
+ 2
- 2
View file @ 41b1daf8
<?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">
<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:FWEA="http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWEArea/v2.1/XSD" xmlns:FWES="http://transfer.hft-stuttgart.de/pages/in-source/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/in-source/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://transfer.hft-stuttgart.de/pages/in-source/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"/>
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal