From 96d46e0525e863f40840220fc33f4c7e9bea02f6 Mon Sep 17 00:00:00 2001 From: Rushi Date: Mon, 27 Oct 2025 15:19:35 +0100 Subject: [PATCH] Updated to Energy ADE 3 beta 7 - version 0.2 --- .idea/.name | 2 +- .idea/gradle.xml | 10 +- .idea/misc.xml | 3 +- .idea/vcs.xml | 2 +- README.md | 5 +- build.gradle | 8 +- .../3dcitydb/postgreSQL/CREATE_ADE_DB.sql | 544 +++---- .../3dcitydb/postgreSQL/DROP_ADE_DB.sql | 234 +-- .../schema-mapping/schema-mapping.xml | 1260 ++++++++--------- .../AbstractQualifiedAttributeExporter.java | 6 +- .../exporter/BuildingPropertiesExporter.java | 2 +- .../energy3/exporter/ResourceExporter.java | 2 +- .../AbstractQualifiedAttributeImporter.java | 14 +- .../importer/BuildingPropertiesImporter.java | 6 +- 14 files changed, 1050 insertions(+), 1048 deletions(-) diff --git a/.idea/.name b/.idea/.name index e8b1049..16cb557 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -energy-ade-2-citydb \ No newline at end of file +energy-ade-3-citydb \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ef35a05..bf33e9f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,10 +7,10 @@ - + - - + + @@ -21,8 +21,8 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 0975301..669158d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,8 +3,9 @@ - + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index bf9de5c..8fa9d67 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index f82c7b2..ce4b5b8 100644 --- a/README.md +++ b/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 diff --git a/build.gradle b/build.gradle index b7c8e25..42bf7a9 100644 --- a/build.gradle +++ b/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 } diff --git a/resources/database/3dcitydb/postgreSQL/CREATE_ADE_DB.sql b/resources/database/3dcitydb/postgreSQL/CREATE_ADE_DB.sql index ee163e5..89f83d8 100644 --- a/resources/database/3dcitydb/postgreSQL/CREATE_ADE_DB.sql +++ b/resources/database/3dcitydb/postgreSQL/CREATE_ADE_DB.sql @@ -1,11 +1,11 @@ -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- --- CityGML Energy ADE 2.0 (beta 7) +-- CityGML Energy ADE 3.0 (beta 7) -- --- Last update: 2025-06-25 +-- Last update: 2025-10-14 -- --- This DDL script installs the 3DCityDB schema for the Energy ADE 2.0. It must be run +-- 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. -- -- This script was first automatically generated using the 3DCityDB ADE Manager @@ -26,28 +26,28 @@ -- *********************************** Create Sequences *********************************** -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -CREATE SEQUENCE ng2_ctyobj_relation_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; -CREATE SEQUENCE ng2_optical_property_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; -CREATE SEQUENCE ng2_qualified_attribute_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; -CREATE SEQUENCE ng2_suitability_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; +CREATE SEQUENCE ng3_ctyobj_relation_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; +CREATE SEQUENCE ng3_optical_property_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; +CREATE SEQUENCE ng3_qualified_attribute_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; +CREATE SEQUENCE ng3_suitability_seq INCREMENT BY 1 MINVALUE 0 MAXVALUE 9223372036854775807 START WITH 1 CACHE 1 NO CYCLE OWNED BY NONE; -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- *********************************** Create tables ************************************** -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- -------------------------------------------------------------------- --- ng2_address_to_building_unit +-- ng3_address_to_building_unit -- -------------------------------------------------------------------- -CREATE TABLE ng2_address_to_building_unit ( +CREATE TABLE ng3_address_to_building_unit ( address_id BIGINT NOT NULL, building_unit_id BIGINT NOT NULL, PRIMARY KEY (address_id, building_unit_id) ); -- -------------------------------------------------------------------- --- ng2_building - extends building table +-- ng3_building - extends building table -- -------------------------------------------------------------------- -CREATE TABLE ng2_building ( +CREATE TABLE ng3_building ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -59,9 +59,9 @@ CREATE TABLE ng2_building ( ); -- -------------------------------------------------------------------- --- ng2_building_partition +-- ng3_building_partition -- -------------------------------------------------------------------- -CREATE TABLE ng2_building_partition ( +CREATE TABLE ng3_building_partition ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, -- Thermal Zone attributes @@ -109,21 +109,21 @@ CREATE TABLE ng2_building_partition ( ); -- -------------------------------------------------------------------- --- ng2_cityobject - extends cityobject table +-- ng3_cityobject - extends cityobject table -- -------------------------------------------------------------------- -CREATE TABLE ng2_cityobject ( +CREATE TABLE ng3_cityobject ( id BIGINT PRIMARY KEY, layered_construction_id BIGINT, ref_point geometry(POINTZ) ); -- -------------------------------------------------------------------- --- ng2_ctyobj_relation +-- ng3_ctyobj_relation -- -------------------------------------------------------------------- -CREATE TABLE ng2_ctyobj_relation ( - id BIGINT PRIMARY KEY DEFAULT nextval('ng2_ctyobj_relation_seq'::regclass), --- this refers to ng2_cityobject (id), i.e. the source - ng2_cityobject_id BIGINT, +CREATE TABLE ng3_ctyobj_relation ( + id BIGINT PRIMARY KEY DEFAULT nextval('ng3_ctyobj_relation_seq'::regclass), +-- this refers to ng3_cityobject (id), i.e. the source + ng3_cityobject_id BIGINT, -- this refers to cityobject (id), i.e. the target cityobject_id BIGINT, relation_type VARCHAR, @@ -131,9 +131,9 @@ CREATE TABLE ng2_ctyobj_relation ( ); -- -------------------------------------------------------------------- --- ng2_device +-- ng3_device -- -------------------------------------------------------------------- -CREATE TABLE ng2_device ( +CREATE TABLE ng3_device ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, -- AbstractDevice attributes (also for LightingDevice, GenericDevice, GenericElectricalDevice) @@ -173,9 +173,9 @@ CREATE TABLE ng2_device ( ); -- -------------------------------------------------------------------- --- ng2_device_operation +-- ng3_device_operation -- -------------------------------------------------------------------- -CREATE TABLE ng2_device_operation ( +CREATE TABLE ng3_device_operation ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -186,9 +186,9 @@ CREATE TABLE ng2_device_operation ( ); -- -------------------------------------------------------------------- --- ng2_energy_perf_cert +-- ng3_energy_perf_cert -- -------------------------------------------------------------------- -CREATE TABLE ng2_energy_perf_cert ( +CREATE TABLE ng3_energy_perf_cert ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -205,9 +205,9 @@ CREATE TABLE ng2_energy_perf_cert ( ); -- -------------------------------------------------------------------- --- ng2_layer +-- ng3_layer -- -------------------------------------------------------------------- -CREATE TABLE ng2_layer ( +CREATE TABLE ng3_layer ( id BIGINT PRIMARY KEY, thickness NUMERIC, thickness_uom VARCHAR, @@ -217,9 +217,9 @@ CREATE TABLE ng2_layer ( ); -- -------------------------------------------------------------------- --- ng2_layered_construction +-- ng3_layered_construction -- -------------------------------------------------------------------- -CREATE TABLE ng2_layered_construction ( +CREATE TABLE ng3_layered_construction ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, u_value NUMERIC, @@ -236,9 +236,9 @@ CREATE TABLE ng2_layered_construction ( ); -- -------------------------------------------------------------------- --- ng2_library +-- ng3_library -- -------------------------------------------------------------------- -CREATE TABLE ng2_library ( +CREATE TABLE ng3_library ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, type VARCHAR, @@ -248,9 +248,9 @@ CREATE TABLE ng2_library ( ); -- -------------------------------------------------------------------- --- ng2_material +-- ng3_material -- -------------------------------------------------------------------- -CREATE TABLE ng2_material ( +CREATE TABLE ng3_material ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, -- Abstract library attributes @@ -280,9 +280,9 @@ CREATE TABLE ng2_material ( ); -- -------------------------------------------------------------------- --- ng2_occupants +-- ng3_occupants -- -------------------------------------------------------------------- -CREATE TABLE ng2_occupants ( +CREATE TABLE ng3_occupants ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -307,9 +307,9 @@ CREATE TABLE ng2_occupants ( ); -- -------------------------------------------------------------------- --- ng2_opening - extends (building) opening table +-- ng3_opening - extends (building) opening table -- -------------------------------------------------------------------- -CREATE TABLE ng2_opening ( +CREATE TABLE ng3_opening ( id BIGINT PRIMARY KEY, area NUMERIC, area_uom VARCHAR, @@ -324,10 +324,10 @@ CREATE TABLE ng2_opening ( ); -- -------------------------------------------------------------------- --- ng2_optical_property +-- ng3_optical_property -- -------------------------------------------------------------------- -CREATE TABLE ng2_optical_property ( - id BIGINT PRIMARY KEY DEFAULT nextval('ng2_optical_property_seq'::regclass), +CREATE TABLE ng3_optical_property ( + id BIGINT PRIMARY KEY DEFAULT nextval('ng3_optical_property_seq'::regclass), objectclass_id INTEGER, fraction NUMERIC, fraction_uom VARCHAR, @@ -338,10 +338,10 @@ CREATE TABLE ng2_optical_property ( ); -- -------------------------------------------------------------------- --- ng2_qualified_attribute +-- ng3_qualified_attribute -- -------------------------------------------------------------------- -CREATE TABLE ng2_qualified_attribute ( - id BIGINT PRIMARY KEY DEFAULT nextval('ng2_qualified_attribute_seq'::regclass), +CREATE TABLE ng3_qualified_attribute ( + id BIGINT PRIMARY KEY DEFAULT nextval('ng3_qualified_attribute_seq'::regclass), objectclass_id INTEGER, type VARCHAR, type_codespace VARCHAR, @@ -355,9 +355,9 @@ CREATE TABLE ng2_qualified_attribute ( ); -- -------------------------------------------------------------------- --- ng2_refurbishment_measure +-- ng3_refurbishment_measure -- -------------------------------------------------------------------- -CREATE TABLE ng2_refurbishment_measure ( +CREATE TABLE ng3_refurbishment_measure ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -371,9 +371,9 @@ CREATE TABLE ng2_refurbishment_measure ( ); -- -------------------------------------------------------------------- --- ng2_resource +-- ng3_resource -- -------------------------------------------------------------------- -CREATE TABLE ng2_resource ( +CREATE TABLE ng3_resource ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, type VARCHAR, @@ -414,9 +414,9 @@ CREATE TABLE ng2_resource ( ); -- -------------------------------------------------------------------- --- ng2_schedule +-- ng3_schedule -- -------------------------------------------------------------------- -CREATE TABLE ng2_schedule ( +CREATE TABLE ng3_schedule ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, library_code VARCHAR, @@ -447,9 +447,9 @@ CREATE TABLE ng2_schedule ( ); -- -------------------------------------------------------------------- --- ng2_schedule_component +-- ng3_schedule_component -- -------------------------------------------------------------------- -CREATE TABLE ng2_schedule_component ( +CREATE TABLE ng3_schedule_component ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -464,9 +464,9 @@ CREATE TABLE ng2_schedule_component ( ); -- -------------------------------------------------------------------- --- ng2_solar_collector +-- ng3_solar_collector -- -------------------------------------------------------------------- -CREATE TABLE ng2_solar_collector ( +CREATE TABLE ng3_solar_collector ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, type VARCHAR, @@ -491,9 +491,9 @@ CREATE TABLE ng2_solar_collector ( ); -- -------------------------------------------------------------------- --- ng2_storage_device +-- ng3_storage_device -- -------------------------------------------------------------------- -CREATE TABLE ng2_storage_device ( +CREATE TABLE ng3_storage_device ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, medium VARCHAR, @@ -511,10 +511,10 @@ CREATE TABLE ng2_storage_device ( ); -- -------------------------------------------------------------------- --- ng2_suitability +-- ng3_suitability -- -------------------------------------------------------------------- -CREATE TABLE ng2_suitability ( - id BIGINT PRIMARY KEY DEFAULT nextval('ng2_suitability_seq'::regclass), +CREATE TABLE ng3_suitability ( + id BIGINT PRIMARY KEY DEFAULT nextval('ng3_suitability_seq'::regclass), reason VARCHAR, reason_codespace VARCHAR, value NUMERIC, @@ -526,18 +526,18 @@ CREATE TABLE ng2_suitability ( ); -- -------------------------------------------------------------------- --- ng2_them_surf_to_thermal_zone +-- ng3_them_surf_to_thermal_zone -- -------------------------------------------------------------------- -CREATE TABLE ng2_them_surf_to_thermal_zone ( +CREATE TABLE ng3_them_surf_to_thermal_zone ( thematic_surface_id BIGINT NOT NULL, thermal_zone_id BIGINT NOT NULL, PRIMARY KEY (thematic_surface_id, thermal_zone_id) ); -- -------------------------------------------------------------------- --- ng2_thematic_surface - extends (building) thematic_surface table +-- ng3_thematic_surface - extends (building) thematic_surface table -- -------------------------------------------------------------------- -CREATE TABLE ng2_thematic_surface ( +CREATE TABLE ng3_thematic_surface ( id BIGINT PRIMARY KEY, total_surf_area NUMERIC, total_surf_area_uom VARCHAR, @@ -561,9 +561,9 @@ CREATE TABLE ng2_thematic_surface ( ); -- -------------------------------------------------------------------- --- ng2_time_series +-- ng3_time_series -- -------------------------------------------------------------------- -CREATE TABLE ng2_time_series ( +CREATE TABLE ng3_time_series ( id BIGINT PRIMARY KEY, objectclass_id INTEGER, -- AbstractTieSeries attributes @@ -611,9 +611,9 @@ CREATE TABLE ng2_time_series ( ); -- -------------------------------------------------------------------- --- ng2_urban_function_area +-- ng3_urban_function_area -- -------------------------------------------------------------------- -CREATE TABLE ng2_urban_function_area ( +CREATE TABLE ng3_urban_function_area ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -622,9 +622,9 @@ CREATE TABLE ng2_urban_function_area ( ); -- -------------------------------------------------------------------- --- ng2_utl_ntw_connection +-- ng3_utl_ntw_connection -- -------------------------------------------------------------------- -CREATE TABLE ng2_utl_ntw_connection ( +CREATE TABLE ng3_utl_ntw_connection ( id BIGINT PRIMARY KEY, network_type VARCHAR, network_type_codespace VARCHAR, @@ -640,9 +640,9 @@ CREATE TABLE ng2_utl_ntw_connection ( ); -- -------------------------------------------------------------------- --- ng2_weather_data +-- ng3_weather_data -- -------------------------------------------------------------------- -CREATE TABLE ng2_weather_data ( +CREATE TABLE ng3_weather_data ( id BIGINT PRIMARY KEY, type VARCHAR, type_codespace VARCHAR, @@ -664,201 +664,201 @@ CREATE TABLE ng2_weather_data ( -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- -------------------------------------------------------------------- --- ng2_address_to_building_unit +-- ng3_address_to_building_unit -- -------------------------------------------------------------------- -ALTER TABLE ng2_address_to_building_unit ADD CONSTRAINT ng2_addr_to_bdgu_fk1 FOREIGN KEY (address_id) REFERENCES address (id) ON DELETE CASCADE; -ALTER TABLE ng2_address_to_building_unit ADD CONSTRAINT ng2_addr_to_bdgu_fk2 FOREIGN KEY (building_unit_id) REFERENCES ng2_building_partition (id) ON DELETE CASCADE; +ALTER TABLE ng3_address_to_building_unit ADD CONSTRAINT ng3_addr_to_bdgu_fk1 FOREIGN KEY (address_id) REFERENCES address (id) ON DELETE CASCADE; +ALTER TABLE ng3_address_to_building_unit ADD CONSTRAINT ng3_addr_to_bdgu_fk2 FOREIGN KEY (building_unit_id) REFERENCES ng3_building_partition (id) ON DELETE CASCADE; -- -------------------------------------------------------------------- --- ng2_building +-- ng3_building -- -------------------------------------------------------------------- -ALTER TABLE ng2_building ADD CONSTRAINT ng2_bdg_fk FOREIGN KEY (id) REFERENCES building (id); +ALTER TABLE ng3_building ADD CONSTRAINT ng3_bdg_fk FOREIGN KEY (id) REFERENCES building (id); -- -------------------------------------------------------------------- --- ng2_building_partition +-- ng3_building_partition -- -------------------------------------------------------------------- -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_lod1_fk FOREIGN KEY (lod1_solid_id) REFERENCES surface_geometry (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_lod2_fk FOREIGN KEY (lod2_solid_id) REFERENCES surface_geometry (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_lod3_fk FOREIGN KEY (lod3_solid_id) REFERENCES surface_geometry (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_uz_fk FOREIGN KEY (usage_zone_id) REFERENCES ng2_building_partition (id) ON DELETE SET NULL; -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_tz_fk FOREIGN KEY (thermal_zone_id) REFERENCES ng2_building_partition (id) ON DELETE SET NULL; -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_bdg_fk FOREIGN KEY (building_id) REFERENCES ng2_building (id); -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_sched_fk1 FOREIGN KEY (cooling_schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_sched_fk2 FOREIGN KEY (heating_schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; -ALTER TABLE ng2_building_partition ADD CONSTRAINT ng2_bdgp_sched_fk3 FOREIGN KEY (ventilation_schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_lod1_fk FOREIGN KEY (lod1_solid_id) REFERENCES surface_geometry (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_lod2_fk FOREIGN KEY (lod2_solid_id) REFERENCES surface_geometry (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_lod3_fk FOREIGN KEY (lod3_solid_id) REFERENCES surface_geometry (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_uz_fk FOREIGN KEY (usage_zone_id) REFERENCES ng3_building_partition (id) ON DELETE SET NULL; +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_tz_fk FOREIGN KEY (thermal_zone_id) REFERENCES ng3_building_partition (id) ON DELETE SET NULL; +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_bdg_fk FOREIGN KEY (building_id) REFERENCES ng3_building (id); +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_sched_fk1 FOREIGN KEY (cooling_schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_sched_fk2 FOREIGN KEY (heating_schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_building_partition ADD CONSTRAINT ng3_bdgp_sched_fk3 FOREIGN KEY (ventilation_schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_cityobject +-- ng3_cityobject -- -------------------------------------------------------------------- -ALTER TABLE ng2_cityobject ADD CONSTRAINT ng2_cto_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_cityobject ADD CONSTRAINT ng2_cto_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng2_layered_construction (id) ON DELETE SET NULL; +ALTER TABLE ng3_cityobject ADD CONSTRAINT ng3_cto_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_cityobject ADD CONSTRAINT ng3_cto_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng3_layered_construction (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_ctyobj_relation +-- ng3_ctyobj_relation -- -------------------------------------------------------------------- -ALTER TABLE ng2_ctyobj_relation ADD CONSTRAINT ng2_cto_rel_fk2 FOREIGN KEY (cityobject_id) REFERENCES cityobject (id) ON DELETE SET NULL; -ALTER TABLE ng2_ctyobj_relation ADD CONSTRAINT ng2_cto_rel_fk1 FOREIGN KEY (ng2_cityobject_id) REFERENCES ng2_cityobject (id); +ALTER TABLE ng3_ctyobj_relation ADD CONSTRAINT ng3_cto_rel_fk2 FOREIGN KEY (cityobject_id) REFERENCES cityobject (id) ON DELETE SET NULL; +ALTER TABLE ng3_ctyobj_relation ADD CONSTRAINT ng3_cto_rel_fk1 FOREIGN KEY (ng3_cityobject_id) REFERENCES ng3_cityobject (id); -- -------------------------------------------------------------------- --- ng2_device +-- ng3_device -- -------------------------------------------------------------------- -ALTER TABLE ng2_device ADD CONSTRAINT ng2_dev_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_device ADD CONSTRAINT ng2_dev_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_device ADD CONSTRAINT ng2_dev_opt_fk FOREIGN KEY (transmittance_id) REFERENCES ng2_optical_property (id) ON DELETE SET NULL; -ALTER TABLE ng2_device ADD CONSTRAINT ng2_dev_ng2_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng2_cityobject (id) ON DELETE SET NULL; +ALTER TABLE ng3_device ADD CONSTRAINT ng3_dev_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_device ADD CONSTRAINT ng3_dev_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_device ADD CONSTRAINT ng3_dev_opt_fk FOREIGN KEY (transmittance_id) REFERENCES ng3_optical_property (id) ON DELETE SET NULL; +ALTER TABLE ng3_device ADD CONSTRAINT ng3_dev_ng3_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng3_cityobject (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_device_operation +-- ng3_device_operation -- -------------------------------------------------------------------- -ALTER TABLE ng2_device_operation ADD CONSTRAINT ng2_dev_opr_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_device_operation ADD CONSTRAINT ng2_dev_opr_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; -ALTER TABLE ng2_device_operation ADD CONSTRAINT ng2_dev_opr_dev_fk FOREIGN KEY (device_id) REFERENCES ng2_device (id) ON DELETE SET NULL; +ALTER TABLE ng3_device_operation ADD CONSTRAINT ng3_dev_opr_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_device_operation ADD CONSTRAINT ng3_dev_opr_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_device_operation ADD CONSTRAINT ng3_dev_opr_dev_fk FOREIGN KEY (device_id) REFERENCES ng3_device (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_energy_perf_cert +-- ng3_energy_perf_cert -- -------------------------------------------------------------------- -ALTER TABLE ng2_energy_perf_cert ADD CONSTRAINT ng2_epc_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_energy_perf_cert ADD CONSTRAINT ng2_epc_bdg_fk FOREIGN KEY (building_id) REFERENCES ng2_building (id) ON DELETE SET NULL; -ALTER TABLE ng2_energy_perf_cert ADD CONSTRAINT ng2_epc_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng2_building_partition (id) ON DELETE SET NULL; +ALTER TABLE ng3_energy_perf_cert ADD CONSTRAINT ng3_epc_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_energy_perf_cert ADD CONSTRAINT ng3_epc_bdg_fk FOREIGN KEY (building_id) REFERENCES ng3_building (id) ON DELETE SET NULL; +ALTER TABLE ng3_energy_perf_cert ADD CONSTRAINT ng3_epc_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng3_building_partition (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_layer +-- ng3_layer -- -------------------------------------------------------------------- -ALTER TABLE ng2_layer ADD CONSTRAINT ng2_lyr_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_layer ADD CONSTRAINT ng2_lyr_mat_fk FOREIGN KEY (material_id) REFERENCES ng2_material (id) ON DELETE SET NULL; -ALTER TABLE ng2_layer ADD CONSTRAINT ng2_lyr_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng2_layered_construction (id) ON DELETE SET NULL; +ALTER TABLE ng3_layer ADD CONSTRAINT ng3_lyr_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_layer ADD CONSTRAINT ng3_lyr_mat_fk FOREIGN KEY (material_id) REFERENCES ng3_material (id) ON DELETE SET NULL; +ALTER TABLE ng3_layer ADD CONSTRAINT ng3_lyr_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng3_layered_construction (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_layered_construction +-- ng3_layered_construction -- -------------------------------------------------------------------- -ALTER TABLE ng2_layered_construction ADD CONSTRAINT ng2_lcns_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_layered_construction ADD CONSTRAINT ng2_lcns_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_layered_construction ADD CONSTRAINT ng2_lcns_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng2_layered_construction (id) ON DELETE SET NULL; -ALTER TABLE ng2_layered_construction ADD CONSTRAINT ng2_lcns_lib_fk FOREIGN KEY (library_id) REFERENCES ng2_library (id) ON DELETE SET NULL; +ALTER TABLE ng3_layered_construction ADD CONSTRAINT ng3_lcns_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_layered_construction ADD CONSTRAINT ng3_lcns_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_layered_construction ADD CONSTRAINT ng3_lcns_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng3_layered_construction (id) ON DELETE SET NULL; +ALTER TABLE ng3_layered_construction ADD CONSTRAINT ng3_lcns_lib_fk FOREIGN KEY (library_id) REFERENCES ng3_library (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_library +-- ng3_library -- -------------------------------------------------------------------- -ALTER TABLE ng2_library ADD CONSTRAINT ng2_lib_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_library ADD CONSTRAINT ng2_lib_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_library ADD CONSTRAINT ng3_lib_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_library ADD CONSTRAINT ng3_lib_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -- -------------------------------------------------------------------- --- ng2_material +-- ng3_material -- -------------------------------------------------------------------- -ALTER TABLE ng2_material ADD CONSTRAINT ng2_mat_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_material ADD CONSTRAINT ng2_mat_lib_fk FOREIGN KEY (library_id) REFERENCES ng2_library (id) ON DELETE SET NULL; +ALTER TABLE ng3_material ADD CONSTRAINT ng3_mat_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_material ADD CONSTRAINT ng3_mat_lib_fk FOREIGN KEY (library_id) REFERENCES ng3_library (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_occupants +-- ng3_occupants -- -------------------------------------------------------------------- -ALTER TABLE ng2_occupants ADD CONSTRAINT ng2_occ_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_occupants ADD CONSTRAINT ng2_occ_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; -ALTER TABLE ng2_occupants ADD CONSTRAINT ng2_occ_ng2_bdgp_fk FOREIGN KEY (building_partition_id) REFERENCES ng2_building_partition (id) ON DELETE SET NULL; +ALTER TABLE ng3_occupants ADD CONSTRAINT ng3_occ_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_occupants ADD CONSTRAINT ng3_occ_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_occupants ADD CONSTRAINT ng3_occ_ng3_bdgp_fk FOREIGN KEY (building_partition_id) REFERENCES ng3_building_partition (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_opening +-- ng3_opening -- -------------------------------------------------------------------- -ALTER TABLE ng2_opening ADD CONSTRAINT ng2_opn_fk FOREIGN KEY (id) REFERENCES opening (id); +ALTER TABLE ng3_opening ADD CONSTRAINT ng3_opn_fk FOREIGN KEY (id) REFERENCES opening (id); -- -------------------------------------------------------------------- --- ng2_optical_property +-- ng3_optical_property -- -------------------------------------------------------------------- -ALTER TABLE ng2_optical_property ADD CONSTRAINT ng2_optpty_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_optical_property ADD CONSTRAINT ng2_optpty_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng2_layered_construction (id); +ALTER TABLE ng3_optical_property ADD CONSTRAINT ng3_optpty_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_optical_property ADD CONSTRAINT ng3_optpty_lcns_fk FOREIGN KEY (layered_construction_id) REFERENCES ng3_layered_construction (id); -- -------------------------------------------------------------------- --- ng2_qualified_attribute +-- ng3_qualified_attribute -- -------------------------------------------------------------------- -ALTER TABLE ng2_qualified_attribute ADD CONSTRAINT ng2_qatt_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_qualified_attribute ADD CONSTRAINT ng2_qatt_bdg_fk FOREIGN KEY (building_id) REFERENCES ng2_building (id); -ALTER TABLE ng2_qualified_attribute ADD CONSTRAINT ng2_qatt_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng2_building_partition (id); +ALTER TABLE ng3_qualified_attribute ADD CONSTRAINT ng3_qatt_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_qualified_attribute ADD CONSTRAINT ng3_qatt_bdg_fk FOREIGN KEY (building_id) REFERENCES ng3_building (id); +ALTER TABLE ng3_qualified_attribute ADD CONSTRAINT ng3_qatt_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng3_building_partition (id); -- -------------------------------------------------------------------- --- ng2_refurbishment_measure +-- ng3_refurbishment_measure -- -------------------------------------------------------------------- -ALTER TABLE ng2_refurbishment_measure ADD CONSTRAINT ng2_refurb_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_refurbishment_measure ADD CONSTRAINT ng2_refurb_bdg_fk FOREIGN KEY (building_id) REFERENCES ng2_building (id) ON DELETE SET NULL; -ALTER TABLE ng2_refurbishment_measure ADD CONSTRAINT ng2_refurb_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng2_building_partition (id) ON DELETE SET NULL; +ALTER TABLE ng3_refurbishment_measure ADD CONSTRAINT ng3_refurb_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_refurbishment_measure ADD CONSTRAINT ng3_refurb_bdg_fk FOREIGN KEY (building_id) REFERENCES ng3_building (id) ON DELETE SET NULL; +ALTER TABLE ng3_refurbishment_measure ADD CONSTRAINT ng3_refurb_bdg_part_fk FOREIGN KEY (building_partition_id) REFERENCES ng3_building_partition (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_resource +-- ng3_resource -- -------------------------------------------------------------------- -ALTER TABLE ng2_resource ADD CONSTRAINT ng2_res_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_resource ADD CONSTRAINT ng2_res_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_resource ADD CONSTRAINT ng2_res_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng2_time_series (id) ON DELETE SET NULL; -ALTER TABLE ng2_resource ADD CONSTRAINT ng2_res_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng2_cityobject (id) ON DELETE SET NULL; +ALTER TABLE ng3_resource ADD CONSTRAINT ng3_res_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_resource ADD CONSTRAINT ng3_res_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_resource ADD CONSTRAINT ng3_res_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng3_time_series (id) ON DELETE SET NULL; +ALTER TABLE ng3_resource ADD CONSTRAINT ng3_res_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng3_cityobject (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_schedule +-- ng3_schedule -- -------------------------------------------------------------------- -ALTER TABLE ng2_schedule ADD CONSTRAINT ng2_sched_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_schedule ADD CONSTRAINT ng2_sched_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_schedule ADD CONSTRAINT ng2_sched_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng2_time_series (id) ON DELETE SET NULL; -ALTER TABLE ng2_schedule ADD CONSTRAINT ng2_sched_lib_fk FOREIGN KEY (library_id) REFERENCES ng2_library (id) ON DELETE SET NULL; +ALTER TABLE ng3_schedule ADD CONSTRAINT ng3_sched_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_schedule ADD CONSTRAINT ng3_sched_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_schedule ADD CONSTRAINT ng3_sched_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng3_time_series (id) ON DELETE SET NULL; +ALTER TABLE ng3_schedule ADD CONSTRAINT ng3_sched_lib_fk FOREIGN KEY (library_id) REFERENCES ng3_library (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_schedule_component +-- ng3_schedule_component -- -------------------------------------------------------------------- -ALTER TABLE ng2_schedule_component ADD CONSTRAINT ng2_sched_comp_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_schedule_component ADD CONSTRAINT ng2_sched_comp_sched_fk1 FOREIGN KEY (parent_schedule_id) REFERENCES ng2_schedule (id); -ALTER TABLE ng2_schedule_component ADD CONSTRAINT ng2_sched_comp_sched_fk2 FOREIGN KEY (schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_schedule_component ADD CONSTRAINT ng3_sched_comp_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_schedule_component ADD CONSTRAINT ng3_sched_comp_sched_fk1 FOREIGN KEY (parent_schedule_id) REFERENCES ng3_schedule (id); +ALTER TABLE ng3_schedule_component ADD CONSTRAINT ng3_sched_comp_sched_fk2 FOREIGN KEY (schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_solar_collector +-- ng3_solar_collector -- -------------------------------------------------------------------- -ALTER TABLE ng2_solar_collector ADD CONSTRAINT ng2_sol_coll_fk FOREIGN KEY (id) REFERENCES ng2_device (id); -ALTER TABLE ng2_solar_collector ADD CONSTRAINT ng2_sol_coll_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -ALTER TABLE ng2_solar_collector ADD CONSTRAINT ng2_sol_coll_lod2_fk FOREIGN KEY (lod2_multi_surface_id) REFERENCES surface_geometry (id); -ALTER TABLE ng2_solar_collector ADD CONSTRAINT ng2_sol_coll_lod3_fk FOREIGN KEY (lod3_multi_surface_id) REFERENCES surface_geometry (id); +ALTER TABLE ng3_solar_collector ADD CONSTRAINT ng3_sol_coll_fk FOREIGN KEY (id) REFERENCES ng3_device (id); +ALTER TABLE ng3_solar_collector ADD CONSTRAINT ng3_sol_coll_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_solar_collector ADD CONSTRAINT ng3_sol_coll_lod2_fk FOREIGN KEY (lod2_multi_surface_id) REFERENCES surface_geometry (id); +ALTER TABLE ng3_solar_collector ADD CONSTRAINT ng3_sol_coll_lod3_fk FOREIGN KEY (lod3_multi_surface_id) REFERENCES surface_geometry (id); -- -------------------------------------------------------------------- --- ng2_storage_device +-- ng3_storage_device -- -------------------------------------------------------------------- -ALTER TABLE ng2_storage_device ADD CONSTRAINT ng2_sto_dev_fk FOREIGN KEY (id) REFERENCES ng2_device (id); -ALTER TABLE ng2_storage_device ADD CONSTRAINT ng2_sto_dev_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_storage_device ADD CONSTRAINT ng3_sto_dev_fk FOREIGN KEY (id) REFERENCES ng3_device (id); +ALTER TABLE ng3_storage_device ADD CONSTRAINT ng3_sto_dev_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -- -------------------------------------------------------------------- --- ng2_suitability +-- ng3_suitability -- -------------------------------------------------------------------- -ALTER TABLE ng2_suitability ADD CONSTRAINT ng2_suit_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng2_cityobject (id); -ALTER TABLE ng2_suitability ADD CONSTRAINT ng2_suit_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng2_schedule (id) ON DELETE SET NULL; +ALTER TABLE ng3_suitability ADD CONSTRAINT ng3_suit_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng3_cityobject (id); +ALTER TABLE ng3_suitability ADD CONSTRAINT ng3_suit_sched_fk FOREIGN KEY (schedule_id) REFERENCES ng3_schedule (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_them_surf_to_thermal_zone +-- ng3_them_surf_to_thermal_zone -- -------------------------------------------------------------------- -ALTER TABLE ng2_them_surf_to_thermal_zone ADD CONSTRAINT ng2_thm_surf_to_tz_fk2 FOREIGN KEY (thermal_zone_id) REFERENCES ng2_building_partition (id); -ALTER TABLE ng2_them_surf_to_thermal_zone ADD CONSTRAINT ng2_thm_surf_to_tz_fk1 FOREIGN KEY (thematic_surface_id) REFERENCES thematic_surface (id) ON DELETE CASCADE; +ALTER TABLE ng3_them_surf_to_thermal_zone ADD CONSTRAINT ng3_thm_surf_to_tz_fk2 FOREIGN KEY (thermal_zone_id) REFERENCES ng3_building_partition (id); +ALTER TABLE ng3_them_surf_to_thermal_zone ADD CONSTRAINT ng3_thm_surf_to_tz_fk1 FOREIGN KEY (thematic_surface_id) REFERENCES thematic_surface (id) ON DELETE CASCADE; -- -------------------------------------------------------------------- --- ng2_thematic_surface +-- ng3_thematic_surface -- -------------------------------------------------------------------- -ALTER TABLE ng2_thematic_surface ADD CONSTRAINT ng2_them_surf_fk FOREIGN KEY (id) REFERENCES thematic_surface (id); +ALTER TABLE ng3_thematic_surface ADD CONSTRAINT ng3_them_surf_fk FOREIGN KEY (id) REFERENCES thematic_surface (id); -- -------------------------------------------------------------------- --- ng2_time_series +-- ng3_time_series -- -------------------------------------------------------------------- -ALTER TABLE ng2_time_series ADD CONSTRAINT ng2_ts_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_time_series ADD CONSTRAINT ng2_ts_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); +ALTER TABLE ng3_time_series ADD CONSTRAINT ng3_ts_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_time_series ADD CONSTRAINT ng3_ts_oc_fk FOREIGN KEY (objectclass_id) REFERENCES objectclass (id); -- -------------------------------------------------------------------- --- ng2_urban_function_area +-- ng3_urban_function_area -- -------------------------------------------------------------------- -ALTER TABLE ng2_urban_function_area ADD CONSTRAINT ng2_ufa_fk FOREIGN KEY (id) REFERENCES cityobjectgroup (id); +ALTER TABLE ng3_urban_function_area ADD CONSTRAINT ng3_ufa_fk FOREIGN KEY (id) REFERENCES cityobjectgroup (id); -- -------------------------------------------------------------------- --- ng2_utl_ntw_connection +-- ng3_utl_ntw_connection -- -------------------------------------------------------------------- -ALTER TABLE ng2_utl_ntw_connection ADD CONSTRAINT ng2_utl_ntw_con_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_utl_ntw_connection ADD CONSTRAINT ng2_utl_ntw_con_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng2_cityobject (id) ON DELETE SET NULL; +ALTER TABLE ng3_utl_ntw_connection ADD CONSTRAINT ng3_utl_ntw_con_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_utl_ntw_connection ADD CONSTRAINT ng3_utl_ntw_con_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng3_cityobject (id) ON DELETE SET NULL; -- -------------------------------------------------------------------- --- ng2_weather_data +-- ng3_weather_data -- -------------------------------------------------------------------- -ALTER TABLE ng2_weather_data ADD CONSTRAINT ng2_wth_data_fk FOREIGN KEY (id) REFERENCES cityobject (id); -ALTER TABLE ng2_weather_data ADD CONSTRAINT ng2_wth_data_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng2_time_series (id) ON DELETE SET NULL; -ALTER TABLE ng2_weather_data ADD CONSTRAINT ng2_wth_data_ng2_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng2_cityobject (id) ON DELETE SET NULL; +ALTER TABLE ng3_weather_data ADD CONSTRAINT ng3_wth_data_fk FOREIGN KEY (id) REFERENCES cityobject (id); +ALTER TABLE ng3_weather_data ADD CONSTRAINT ng3_wth_data_ts_fk FOREIGN KEY (time_series_id) REFERENCES ng3_time_series (id) ON DELETE SET NULL; +ALTER TABLE ng3_weather_data ADD CONSTRAINT ng3_wth_data_ng3_cto_fk FOREIGN KEY (cityobject_id) REFERENCES ng3_cityobject (id) ON DELETE SET NULL; -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -866,183 +866,183 @@ ALTER TABLE ng2_weather_data ADD CONSTRAINT ng2_wth_data_ng2_cto_fk FOREIGN KEY -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- -------------------------------------------------------------------- --- ng2_address_to_building_unit +-- ng3_address_to_building_unit -- -------------------------------------------------------------------- -CREATE INDEX ng2_address_to_bdgu_fk1x ON ng2_address_to_building_unit USING btree (address_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_address_to_bdgu_fk2x ON ng2_address_to_building_unit USING btree (building_unit_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_address_to_bdgu_fk1x ON ng3_address_to_building_unit USING btree (address_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_address_to_bdgu_fk2x ON ng3_address_to_building_unit USING btree (building_unit_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_building +-- ng3_building -- -------------------------------------------------------------------- -- no indices needed -- -------------------------------------------------------------------- --- ng2_building_partition +-- ng3_building_partition -- -------------------------------------------------------------------- -CREATE INDEX ng2_bdgp_oc_fkx ON ng2_building_partition USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_sched_fk1x ON ng2_building_partition USING btree (cooling_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_sched_fk2x ON ng2_building_partition USING btree (heating_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_sched_fk3x ON ng2_building_partition USING btree (ventilation_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_uz_fkx ON ng2_building_partition USING btree (usage_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_tz_fkx ON ng2_building_partition USING btree (thermal_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_bdg_fkx ON ng2_building_partition USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_solid1_fkx ON ng2_building_partition USING btree (lod1_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_solid2_fkx ON ng2_building_partition USING btree (lod2_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_bdgp_solid3_fkx ON ng2_building_partition USING btree (lod3_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_oc_fkx ON ng3_building_partition USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_sched_fk1x ON ng3_building_partition USING btree (cooling_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_sched_fk2x ON ng3_building_partition USING btree (heating_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_sched_fk3x ON ng3_building_partition USING btree (ventilation_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_uz_fkx ON ng3_building_partition USING btree (usage_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_tz_fkx ON ng3_building_partition USING btree (thermal_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_bdg_fkx ON ng3_building_partition USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_solid1_fkx ON ng3_building_partition USING btree (lod1_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_solid2_fkx ON ng3_building_partition USING btree (lod2_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_bdgp_solid3_fkx ON ng3_building_partition USING btree (lod3_solid_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_cityobject +-- ng3_cityobject -- -------------------------------------------------------------------- -CREATE INDEX ng2_cto_ref_point_spx ON ng2_cityobject USING gist (ref_point); -CREATE INDEX ng2_cto_lcns_fkx ON ng2_cityobject USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_cto_ref_point_spx ON ng3_cityobject USING gist (ref_point); +CREATE INDEX ng3_cto_lcns_fkx ON ng3_cityobject USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_ctyobj_relation +-- ng3_ctyobj_relation -- -------------------------------------------------------------------- -CREATE INDEX ng2_cto_rel_fk1x ON ng2_ctyobj_relation USING btree (ng2_cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_cto_rel_fk2x ON ng2_ctyobj_relation USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_cto_rel_fk1x ON ng3_ctyobj_relation USING btree (ng3_cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_cto_rel_fk2x ON ng3_ctyobj_relation USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_device +-- ng3_device -- -------------------------------------------------------------------- -CREATE INDEX ng2_dev_oc_fkx ON ng2_device USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_dev_opt_fkx ON ng2_device USING btree (transmittance_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_dev_cto_fkx ON ng2_device USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_dev_oc_fkx ON ng3_device USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_dev_opt_fkx ON ng3_device USING btree (transmittance_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_dev_cto_fkx ON ng3_device USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_device_operation +-- ng3_device_operation -- -------------------------------------------------------------------- -CREATE INDEX ng2_dev_opr_sched_fkx ON ng2_device_operation USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_dev_opr_dev_fkx ON ng2_device_operation USING btree (device_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_dev_opr_sched_fkx ON ng3_device_operation USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_dev_opr_dev_fkx ON ng3_device_operation USING btree (device_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_energy_perf_cert +-- ng3_energy_perf_cert -- -------------------------------------------------------------------- -CREATE INDEX ng2_epc_bdg_fkx ON ng2_energy_perf_cert USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_epc_bdg_part_fkx ON ng2_energy_perf_cert USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_epc_bdg_fkx ON ng3_energy_perf_cert USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_epc_bdg_part_fkx ON ng3_energy_perf_cert USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_layer +-- ng3_layer -- -------------------------------------------------------------------- -CREATE INDEX ng2_lyr_mat_fkx ON ng2_layer USING btree (material_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_lyr_lcns_fkx ON ng2_layer USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lyr_mat_fkx ON ng3_layer USING btree (material_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lyr_lcns_fkx ON ng3_layer USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_layered_constr +-- ng3_layered_constr -- -------------------------------------------------------------------- -CREATE INDEX ng2_lcns_oc_fkx ON ng2_layered_construction USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_lcns_lcns_fkx ON ng2_layered_construction USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_lcns_lib_fkx ON ng2_layered_construction USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lcns_oc_fkx ON ng3_layered_construction USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lcns_lcns_fkx ON ng3_layered_construction USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lcns_lib_fkx ON ng3_layered_construction USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_library +-- ng3_library -- -------------------------------------------------------------------- -CREATE INDEX ng2_lib_oc_fkx ON ng2_library USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_lib_oc_fkx ON ng3_library USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_material +-- ng3_material -- -------------------------------------------------------------------- -CREATE INDEX ng2_mat_oc_fkx ON ng2_material USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_mat_lib_fkx ON ng2_material USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_mat_oc_fkx ON ng3_material USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_mat_lib_fkx ON ng3_material USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_occupants +-- ng3_occupants -- -------------------------------------------------------------------- -CREATE INDEX ng2_occ_sched_fkx ON ng2_occupants USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_occ_ng2_bdgp_fkx ON ng2_occupants USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_occ_sched_fkx ON ng3_occupants USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_occ_ng3_bdgp_fkx ON ng3_occupants USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_opening +-- ng3_opening -- -------------------------------------------------------------------- -- no indices needed -- -------------------------------------------------------------------- --- ng2_optical_property +-- ng3_optical_property -- -------------------------------------------------------------------- -CREATE INDEX ng2_optpty_oc_fkx ON ng2_optical_property USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_optpty_lcns_fkx ON ng2_optical_property USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_optpty_oc_fkx ON ng3_optical_property USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_optpty_lcns_fkx ON ng3_optical_property USING btree (layered_construction_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_qualified_attribute +-- ng3_qualified_attribute -- -------------------------------------------------------------------- -CREATE INDEX ng2_qual_attr_oc_fkx ON ng2_qualified_attribute USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_qual_attr_bdg_fkx ON ng2_qualified_attribute USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_qual_attr_bdg_part_fkx ON ng2_qualified_attribute USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_qual_attr_type_idx ON ng2_qualified_attribute USING btree (type ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_qual_attr_oc_fkx ON ng3_qualified_attribute USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_qual_attr_bdg_fkx ON ng3_qualified_attribute USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_qual_attr_bdg_part_fkx ON ng3_qualified_attribute USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_qual_attr_type_idx ON ng3_qualified_attribute USING btree (type ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_refurbishment_measure +-- ng3_refurbishment_measure -- -------------------------------------------------------------------- -CREATE INDEX ng2_ref_meas_bdg_fkx ON ng2_refurbishment_measure USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_ref_meas_bdg_part_fkx ON ng2_refurbishment_measure USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_ref_meas_bdg_fkx ON ng3_refurbishment_measure USING btree (building_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_ref_meas_bdg_part_fkx ON ng3_refurbishment_measure USING btree (building_partition_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_resource +-- ng3_resource -- -------------------------------------------------------------------- -CREATE INDEX ng2_res_oc_fkx ON ng2_resource USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_res_ts_fkx ON ng2_resource USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_res_cto_fkx ON ng2_resource USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_res_oc_fkx ON ng3_resource USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_res_ts_fkx ON ng3_resource USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_res_cto_fkx ON ng3_resource USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_schedule +-- ng3_schedule -- -------------------------------------------------------------------- -CREATE INDEX ng2_sched_oc_fkx ON ng2_schedule USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_sched_ts_fkx ON ng2_schedule USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_sched_lib_fkx ON ng2_schedule USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sched_oc_fkx ON ng3_schedule USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sched_ts_fkx ON ng3_schedule USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sched_lib_fkx ON ng3_schedule USING btree (library_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_schedule_component +-- ng3_schedule_component -- -------------------------------------------------------------------- -CREATE INDEX ng2_sched_comp_sched_fk1x ON ng2_schedule_component USING btree (parent_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_sched_comp_sched_fk2x ON ng2_schedule_component USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sched_comp_sched_fk1x ON ng3_schedule_component USING btree (parent_schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sched_comp_sched_fk2x ON ng3_schedule_component USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_solar_collector +-- ng3_solar_collector -- -------------------------------------------------------------------- -CREATE INDEX ng2_sol_col_oc_fkx ON ng2_solar_collector USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_sol_col_lod2_fkx ON ng2_solar_collector USING btree (lod2_multi_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_sol_col_lod3_fkx ON ng2_solar_collector USING btree (lod2_multi_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sol_col_oc_fkx ON ng3_solar_collector USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sol_col_lod2_fkx ON ng3_solar_collector USING btree (lod2_multi_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sol_col_lod3_fkx ON ng3_solar_collector USING btree (lod2_multi_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_storage_device +-- ng3_storage_device -- -------------------------------------------------------------------- -CREATE INDEX ng2_sto_dev_oc_fkx ON ng2_storage_device USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_sto_dev_oc_fkx ON ng3_storage_device USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_suitability +-- ng3_suitability -- -------------------------------------------------------------------- -CREATE INDEX ng2_suit_cto_fkx ON ng2_suitability USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_suit_sched_fkx ON ng2_suitability USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_suit_reas_fkx ON ng2_suitability USING btree (reason ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_suit_cto_fkx ON ng3_suitability USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_suit_sched_fkx ON ng3_suitability USING btree (schedule_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_suit_reas_fkx ON ng3_suitability USING btree (reason ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_them_surf_to_thermal_zone +-- ng3_them_surf_to_thermal_zone -- -------------------------------------------------------------------- -CREATE INDEX ng2_thm_surf_to_tz_fk1x ON ng2_them_surf_to_thermal_zone USING btree (thematic_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_thm_surf_to_tz_fk2x ON ng2_them_surf_to_thermal_zone USING btree (thermal_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_thm_surf_to_tz_fk1x ON ng3_them_surf_to_thermal_zone USING btree (thematic_surface_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_thm_surf_to_tz_fk2x ON ng3_them_surf_to_thermal_zone USING btree (thermal_zone_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_thematic_surface +-- ng3_thematic_surface -- -------------------------------------------------------------------- -- no indices needed -- -------------------------------------------------------------------- --- ng2_time_series +-- ng3_time_series -- -------------------------------------------------------------------- -CREATE INDEX ng2_ts_oc_fkx ON ng2_time_series USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_ts_oc_fkx ON ng3_time_series USING btree (objectclass_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_urban_function_area +-- ng3_urban_function_area -- -------------------------------------------------------------------- -- no indices needed -- -------------------------------------------------------------------- --- ng2_utl_ntw_connection +-- ng3_utl_ntw_connection -- -------------------------------------------------------------------- -CREATE INDEX ng2_utl_ntw_conn_cto_fkx ON ng2_utl_ntw_connection USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_utl_ntw_conn_cto_fkx ON ng3_utl_ntw_connection USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -- -------------------------------------------------------------------- --- ng2_weather_data +-- ng3_weather_data -- -------------------------------------------------------------------- -CREATE INDEX ng2_wht_data_ts_fkx ON ng2_weather_data USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); -CREATE INDEX ng2_wht_data_cto_fkx ON ng2_weather_data USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_wht_data_ts_fkx ON ng3_weather_data USING btree (time_series_id ASC NULLS LAST) WITH (FILLFACTOR = 90); +CREATE INDEX ng3_wht_data_cto_fkx ON ng3_weather_data USING btree (cityobject_id ASC NULLS LAST) WITH (FILLFACTOR = 90); diff --git a/resources/database/3dcitydb/postgreSQL/DROP_ADE_DB.sql b/resources/database/3dcitydb/postgreSQL/DROP_ADE_DB.sql index c499046..f02d467 100644 --- a/resources/database/3dcitydb/postgreSQL/DROP_ADE_DB.sql +++ b/resources/database/3dcitydb/postgreSQL/DROP_ADE_DB.sql @@ -1,11 +1,11 @@ -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- --- 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 diff --git a/resources/database/schema-mapping/schema-mapping.xml b/resources/database/schema-mapping/schema-mapping.xml index deaf3a8..a7aaf3f 100644 --- a/resources/database/schema-mapping/schema-mapping.xml +++ b/resources/database/schema-mapping/schema-mapping.xml @@ -3,9 +3,9 @@ **************************************************************************************** **************************************************************************************** -CityGML Energy ADE 2.0 (beta 7) +CityGML Energy ADE 3.0 (beta 7) -Last update: 2025-06-25 +Last update: 2025-10-14 This schema mapping file was first automatically generated using the ADE Manager of the 3DCityDB Importer/Exporter and successively manually edited and restructured. @@ -27,13 +27,13 @@ https://3d.bk.tudelft.nl/gagugiaro/ Energy ADE - 2.0 beta 7 (2025-06-25) + 3.0 beta 7 (2025-10-14) Database schema for the 3DCityDB 4.x - ng2 + ng3 - - http://www.citygml.org/ade/energy/2.0 + + http://www.citygml.org/ade/energy/3.0 @@ -41,84 +41,84 @@ https://3d.bk.tudelft.nl/gagugiaro/ - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - + + + - + @@ -126,18 +126,18 @@ https://3d.bk.tudelft.nl/gagugiaro/ - - + + - + - - + + - + - - + + @@ -149,163 +149,163 @@ https://3d.bk.tudelft.nl/gagugiaro/ - + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + - - - - + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - + + - - + + - - - - - - + + + + + + @@ -313,478 +313,478 @@ https://3d.bk.tudelft.nl/gagugiaro/ - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - + - - + + - - + + - - - - - + + + + + - + - - + + - - - - + + + + - + - - + + - - - + + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - - + + - + - - + + - - + + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - - - - - + + + + + + + @@ -792,9 +792,9 @@ https://3d.bk.tudelft.nl/gagugiaro/ - + - + - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - + + - - + + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - - + + + - + - - - - - + + + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - - - + + + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - + + - + - + - + - + - - + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -1250,153 +1250,153 @@ https://3d.bk.tudelft.nl/gagugiaro/ - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java index ff8b15b..4de0e8a 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/AbstractQualifiedAttributeExporter.java +++ b/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); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java index 1f17a0d..5e35a4b 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/BuildingPropertiesExporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java index e915e54..3b7875f 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/ResourceExporter.java +++ b/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; diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java index 30a684f..5e937fe 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/AbstractQualifiedAttributeImporter.java +++ b/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()); diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java index ac73c1c..a965bfb 100644 --- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/BuildingPropertiesImporter.java +++ b/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; -- GitLab