Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 32 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2846108
add dictionary sql for extra dss2020 extension classes
sjib Feb 9, 2024
0a8d586
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 9, 2024
3de416f
Adapt setup.sh
sjib Feb 9, 2024
c6c659c
Merge branch 'dictionaries_dss2020_extension_tables' of https://githu…
sjib Feb 9, 2024
848a138
add ending sql
sjib Feb 9, 2024
9e9c118
add // skip-keyword-check
sjib Feb 9, 2024
15e78b0
replace qgep_od with tww_od
sjib Feb 9, 2024
88968ab
wrong attribute_id in dataowner, provider, last_modification
sjib Feb 9, 2024
a829f4b
wrong statement for dictionary_od_values
sjib Feb 9, 2024
d0f3c4f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 9, 2024
e01553c
rename _aquifier to dss15_aquifier
sjib Feb 22, 2024
48990d3
rename _aquifier in dictionaries
sjib Feb 22, 2024
feb1e02
rename _planning_zone to dss15_planning_zone
sjib Feb 22, 2024
423a26c
rename _planning_zone dictionaries
sjib Feb 22, 2024
9802f98
adapt vw_swmm_aquifier
sjib Feb 22, 2024
64754ba
adapt interlis_importer_to_intermediate_schema.py
sjib Feb 22, 2024
a0c42a2
comment adapted
sjib Feb 22, 2024
07fbb5d
Changed spelling mistake
sjib Feb 22, 2024
dd69e49
Correct dss15_planning_zone_kind instead of _planning_zone_kind in sw…
sjib Feb 22, 2024
67faa53
correct description for 03_vw_swmm_aquifers.sql
sjib Feb 22, 2024
d7af630
renamde class to aquifer
sjib Feb 22, 2024
fe7ebf4
more corrections
sjib Feb 22, 2024
e5adde9
integrate file.classname instead of class changes
sjib Feb 22, 2024
08b5172
integrate 2
sjib Feb 22, 2024
696cea6
Merge branch 'main' into dictionaries_dss2020_extension_tables
sjib Feb 22, 2024
a9f1f1d
correct dss15_planning_zone in 14_vw_swmm_coverages.ql
sjib Feb 22, 2024
44d4b47
// skip-keyword-check added
sjib Feb 22, 2024
73f4f56
rename sql to dss15*
sjib Feb 26, 2024
f5e2868
adapt setup.sh to rename dss15
sjib Feb 26, 2024
4cd37eb
setup.sh - spelling mistake aquifer
sjib Feb 26, 2024
a0130a3
Add fk_dss15_aquifier to water_catchments and infiltration_installations
ponceta Mar 4, 2024
2d06e69
water_catchment does not exist anymore or yet?
ponceta Mar 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions datamodel/changelogs/0001/51_aquifier_2015_dictionaries.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
------ this file generates the tww is_dictionary (Table _aquifier dss 2015) in en on TEKSI
------ For questions etc. please contact Stefan Burckhardt [email protected]
------ version 9.2.2024 09:18:00
------ // skip-keyword-check based on version 04.07.2017 23:28:49 09_qgep_dictionaries.sql
------ with 3D coordinates

--- CREATE TABLE tww_sys.dictionary_od_table already exists

INSERT INTO tww_sys.dictionary_od_table (id, tablename, name_en, shortcut_en, name_de, shortcut_de, name_fr, shortcut_fr, name_it, shortcut_it, name_ro, shortcut_ro) VALUES (30,'_aquifier','aquifier','AQ','Grundwasserleiter','GL','Aquifère','AQ','NULL','NULL','NULL','NULL');

--- CREATE TABLE tww_sys.dictionary_od_field already exists

INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,283,'_aquifier','average_groundwater_level','average_groundwater_level','MittlererGWSpiegel','NIVEAU_NAPPE_MOY','zzz_MittlererGWSpiegel','nivelul_mediu_al_apelor_subterane','Average level of groundwater table','Höhe des mittleren Grundwasserspiegels','[m.s.m.]','[m s.l.m.]','rrr_[M.ü.M.]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','decimal(7,3)','[m.a.sl.]','meters above sea level [m.a.sl.]','[M.ü.M.]','Meter über Meer [M.ü.M.]','','','','','','',-200,5000);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,2519,'_aquifier','identifier','identifier','Bezeichnung','DESIGNATION','denominazione','identificator','NULL','NULL','NULL','NULL','rrr_[M.ü.M.]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','varchar(20)','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,284,'_aquifier','maximal_groundwater_level','maximal_groundwater_level','MaxGWSpiegel','NIVEAU_NAPPE_MAX','zzz_MaxGWSpiegel','nivelul_maxim_al_apelor_subterane','Maximal level of ground water table','Maximale Lage des Grundwasserspiegels','[m.s.m.]','[m s.l.m.]','rrr_[M.ü.M.]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','decimal(7,3)','[m.a.sl.]','meters above sea level [m.a.sl.]','[M.ü.M.]','Meter über Meer [M.ü.M.]','','','','','','',-200,5000);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,285,'_aquifier','minimal_groundwater_level','minimal_groundwater_level','MinGWSpiegel','NIVEAU_NAPPE_MIN','zzz_MinGWSpiegel','nivelul_minim_al_apelor_subterane','Minimal level of groundwater table','Minimale Lage des Grundwasserspiegels','[m.s.m.]','[m s.l.m.]','rrr_[M.ü.M.]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','decimal(7,3)','[m.a.sl.]','meters above sea level [m.a.sl.]','[M.ü.M.]','Meter über Meer [M.ü.M.]','','','','','','',-200,5000);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,2246,'_aquifier','perimeter','perimeter','Perimeter','PERIMETRE','perimetro','perimetru','Boundary points of the perimeter','Begrenzungspunkte der Fläche','[CoordNat]','[LKoord]','[LKoord]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','geometry','[LKoord]','points with coordinates in the swiss national grid','[LKoord]','Punkte mit Schweizer Landeskoordinaten','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,2577,'_aquifier','remark','remark','Bemerkung','REMARQUE','osservazione','observa?ii','General remarks','Allgemeine Bemerkungen','Remarques générales','NULL','[LKoord]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,999999,'_aquifier','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID','OBJ_ID - Unique ID','OBJ_ID - eindeutige Kennung','OBJ_ID - ID unique','OBJ_ID - identificatore univoco','rrr_OBJ_ID - eindeutige Kennung',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::tww_od.plantype[],'true','varchar(16)','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,999998,'_aquifier','dataowner','dataowner','Datenherr','MAITRE_DES_DONNEES','proprietario_dati','rrr_Datenherr','dataowner - 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','zzz_Metaattribut L''attributo proprietario dati si riferisce alla persona o ente che è autorizzato a eliminare, modificare o gestire i dati','rrr_Metaattribut Datenherr ist diejenige Person oder Stelle, die berechtigt ist, diesen Datensatz zu löschen, zu ändern bzw. zu verwalten',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::tww_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,999997,'_aquifier','provider','provider','Datenlieferant','FOURNISSEUR_DES_DONNEES','fornitore_dati','rrr_Datenlieferant','Metaattribute provider - 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','zzz_Metaattribut L''attributo fornitore dati si riferisce alla persona o ente che ha fornito i dati','rrr_Metaattribut Datenlieferant ist diejenige Person oder Stelle, die die Daten geliefert hat',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::tww_od.plantype[],'true','varchar(80)','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (30,999996,'_aquifier','last_modification','last_modification','Letzte_Aenderung','DERNIERE_MODIFICATION','ultima_modifica','rrr_Letze_Aenderung','Last modification: INTERLIS_1_DATE','Letzte Änderung: INTERLIS_1_DATE','Dernière modification: INTERLIS_1_DATE','ultima_modifica: INTERLIS_1_DATE','rrr_Letzte Änderung: INTERLIS_1_DATE',ARRAY['Werkinformation','Leitungskataster', 'GEP_Verband','GEP_Traegerschaft','SAA', 'PAA']::tww_od.plantype[],'true','TIMESTAMP','','','','','','','','','','',NULL,NULL);

-- CREATE TABLE tww_sys.dictionary_od_values already exists

INSERT INTO tww_sys.dictionary_od_table (id, tablename, name_en, shortcut_en, name_de, shortcut_de, name_fr, shortcut_fr, name_it, shortcut_it, name_ro, shortcut_ro) VALUES (30,'_aquifier','aquifier','AQ','Grundwasserleiter','GL','Aquifère','AQ','NULL','NULL','NULL','NULL');
23 changes: 23 additions & 0 deletions datamodel/changelogs/0001/52_planning_zone_2015_dictionaries.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
------ this file generates the tww is_dictionary (Table _planning_zone dss 2015) in en on TEKSI
------ For questions etc. please contact Stefan Burckhardt [email protected]
------ version 9.2.2024 09:22:00
------ // skip-keyword-check based on version 04.07.2017 23:28:49 09_qgep_dictionaries.sql
------ with 3D coordinates

--- CREATE TABLE tww_sys.dictionary_od_table already exists

INSERT INTO tww_sys.dictionary_od_table (id, tablename, name_en, shortcut_en, name_de, shortcut_de, name_fr, shortcut_fr, name_it, shortcut_it, name_ro, shortcut_ro) VALUES (104,'_planning_zone','planning zone','PL','Planungszone','PL','Zones réservées','ZR','NULL','NULL','NULL','NULL');

--- CREATE TABLE tww_sys.dictionary_od_field already exists

INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (104,313,'_planning_zone','kind','kind','Art','GENRE','tipo','tip','Type of planning zone','Art der Bauzone','Genre de zones à bâtir','NULL','[LKoord]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','integer','','','','','','','','','','',NULL,NULL);
INSERT INTO tww_sys.dictionary_od_field (class_id, attribute_id, table_name, field_name, field_name_en, field_name_de, field_name_fr, field_name_it, field_name_ro, field_description_en, field_description_de, field_description_fr, field_description_it, field_description_ro, field_mandatory, field_visible, field_datatype, field_unit_en, field_unit_description_en, field_unit_de, field_unit_description_de, field_unit_fr, field_unit_description_fr, field_unit_it, field_unit_description_it, field_unit_ro, field_unit_description_ro, field_max, field_min) VALUES (104,3623,'_planning_zone','perimeter','perimeter','Perimeter','PERIMETRE','perimetro','perimetru','Boundary points of the perimeter','Begrenzungspunkte der Fläche','[CoordNat]','[LKoord]','[LKoord]',ARRAY['kein_Plantyp_definiert']::tww_od.plantype[],'true','geometry','[LKoord]','Swiss national grid coordinates','[LKoord]','Punkte mit Schweizer Landeskoordinaten','','','','','','',NULL,NULL);

-- CREATE TABLE tww_sys.dictionary_od_values already exists

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 (104,313,2990,'_planning_zone','kind','other','other','','andere','','autres','','altri','','','',' ','','','','');
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 (104,313,31,'_planning_zone','kind','commercial_zone','commercial_zone','','Gewerbezone','','zone_artisanale','','zzz_Gewerbezone','','','',' ','','','','');
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 (104,313,32,'_planning_zone','kind','industrial_zone','industrial_zone','','Industriezone','','zone_industrielle','','zzz_Industriezone','','','',' ','','','','');
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 (104,313,30,'_planning_zone','kind','agricultural_zone','agricultural_zone','','Landwirtschaftszone','','zone_agricole','','zzz_Landwirtschaftszone','','','',' ','','','','');
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 (104,313,3077,'_planning_zone','kind','unknown','unknown','','unbekannt','','inconnu','','sconosciuto','','','',' ','','','','');
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 (104,313,29,'_planning_zone','kind','residential_zone','residential_zone','','Wohnzone','','zone_d_habitations','','zzz_Wohnzone','','','',' ','','','','');
2 changes: 2 additions & 0 deletions datamodel/scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/fix_was
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/fix_depth.sql
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/51_aquifier_2015.sql -v SRID=$SRID
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/52_planning_zone_2015.sql -v SRID=$SRID
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/51_aquifier_2015_dictionaries.sql -v SRID=$SRID
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/changelogs/0001/52_planning_zone_2015_dictionaries.sql -v SRID=$SRID

psql "service=${PGSERVICE}" -c "CREATE SCHEMA IF NOT EXISTS tww_app;"
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/app/symbology_functions.sql
Expand Down
Loading