Merge pull request #19 from tudelft3d/gio-dev

Gio dev

README.md

@@ -27,7 +27,7 @@ In particular, the **Layer Loader** offers following functionalities:
 - Support for CityGML enumerations and codelists
 - All layer geometries are 3D: they can be visualised both in 2D and in 3D (Please be aware that 3D visualisation in QGIS 3D map is still a bit unstable...).
 
-Further details, and a user guide, can be found in the \user_guide subfolder of the plugin installation directory (see file "[3DCityDB-Tools_UserGuide.pdf](user_guide/3DCityDB-Tools_UserGuide_0.7.pdf)").
+Further details, and a user guide, can be found in the \user_guide subfolder of the plugin installation directory (see file "[3DCityDB-Tools_UserGuide.pdf](user_guide/3DCityDB-Tools_UserGuide_0.7.1.pdf)").
 
 Some datasets for testing purposes are available, too, and are contained in the \test_datasets subfolder.
 

README_dev.md

@@ -0,0 +1,5 @@
+# 3DCityDB-Tools for QGIS GIO_DEV branch
+
+This repository contains code of a **QGIS plugin** that facilitates management and visualization of data stored in the CityGML **3D City Database** (aka 3DCityDB), which currently supports CityGML v. 1.0 and 2.0.
+
+This a development brach which contains UNSTABLE code!

cdb4/ddl_scripts/CHANGELOG.txt

@@ -3,6 +3,11 @@
 Test whether it makes sense to add "hard-coded" bbox filter also to views.
 Test whether it makes to add an update statement to delete trigger functions to reduce number of features in table layer metadata
 
+2023-02-20
+----------
+Version 0.9.1
+Solved bug: Function qgis_pkg.cleanup_schema() now really resets sequences
+
 2023-02-10
 ----------
 Version 0.9.0

cdb4/ddl_scripts/postgresql/010_functions.sql

@@ -100,9 +100,9 @@ DECLARE
 BEGIN
 major_version  := 0;
 minor_version  := 9;
-minor_revision := 0;
-code_name      := 'Venice Carnival';
-release_date   := '2023-02-15'::date;
+minor_revision := 1;
+code_name      := 'Fritole e galani :o)';
+release_date   := '2023-02-20'::date;
 version        := concat(major_version,'.',minor_version,'.',minor_revision);
 full_version   := concat(major_version,'.',minor_version,'.',minor_revision,' "',code_name,'", released on ',release_date);
 
@@ -203,7 +203,20 @@ FOR rec IN
     AND table_name <> 'aggregation_info'
     AND table_name NOT LIKE 'tmp_%'
   LOOP
-   	EXECUTE format('TRUNCATE TABLE %I.%I RESTART IDENTITY CASCADE', cdb_schema, rec.table_name);
+   	EXECUTE format('TRUNCATE TABLE %I.%I CASCADE', cdb_schema, rec.table_name);
+	-- This would suffice, if the tables were created using the IDENTITY clause.
+	--EXECUTE format('TRUNCATE TABLE %I.%I RESTART IDENTITY CASCADE', cdb_schema, rec.table_name);
+  END LOOP;
+
+FOR rec IN 
+    SELECT sequence_name FROM information_schema.sequences where sequence_schema = cdb_schema
+    AND sequence_name <> 'ade_seq'
+    AND sequence_name <> 'schema_seq'
+  LOOP
+	-- The user must be owner of the sequence to RESTART it.
+	-- EXECUTE format('ALTER SEQUENCE %I.%I RESTART', cdb_schema, rec.sequence_name);
+	-- In this way, the user can reset it to 1 even without ownership.
+    EXECUTE format('SELECT setval(''%I.%I'', 1, false)', cdb_schema, rec.sequence_name);
   END LOOP;
 
 EXCEPTION

cdb4/gui_admin/admin_constants.py

@@ -62,8 +62,3 @@
     image_rc=':/plugins/citydb_loader/icons/critical_warning_icon.svg',
     color_hex='#DA4453', # pale red
     addtional_text='{text}')
-
-# menu_html: str = icon_msg_core.format(
-#     image_rc=':/plugins/citydb_loader/icons/plugin_icon.png',
-#     color_hex='#000000',  # black
-#     addtional_text='{text}')