add dictionary sql for extra dss2020 extension classes and rename to dss15_*

datamodel/app/swmm_views/03_vw_swmm_aquifers.sql

@@ -1,5 +1,5 @@
 --------
--- View for the swmm module class _aquifiers, in VSA-DSS 2020 not part of the datamodel anymore - therefore referenced on tww_od._aquifier
+-- // skip-keyword-check View for the swmm module class aquifer (in  qgep wrongly named aquifier), in VSA-DSS 2020 not part of the datamodel anymore - therefore referenced on tww_od.dss15_aquifer
 --------
 CREATE OR REPLACE VIEW tww_app.swmm_vw_aquifers AS
 
@@ -18,4 +18,4 @@ SELECT
 	average_groundwater_level as WaterTableElevation,
 	0.3 as UnsatZoneMoisture,
 	null as UpperEvapPattern
-FROM tww_od._aquifier as aq;
+FROM tww_od.dss15_aquifer as aq;

datamodel/app/swmm_views/06_vw_swmm_landuses.sql

@@ -7,4 +7,4 @@ CREATE OR REPLACE VIEW tww_app.swmm_vw_landuses AS
     0 as sweepingInterval,
     0 as fractionAvailable,
     0 as lastSwept
-  FROM tww_vl._planning_zone_kind;
+  FROM tww_vl.dss15_planning_zone_kind;

datamodel/app/swmm_views/14_vw_swmm_coverages.sql

@@ -8,8 +8,8 @@ SELECT
   pzk.value_en as landUse,
   round((st_area(st_intersection(sub.geom, pz.perimeter_geometry))/st_area(sub.geom))::numeric,2)*100 as percent,
   sub.obj_id
-FROM tww_app.swmm_vw_subcatchments sub, tww_od._planning_zone pz
-LEFT JOIN tww_vl._planning_zone_kind pzk on pz.kind = pzk.code
+FROM tww_app.swmm_vw_subcatchments sub, tww_od.dss15_planning_zone pz
+LEFT JOIN tww_vl.dss15_planning_zone_kind pzk on pz.kind = pzk.code
 WHERE st_intersects(sub.geom, pz.perimeter_geometry)
 AND st_isvalid(sub.geom) AND st_isvalid(pz.perimeter_geometry)
 ORDER BY sub.Name, percent DESC;

datamodel/changelogs/0001/04_vsa_kek_extension.sql

@@ -1018,7 +1018,7 @@ ALTER TABLE tww_vl.file_classname ADD CONSTRAINT pkey_tww_vl_file_classname_code
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3838,3838,'river_bed','Gewaessersohle','FOND_COURS_EAU', 'zzz_Gewaessersohle', 'rrr_Gewaessersohle', '', '', '', '', '', 'true');
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3839,3839,'water_control_structure','Gewaesserverbauung','AMENAGEMENT_COURS_EAU', 'zzz_Gewaesserverbauung', 'rrr_Gewaesserverbauung', '', '', '', '', '', 'true');
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3840,3840,'dam','GewaesserWehr','OUVRAGE_RETENUE', 'zzz_GewaesserWehr', 'rrr_GewaesserWehr', '', '', '', '', '', 'true');
- INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3841,3841,'aquifier','Grundwasserleiter','AQUIFERE', 'acquifero', 'rrr_Grundwasserleiter', '', '', '', '', '', 'true');
+ INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3841,3841,'aquifer','Grundwasserleiter','AQUIFERE', 'acquifero', 'rrr_Grundwasserleiter', '', '', '', '', '', 'true');
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3842,3842,'ground_water_protection_perimeter','Grundwasserschutzareal','PERIMETRE_PROT_EAUX_SOUT', 'zzz_Grundwasserschutzareal', 'rrr_Grundwasserschutzareal', '', '', '', '', '', 'true');
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3843,3843,'groundwater_protection_zone','Grundwasserschutzzone','ZONE_PROT_EAUX_SOUT', 'zzz_Grundwasserschutzzone', 'rrr_Grundwasserschutzzone', '', '', '', '', '', 'true');
  INSERT INTO tww_vl.file_classname (code, vsacode, value_en, value_de, value_fr, value_it, value_ro, abbr_en, abbr_de, abbr_fr, abbr_it, abbr_ro, active) VALUES (3844,3844,'reach','Haltung','TRONCON', 'tratta', 'rrr_Haltung', '', '', '', '', '', 'true');

datamodel/changelogs/0001/09_tww_dictionaries_kek.sql

@@ -789,7 +789,7 @@
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3838,'file','classname','river_bed','river_bed',NULL,'Gewaessersohle',NULL,'FOND_COURS_EAU',NULL,'zzz_Gewaessersohle',NULL,'rrr_Gewaessersohle',NULL,NULL,NULL,NULL,NULL,NULL);
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3839,'file','classname','water_control_structure','water_control_structure',NULL,'Gewaesserverbauung',NULL,'AMENAGEMENT_COURS_EAU',NULL,'zzz_Gewaesserverbauung',NULL,'rrr_Gewaesserverbauung',NULL,NULL,NULL,NULL,NULL,NULL);
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3840,'file','classname','dam','dam',NULL,'GewaesserWehr',NULL,'OUVRAGE_RETENUE',NULL,'zzz_GewaesserWehr',NULL,'rrr_GewaesserWehr',NULL,NULL,NULL,NULL,NULL,NULL);
- INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3841,'file','classname','aquifier','aquifier',NULL,'Grundwasserleiter',NULL,'AQUIFERE',NULL,'acquifero',NULL,'rrr_Grundwasserleiter',NULL,NULL,NULL,NULL,NULL,NULL);
+ INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3841,'file','classname','dss15_aquifer','aquifer',NULL,'Grundwasserleiter',NULL,'AQUIFERE',NULL,'acquifero',NULL,'rrr_Grundwasserleiter',NULL,NULL,NULL,NULL,NULL,NULL);
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3842,'file','classname','ground_water_protection_perimeter','ground_water_protection_perimeter',NULL,'Grundwasserschutzareal',NULL,'PERIMETRE_PROT_EAUX_SOUT',NULL,'zzz_Grundwasserschutzareal',NULL,'rrr_Grundwasserschutzareal',NULL,NULL,NULL,NULL,NULL,NULL);
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3843,'file','classname','groundwater_protection_zone','groundwater_protection_zone',NULL,'Grundwasserschutzzone',NULL,'ZONE_PROT_EAUX_SOUT',NULL,'zzz_Grundwasserschutzzone',NULL,'rrr_Grundwasserschutzzone',NULL,NULL,NULL,NULL,NULL,NULL);
  INSERT INTO tww_sys.dictionary_od_values (class_id, attribute_id, value_id, table_name, field_name, value_name, value_name_en, shortcut_en, value_name_de, shortcut_de, value_name_fr, shortcut_fr, value_name_it, shortcut_it, value_name_ro, shortcut_ro, value_description_en, value_description_de, value_description_fr, value_description_it, value_description_ro) VALUES (3754,3764,3844,'file','classname','reach','reach',NULL,'Haltung',NULL,'TRONCON',NULL,'tratta',NULL,'rrr_Haltung',NULL,NULL,NULL,NULL,NULL,NULL);

datamodel/changelogs/0001/51_dss15_aquifer.sql

@@ -0,0 +1,65 @@
+------ This file generates the VSA-DSS database (Modul VSA-DSS 2015) table dss15_aquifer (as it does not exist anymore in VSA-DSS 2020)  in en on QQIS
+------ For questions etc. please contact Stefan Burckhardt [email protected]
+------ version 22.02.2024 17:22:28
+BEGIN;
+------ CREATE SCHEMA tww;
+
+-------
+CREATE TABLE tww_od.dss15_aquifer
+(
+   obj_id varchar(16) NOT NULL,
+   CONSTRAINT pkey_tww_od_dss15_aquifer_obj_id PRIMARY KEY (obj_id)
+)
+WITH (
+   OIDS = False
+);
+CREATE SEQUENCE tww_od.seq_dss15_aquifer_oid INCREMENT 1 MINVALUE 0 MAXVALUE 999999 START 0;
+ ALTER TABLE tww_od.dss15_aquifer ALTER COLUMN obj_id SET DEFAULT tww_sys.generate_oid('tww_od','dss15_aquifer');
+COMMENT ON COLUMN tww_od.dss15_aquifer.obj_id IS '[primary_key] INTERLIS STANDARD OID (with Postfix/Präfix) or UUOID, see www.interlis.ch';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN average_groundwater_level  decimal(7,3) ;
+COMMENT ON COLUMN tww_od.dss15_aquifer.average_groundwater_level IS 'Average level of groundwater table / Höhe des mittleren Grundwasserspiegels / Niveau moyen de la nappe';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN identifier  varchar(20) ;
+COMMENT ON COLUMN tww_od.dss15_aquifer.identifier IS '';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN maximal_groundwater_level  decimal(7,3) ;
+COMMENT ON COLUMN tww_od.dss15_aquifer.maximal_groundwater_level IS 'Maximal level of ground water table / Maximale Lage des Grundwasserspiegels / Niveau maximal de la nappe';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN minimal_groundwater_level  decimal(7,3) ;
+COMMENT ON COLUMN tww_od.dss15_aquifer.minimal_groundwater_level IS 'Minimal level of groundwater table / Minimale Lage des Grundwasserspiegels / Niveau minimal de la nappe';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN perimeter_geometry geometry('CURVEPOLYGON', :SRID);
+CREATE INDEX in_tww_od_dss15_aquifer_perimeter_geometry ON tww_od.dss15_aquifer USING gist (perimeter_geometry );
+COMMENT ON COLUMN tww_od.dss15_aquifer.perimeter_geometry IS 'Boundary points of the perimeter / Begrenzungspunkte der Fläche / Points de délimitation de la surface';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN remark  varchar(80) ;
+COMMENT ON COLUMN tww_od.dss15_aquifer.remark IS 'General remarks / Allgemeine Bemerkungen / Remarques générales';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN last_modification TIMESTAMP without time zone DEFAULT now();
+COMMENT ON COLUMN tww_od.dss15_aquifer.last_modification IS 'Last modification / Letzte_Aenderung / Derniere_modification: INTERLIS_1_DATE';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN fk_dataowner varchar(16);
+COMMENT ON COLUMN tww_od.dss15_aquifer.fk_dataowner IS 'Foreignkey to Metaattribute dataowner (as an organisation) - this is the person or body who is allowed to delete, change or maintain this object / Metaattribut Datenherr ist diejenige Person oder Stelle, die berechtigt ist, diesen Datensatz zu löschen, zu ändern bzw. zu verwalten / Maître des données gestionnaire de données, qui est la personne ou l''organisation autorisée pour gérer, modifier ou supprimer les données de cette table/classe';
+ALTER TABLE tww_od.dss15_aquifer ADD COLUMN fk_provider varchar (16);
+COMMENT ON COLUMN tww_od.dss15_aquifer.fk_provider IS 'Foreignkey to Metaattribute provider (as an organisation) - this is the person or body who delivered the data / Metaattribut Datenlieferant ist diejenige Person oder Stelle, die die Daten geliefert hat / FOURNISSEUR DES DONNEES Organisation qui crée l’enregistrement de ces données ';
+-------
+CREATE TRIGGER
+update_last_modified_dss15_aquifer
+BEFORE UPDATE OR INSERT ON
+ tww_od.dss15_aquifer
+FOR EACH ROW EXECUTE PROCEDURE
+ tww_sys.update_last_modified();
+
+-------
+
+/* ALTER TABLE tww_od.water_catchment ADD COLUMN fk_dss15_aquifer varchar (16);
+ALTER TABLE tww_od.water_catchment ADD CONSTRAINT rel_water_catchment_dss15_aquifer FOREIGN KEY (fk_dss15_aquifer) REFERENCES tww_od.dss15_aquifer(obj_id) ON UPDATE CASCADE ON DELETE set null; */
+
+
+ALTER TABLE tww_od.infiltration_installation ADD COLUMN fk_dss15_aquifer varchar (16);
+ALTER TABLE tww_od.infiltration_installation ADD CONSTRAINT rel_infiltration_installation_dss15_aquifer FOREIGN KEY (fk_dss15_aquifer) REFERENCES tww_od.dss15_aquifer(obj_id) ON UPDATE CASCADE ON DELETE set null;
+
+
+ALTER TABLE tww_od.dss15_aquifer ADD CONSTRAINT rel_od_dss15_aquifer_fk_dataowner FOREIGN KEY (fk_dataowner) REFERENCES tww_od.organisation(obj_id);
+ALTER TABLE tww_od.dss15_aquifer ADD CONSTRAINT rel_od_dss15_aquifer_fk_dataprovider FOREIGN KEY (fk_provider) REFERENCES tww_od.organisation(obj_id);
+
+
+------ Indexes on identifiers
+
+CREATE UNIQUE INDEX in_od_dss15_aquifer_identifier ON tww_od.dss15_aquifer USING btree (identifier ASC NULLS LAST, fk_dataowner ASC NULLS LAST);
+
+
+COMMIT;