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
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3992 additions and 3209 deletions
+3992 -3209
public/FWELanduse/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
+ 29
- 15
View file @ 41b1daf8
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:54:48
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:59:30
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Create tables **************************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -8,24 +8,26 @@
CREATE TABLE FWEL_energysurvey
(
id INTEGER NOT NULL,
biomasspotentialbioethanol NUMERIC,
biomasspotentialbioethanolun VARCHAR(1000),
biomasspotentialbiogas NUMERIC,
biomasspotentialbiogasunit VARCHAR(1000),
biomasspotentialforest NUMERIC,
biomasspotentialforestunit VARCHAR(1000),
biomasspotentialplantoil NUMERIC,
biomasspotentialplantoilunit VARCHAR(1000),
biomasspotentialresidualso_1 VARCHAR(1000),
biomasspotentialresidualsoli NUMERIC,
biomasspotentialsolidfuel NUMERIC,
biomasspotentialsolidfueluni VARCHAR(1000),
biomassprimaryenergypotent_1 VARCHAR(1000),
biomassprimaryenergypotentia NUMERIC,
biomasstobioethanol NUMERIC,
biomasstobioethanolunit VARCHAR(1000),
biomasstobiogas NUMERIC,
biomasstobiogasunit VARCHAR(1000),
biomasstoelectricitypotent_1 VARCHAR(1000),
biomasstoelectricitypotentia NUMERIC,
biomasstoenergywoods NUMERIC,
biomasstoenergywoodsunit VARCHAR(1000),
biomasstoplantoil NUMERIC,
biomasstoplantoilunit VARCHAR(1000),
biomasstoresidualsolidfuel NUMERIC,
biomasstoresidualsolidfuelun VARCHAR(1000),
biomasstosolidfuel NUMERIC,
biomasstosolidfuelunit VARCHAR(1000),
biomasstothermalpotential NUMERIC,
biomasstothermalpotentialuni VARCHAR(1000),
biomassweight NUMERIC,
biomassweightunit VARCHAR(1000),
electricitypotentialfrompv_1 VARCHAR(1000),
electricitypotentialfrompvbu NUMERIC,
landusesurve_energysurvey_id INTEGER,
......@@ -35,8 +37,6 @@ CREATE TABLE FWEL_energysurvey
spacecoolingdemandunit VARCHAR(1000),
spaceheatingdemand NUMERIC,
spaceheatingdemandunit VARCHAR(1000),
vegetationcovercat_codespace VARCHAR(1000),
vegetationcovercategory VARCHAR(1000),
PRIMARY KEY (id)
);
......@@ -46,6 +46,10 @@ CREATE TABLE FWEL_energysurvey
CREATE TABLE FWEL_foodsurvey
(
id INTEGER NOT NULL,
animalcalorie INTEGER,
animalcalorieunit VARCHAR(1000),
cropcalorie INTEGER,
cropcalorieunit VARCHAR(1000),
foodcategory VARCHAR(1000),
foodcategory_codespace VARCHAR(1000),
foodconsumption NUMERIC,
......@@ -59,6 +63,8 @@ CREATE TABLE FWEL_foodsurvey
foodproductionwaterdemand NUMERIC,
foodproductionwaterdemanduni VARCHAR(1000),
landusesurvey_foodsurvey_id INTEGER,
vegetalcalorie INTEGER,
vegetalcalorieunit VARCHAR(1000),
PRIMARY KEY (id)
);
......@@ -81,9 +87,13 @@ CREATE TABLE FWEL_landusesurvey
id INTEGER NOT NULL,
buildingfootprintarea NUMERIC,
buildingfootprintarea_uom VARCHAR(1000),
croptype VARCHAR(1000),
croptype_codespace VARCHAR(1000),
land_use_consistsoffwesur_id INTEGER,
objectclass_id INTEGER,
population INTEGER,
soiltype VARCHAR(1000),
soiltype_codespace VARCHAR(1000),
surfacearea NUMERIC,
surfacearea_uom VARCHAR(1000),
surveydescription VARCHAR(1000),
......@@ -108,9 +118,13 @@ CREATE TABLE FWEL_watersurvey
domesticwaterdemandunit VARCHAR(1000),
domesticwaterwaste NUMERIC,
domesticwaterwasteunit VARCHAR(1000),
irrigationdemand NUMERIC,
irrigationdemandunit VARCHAR(1000),
landusesurvey_watersurvey_id INTEGER,
totaldomesticwaste NUMERIC,
totaldomesticwasteunit VARCHAR(1000),
transpirationloss NUMERIC,
transpirationlossunit VARCHAR(1000),
PRIMARY KEY (id)
);
......
public/FWELanduse/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:54:48
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:59:30
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- *********************************** Drop foreign keys **********************************
-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
public/FWELanduse/v2.1/DDL/schema-mapping/schema-mapping.xml
+ 37
- 21
View file @ 41b1daf8
......@@ -8,11 +8,11 @@
</metadata>
<applicationSchemas>
<schema id="FWEL" isADERoot="true">
<namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD</namespace>
<namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWELanduse/v2.1/XSD</namespace>
</schema>
</applicationSchemas>
<featureTypes>
<featureType id="FWEL_EnergySurveyType" table="FWEL_energysurvey" objectClassId="20000" path="EnergySurvey" schema="FWEL">
<featureType id="FWEL_EnergySurveyType" table="FWEL_energysurvey" objectClassId="30000" path="EnergySurvey" schema="FWEL">
<extension base="FWEL_LandUseSurveyType">
<join table="FWEL_landusesurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -24,30 +24,28 @@
<attribute column="residentialelectricitydema_1" type="string" maxOccurs="1" path="residentialElectricityDemandUnit" schema="FWEL"/>
<attribute column="electricitypotentialfrompvbu" type="double" maxOccurs="1" path="electricityPotentialFromPVBuildings" schema="FWEL"/>
<attribute column="electricitypotentialfrompv_1" type="string" maxOccurs="1" path="electricityPotentialFromPVBuildingsUnit" schema="FWEL"/>
<complexAttribute maxOccurs="1" path="vegetationCoverCategory" schema="FWEL">
<attribute column="vegetationcovercat_codespace" type="string" path="@codespace" schema="gml"/>
<attribute column="vegetationcovercategory" type="string" path="." schema="FWEL"/>
</complexAttribute>
<attribute column="biomassprimaryenergypotentia" type="double" maxOccurs="1" path="biomassPrimaryEnergyPotential" schema="FWEL"/>
<attribute column="biomassprimaryenergypotent_1" type="string" maxOccurs="1" path="biomassPrimaryEnergyPotentialUnit" schema="FWEL"/>
<attribute column="biomasstoenergywoods" type="double" maxOccurs="1" path="biomassToEnergyWoods" schema="FWEL"/>
<attribute column="biomasstoenergywoodsunit" type="string" maxOccurs="1" path="biomassToEnergyWoodsUnit" schema="FWEL"/>
<attribute column="biomasstobiogas" type="double" maxOccurs="1" path="biomassToBiogas" schema="FWEL"/>
<attribute column="biomasstobiogasunit" type="string" maxOccurs="1" path="biomassToBiogasUnit" schema="FWEL"/>
<attribute column="biomasstoplantoil" type="double" maxOccurs="1" path="biomassToPlantOil" schema="FWEL"/>
<attribute column="biomasstoplantoilunit" type="string" maxOccurs="1" path="biomassToPlantOilUnit" schema="FWEL"/>
<attribute column="biomasstobioethanol" type="double" maxOccurs="1" path="biomassToBioethanol" schema="FWEL"/>
<attribute column="biomasstobioethanolunit" type="string" maxOccurs="1" path="biomassToBioethanolUnit" schema="FWEL"/>
<attribute column="biomasstoresidualsolidfuel" type="double" maxOccurs="1" path="biomassToResidualSolidFuel" schema="FWEL"/>
<attribute column="biomasstoresidualsolidfuelun" type="string" maxOccurs="1" path="biomassToResidualSolidFuelUnit" schema="FWEL"/>
<attribute column="biomasstosolidfuel" type="double" maxOccurs="1" path="biomassToSolidFuel" schema="FWEL"/>
<attribute column="biomasstosolidfuelunit" type="string" maxOccurs="1" path="biomassToSolidFuelUnit" schema="FWEL"/>
<attribute column="biomasspotentialforest" type="double" maxOccurs="1" path="biomassPotentialForest" schema="FWEL"/>
<attribute column="biomasspotentialforestunit" type="string" maxOccurs="1" path="biomassPotentialForestUnit" schema="FWEL"/>
<attribute column="biomasspotentialbiogas" type="double" maxOccurs="1" path="biomassPotentialBiogas" schema="FWEL"/>
<attribute column="biomasspotentialbiogasunit" type="string" maxOccurs="1" path="biomassPotentialBiogasUnit" schema="FWEL"/>
<attribute column="biomasspotentialplantoil" type="double" maxOccurs="1" path="biomassPotentialPlantOil" schema="FWEL"/>
<attribute column="biomasspotentialplantoilunit" type="string" maxOccurs="1" path="biomassPotentialPlantOilUnit" schema="FWEL"/>
<attribute column="biomasspotentialbioethanol" type="double" maxOccurs="1" path="biomassPotentialBioethanol" schema="FWEL"/>
<attribute column="biomasspotentialbioethanolun" type="string" maxOccurs="1" path="biomassPotentialBioethanolUnit" schema="FWEL"/>
<attribute column="biomasspotentialresidualsoli" type="double" maxOccurs="1" path="biomassPotentialResidualSolidFuel" schema="FWEL"/>
<attribute column="biomasspotentialresidualso_1" type="string" maxOccurs="1" path="biomassPotentialResidualSolidFuelUnit" schema="FWEL"/>
<attribute column="biomasspotentialsolidfuel" type="double" maxOccurs="1" path="biomassPotentialSolidFuel" schema="FWEL"/>
<attribute column="biomasspotentialsolidfueluni" type="string" maxOccurs="1" path="biomassPotentialSolidFuelUnit" schema="FWEL"/>
<attribute column="biomasstoelectricitypotentia" type="double" maxOccurs="1" path="biomassToElectricityPotential" schema="FWEL"/>
<attribute column="biomasstoelectricitypotent_1" type="string" maxOccurs="1" path="biomassToElectricityPotentialUnit" schema="FWEL"/>
<attribute column="biomasstothermalpotential" type="double" maxOccurs="1" path="biomassToThermalPotential" schema="FWEL"/>
<attribute column="biomasstothermalpotentialuni" type="string" maxOccurs="1" path="biomassToThermalPotentialUnit" schema="FWEL"/>
<attribute column="biomassweight" type="double" maxOccurs="1" path="biomassWeight" schema="FWEL"/>
<attribute column="biomassweightunit" type="string" maxOccurs="1" path="biomassWeightUnit" schema="FWEL"/>
</featureType>
<featureType id="FWEL_LandUseSurveyType" table="FWEL_landusesurvey" objectClassId="20001" path="LandUseSurvey" schema="FWEL">
<featureType id="FWEL_LandUseSurveyType" table="FWEL_landusesurvey" objectClassId="30001" path="LandUseSurvey" schema="FWEL">
<extension base="AbstractFeatureType">
<join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -63,6 +61,14 @@
<attribute column="surfacearea_uom" type="string" path="@uom" schema="gml"/>
<attribute column="surfacearea" type="double" path="." schema="FWEL"/>
</complexAttribute>
<complexAttribute maxOccurs="1" path="soilType" schema="FWEL">
<attribute column="soiltype_codespace" type="string" path="@codespace" schema="gml"/>
<attribute column="soiltype" type="string" path="." schema="FWEL"/>
</complexAttribute>
<complexAttribute maxOccurs="1" path="cropType" schema="FWEL">
<attribute column="croptype_codespace" type="string" path="@codespace" schema="gml"/>
<attribute column="croptype" type="string" path="." schema="FWEL"/>
</complexAttribute>
<featureProperty target="FWEL_FoodSurveyType" relationType="composition" path="foodSurvey" schema="FWEL">
<join table="FWEL_foodsurvey" fromColumn="id" toColumn="landusesurvey_foodsurvey_id" toRole="child"/>
</featureProperty>
......@@ -73,7 +79,7 @@
<join table="FWEL_energysurvey" fromColumn="id" toColumn="landusesurve_energysurvey_id" toRole="child"/>
</featureProperty>
</featureType>
<featureType id="FWEL_FoodSurveyType" table="FWEL_foodsurvey" objectClassId="20002" path="FoodSurvey" schema="FWEL">
<featureType id="FWEL_FoodSurveyType" table="FWEL_foodsurvey" objectClassId="30002" path="FoodSurvey" schema="FWEL">
<extension base="FWEL_LandUseSurveyType">
<join table="FWEL_landusesurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -87,12 +93,18 @@
<attribute column="foodproductionunit" type="string" maxOccurs="1" path="foodProductionUnit" schema="FWEL"/>
<attribute column="foodproductionwaterdemand" type="double" maxOccurs="1" path="foodProductionWaterDemand" schema="FWEL"/>
<attribute column="foodproductionwaterdemanduni" type="string" maxOccurs="1" path="foodProductionWaterDemandUnit" schema="FWEL"/>
<attribute column="cropcalorie" type="integer" maxOccurs="1" path="cropCalorie" schema="FWEL"/>
<attribute column="foodproductionenergydemand" type="double" maxOccurs="1" path="foodProductionEnergyDemand" schema="FWEL"/>
<attribute column="cropcalorieunit" type="string" maxOccurs="1" path="cropCalorieUnit" schema="FWEL"/>
<attribute column="foodproductionengerydemandun" type="string" maxOccurs="1" path="foodProductionEngeryDemandUnit" schema="FWEL"/>
<attribute column="vegetalcalorie" type="integer" maxOccurs="1" path="vegetalCalorie" schema="FWEL"/>
<attribute column="vegetalcalorieunit" type="string" maxOccurs="1" path="vegetalCalorieUnit" schema="FWEL"/>
<attribute column="animalcalorie" type="integer" maxOccurs="1" path="animalCalorie" schema="FWEL"/>
<attribute column="foodconsumption" type="double" maxOccurs="1" path="foodConsumption" schema="FWEL"/>
<attribute column="animalcalorieunit" type="string" maxOccurs="1" path="animalCalorieUnit" schema="FWEL"/>
<attribute column="foodconsumptionunit" type="string" maxOccurs="1" path="foodConsumptionUnit" schema="FWEL"/>
</featureType>
<featureType id="FWEL_WaterSurveyType" table="FWEL_watersurvey" objectClassId="20003" path="WaterSurvey" schema="FWEL">
<featureType id="FWEL_WaterSurveyType" table="FWEL_watersurvey" objectClassId="30003" path="WaterSurvey" schema="FWEL">
<extension base="FWEL_LandUseSurveyType">
<join table="FWEL_landusesurvey" fromColumn="id" toColumn="id" toRole="parent"/>
</extension>
......@@ -105,9 +117,13 @@
<attribute column="domesticwaterwaste" type="double" maxOccurs="1" path="domesticWaterWaste" schema="FWEL"/>
<attribute column="domesticwaterwasteunit" type="string" maxOccurs="1" path="domesticWaterWasteUnit" schema="FWEL"/>
<attribute column="domesticsolidwaste" type="double" maxOccurs="1" path="domesticSolidWaste" schema="FWEL"/>
<attribute column="irrigationdemand" type="double" maxOccurs="1" path="irrigationDemand" schema="FWEL"/>
<attribute column="domesticsolidwasteunit" type="string" maxOccurs="1" path="domesticSolidWasteUnit" schema="FWEL"/>
<attribute column="irrigationdemandunit" type="string" maxOccurs="1" path="irrigationDemandUnit" schema="FWEL"/>
<attribute column="totaldomesticwaste" type="double" maxOccurs="1" path="totalDomesticWaste" schema="FWEL"/>
<attribute column="transpirationloss" type="double" maxOccurs="1" path="transpirationLoss" schema="FWEL"/>
<attribute column="totaldomesticwasteunit" type="string" maxOccurs="1" path="totalDomesticWasteUnit" schema="FWEL"/>
<attribute column="transpirationlossunit" type="string" maxOccurs="1" path="transpirationLossUnit" schema="FWEL"/>
</featureType>
</featureTypes>
<propertyInjections>
......
public/FWELanduse/v2.1/UML/EARoot/EA1.htm
+ 6
- 6
View file @ 41b1daf8
......@@ -36,11 +36,11 @@ function nameClassifier(name, separator)
<img src="EA2.png" usemap="#EA2" border="0" />
<MAP NAME="EA2">
<area shape="rect" coords="690,599,1020,1014" href="EA4.htm" target="_self">
<area shape="rect" coords="341,599,655,831" href="EA10.htm" target="_self">
<area shape="rect" coords="10,599,306,831" href="EA6.htm" target="_self">
<area shape="rect" coords="370,363,626,504" href="EA8.htm" target="_self">
<area shape="rect" coords="370,174,626,269" href="EA7.htm" target="_self">
<area shape="rect" coords="690,599,1020,1026" href="EA5.htm" target="_self">
<area shape="rect" coords="341,599,655,870" href="EA11.htm" target="_self">
<area shape="rect" coords="10,599,306,883" href="EA7.htm" target="_self">
<area shape="rect" coords="370,363,626,530" href="EA9.htm" target="_self">
<area shape="rect" coords="370,174,626,269" href="EA8.htm" target="_self">
</MAP>
<div class="ObjectTitle">FWELanduse : Class diagram</div>
......@@ -51,7 +51,7 @@ function nameClassifier(name, separator)
</tr>
<tr>
<td width="15%" class="ObjectDetailsTopic">Modified:</td>
<td width="85%" class="ObjectDetailsValue">1/9/2021 5:31:19 PM</td>
<td width="85%" class="ObjectDetailsValue">3/29/2021 5:05:01 PM</td>
</tr>
<tr style="padding-top: 10px;">
<td width="15%" class="ObjectDetailsTopic"><img src="../images/plus03.gif" align="absmiddle" id="proj" onclick="parent.toggleData(this.id)" />Project:</td>
......
public/FWELanduse/v2.1/UML/EARoot/EA10.htm
+ 13
- 685
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA11.htm 0 → 100644
+ 991
- 0
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA2.png
+ 0
- 0
View replaced file @ deaaa10b View file @ 41b1daf8
public/FWELanduse/v2.1/UML/EARoot/EA2.png

134 KB | W: 0px | H: 0px

public/FWELanduse/v2.1/UML/EARoot/EA2.png

153 KB | W: 0px | H: 0px

public/FWELanduse/v2.1/UML/EARoot/EA2.png
public/FWELanduse/v2.1/UML/EARoot/EA2.png
public/FWELanduse/v2.1/UML/EARoot/EA2.png
public/FWELanduse/v2.1/UML/EARoot/EA2.png
  • 2-up
  • Swipe
  • Onion skin
public/FWELanduse/v2.1/UML/EARoot/EA3.htm
+ 1
- 1
View file @ 41b1daf8
......@@ -132,7 +132,7 @@ function nameClassifier(name, separator)
</td>
</tr> <tr>
<td width="50%" class="TableRow" valign="top">targetNamespace</td>
<td width="50%" class="TableRow" valign="top"><a href="http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD" target="_blank" >http://transfer.hft-stuttgart.de/pages/fwe-ade/FWELanduse/v2.1/XSD</a></td>
<td width="50%" class="TableRow" valign="top"><a href="http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWELanduse/v2.1/XSD" target="_blank" >http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWELanduse/v2.1/XSD</a></td>
</tr>
<tr>
<td class="TableRowBottomDashed" colspan="2">
......
public/FWELanduse/v2.1/UML/EARoot/EA4.htm
+ 13
- 1405
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA5.htm
+ 1450
- 10
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA6.htm
+ 12
- 636
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA7.htm
+ 787
- 19
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA8.htm
+ 32
- 387
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/EARoot/EA9.htm
+ 607
- 12
View file @ 41b1daf8
This diff is collapsed.
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMap0b.xml
+ 1
- 1
View file @ 41b1daf8
0BFA80DC-8963-40f6-8307-33694FA33912/EA6.htm;
0BFA80DC-8963-40f6-8307-33694FA33912/EA7.htm;
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMap2d.xml
+ 1
- 1
View file @ 41b1daf8
2D3024B3-BF47-4323-927D-BD9CFC58A1B2/EA4.htm;
2D3024B3-BF47-4323-927D-BD9CFC58A1B2/EA5.htm;
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMap36.xml
+ 1
- 1
View file @ 41b1daf8
36DF30C7-6B32-484a-AF1F-A01F89DD8766/EA5.htm;
36DF30C7-6B32-484a-AF1F-A01F89DD8766/EA6.htm;
public/FWELanduse/v2.1/UML/js/data/guidmaps/GuidMap42.xml 0 → 100644
+ 1
- 0
View file @ 41b1daf8
421410AC-3B99-4f72-9792-AB74105819EC/EA4.htm;
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