From c24472a302228e9e0969a992561ca88a898e241a Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Thu, 20 Jun 2024 11:04:25 +0200 Subject: [PATCH] Balises (#240) --- datamodel/app/vw_sign_symbol.py | 27 +- datamodel/changelogs/0101/0101_01_balises.sql | 101 + datamodel/setup.sh | 1 + project/images/marker/editable/m-11-l.svg | 55 + project/images/marker/editable/m-11-r.svg | 9 + project/images/marker/editable/m-12-l.svg | 104 + project/images/marker/editable/m-12-r.svg | 103 + project/images/marker/editable/m-13.svg | 21 + project/images/marker/editable/m-14-l.svg | 9 + project/images/marker/editable/m-14-r.svg | 9 + project/images/marker/editable/m-15.svg | 46 + project/images/marker/editable/m-16.svg | 5 + project/images/marker/original/m-11-l.svg | 55 + project/images/marker/original/m-11-r.svg | 9 + project/images/marker/original/m-12-l.svg | 104 + project/images/marker/original/m-12-r.svg | 103 + project/images/marker/original/m-13.svg | 21 + project/images/marker/original/m-14-l.svg | 9 + project/images/marker/original/m-14-r.svg | 9 + project/images/marker/original/m-15.svg | 46 + project/images/marker/original/m-16.svg | 5 + project/images/other/editable/marker.svg | 185 +- project/images/other/original/marker.svg | 185 +- project/signalo.qgs | 15886 +++++++++------- 24 files changed, 9505 insertions(+), 7602 deletions(-) create mode 100644 datamodel/changelogs/0101/0101_01_balises.sql create mode 100644 project/images/marker/editable/m-11-l.svg create mode 100644 project/images/marker/editable/m-11-r.svg create mode 100644 project/images/marker/editable/m-12-l.svg create mode 100644 project/images/marker/editable/m-12-r.svg create mode 100644 project/images/marker/editable/m-13.svg create mode 100644 project/images/marker/editable/m-14-l.svg create mode 100644 project/images/marker/editable/m-14-r.svg create mode 100644 project/images/marker/editable/m-15.svg create mode 100644 project/images/marker/editable/m-16.svg create mode 100644 project/images/marker/original/m-11-l.svg create mode 100644 project/images/marker/original/m-11-r.svg create mode 100644 project/images/marker/original/m-12-l.svg create mode 100644 project/images/marker/original/m-12-r.svg create mode 100644 project/images/marker/original/m-13.svg create mode 100644 project/images/marker/original/m-14-l.svg create mode 100644 project/images/marker/original/m-14-r.svg create mode 100644 project/images/marker/original/m-15.svg create mode 100644 project/images/marker/original/m-16.svg diff --git a/datamodel/app/vw_sign_symbol.py b/datamodel/app/vw_sign_symbol.py index fcfbe60e..28b78224 100644 --- a/datamodel/app/vw_sign_symbol.py +++ b/datamodel/app/vw_sign_symbol.py @@ -40,27 +40,31 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , support.fk_support_type , support.fk_support_base_type , support.geometry::geometry(Point,{srid}) AS support_geometry - , COALESCE(vl_official_sign.directional_sign, vl_user_sign.directional_sign, FALSE) AS directional_sign + , COALESCE(vl_official_sign.directional_sign, vl_user_sign.directional_sign, vl_marker_type.directional_sign, FALSE) AS directional_sign , CASE WHEN sign.fk_sign_type = 15 THEN vl_user_sign.value_de + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.value_de ELSE vl_official_sign.value_de END AS _symbol_value_de , CASE WHEN sign.fk_sign_type = 15 THEN vl_user_sign.value_fr + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.value_fr ELSE vl_official_sign.value_fr END AS _symbol_value_fr , CASE WHEN sign.fk_sign_type = 15 THEN vl_user_sign.value_it + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.value_it ELSE vl_official_sign.value_it END AS _symbol_value_it , CASE WHEN sign.fk_sign_type = 15 THEN vl_user_sign.value_ro + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.value_ro ELSE vl_official_sign.value_ro END AS _symbol_value_ro , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_de - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_de WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_de @@ -69,7 +73,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_fr - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_fr WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_fr @@ -78,7 +82,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_it - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_it WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_it @@ -87,7 +91,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_ro - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_ro WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_ro @@ -96,7 +100,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_de_right - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_de_right WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_de_right @@ -105,7 +109,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_fr_right - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_fr_right WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_fr_right @@ -114,7 +118,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_it_right - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_it_right WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_it_right @@ -123,7 +127,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 'complex.svg'::text WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_ro_right - WHEN sign.fk_sign_type = 12 THEN 'marker.svg'::text + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_ro_right WHEN sign.fk_sign_type = 13 THEN 'mirror'||CASE WHEN sign.fk_mirror_shape=12 THEN '-circular' ELSE '' END||CASE WHEN NOT mirror_red_frame THEN '-noframe' ELSE '' END || '.svg'::text WHEN sign.fk_sign_type = 14 THEN 'street-plate.svg'::text WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_ro_right @@ -132,7 +136,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 106 WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_height - WHEN sign.fk_sign_type = 12 THEN 130 + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_height WHEN sign.fk_sign_type = 13 THEN 80 WHEN sign.fk_sign_type = 14 THEN 50 WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_height @@ -141,7 +145,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): , CASE WHEN sign.complex IS TRUE THEN 121 WHEN sign.fk_sign_type = 11 THEN vl_official_sign.img_width - WHEN sign.fk_sign_type = 12 THEN 70 + WHEN sign.fk_sign_type = 12 THEN vl_marker_type.img_width WHEN sign.fk_sign_type = 13 THEN 100 WHEN sign.fk_sign_type = 14 THEN 100 WHEN sign.fk_sign_type = 15 THEN vl_user_sign.img_width @@ -153,6 +157,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): LEFT JOIN signalo_db.support ON support.id = azimut.fk_support LEFT JOIN signalo_db.vl_official_sign ON vl_official_sign.id = sign.fk_official_sign LEFT JOIN signalo_db.vl_user_sign ON vl_user_sign.id = sign.fk_user_sign + LEFT JOIN signalo_db.vl_marker_type ON vl_marker_type.id = sign.fk_marker_type ), diff --git a/datamodel/changelogs/0101/0101_01_balises.sql b/datamodel/changelogs/0101/0101_01_balises.sql new file mode 100644 index 00000000..3973559d --- /dev/null +++ b/datamodel/changelogs/0101/0101_01_balises.sql @@ -0,0 +1,101 @@ +--Disable triggers in signalo_db.sign before changes +ALTER TABLE signalo_db.sign DISABLE TRIGGER ALL; + +--Disable foreign keys +ALTER TABLE signalo_db.sign + DROP CONSTRAINT fkey_vl_marker_type; + +DROP TABLE IF EXISTS signalo_db.vl_marker_type; + +CREATE TABLE signalo_db.vl_marker_type ( + id text, + active boolean, + value_de text, + value_fr text, + value_it text, + value_ro text, + description_de text, + description_fr text, + description_it text, + description_ro text, + img_de text, + img_fr text, + img_it text, + img_ro text, + img_height integer DEFAULT 100, + img_width integer DEFAULT 100, + no_dynamic_inscription integer DEFAULT 0, + default_inscription1 text, + default_inscription2 text, + default_inscription3 text, + default_inscription4 text, + directional_sign boolean, + img_de_right text, + img_fr_right text, + img_it_right text, + img_ro_right text); + +ALTER TABLE signalo_db.sign + ALTER COLUMN fk_marker_type TYPE text USING fk_marker_type::text; + +INSERT INTO signalo_db.vl_marker_type ( + id, active, value_de, value_fr, img_de, img_fr, img_it, img_ro, img_height, img_width, directional_sign, img_de_right, img_fr_right, img_it_right, img_ro_right) + VALUES + ('m-1', true, 'unbekannt', 'inconnu', NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL), + ('m-2', true, 'andere', 'autre', NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL), + ('m-3', true, 'zu bestimmen', 'à déterminer', NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL), + ('m-11', true, 'Einfacher Leitpfeil', 'Flèche de balisage simple', 'm-11-l.svg', 'm-11-l.svg', 'm-11-l.svg', 'm-11-l.svg', 100, 100, true, 'm-11-r.svg', 'm-11-r.svg', 'm-11-r.svg', 'm-11-r.svg'), + ('m-12', true, 'Mehrfacher Leitpfeil', 'Flèche de balisage multiple', 'm-12-l.svg', 'm-12-l.svg', 'm-12-l.svg', 'm-12-l.svg', 50, 200, true, 'm-12-r.svg', 'm-12-r.svg','m-12-r.svg', 'm-12-r.svg'), + ('m-13', true, 'Verkehrsteiler vom Typ B', 'Séparateur de trafic de type B', 'm-13.svg', 'm-13.svg', 'm-13.svg', 'm-13.svg', 50, 200, false, NULL, NULL, NULL, NULL), + ('m-14', true, 'Leitbake (Richtung)', 'Balise de guidage (direction)', 'm-14-l.svg', 'm-14-l.svg', 'm-14-l.svg', 'm-14-l.svg', 200, 50, true, 'm-14-r.svg', 'm-14-r.svg','m-14-r.svg', 'm-14-r.svg'), + ('m-15', true, 'Leitbake mittig', 'Balisage de guidage milieu', 'm-15.svg', 'm-15.svg', 'm-15.svg', 'm-15.svg', 200, 50, false, NULL, NULL, NULL, NULL), + ('m-16', true, 'Leitstreifen', 'Bande de balisage', 'm-16.svg', 'm-16.svg', 'm-16.svg', 'm-16.svg', 16, 200, false, NULL, NULL, NULL, NULL); + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-1' +WHERE fk_marker_type = '1'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-2' +WHERE fk_marker_type = '2'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-3' +WHERE fk_marker_type = '3'; + +-- If former type was just "balise" +UPDATE signalo_db.sign +SET fk_marker_type = 'm-3' +WHERE fk_marker_type = '11'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-11' +WHERE fk_marker_type = '12'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-16' +WHERE fk_marker_type = '13'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-14' +WHERE fk_marker_type = '14'; + +-- If former type was in fact referencing a support type, not a marker-sign (borne d'îlot) +UPDATE signalo_db.sign +SET fk_marker_type = 'm-3' +WHERE fk_marker_type = '15'; + +UPDATE signalo_db.sign +SET fk_marker_type = 'm-13' +WHERE fk_marker_type = '16'; + +-- Set primary key constraint in signalo_db.vl_marker_type +ALTER TABLE ONLY signalo_db.vl_marker_type + ADD CONSTRAINT marker_type_pkey PRIMARY KEY (id); + +-- Set foreign key for user signs in signalo_db.sign +ALTER TABLE ONLY signalo_db.sign + ADD CONSTRAINT fkey_vl_marker_type FOREIGN KEY (fk_marker_type) REFERENCES signalo_db.vl_marker_type(id) MATCH FULL; + +-- Enable triggers in signalo_db.sign +ALTER TABLE signalo_db.sign ENABLE TRIGGER ALL; diff --git a/datamodel/setup.sh b/datamodel/setup.sh index 28e74c3b..77c4a019 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -80,6 +80,7 @@ psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changel psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_09_exceptes.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_10_dms.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0101/0101_01_balises.sql if [[ $demo_data == True ]]; then echo "*** inserting demo_data" diff --git a/project/images/marker/editable/m-11-l.svg b/project/images/marker/editable/m-11-l.svg new file mode 100644 index 00000000..84c82768 --- /dev/null +++ b/project/images/marker/editable/m-11-l.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/editable/m-11-r.svg b/project/images/marker/editable/m-11-r.svg new file mode 100644 index 00000000..670a55b0 --- /dev/null +++ b/project/images/marker/editable/m-11-r.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/editable/m-12-l.svg b/project/images/marker/editable/m-12-l.svg new file mode 100644 index 00000000..10e3d95f --- /dev/null +++ b/project/images/marker/editable/m-12-l.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/editable/m-12-r.svg b/project/images/marker/editable/m-12-r.svg new file mode 100644 index 00000000..01af7968 --- /dev/null +++ b/project/images/marker/editable/m-12-r.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/editable/m-13.svg b/project/images/marker/editable/m-13.svg new file mode 100644 index 00000000..11819d39 --- /dev/null +++ b/project/images/marker/editable/m-13.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/editable/m-14-l.svg b/project/images/marker/editable/m-14-l.svg new file mode 100644 index 00000000..eac8c760 --- /dev/null +++ b/project/images/marker/editable/m-14-l.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/editable/m-14-r.svg b/project/images/marker/editable/m-14-r.svg new file mode 100644 index 00000000..b12b928f --- /dev/null +++ b/project/images/marker/editable/m-14-r.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/editable/m-15.svg b/project/images/marker/editable/m-15.svg new file mode 100644 index 00000000..f2cafe88 --- /dev/null +++ b/project/images/marker/editable/m-15.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + diff --git a/project/images/marker/editable/m-16.svg b/project/images/marker/editable/m-16.svg new file mode 100644 index 00000000..1d78cac0 --- /dev/null +++ b/project/images/marker/editable/m-16.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/project/images/marker/original/m-11-l.svg b/project/images/marker/original/m-11-l.svg new file mode 100644 index 00000000..84c82768 --- /dev/null +++ b/project/images/marker/original/m-11-l.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/original/m-11-r.svg b/project/images/marker/original/m-11-r.svg new file mode 100644 index 00000000..670a55b0 --- /dev/null +++ b/project/images/marker/original/m-11-r.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/original/m-12-l.svg b/project/images/marker/original/m-12-l.svg new file mode 100644 index 00000000..10e3d95f --- /dev/null +++ b/project/images/marker/original/m-12-l.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/original/m-12-r.svg b/project/images/marker/original/m-12-r.svg new file mode 100644 index 00000000..01af7968 --- /dev/null +++ b/project/images/marker/original/m-12-r.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/original/m-13.svg b/project/images/marker/original/m-13.svg new file mode 100644 index 00000000..11819d39 --- /dev/null +++ b/project/images/marker/original/m-13.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/marker/original/m-14-l.svg b/project/images/marker/original/m-14-l.svg new file mode 100644 index 00000000..eac8c760 --- /dev/null +++ b/project/images/marker/original/m-14-l.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/original/m-14-r.svg b/project/images/marker/original/m-14-r.svg new file mode 100644 index 00000000..b12b928f --- /dev/null +++ b/project/images/marker/original/m-14-r.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/project/images/marker/original/m-15.svg b/project/images/marker/original/m-15.svg new file mode 100644 index 00000000..f2cafe88 --- /dev/null +++ b/project/images/marker/original/m-15.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + diff --git a/project/images/marker/original/m-16.svg b/project/images/marker/original/m-16.svg new file mode 100644 index 00000000..1d78cac0 --- /dev/null +++ b/project/images/marker/original/m-16.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/project/images/other/editable/marker.svg b/project/images/other/editable/marker.svg index 1a70445d..7ab76d4b 100644 --- a/project/images/other/editable/marker.svg +++ b/project/images/other/editable/marker.svg @@ -1,138 +1,77 @@ - - - - image/svg+xml - - - - - + inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - - - - - - - - + id="defs838" /> + inkscape:current-layer="svg834" + lock-margins="false" /> - - + stroke-width="0.69758" + style="paint-order:fill markers stroke" + id="rect824" /> + + + + + diff --git a/project/images/other/original/marker.svg b/project/images/other/original/marker.svg index 1a70445d..7ab76d4b 100644 --- a/project/images/other/original/marker.svg +++ b/project/images/other/original/marker.svg @@ -1,138 +1,77 @@ - - - - image/svg+xml - - - - - + inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - - - - - - - - + id="defs838" /> + inkscape:current-layer="svg834" + lock-margins="false" /> - - + stroke-width="0.69758" + style="paint-order:fill markers stroke" + id="rect824" /> + + + + + diff --git a/project/signalo.qgs b/project/signalo.qgs index 7daa3bed..d10efe31 100644 --- a/project/signalo.qgs +++ b/project/signalo.qgs @@ -1,5 +1,5 @@ - + Signalo - Demo @@ -17,160 +17,161 @@ false + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -186,46 +187,46 @@ vw_azimut_edit_b7acca0e_e618_4f1d_8de3_08e2eb5bf359 - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + meters - 2536965.4002509992569685 - 1152198.59315075958147645 - 2537803.68505283538252115 - 1152749.15615228842943907 + 2537449.92429379234090447 + 1152232.78079614299349487 + 2537897.7200732403434813 + 1152562.17443340714089572 0 @@ -246,152 +247,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + Annotations_12d93f67_97ee_4956_a1a1_ce69a09e6c74 @@ -419,6 +420,7 @@ + @@ -437,12 +439,21 @@ + + 1 + 1 + 1 + 0 + + + 1 0 - + 2419995.7488073636777699 1027366.07117159117478877 @@ -482,6 +493,7 @@ + @@ -513,97 +525,97 @@ 0 0 - + - + - + - - - + - - + - + - + None @@ -647,14 +660,14 @@ 2 - - + + resamplingFilter 0 - + -20037508.34278924390673637 -20037508.34278924763202667 @@ -695,6 +708,7 @@ + @@ -726,97 +740,97 @@ 0 0 - + - + - + - - - + - - + - + - + None @@ -860,14 +875,14 @@ 2 - - + + resamplingFilter 0 - + 2419995.7488073636777699 1027366.07117159117478877 @@ -907,6 +922,7 @@ + @@ -938,97 +954,97 @@ 0 0 - + - + - + - - - + - - + - + - + None @@ -1072,14 +1089,14 @@ 2 - - + + resamplingFilter 0 - + azimut_f5e94397_ee15_4ae1_95b8_af8a412676b3 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."azimut" @@ -1116,6 +1133,7 @@ + @@ -1132,7 +1150,7 @@ - + @@ -1157,138 +1175,138 @@ 1 0 - + - + - + - - - + - - - + - - - - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - @@ -1624,77 +1662,77 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - @@ -1754,21 +1792,21 @@ def my_form_open(dialog, layer, feature): - - COALESCE( "azimut", '<NULL>' ) - + - + coating_7ea56753_207f_4981_84ef_635958fc4808 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_coating" @@ -1796,6 +1834,7 @@ def my_form_open(dialog, layer, feature): + @@ -1829,138 +1868,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -2090,9 +2137,9 @@ def my_form_open(dialog, layer, feature): - + - + dms_document_fda9c16e_95ed_4277_85dd_30a1dc7c52c2 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="signalo_db"."dms_document" @@ -2129,6 +2176,7 @@ def my_form_open(dialog, layer, feature): + @@ -2145,7 +2193,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2170,138 +2218,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - + - + - + - - + - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -2455,45 +2509,46 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - @@ -2519,9 +2574,9 @@ def my_form_open(dialog, layer, feature): COALESCE( "identification", '<NULL>' ) - + - + dms_rel_document_62c2a0d8_3860_428b_a495_9c8a8a8fcc7b service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="signalo_db"."dms_rel_document" @@ -2558,6 +2613,7 @@ def my_form_open(dialog, layer, feature): + @@ -2574,7 +2630,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2599,138 +2655,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - + - + - + - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - @@ -2883,9 +2945,9 @@ def my_form_open(dialog, layer, feature): "id" - + - + durability_a4cef524_85b2_4913_84a1_926afcce6000 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_durability" @@ -2913,6 +2975,7 @@ def my_form_open(dialog, layer, feature): + @@ -2946,138 +3009,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -3207,9 +3278,9 @@ def my_form_open(dialog, layer, feature): - + - + frame_b99392c7_2b01_4b3a_bde4_f003e2b838e4 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."frame" @@ -3246,6 +3317,7 @@ def my_form_open(dialog, layer, feature): + @@ -3262,7 +3334,7 @@ def my_form_open(dialog, layer, feature): - + @@ -3287,138 +3359,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - - + + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + @@ -3757,125 +3829,148 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -3907,83 +4002,83 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - @@ -4060,21 +4155,21 @@ def my_form_open(dialog, layer, feature): - - COALESCE( "rank", '<NULL>' ) - + - + frame_fixing_type_63843528_0c72_40f3_957a_7147d1820e7c service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_frame_fixing_type" @@ -4102,6 +4197,7 @@ def my_form_open(dialog, layer, feature): + @@ -4135,138 +4231,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -4396,9 +4500,9 @@ def my_form_open(dialog, layer, feature): - + - + frame_type_497d77ea_a95f_41cd_8c09_df811ac9635d service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_frame_type" @@ -4426,6 +4530,7 @@ def my_form_open(dialog, layer, feature): + @@ -4459,138 +4564,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -4720,9 +4833,9 @@ def my_form_open(dialog, layer, feature): - + - + lighting_c690da23_6bac_4bb9_ae77_84d1c461a41c service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_lighting" @@ -4750,6 +4863,7 @@ def my_form_open(dialog, layer, feature): + @@ -4783,138 +4897,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -5051,9 +5173,9 @@ def my_form_open(dialog, layer, feature): "value_en" - + - + marker_type_92d19509_ce38_40d9_bac4_eecb4dff3273 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="signalo_db"."vl_marker_type" @@ -5090,6 +5212,7 @@ def my_form_open(dialog, layer, feature): + @@ -5106,7 +5229,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5131,138 +5254,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -5443,9 +5814,9 @@ def my_form_open(dialog, layer, feature): "value_de" - + - + mirror_shape_96db4de4_ebf8_43e1_8365_5c16d28719bc service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="signalo_db"."vl_mirror_shape" @@ -5482,6 +5853,7 @@ def my_form_open(dialog, layer, feature): + @@ -5498,7 +5870,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5523,138 +5895,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -5842,9 +6222,9 @@ def my_form_open(dialog, layer, feature): "value_de" - + - + official_sign_02419ef5_80b5_48e3_869b_58a12167b0ae service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_official_sign" @@ -5881,6 +6261,7 @@ def my_form_open(dialog, layer, feature): + @@ -5897,7 +6278,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5922,138 +6303,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -6541,9 +6950,9 @@ def my_form_open(dialog, layer, feature): "id" || ' ' || attribute(concat('value_',@qgis_locale)) - + - + owner_4e532508_fa34_406c_8846_8f8306ca74ee service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_owner" @@ -6580,6 +6989,7 @@ def my_form_open(dialog, layer, feature): + @@ -6596,7 +7006,7 @@ def my_form_open(dialog, layer, feature): - + @@ -6621,138 +7031,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - @@ -7009,9 +7431,9 @@ def my_form_open(dialog, layer, feature): "name" - + - + provider_4ab3ab90_0529_498a_8d27_4debfbbe453a service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='0' table="signalo_db"."vl_provider" @@ -7048,6 +7470,7 @@ def my_form_open(dialog, layer, feature): + @@ -7064,7 +7487,7 @@ def my_form_open(dialog, layer, feature): - + @@ -7089,138 +7512,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - @@ -7474,9 +7909,9 @@ def my_form_open(dialog, layer, feature): "name" - + - + sign_2499f9bd_24a2_4384_b329_dc522a94c545 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."sign" @@ -7513,6 +7948,7 @@ def my_form_open(dialog, layer, feature): + @@ -7529,7 +7965,7 @@ def my_form_open(dialog, layer, feature): - + @@ -7540,8 +7976,9 @@ def my_form_open(dialog, layer, feature): postgres - - + + + @@ -7557,138 +7994,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8639,465 +9255,706 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -9129,191 +9986,196 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + - - - + + + - - - + + + - - - + + + @@ -9353,6 +10215,31 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9394,11 +10281,16 @@ def my_form_open(dialog, layer, feature): + + + + + @@ -9465,6 +10357,31 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9506,11 +10423,16 @@ def my_form_open(dialog, layer, feature): + + + + + @@ -9575,6 +10497,31 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9616,11 +10563,16 @@ def my_form_open(dialog, layer, feature): + + + + + @@ -9655,9 +10607,9 @@ def my_form_open(dialog, layer, feature): "id" - + - + sign_type_922b284e_5fef_4464_826e_755cf776cac5 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_sign_type" @@ -9685,6 +10637,7 @@ def my_form_open(dialog, layer, feature): + @@ -9718,138 +10671,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -9988,9 +10949,9 @@ def my_form_open(dialog, layer, feature): "value_de" - + - + status_5f245030_6519_4c89_8eb9_987e8fac9a4d service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_status" @@ -10018,6 +10979,7 @@ def my_form_open(dialog, layer, feature): + @@ -10051,138 +11013,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -10312,19 +11282,19 @@ def my_form_open(dialog, layer, feature): - + - + 2537376.25502501102164388 - 1152411.42123516835272312 + 1152387.11642726277932525 2538449.47999999998137355 1152830.11123771546408534 6.6224867978221571 - 46.52006455084227809 - 6.63652866359770055 + 46.51984592639676208 + 6.63653190769461965 46.52393046604050397 support_347aa750_1661_498f_a7e8_017adc616ba0 @@ -10363,6 +11333,7 @@ def my_form_open(dialog, layer, feature): + @@ -10379,7 +11350,7 @@ def my_form_open(dialog, layer, feature): - + @@ -10393,8 +11364,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -10407,181 +11378,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - + + + - 0 0 1 - - - - + + + + - + - + @@ -10668,519 +11642,547 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - @@ -11212,121 +12214,121 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - @@ -11429,15 +12431,15 @@ def my_form_open(dialog, layer, feature): - "id" - + - + support_base_type_fe9c67db_d588_4092_adef_496e922cfa4c service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_support_base_type" @@ -11465,6 +12467,7 @@ def my_form_open(dialog, layer, feature): + @@ -11498,138 +12501,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -11759,9 +12770,9 @@ def my_form_open(dialog, layer, feature): - + - + support_type_d8e8fb77_0ce7_4d23_bb9e_c12c12d412bf service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_support_type" @@ -11798,6 +12809,7 @@ def my_form_open(dialog, layer, feature): + @@ -11814,7 +12826,7 @@ def my_form_open(dialog, layer, feature): - + @@ -11839,138 +12851,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -12146,9 +13166,9 @@ def my_form_open(dialog, layer, feature): "value_en" - + - + vl_user_sign_c625b1d7_23e8_4c2b_a4d4_e027a23ebe9b service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_user_sign" @@ -12185,6 +13205,7 @@ def my_form_open(dialog, layer, feature): + @@ -12201,7 +13222,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12226,138 +13247,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -12843,21 +13892,9 @@ def my_form_open(dialog, layer, feature): "id" || ' ' || attribute(concat('value_',@qgis_locale)) - + - - - 2537376.25502501102164388 - 1152411.42123516835272312 - 2538449.47999999998137355 - 1152830.11123771546408534 - - - 6.6224867978221571 - 46.52006455084227809 - 6.63652866359770055 - 46.52393046604050397 - + vw_azimut_edit_b7acca0e_e618_4f1d_8de3_08e2eb5bf359 service='pg_signalo' sslmode=disable key='id' srid=2056 type=LineString checkPrimaryKeyUnicity='1' table="signalo_app"."vw_azimut_edit" (geometry) @@ -12894,6 +13931,7 @@ def my_form_open(dialog, layer, feature): + @@ -12910,7 +13948,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12935,211 +13973,211 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - + + + 0 0 1 - - - - + + + + - + - + @@ -13225,23 +14266,23 @@ def my_form_open(dialog, layer, feature): - + - + - + - + + + + - + - + - + - - - + + + - + - @@ -13315,21 +14359,9 @@ def my_form_open(dialog, layer, feature): "id" - + - - - 2537376.25502501102164388 - 1152411.42123516835272312 - 2538449.47999999998137355 - 1152830.11123771546408534 - - - 6.6224867978221571 - 46.52006455084227809 - 6.63652866359770055 - 46.52393046604050397 - + vw_edited_support_9e44c97f_e06b_4184_b445_881318a02e8b service='pg_signalo' sslmode=disable key='id' srid=2056 type=Point checkPrimaryKeyUnicity='0' table="signalo_app"."vw_edited_support" (geometry) @@ -13357,6 +14389,7 @@ def my_form_open(dialog, layer, feature): + @@ -13390,267 +14423,270 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - + + + 0 0 1 - + - - + - + - - + + + + + + - - + + - - + + - - + + - + - + - @@ -13703,19 +14743,19 @@ def my_form_open(dialog, layer, feature): "id" - + - + 2537376.25502501102164388 - 1152411.42123516835272312 + 1152387.11642726277932525 2538449.47999999998137355 1152830.11123771546408534 6.6224867978221571 - 46.52006455084227809 - 6.63652866359770055 + 46.51984592639676208 + 6.63653190769461965 46.52393046604050397 vw_sign_symbol_a4db15ac_b65f_46c3_b5d8_bcf3dbf10405 @@ -13754,6 +14794,7 @@ def my_form_open(dialog, layer, feature): + @@ -13770,7 +14811,7 @@ def my_form_open(dialog, layer, feature): - + @@ -13781,22 +14822,22 @@ def my_form_open(dialog, layer, feature): postgres - + - + - + - + @@ -13805,10 +14846,10 @@ def my_form_open(dialog, layer, feature): - - - + + + @@ -13822,482 +14863,526 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - + - + @@ -14305,1169 +15390,1169 @@ def my_form_open(dialog, layer, feature): - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -16031,462 +17220,462 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -16862,8 +18051,8 @@ def my_form_open(dialog, layer, feature): - @@ -16874,7 +18063,7 @@ THEN "fk_user_sign" ELSE concat("fk_official_sign",' ', "_symbol_value_fr") END - + @@ -17037,9 +18226,9 @@ END @@ -17061,88 +18250,91 @@ END + + + Lucie Nicolier 2020-09-30T08:43:17 - - - + + + - + - + - - - + + + - + - - - - - + + + - - - - - - - + + + - + - - - - + + + + - + - + - + + - + PROJCRS["CH1903+ / LV95",BASEGEOGCRS["CH1903+",DATUM["CH1903+",ELLIPSOID["Bessel 1841",6377397.155,299.1528128,LENGTHUNIT["metre",1]]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],ID["EPSG",4150]],CONVERSION["Swiss Oblique Mercator 1995",METHOD["Hotine Oblique Mercator (variant B)",ID["EPSG",9815]],PARAMETER["Latitude of projection centre",46.9524055555556,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8811]],PARAMETER["Longitude of projection centre",7.43958333333333,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8812]],PARAMETER["Azimuth of initial line",90,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8813]],PARAMETER["Angle from Rectified to Skew Grid",90,ANGLEUNIT["degree",0.0174532925199433],ID["EPSG",8814]],PARAMETER["Scale factor on initial line",1,SCALEUNIT["unity",1],ID["EPSG",8815]],PARAMETER["Easting at projection centre",2600000,LENGTHUNIT["metre",1],ID["EPSG",8816]],PARAMETER["Northing at projection centre",1200000,LENGTHUNIT["metre",1],ID["EPSG",8817]]],CS[Cartesian,2],AXIS["(E)",east,ORDER[1],LENGTHUNIT["metre",1]],AXIS["(N)",north,ORDER[2],LENGTHUNIT["metre",1]],USAGE[SCOPE["Cadastre, engineering survey, topographic mapping (large and medium scale)."],AREA["Liechtenstein; Switzerland."],BBOX[45.82,5.96,47.81,10.49]],ID["EPSG",2056]] +proj=somerc +lat_0=46.9524055555556 +lon_0=7.43958333333333 +k_0=1 +x_0=2600000 +y_0=1200000 +ellps=bessel +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs @@ -17294,41 +18487,41 @@ END - + - + - + @@ -17345,4 +18538,7 @@ END + + +