Merge branch 'beta7' into 'master'

Updated to Energy ADE 3 beta 7 - version 0.2

See merge request !14

.idea/.name

-energy-ade-2-citydb
\ No newline at end of file
+energy-ade-3-citydb
\ No newline at end of file

.idea/gradle.xml

@@ -7,10 +7,10 @@
         <compositeConfiguration>
           <compositeBuild compositeDefinitionSource="SCRIPT">
             <builds>
-              <build path="$PROJECT_DIR$/../energy-ade-2-citygml4j" name="energy-ade-2-citygml4j">
+              <build path="$PROJECT_DIR$/../energy-ade-3-citygml4j" name="energy-ade-3-citygml4j">
                 <projects>
-                  <project path="$PROJECT_DIR$/../energy-ade-2-citygml4j" />
-                  <project path="$PROJECT_DIR$/../energy-ade-2-citygml4j/energy-ade-samples" />
+                  <project path="$PROJECT_DIR$/../energy-ade-3-citygml4j" />
+                  <project path="$PROJECT_DIR$/../energy-ade-3-citygml4j/energy-ade-samples" />
                 </projects>
               </build>
             </builds>
@@ -21,8 +21,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/../energy-ade-2-citygml4j" />
-            <option value="$PROJECT_DIR$/../energy-ade-2-citygml4j/energy-ade-samples" />
+            <option value="$PROJECT_DIR$/../energy-ade-3-citygml4j" />
+            <option value="$PROJECT_DIR$/../energy-ade-3-citygml4j/energy-ade-samples" />
           </set>
         </option>
       </GradleProjectSettings>

.idea/misc.xml

@@ -3,8 +3,9 @@
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$/../digitwins4peds" />
-    <file type="web" url="file://$PROJECT_DIR$" />
     <file type="web" url="file://$PROJECT_DIR$/../energy-ade-2-citygml4j" />
+    <file type="web" url="file://$PROJECT_DIR$" />
+    <file type="web" url="file://$PROJECT_DIR$/../energy-ade-3-citygml4j" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="liberica-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

.idea/vcs.xml

@@ -2,6 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../energy-ade-2-citygml4j" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../energy-ade-3-citygml4j" vcs="Git" />
   </component>
 </project>
\ No newline at end of file

README.md

@@ -12,12 +12,12 @@ Currently, there are _no plans to migrate_ the Energy ADE 3 importer-exporter AP
 
 The following modules are supported at the moment:
 
--  Core (AbstractBuilding, Refurbishment Measures)
+-  Core (AbstractBuilding, RefurbishmentMeasures, WeatherData)
 -  Resource
 -  UrbanFunctionArea
 -  WeatherStation
 -  Timeseries
--  DataTypes
+-  DataTypes (AbstractQualifiedAttribute)
 
 The following modules are currently in development:
 
@@ -27,6 +27,7 @@ The following modules are currently in development:
 -  LayeredConstruction
 -  Schedule
 -  Devices
+-  DataTypes (AbstractOpticalProperties)
 
 # Release
 

build.gradle

@@ -8,8 +8,8 @@ plugins {
 }
 
 group = 'de.stuttgart.hft'
-version = 'beta7-0.1'
-description 'Energy ADE 3 (beta 7) extension for the 3DCityDB - release 0.1'
+version = 'beta7-0.2'
+description 'Energy ADE 3 (beta 7) extension for the 3DCityDB - release 0.2'
 
 repositories {
     maven {
@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     api 'org.citydb:impexp-client-gui:5.5.1'
-    api 'org.citygml4j.ade:energy-ade-3-citygml4j:3.0.1'
+    api 'org.citygml4j.ade:energy-ade-3-citygml4j:3.0.2'
 
-    citygml4j('org.citygml4j.ade:energy-ade-3-citygml4j:3.0.1') {
+    citygml4j('org.citygml4j.ade:energy-ade-3-citygml4j:3.0.2') {
         transitive = false
     }
 

resources/database/3dcitydb/postgreSQL/DROP_ADE_DB.sql

 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 --
--- CityGML Energy ADE 2.0 (beta 7)
+-- CityGML Energy ADE 3.0 (beta 7)
 --
--- Last update: 2025-05-09
+-- Last update: 2025-10-14
 --
--- This DDL script uninstalls the 3DCityDB schema for the Energy ADE 2.0. It must be run
+-- This DDL script uninstalls the 3DCityDB schema for the Energy ADE. It must be run
 -- from within the ADE Manager plugin of the 3DCityDB Importer/Exporter.
 --
 -- This script was first automatically generated using the 3DCityDB ADE Manager
@@ -25,125 +25,125 @@
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
-ALTER TABLE ng2_address_to_building_unit DROP CONSTRAINT ng2_addr_to_bdgu_fk1;
-ALTER TABLE ng2_address_to_building_unit DROP CONSTRAINT ng2_addr_to_bdgu_fk2;
-ALTER TABLE ng2_building DROP CONSTRAINT ng2_bdg_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_bdg_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_lod1_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_lod2_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_lod3_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_oc_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_sched_fk1;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_sched_fk2;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_sched_fk3;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_tz_fk;
-ALTER TABLE ng2_building_partition DROP CONSTRAINT ng2_bdgp_uz_fk;
-ALTER TABLE ng2_cityobject DROP CONSTRAINT ng2_cto_fk;
-ALTER TABLE ng2_cityobject DROP CONSTRAINT ng2_cto_lcns_fk;
-ALTER TABLE ng2_ctyobj_relation DROP CONSTRAINT ng2_cto_rel_fk1;
-ALTER TABLE ng2_ctyobj_relation DROP CONSTRAINT ng2_cto_rel_fk2;
-ALTER TABLE ng2_device DROP CONSTRAINT ng2_dev_fk;
-ALTER TABLE ng2_device DROP CONSTRAINT ng2_dev_ng2_cto_fk;
-ALTER TABLE ng2_device DROP CONSTRAINT ng2_dev_oc_fk;
-ALTER TABLE ng2_device DROP CONSTRAINT ng2_dev_opt_fk;
-ALTER TABLE ng2_device_operation DROP CONSTRAINT ng2_dev_opr_fk;
-ALTER TABLE ng2_device_operation DROP CONSTRAINT ng2_dev_opr_dev_fk;
-ALTER TABLE ng2_device_operation DROP CONSTRAINT ng2_dev_opr_sched_fk;
-ALTER TABLE ng2_energy_perf_cert DROP CONSTRAINT ng2_epc_fk;
-ALTER TABLE ng2_energy_perf_cert DROP CONSTRAINT ng2_epc_bdg_fk;
-ALTER TABLE ng2_energy_perf_cert DROP CONSTRAINT ng2_epc_bdg_part_fk;
-ALTER TABLE ng2_layer DROP CONSTRAINT ng2_lyr_fk;
-ALTER TABLE ng2_layer DROP CONSTRAINT ng2_lyr_lcns_fk;
-ALTER TABLE ng2_layer DROP CONSTRAINT ng2_lyr_mat_fk;
-ALTER TABLE ng2_layered_construction DROP CONSTRAINT ng2_lcns_fk;
-ALTER TABLE ng2_layered_construction DROP CONSTRAINT ng2_lcns_lcns_fk;
-ALTER TABLE ng2_layered_construction DROP CONSTRAINT ng2_lcns_oc_fk;
-ALTER TABLE ng2_layered_construction DROP CONSTRAINT ng2_lcns_lib_fk;
-ALTER TABLE ng2_library DROP CONSTRAINT ng2_lib_fk;
-ALTER TABLE ng2_library DROP CONSTRAINT ng2_lib_oc_fk;
-ALTER TABLE ng2_material DROP CONSTRAINT ng2_mat_fk;
-ALTER TABLE ng2_material DROP CONSTRAINT ng2_mat_lib_fk;
-ALTER TABLE ng2_occupants DROP CONSTRAINT ng2_occ_fk;
-ALTER TABLE ng2_occupants DROP CONSTRAINT ng2_occ_ng2_bdgp_fk;
-ALTER TABLE ng2_occupants DROP CONSTRAINT ng2_occ_sched_fk;
-ALTER TABLE ng2_opening DROP CONSTRAINT ng2_opn_fk;
-ALTER TABLE ng2_optical_property DROP CONSTRAINT ng2_optpty_lcns_fk;
-ALTER TABLE ng2_optical_property DROP CONSTRAINT ng2_optpty_oc_fk; 
-ALTER TABLE ng2_qualified_attribute DROP CONSTRAINT ng2_qatt_oc_fk; 
-ALTER TABLE ng2_qualified_attribute DROP CONSTRAINT ng2_qatt_bdg_fk;
-ALTER TABLE ng2_qualified_attribute DROP CONSTRAINT ng2_qatt_bdg_part_fk;
-ALTER TABLE ng2_refurbishment_measure DROP CONSTRAINT ng2_refurb_fk;
-ALTER TABLE ng2_refurbishment_measure DROP CONSTRAINT ng2_refurb_bdg_fk;
-ALTER TABLE ng2_refurbishment_measure DROP CONSTRAINT ng2_refurb_bdg_part_fk;
-ALTER TABLE ng2_resource DROP CONSTRAINT ng2_res_fk;
-ALTER TABLE ng2_resource DROP CONSTRAINT ng2_res_oc_fk;
-ALTER TABLE ng2_resource DROP CONSTRAINT ng2_res_ts_fk;
-ALTER TABLE ng2_resource DROP CONSTRAINT ng2_res_cto_fk;
-ALTER TABLE ng2_schedule DROP CONSTRAINT ng2_sched_fk;
-ALTER TABLE ng2_schedule DROP CONSTRAINT ng2_sched_oc_fk;
-ALTER TABLE ng2_schedule DROP CONSTRAINT ng2_sched_ts_fk;
-ALTER TABLE ng2_schedule DROP CONSTRAINT ng2_sched_lib_fk;
-ALTER TABLE ng2_schedule_component DROP CONSTRAINT ng2_sched_comp_fk;
-ALTER TABLE ng2_schedule_component DROP CONSTRAINT ng2_sched_comp_sched_fk1;
-ALTER TABLE ng2_schedule_component DROP CONSTRAINT ng2_sched_comp_sched_fk2;
-ALTER TABLE ng2_solar_collector DROP CONSTRAINT ng2_sol_coll_fk;
-ALTER TABLE ng2_solar_collector DROP CONSTRAINT ng2_sol_coll_oc_fk;
-ALTER TABLE ng2_solar_collector DROP CONSTRAINT ng2_sol_coll_lod2_fk;
-ALTER TABLE ng2_solar_collector DROP CONSTRAINT ng2_sol_coll_lod3_fk;
-ALTER TABLE ng2_storage_device DROP CONSTRAINT ng2_sto_dev_fk;
-ALTER TABLE ng2_storage_device DROP CONSTRAINT ng2_sto_dev_oc_fk;
-ALTER TABLE ng2_suitability DROP CONSTRAINT ng2_suit_cto_fk;
-ALTER TABLE ng2_suitability DROP CONSTRAINT ng2_suit_sched_fk;
-ALTER TABLE ng2_them_surf_to_thermal_zone DROP CONSTRAINT ng2_thm_surf_to_tz_fk1;
-ALTER TABLE ng2_them_surf_to_thermal_zone DROP CONSTRAINT ng2_thm_surf_to_tz_fk2;
-ALTER TABLE ng2_thematic_surface DROP CONSTRAINT ng2_them_surf_fk;
-ALTER TABLE ng2_time_series DROP CONSTRAINT ng2_ts_fk;
-ALTER TABLE ng2_time_series DROP CONSTRAINT ng2_ts_oc_fk;
-ALTER TABLE ng2_urban_function_area DROP CONSTRAINT ng2_ufa_fk;
-ALTER TABLE ng2_utl_ntw_connection DROP CONSTRAINT ng2_utl_ntw_con_cto_fk;
-ALTER TABLE ng2_utl_ntw_connection DROP CONSTRAINT ng2_utl_ntw_con_fk;
-ALTER TABLE ng2_weather_data DROP CONSTRAINT ng2_wth_data_fk;
-ALTER TABLE ng2_weather_data DROP CONSTRAINT ng2_wth_data_ng2_cto_fk;
-ALTER TABLE ng2_weather_data DROP CONSTRAINT ng2_wth_data_ts_fk;
+ALTER TABLE ng3_address_to_building_unit DROP CONSTRAINT ng3_addr_to_bdgu_fk1;
+ALTER TABLE ng3_address_to_building_unit DROP CONSTRAINT ng3_addr_to_bdgu_fk2;
+ALTER TABLE ng3_building DROP CONSTRAINT ng3_bdg_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_bdg_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_lod1_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_lod2_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_lod3_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_oc_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_sched_fk1;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_sched_fk2;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_sched_fk3;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_tz_fk;
+ALTER TABLE ng3_building_partition DROP CONSTRAINT ng3_bdgp_uz_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_lcns_fk;
+ALTER TABLE ng3_ctyobj_relation DROP CONSTRAINT ng3_cto_rel_fk1;
+ALTER TABLE ng3_ctyobj_relation DROP CONSTRAINT ng3_cto_rel_fk2;
+ALTER TABLE ng3_device DROP CONSTRAINT ng3_dev_fk;
+ALTER TABLE ng3_device DROP CONSTRAINT ng3_dev_ng3_cto_fk;
+ALTER TABLE ng3_device DROP CONSTRAINT ng3_dev_oc_fk;
+ALTER TABLE ng3_device DROP CONSTRAINT ng3_dev_opt_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_dev_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_sched_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_bdg_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_bdg_part_fk;
+ALTER TABLE ng3_layer DROP CONSTRAINT ng3_lyr_fk;
+ALTER TABLE ng3_layer DROP CONSTRAINT ng3_lyr_lcns_fk;
+ALTER TABLE ng3_layer DROP CONSTRAINT ng3_lyr_mat_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_lcns_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_oc_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_lib_fk;
+ALTER TABLE ng3_library DROP CONSTRAINT ng3_lib_fk;
+ALTER TABLE ng3_library DROP CONSTRAINT ng3_lib_oc_fk;
+ALTER TABLE ng3_material DROP CONSTRAINT ng3_mat_fk;
+ALTER TABLE ng3_material DROP CONSTRAINT ng3_mat_lib_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_ng3_bdgp_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_sched_fk;
+ALTER TABLE ng3_opening DROP CONSTRAINT ng3_opn_fk;
+ALTER TABLE ng3_optical_property DROP CONSTRAINT ng3_optpty_lcns_fk;
+ALTER TABLE ng3_optical_property DROP CONSTRAINT ng3_optpty_oc_fk; 
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_oc_fk; 
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_bdg_fk;
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_bdg_part_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_bdg_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_bdg_part_fk;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_fk;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_oc_fk;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_ts_fk;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_cto_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_oc_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_ts_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_lib_fk;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_fk;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_sched_fk1;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_sched_fk2;
+ALTER TABLE ng3_solar_collector DROP CONSTRAINT ng3_sol_coll_fk;
+ALTER TABLE ng3_solar_collector DROP CONSTRAINT ng3_sol_coll_oc_fk;
+ALTER TABLE ng3_solar_collector DROP CONSTRAINT ng3_sol_coll_lod2_fk;
+ALTER TABLE ng3_solar_collector DROP CONSTRAINT ng3_sol_coll_lod3_fk;
+ALTER TABLE ng3_storage_device DROP CONSTRAINT ng3_sto_dev_fk;
+ALTER TABLE ng3_storage_device DROP CONSTRAINT ng3_sto_dev_oc_fk;
+ALTER TABLE ng3_suitability DROP CONSTRAINT ng3_suit_cto_fk;
+ALTER TABLE ng3_suitability DROP CONSTRAINT ng3_suit_sched_fk;
+ALTER TABLE ng3_them_surf_to_thermal_zone DROP CONSTRAINT ng3_thm_surf_to_tz_fk1;
+ALTER TABLE ng3_them_surf_to_thermal_zone DROP CONSTRAINT ng3_thm_surf_to_tz_fk2;
+ALTER TABLE ng3_thematic_surface DROP CONSTRAINT ng3_them_surf_fk;
+ALTER TABLE ng3_time_series DROP CONSTRAINT ng3_ts_fk;
+ALTER TABLE ng3_time_series DROP CONSTRAINT ng3_ts_oc_fk;
+ALTER TABLE ng3_urban_function_area DROP CONSTRAINT ng3_ufa_fk;
+ALTER TABLE ng3_utl_ntw_connection DROP CONSTRAINT ng3_utl_ntw_con_cto_fk;
+ALTER TABLE ng3_utl_ntw_connection DROP CONSTRAINT ng3_utl_ntw_con_fk;
+ALTER TABLE ng3_weather_data DROP CONSTRAINT ng3_wth_data_fk;
+ALTER TABLE ng3_weather_data DROP CONSTRAINT ng3_wth_data_ng3_cto_fk;
+ALTER TABLE ng3_weather_data DROP CONSTRAINT ng3_wth_data_ts_fk;
 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop tables *************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
-DROP TABLE ng2_address_to_building_unit CASCADE;
-DROP TABLE ng2_building CASCADE;
-DROP TABLE ng2_building_partition CASCADE;
-DROP TABLE ng2_cityobject CASCADE;
-DROP TABLE ng2_ctyobj_relation CASCADE;
-DROP TABLE ng2_device CASCADE;
-DROP TABLE ng2_device_operation CASCADE;
-DROP TABLE ng2_energy_perf_cert CASCADE;
-DROP TABLE ng2_layer CASCADE;
-DROP TABLE ng2_layered_construction CASCADE;
-DROP TABLE ng2_library CASCADE;
-DROP TABLE ng2_material CASCADE;
-DROP TABLE ng2_occupants CASCADE;
-DROP TABLE ng2_opening CASCADE;
-DROP TABLE ng2_optical_property CASCADE;
-DROP TABLE ng2_qualified_attribute CASCADE;
-DROP TABLE ng2_refurbishment_measure CASCADE;
-DROP TABLE ng2_resource CASCADE;
-DROP TABLE ng2_schedule CASCADE;
-DROP TABLE ng2_schedule_component CASCADE;
-DROP TABLE ng2_solar_collector CASCADE;
-DROP TABLE ng2_storage_device CASCADE;
-DROP TABLE ng2_suitability CASCADE;
-DROP TABLE ng2_them_surf_to_thermal_zone CASCADE;
-DROP TABLE ng2_thematic_surface CASCADE;
-DROP TABLE ng2_time_series CASCADE;
-DROP TABLE ng2_urban_function_area CASCADE;
-DROP TABLE ng2_utl_ntw_connection CASCADE;
-DROP TABLE ng2_weather_data CASCADE;
+DROP TABLE ng3_address_to_building_unit CASCADE;
+DROP TABLE ng3_building CASCADE;
+DROP TABLE ng3_building_partition CASCADE;
+DROP TABLE ng3_cityobject CASCADE;
+DROP TABLE ng3_ctyobj_relation CASCADE;
+DROP TABLE ng3_device CASCADE;
+DROP TABLE ng3_device_operation CASCADE;
+DROP TABLE ng3_energy_perf_cert CASCADE;
+DROP TABLE ng3_layer CASCADE;
+DROP TABLE ng3_layered_construction CASCADE;
+DROP TABLE ng3_library CASCADE;
+DROP TABLE ng3_material CASCADE;
+DROP TABLE ng3_occupants CASCADE;
+DROP TABLE ng3_opening CASCADE;
+DROP TABLE ng3_optical_property CASCADE;
+DROP TABLE ng3_qualified_attribute CASCADE;
+DROP TABLE ng3_refurbishment_measure CASCADE;
+DROP TABLE ng3_resource CASCADE;
+DROP TABLE ng3_schedule CASCADE;
+DROP TABLE ng3_schedule_component CASCADE;
+DROP TABLE ng3_solar_collector CASCADE;
+DROP TABLE ng3_storage_device CASCADE;
+DROP TABLE ng3_suitability CASCADE;
+DROP TABLE ng3_them_surf_to_thermal_zone CASCADE;
+DROP TABLE ng3_thematic_surface CASCADE;
+DROP TABLE ng3_time_series CASCADE;
+DROP TABLE ng3_urban_function_area CASCADE;
+DROP TABLE ng3_utl_ntw_connection CASCADE;
+DROP TABLE ng3_weather_data CASCADE;
 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop Sequences ************************************* 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
-DROP SEQUENCE ng2_ctyobj_relation_seq;
-DROP SEQUENCE ng2_optical_property_seq;
-DROP SEQUENCE ng2_qualified_attribute_seq;
-DROP SEQUENCE ng2_suitability_seq;
\ No newline at end of file
+DROP SEQUENCE ng3_ctyobj_relation_seq;
+DROP SEQUENCE ng3_optical_property_seq;
+DROP SEQUENCE ng3_qualified_attribute_seq;
+DROP SEQUENCE ng3_suitability_seq;
\ No newline at end of file

src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java

@@ -40,15 +40,15 @@ public class AbstractQualifiedAttributeExporter implements ADEExporter {
         this.manager = manager;
         attributeClassMap = new HashMap<>();
         SchemaMapping schemaMapping = ObjectRegistry.getInstance().getSchemaMapping();
-        ComplexType qualifiedHeightType = schemaMapping.getComplexType("QualifiedHeight", "http://www.citygml.org/ade/energy/2.0");
+        ComplexType qualifiedHeightType = schemaMapping.getComplexType("QualifiedHeight", "http://www.citygml.org/ade/energy/3.0");
         int objectClassIdOfQualifiedHeight = qualifiedHeightType.getObjectClassId();
         attributeClassMap.put(objectClassIdOfQualifiedHeight, QualifiedHeight.class);
 
-        ComplexType qualifiedAreaType = schemaMapping.getComplexType("QualifiedArea", "http://www.citygml.org/ade/energy/2.0");
+        ComplexType qualifiedAreaType = schemaMapping.getComplexType("QualifiedArea", "http://www.citygml.org/ade/energy/3.0");
         int objectClassIdOfQualifiedArea = qualifiedAreaType.getObjectClassId();
         attributeClassMap.put(objectClassIdOfQualifiedArea, QualifiedArea.class);
 
-        ComplexType qualifiedVolumeType = schemaMapping.getComplexType("QualifiedVolume", "http://www.citygml.org/ade/energy/2.0");
+        ComplexType qualifiedVolumeType = schemaMapping.getComplexType("QualifiedVolume", "http://www.citygml.org/ade/energy/3.0");
         int objectClassIdOfQualifiedVolume = qualifiedVolumeType.getObjectClassId();
         attributeClassMap.put(objectClassIdOfQualifiedVolume, QualifiedVolume.class);
 

src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java

@@ -10,7 +10,7 @@ import org.citydb.core.query.filter.projection.ProjectionFilter;
 import org.citygml4j.ade.energy3.model.core.*;
 import org.citygml4j.ade.energy3.model.module.EnergyADEModule;
 import org.citygml4j.model.citygml.building.AbstractBuilding;
-import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType;
+import org.sig3d.citygml.energyADE3beta7.ThermalStatusValueType;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java

@@ -10,7 +10,7 @@ import org.citygml4j.ade.energy3.model.core.AbstractResource;
 import org.citygml4j.ade.energy3.model.supportingClasses.*;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.basicTypes.Measure;
-import org.sig3d.citygml.energyADE2beta7.ResourceStatusValueType;
+import org.sig3d.citygml.energyADE3beta7.ResourceStatusValueType;
 
 import java.sql.*;
 import java.util.ArrayList;

src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java

@@ -10,10 +10,10 @@ import org.citydb.core.database.schema.mapping.SchemaMapping;
 import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
 import org.citydb.core.registry.ObjectRegistry;
-import org.sig3d.citygml.energyADE2beta7.AbstractQualifiedAttributeType;
-import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType;
-import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType;
-import org.sig3d.citygml.energyADE2beta7.QualifiedVolumeType;
+import org.sig3d.citygml.energyADE3beta7.AbstractQualifiedAttributeType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedAreaType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedHeightType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedVolumeType;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -69,7 +69,7 @@ public class AbstractQualifiedAttributeImporter implements ADEImporter {
         if (abstractQualifiedAttribute instanceof QualifiedHeightType qualifiedHeight) {
             if (qualifiedHeight.isSetType()) {
                 SchemaMapping schemaMapping = ObjectRegistry.getInstance().getSchemaMapping();
-                ComplexType qualifiedHeightType = schemaMapping.getComplexType("QualifiedHeight", "http://www.citygml.org/ade/energy/2.0");
+                ComplexType qualifiedHeightType = schemaMapping.getComplexType("QualifiedHeight", "http://www.citygml.org/ade/energy/3.0");
                 int objectClassId = qualifiedHeightType.getObjectClassId();
                 ps.setInt(2, objectClassId);
                 ps.setString(3, qualifiedHeight.getType().getValue());
@@ -78,7 +78,7 @@ public class AbstractQualifiedAttributeImporter implements ADEImporter {
         } else if (abstractQualifiedAttribute instanceof QualifiedAreaType qualifiedArea) {
             if (qualifiedArea.isSetType()) {
                 SchemaMapping schemaMapping = ObjectRegistry.getInstance().getSchemaMapping();
-                ComplexType qualifiedAreaType = schemaMapping.getComplexType("QualifiedArea", "http://www.citygml.org/ade/energy/2.0");
+                ComplexType qualifiedAreaType = schemaMapping.getComplexType("QualifiedArea", "http://www.citygml.org/ade/energy/3.0");
                 int objectClassId = qualifiedAreaType.getObjectClassId();
                 ps.setInt(2, objectClassId);
                 ps.setString(3, qualifiedArea.getType().getValue());
@@ -87,7 +87,7 @@ public class AbstractQualifiedAttributeImporter implements ADEImporter {
         } else if (abstractQualifiedAttribute instanceof QualifiedVolumeType qualifiedVolume) {
             if (qualifiedVolume.isSetType()){
                 SchemaMapping schemaMapping = ObjectRegistry.getInstance().getSchemaMapping();
-                ComplexType qualifiedVolumeType = schemaMapping.getComplexType("QualifiedVolume", "http://www.citygml.org/ade/energy/2.0");
+                ComplexType qualifiedVolumeType = schemaMapping.getComplexType("QualifiedVolume", "http://www.citygml.org/ade/energy/3.0");
                 int objectClassId = qualifiedVolumeType.getObjectClassId();
                 ps.setInt(2, objectClassId);
                 ps.setString(3, qualifiedVolume.getType().getValue());

src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java

@@ -11,9 +11,9 @@ import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.GeometryConverter;
 import org.citygml4j.ade.energy3.model.core.*;
 import org.citygml4j.model.citygml.building.AbstractBuilding;
-import org.sig3d.citygml.energyADE2beta7.QualifiedAreaType;
-import org.sig3d.citygml.energyADE2beta7.QualifiedHeightType;
-import org.sig3d.citygml.energyADE2beta7.QualifiedVolumeType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedAreaType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedHeightType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedVolumeType;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;