FWELanduse update and namespace update for all

41b1daf8 · Rushikesh Padsala · deaaa10b · 41b1daf8 · 41b1daf8 · 41b1daf8
Commit 41b1daf8 authored 3 years ago by Rushikesh Padsala
Hide whitespace changes
Inline Side-by-side

Showing

with 58 additions and 44 deletions
+58 -44
--- a/public/FWEArea/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Create tables ************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Disable Versioning ********************************* 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Enable Versioning ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Create tables ************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/3dcitydb/postgreSQL/DROP_ADE_DB.sql
+++ b/public/FWEArea/v2.1/DDL/3dcitydb/postgreSQL/DROP_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:56:23 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 18:00:36 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEArea/v2.1/DDL/schema-mapping/schema-mapping.xml
+++ b/public/FWEArea/v2.1/DDL/schema-mapping/schema-mapping.xml
@@ -8,11 +8,11 @@
    </metadata>
    <applicationSchemas>
        <schema id="FWEA" isADERoot="true">
-            <namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEArea/v2.1/XSD</namespace>
+            <namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWEArea/v2.1/XSD</namespace>
        </schema>
    </applicationSchemas>
    <featureTypes>
-        <featureType id="FWEA_AreaSurveyType" table="FWEA_areasurvey" objectClassId="30000" path="AreaSurvey" schema="FWEA">
+        <featureType id="FWEA_AreaSurveyType" table="FWEA_areasurvey" objectClassId="40000" path="AreaSurvey" schema="FWEA">
            <extension base="AbstractFeatureType">
                <join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -58,7 +58,7 @@
                <join table="FWEA_energysurvey" fromColumn="id" toColumn="areasurvey_energysurvey_id" toRole="child"/>
            </featureProperty>
        </featureType>
-        <featureType id="FWEA_FoodSurveyType" table="FWEA_foodsurvey" objectClassId="30001" path="FoodSurvey" schema="FWEA">
+        <featureType id="FWEA_FoodSurveyType" table="FWEA_foodsurvey" objectClassId="40001" path="FoodSurvey" schema="FWEA">
            <extension base="FWEA_AreaSurveyType">
                <join table="FWEA_areasurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -77,7 +77,7 @@
            <attribute column="foodconsumption" type="double" maxOccurs="1" path="foodConsumption" schema="FWEA"/>
            <attribute column="foodconsumptionunit" type="string" maxOccurs="1" path="foodConsumptionUnit" schema="FWEA"/>
        </featureType>
-        <featureType id="FWEA_WaterSurveyType" table="FWEA_watersurvey" objectClassId="30002" path="WaterSurvey" schema="FWEA">
+        <featureType id="FWEA_WaterSurveyType" table="FWEA_watersurvey" objectClassId="40002" path="WaterSurvey" schema="FWEA">
            <extension base="FWEA_AreaSurveyType">
                <join table="FWEA_areasurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -94,7 +94,7 @@
            <attribute column="totaldomesticwasteenergypote" type="double" maxOccurs="1" path="totalDomesticWasteEnergyPotential" schema="FWEA"/>
            <attribute column="totaldomesticwasteenergypo_1" type="string" maxOccurs="1" path="totalDomesticWasteEnergyPotentialUnit" schema="FWEA"/>
        </featureType>
-        <featureType id="FWEA_EnergySurveyType" table="FWEA_energysurvey" objectClassId="30003" path="EnergySurvey" schema="FWEA">
+        <featureType id="FWEA_EnergySurveyType" table="FWEA_energysurvey" objectClassId="40003" path="EnergySurvey" schema="FWEA">
            <extension base="FWEA_AreaSurveyType">
                <join table="FWEA_areasurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -113,7 +113,7 @@
            <attribute column="biomassthermalpotential" type="double" maxOccurs="1" path="biomassThermalPotential" schema="FWEA"/>
            <attribute column="biomassthermalpotentialunit" type="string" maxOccurs="1" path="biomassThermalPotentialUnit" schema="FWEA"/>
        </featureType>
-        <featureType id="FWEA_FWEAreaType" table="FWEA_fwearea" objectClassId="30004" topLevel="true" path="FWEArea" schema="FWEA">
+        <featureType id="FWEA_FWEAreaType" table="FWEA_fwearea" objectClassId="40004" topLevel="true" path="FWEArea" schema="FWEA">
            <extension base="AbstractCityObjectType">
                <join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>

--- a/public/FWEArea/v2.1/XSD/FWEArea.xsd
+++ b/public/FWEArea/v2.1/XSD/FWEArea.xsd
-<?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">
+<?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:FWEL="http://transfer.hft-stuttgart.de/pages/in-source/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/in-source/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://transfer.hft-stuttgart.de/pages/in-source/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"/>

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Create tables ************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Disable Versioning ********************************* 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Enable Versioning ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/postgreSQL/CREATE_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Create tables ************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/3dcitydb/postgreSQL/DROP_ADE_DB.sql
+++ b/public/FWEBuilding/v2.1/DDL/3dcitydb/postgreSQL/DROP_ADE_DB.sql
-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-01-10 14:53:44 
+-- This document was automatically created by the ADE-Manager tool of 3DCityDB (https://www.3dcitydb.org) on 2021-03-29 17:57:18 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWEBuilding/v2.1/DDL/schema-mapping/schema-mapping.xml
+++ b/public/FWEBuilding/v2.1/DDL/schema-mapping/schema-mapping.xml
@@ -8,11 +8,11 @@
    </metadata>
    <applicationSchemas>
        <schema id="FWEB" isADERoot="true">
-            <namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/fwe-ade/FWEBuilding/v2.1/XSD</namespace>
+            <namespace context="citygml-2.0">http://transfer.hft-stuttgart.de/pages/in-source/fwe-ade/FWEBuilding/v2.1/XSD</namespace>
        </schema>
    </applicationSchemas>
    <featureTypes>
-        <featureType id="FWEB_BuildingSurveyType" table="FWEB_buildingsurvey" objectClassId="10000" path="BuildingSurvey" schema="FWEB">
+        <featureType id="FWEB_BuildingSurveyType" table="FWEB_buildingsurvey" objectClassId="20000" path="BuildingSurvey" schema="FWEB">
            <extension base="AbstractFeatureType">
                <join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -38,7 +38,7 @@
                <join table="FWEB_energysurvey" fromColumn="id" toColumn="buildingsurv_energysurvey_id" toRole="child"/>
            </featureProperty>
        </featureType>
-        <featureType id="FWEB_FoodSurveyType" table="FWEB_foodsurvey" objectClassId="10001" path="FoodSurvey" schema="FWEB">
+        <featureType id="FWEB_FoodSurveyType" table="FWEB_foodsurvey" objectClassId="20001" path="FoodSurvey" schema="FWEB">
            <extension base="FWEB_BuildingSurveyType">
                <join table="FWEB_buildingsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -57,7 +57,7 @@
            <attribute column="foodconsumption" type="double" maxOccurs="1" path="foodConsumption" schema="FWEB"/>
            <attribute column="foodconsumptionunit" type="string" maxOccurs="1" path="foodConsumptionUnit" schema="FWEB"/>
        </featureType>
-        <featureType id="FWEB_WaterSurveyType" table="FWEB_watersurvey" objectClassId="10002" path="WaterSurvey" schema="FWEB">
+        <featureType id="FWEB_WaterSurveyType" table="FWEB_watersurvey" objectClassId="20002" path="WaterSurvey" schema="FWEB">
            <extension base="FWEB_BuildingSurveyType">
                <join table="FWEB_buildingsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>
@@ -74,7 +74,7 @@
            <attribute column="totaldomesticwaste" type="double" maxOccurs="1" path="totalDomesticWaste" schema="FWEB"/>
            <attribute column="totaldomesticwasteunit" type="string" maxOccurs="1" path="totalDomesticWasteUnit" schema="FWEB"/>
        </featureType>
-        <featureType id="FWEB_EnergySurveyType" table="FWEB_energysurvey" objectClassId="10003" path="EnergySurvey" schema="FWEB">
+        <featureType id="FWEB_EnergySurveyType" table="FWEB_energysurvey" objectClassId="20003" path="EnergySurvey" schema="FWEB">
            <extension base="FWEB_BuildingSurveyType">
                <join table="FWEB_buildingsurvey" fromColumn="id" toColumn="id" toRole="parent"/>
            </extension>

--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
-<?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:bldg="http://www.opengis.net/citygml/building/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/FWEBuilding/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:bldg="http://www.opengis.net/citygml/building/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/FWEBuilding/v2.1/XSD" version="2.1">
  <annotation>
    <documentation>This is the FWE ADE for CityGML building datasets developed in the IN-SOURCE project.</documentation>
  </annotation>

--- a/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
+++ b/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/CREATE_ADE_DB.sql
-- 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 NUMBER,
+    biomasspotentialbioethanolun VARCHAR2(1000),
+    biomasspotentialbiogas NUMBER,
+    biomasspotentialbiogasunit VARCHAR2(1000),
+    biomasspotentialforest NUMBER,
+    biomasspotentialforestunit VARCHAR2(1000),
+    biomasspotentialplantoil NUMBER,
+    biomasspotentialplantoilunit VARCHAR2(1000),
+    biomasspotentialresidualso_1 VARCHAR2(1000),
+    biomasspotentialresidualsoli NUMBER,
+    biomasspotentialsolidfuel NUMBER,
+    biomasspotentialsolidfueluni VARCHAR2(1000),
    biomassprimaryenergypotent_1 VARCHAR2(1000),
    biomassprimaryenergypotentia NUMBER,
-    biomasstobioethanol NUMBER,
-    biomasstobioethanolunit VARCHAR2(1000),
-    biomasstobiogas NUMBER,
-    biomasstobiogasunit VARCHAR2(1000),
    biomasstoelectricitypotent_1 VARCHAR2(1000),
    biomasstoelectricitypotentia NUMBER,
-    biomasstoenergywoods NUMBER,
-    biomasstoenergywoodsunit VARCHAR2(1000),
-    biomasstoplantoil NUMBER,
-    biomasstoplantoilunit VARCHAR2(1000),
-    biomasstoresidualsolidfuel NUMBER,
-    biomasstoresidualsolidfuelun VARCHAR2(1000),
-    biomasstosolidfuel NUMBER,
-    biomasstosolidfuelunit VARCHAR2(1000),
    biomasstothermalpotential NUMBER,
    biomasstothermalpotentialuni VARCHAR2(1000),
+    biomassweight NUMBER,
+    biomassweightunit VARCHAR2(1000),
    electricitypotentialfrompv_1 VARCHAR2(1000),
    electricitypotentialfrompvbu NUMBER,
    landusesurve_energysurvey_id INTEGER,
@@ -35,8 +37,6 @@ CREATE TABLE FWEL_energysurvey
    spacecoolingdemandunit VARCHAR2(1000),
    spaceheatingdemand NUMBER,
    spaceheatingdemandunit VARCHAR2(1000),
-    vegetationcovercat_codespace VARCHAR2(1000),
-    vegetationcovercategory VARCHAR2(1000),
    PRIMARY KEY (id)
 );

@@ -46,6 +46,10 @@ CREATE TABLE FWEL_energysurvey
 CREATE TABLE FWEL_foodsurvey
 (
    id INTEGER NOT NULL,
+    animalcalorie INTEGER,
+    animalcalorieunit VARCHAR2(1000),
+    cropcalorie INTEGER,
+    cropcalorieunit VARCHAR2(1000),
    foodcategory VARCHAR2(1000),
    foodcategory_codespace VARCHAR2(1000),
    foodconsumption NUMBER,
@@ -59,6 +63,8 @@ CREATE TABLE FWEL_foodsurvey
    foodproductionwaterdemand NUMBER,
    foodproductionwaterdemanduni VARCHAR2(1000),
    landusesurvey_foodsurvey_id INTEGER,
+    vegetalcalorie INTEGER,
+    vegetalcalorieunit VARCHAR2(1000),
    PRIMARY KEY (id)
 );

@@ -81,9 +87,13 @@ CREATE TABLE FWEL_landusesurvey
    id INTEGER NOT NULL,
    buildingfootprintarea NUMBER,
    buildingfootprintarea_uom VARCHAR2(1000),
+    croptype VARCHAR2(1000),
+    croptype_codespace VARCHAR2(1000),
    land_use_consistsoffwesur_id INTEGER,
    objectclass_id INTEGER,
    population INTEGER,
+    soiltype VARCHAR2(1000),
+    soiltype_codespace VARCHAR2(1000),
    surfacearea NUMBER,
    surfacearea_uom VARCHAR2(1000),
    surveydescription VARCHAR2(1000),
@@ -108,9 +118,13 @@ CREATE TABLE FWEL_watersurvey
    domesticwaterdemandunit VARCHAR2(1000),
    domesticwaterwaste NUMBER,
    domesticwaterwasteunit VARCHAR2(1000),
+    irrigationdemand NUMBER,
+    irrigationdemandunit VARCHAR2(1000),
    landusesurvey_watersurvey_id INTEGER,
    totaldomesticwaste NUMBER,
    totaldomesticwasteunit VARCHAR2(1000),
+    transpirationloss NUMBER,
+    transpirationlossunit VARCHAR2(1000),
    PRIMARY KEY (id)
 );


--- a/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
+++ b/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/DISABLE_ADE_VERSIONING.sql
-- 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 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Disable Versioning ********************************* 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
+++ b/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/DROP_ADE_DB.sql
-- 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 ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 

--- a/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
+++ b/public/FWELanduse/v2.1/DDL/3dcitydb/oracle/ENABLE_ADE_VERSIONING.sql
-- 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 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Enable Versioning ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++