updated to beta8 version of 11-12-2025

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

@@ -3,7 +3,7 @@
 --
 -- CityGML Energy ADE 3.0 (beta 8)
 --
--- Last update: 2025-12-15
+-- Last update: 2025-12-11
 --
 -- This DDL script installs the 3DCityDB schema for the Energy ADE. It must be run
 -- from within the ADE Manager plugin of the 3DCityDB Importer/Exporter.
@@ -39,15 +39,15 @@ CREATE SEQUENCE ng3_suitability_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 922337203
 -- ng3_cityobject (also for ade feature and feature with lifespan
 -- -------------------------------------------------------------------- 
 CREATE TABLE ng3_cityobject (
-    id BIGINT                 PRIMARY KEY,
-    objectclass_id            INTEGER,
-    perm_identifier           VARCHAR,
-    perm_identifier_codespace VARCHAR,
-    valid_from                TIMESTAMP WITH TIME ZONE,
-    valid_to                  TIMESTAMP WITH TIME ZONE,
-    layered_constr_id         BIGINT,
-    lib_layered_constr_id     BIGINT,
-    ref_point                 geometry(POINTZ)
+    id BIGINT             PRIMARY KEY,
+    objectclass_id        INTEGER,
+    identifier            VARCHAR,
+    identifier_codespace  VARCHAR,
+    valid_from            TIMESTAMP WITH TIME ZONE,
+    valid_to              TIMESTAMP WITH TIME ZONE,
+    layered_constr_id     BIGINT,
+    lib_layered_constr_id BIGINT,
+    ref_point             geometry(POINTZ)
 );
 CREATE INDEX ng3_cto_oc_fkx        ON ng3_cityobject USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90);
 CREATE INDEX ng3_cto_lcns_fkx      ON ng3_cityobject USING btree (layered_constr_id ASC NULLS LAST) WITH (FILLFACTOR = 90);

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

@@ -3,7 +3,7 @@
 --
 -- CityGML Energy ADE 3.0 (beta 8)
 --
--- Last update: 2025-12-15
+-- Last update: 2025-12-11
 --
 -- 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.
@@ -25,91 +25,94 @@
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop foreign keys ********************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
---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;
+ALTER TABLE ng3_optical_property DROP CONSTRAINT ng3_optpty_oc_fk;
+ALTER TABLE ng3_optical_property DROP CONSTRAINT ng3_optpty_ng3_lcns_fk;
+ALTER TABLE ng3_optical_property DROP CONSTRAINT ng3_optpty_ng3_mat_fk;
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_oc_fk;
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_ng3_bdg_fk;
+ALTER TABLE ng3_qualified_attribute DROP CONSTRAINT ng3_qatt_ng3_spc_fk;
+ALTER TABLE ng3_suitability DROP CONSTRAINT ng3_suit_ng3_cto_fk;
+ALTER TABLE ng3_suitability DROP CONSTRAINT ng3_suit_ng3_sched_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_oc_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_ng3_lcns_fk;
+ALTER TABLE ng3_cityobject DROP CONSTRAINT ng3_cto_ng3_llcns_fk;
+ALTER TABLE ng3_ctyobj_relation DROP CONSTRAINT ng3_cto_rel_fk2;
+ALTER TABLE ng3_ctyobj_relation DROP CONSTRAINT ng3_cto_rel_fk1;
+ALTER TABLE ng3_building DROP CONSTRAINT ng3_bdg_fk;
+ALTER TABLE ng3_thematic_surface DROP CONSTRAINT ng3_them_surf_fk;
+ALTER TABLE ng3_opening DROP CONSTRAINT ng3_opn_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_ng3_sched_fk;
+ALTER TABLE ng3_device_operation DROP CONSTRAINT ng3_dev_opr_ng3_dev_fk;
+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_layered_construction DROP CONSTRAINT ng3_lcns_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_oc_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_ng3_lcns_fk;
+ALTER TABLE ng3_layered_construction DROP CONSTRAINT ng3_lcns_ng3_lib_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_schedule DROP CONSTRAINT ng3_sched_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_oc_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_ng3_ts_fk;
+ALTER TABLE ng3_schedule DROP CONSTRAINT ng3_sched_ng3_lib_fk;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_fk;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_ng3_sched_fk1;
+ALTER TABLE ng3_schedule_component DROP CONSTRAINT ng3_sched_comp_ng3_sched_fk2;
+ALTER TABLE ng3_sensor_data DROP CONSTRAINT ng3_sns_data_fk;
+ALTER TABLE ng3_sensor_data DROP CONSTRAINT ng3_sns_data_oc_fk;
+ALTER TABLE ng3_sensor_data DROP CONSTRAINT ng3_sns_data_ng3_ts_fk;
+ALTER TABLE ng3_sensor_data DROP CONSTRAINT ng3_sns_data_ng3_cto_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_ng3_ts_fk1;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_ng3_ts_fk2;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_ng3_ts_fk3;
+ALTER TABLE ng3_resource DROP CONSTRAINT ng3_res_ng3_cto_fk;
+ALTER TABLE ng3_utl_ntw_connection DROP CONSTRAINT ng3_utl_ntw_con_fk;
+ALTER TABLE ng3_utl_ntw_connection DROP CONSTRAINT ng3_utl_ntw_con_ng3_cto_fk;
+ALTER TABLE ng3_library DROP CONSTRAINT ng3_lib_fk;
+ALTER TABLE ng3_library DROP CONSTRAINT ng3_lib_oc_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_urban_function_area DROP CONSTRAINT ng3_ufa_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_ng3_bdg_fk;
+ALTER TABLE ng3_energy_perf_cert DROP CONSTRAINT ng3_epc_ng3_spc_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_ng3_bdg_fk;
+ALTER TABLE ng3_refurbishment_measure DROP CONSTRAINT ng3_refurb_ng3_spc_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_ng3_sched_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_ng3_spc_fk;
+ALTER TABLE ng3_occupants DROP CONSTRAINT ng3_occ_ng3_bdg_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_oc_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_bdg_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_zn_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_bdgu_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_sched_fk1;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_sched_fk2;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_ng3_sched_fk3;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_lod1_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_lod2_fk;
+ALTER TABLE ng3_space DROP CONSTRAINT ng3_spc_lod3_fk;
+ALTER TABLE ng3_zone_thematic_surface DROP CONSTRAINT ng3_zn_thm_surf_fk;
+ALTER TABLE ng3_zone_thematic_surface DROP CONSTRAINT ng3_zn_thm_surf_oc_fk;
+ALTER TABLE ng3_zone_thematic_surface DROP CONSTRAINT ng3_zn_thm_surf_n3g_zn_fk;
+ALTER TABLE ng3_zone_opening DROP CONSTRAINT ng3_zn_opn_fk;
+ALTER TABLE ng3_zone_opening DROP CONSTRAINT ng3_zn_opn_oc_fk;
+ALTER TABLE ng3_zone_opening DROP CONSTRAINT ng3_zn_opn_ng3_zn_thm_surf_fk;
 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop tables *************************************** 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+
 DROP TABLE ng3_address_to_building_unit CASCADE;
 DROP TABLE ng3_building CASCADE;
 DROP TABLE ng3_space CASCADE;
@@ -140,9 +143,11 @@ DROP TABLE ng3_utl_ntw_connection CASCADE;
 DROP TABLE ng3_sensor_data CASCADE;
 DROP TABLE ng3_zone_opening CASCADE;
 DROP TABLE ng3_zone_thematic_surface CASCADE;
+
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 -- *********************************** Drop Sequences ************************************* 
 -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+
 DROP SEQUENCE ng3_ctyobj_relation_seq;
 DROP SEQUENCE ng3_optical_property_seq;
 DROP SEQUENCE ng3_qualified_attribute_seq;

resources/database/schema-mapping/schema-mapping.xml

@@ -5,7 +5,7 @@
 
 CityGML Energy ADE 3.0 (beta 8)
 
-Last update: 2025-12-15
+Last update: 2025-12-11
 
 This schema mapping file was first automatically generated using the ADE Manager
 of the 3DCityDB Importer/Exporter and successively manually edited and restructured.
@@ -27,7 +27,7 @@ https://3d.bk.tudelft.nl/gagugiaro/
 <schemaMapping xmlns="http://www.3dcitydb.org/database/schema/1.0">
     <metadata>
         <name>Energy ADE</name>
-        <version>3.0 beta 8 (2025-12-15)</version>
+        <version>3.0 beta 8 (2025-12-11)</version>
         <description>Database schema for the 3DCityDB 4.x</description>
         <dbPrefix>ng3</dbPrefix>
     </metadata>
@@ -284,9 +284,9 @@ https://3d.bk.tudelft.nl/gagugiaro/
             <extension base="ng3_AbstractADEFeatureType">
                 <join table="cityobject" fromColumn="id" toColumn="id" toRole="parent"/>
             </extension>
-            <complexAttribute maxOccurs="1" path="permanentIdentifier" schema="ng3">
-                <attribute column="perm_identifier" type="string" path="." schema="ng3"/>
-                <attribute column="perm_identifier_codespace" type="string" path="@codespace" schema="gml"/>
+            <complexAttribute maxOccurs="1" path="identifier" schema="ng3">
+                <attribute column="identifier" type="string" path="." schema="ng3"/>
+                <attribute column="identifier_codespace" type="string" path="@codespace" schema="gml"/>
             </complexAttribute>
             <attribute column="valid_from" type="timestamp" maxOccurs="1" path="validFrom" schema="ng3"/>
             <attribute column="valid_to" type="timestamp" maxOccurs="1" path="validTo" schema="ng3"/>
@@ -1580,9 +1580,9 @@ https://3d.bk.tudelft.nl/gagugiaro/
         <!-- ADE _CityObject -->
         <propertyInjection table="ng3_cityobject" defaultBase="AbstractCityObjectType">
             <join table="ng3_cityobject" fromColumn="id" toColumn="id" toRole="child"/>
-            <complexAttribute maxOccurs="1" path="permanentIdentifier" schema="ng3">
-                <attribute column="perm_identifier" type="string" path="." schema="ng3"/>
-                <attribute column="perm_identifier_codespace" type="string" path="@codespace" schema="gml"/>
+            <complexAttribute maxOccurs="1" path="identifier" schema="ng3">
+                <attribute column="identifier" type="string" path="." schema="ng3"/>
+                <attribute column="identifier_codespace" type="string" path="@codespace" schema="gml"/>
             </complexAttribute>
             <attribute maxOccurs="1" column="validfrom" type="timestamp" path="validFrom" schema="ng3"/>
             <attribute maxOccurs="1" column="validto" type="timestamp" path="validTo" schema="ng3"/>