From f5e80c6862c2e151025d6fec65eb7bb5748229f2 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 30 Jan 2024 10:54:55 +0100 Subject: [PATCH] fix mirrors fix #133 --- data_model/app/vw_sign_symbol.py | 24 ++-- data_model/changelogs/0007/0007_indexes.sql | 3 + data_model/demo_data/azimut_content.sql | 2 + data_model/demo_data/frame_content.sql | 2 + data_model/demo_data/sign_content.sql | 2 + data_model/demo_data/support_content.sql | 2 + data_model/setup.sh | 2 +- .../editable/mirror-circular-noframe.svg | 83 ++++++++++++ .../images/other/editable/mirror-circular.svg | 83 ++++++++++++ .../images/other/editable/mirror-noframe.svg | 42 +++--- project/images/other/editable/mirror.svg | 42 +++--- .../original/mirror-circular-noframe.svg | 83 ++++++++++++ .../images/other/original/mirror-circular.svg | 83 ++++++++++++ .../images/other/original/mirror-noframe.svg | 42 +++--- project/images/other/original/mirror.svg | 42 +++--- project/signalo.qgs | 120 +++++++++--------- 16 files changed, 493 insertions(+), 164 deletions(-) create mode 100644 data_model/changelogs/0007/0007_indexes.sql create mode 100644 project/images/other/editable/mirror-circular-noframe.svg create mode 100644 project/images/other/editable/mirror-circular.svg create mode 100644 project/images/other/original/mirror-circular-noframe.svg create mode 100644 project/images/other/original/mirror-circular.svg diff --git a/data_model/app/vw_sign_symbol.py b/data_model/app/vw_sign_symbol.py index 44fe6338..8fb6134a 100644 --- a/data_model/app/vw_sign_symbol.py +++ b/data_model/app/vw_sign_symbol.py @@ -60,8 +60,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -70,8 +69,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -80,8 +78,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -90,8 +87,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -100,8 +96,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -110,8 +105,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -120,8 +114,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text @@ -130,8 +123,7 @@ def vw_sign_symbol(srid: int, pg_service: str = None): 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 = 13 AND sign.mirror_red_frame IS TRUE THEN 'mirror.svg'::text - WHEN sign.fk_sign_type = 13 AND sign.mirror_red_frame IS FALSE THEN 'mirror-noframe.svg'::text + 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 ELSE NULL::text diff --git a/data_model/changelogs/0007/0007_indexes.sql b/data_model/changelogs/0007/0007_indexes.sql new file mode 100644 index 00000000..3ce6d818 --- /dev/null +++ b/data_model/changelogs/0007/0007_indexes.sql @@ -0,0 +1,3 @@ +CREATE INDEX sign_fk_frame_idx ON signalo_db.sign (fk_frame); +CREATE INDEX frame_fk_azimut_idx ON signalo_db.frame (fk_azimut); +CREATE INDEX azimut_fk_support_idx ON signalo_db.azimut (fk_support); diff --git a/data_model/demo_data/azimut_content.sql b/data_model/demo_data/azimut_content.sql index 782108b9..98a2a0e1 100644 --- a/data_model/demo_data/azimut_content.sql +++ b/data_model/demo_data/azimut_content.sql @@ -4,7 +4,9 @@ INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_ INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('0d8fb844-ec63-43fb-a0e5-cd35a0c62565', '82f3002b-ebdf-4621-9a19-951639fc18bd', 200, NULL, NULL, NULL, '2023-09-06 09:22:19.287', 'Denis Rouzaud', '2023-11-14 05:56:42.155', 'Rouzaud Denis', false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('0e2cd688-3984-46b5-9f70-e052305e2cac', 'f5054922-95a7-4f12-8374-0a57e105327c', 290, NULL, NULL, NULL, '2023-02-22 10:06:58.155', 'Denis Rouzaud', '2023-09-07 09:35:52.676', 'Denis Rouzaud', false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('1193f576-089a-11eb-8b8b-0242ac110002', '814da66a-0894-11eb-99f5-0242ac110002', 0, NULL, NULL, NULL, '2023-02-22 08:31:37.751308', NULL, '2023-02-22 08:31:37.751308', NULL, false, 0, 0); +INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('38d32a6b-2145-4ac7-b890-7459d67cd167', '94ff73df-fc80-4319-b2b9-7aa06ca4f806', 90, NULL, NULL, NULL, '2024-01-30 10:16:21.373', 'Rouzaud Denis', '2024-01-30 10:54:23.077', 'Rouzaud Denis', false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('55ffc93c-fd0f-4c67-8fe7-da217124a793', 'bbdb5d1e-4973-4900-8838-889357a60e65', 180, NULL, NULL, NULL, '2023-09-06 09:22:19.287', 'Denis Rouzaud', '2023-11-24 10:43:42.024', 'Rouzaud Denis', false, 0, 0); +INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('779ffe5a-2538-41ed-8abe-79e6825a1b56', '3dbc19a5-b7bf-4acd-94d0-ba4b0b17ddc0', 180, NULL, NULL, NULL, '2024-01-30 10:16:21.373', 'Rouzaud Denis', '2024-01-30 10:54:13.024', 'Rouzaud Denis', false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('83fb8a3a-0899-11eb-8b8b-0242ac110002', '814da66a-0894-11eb-99f5-0242ac110002', 200, NULL, NULL, NULL, '2023-02-22 08:31:37.777955', NULL, '2023-02-22 08:31:37.777955', NULL, false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('9dcc763a-1af7-4fb8-9e32-085f74a3ef77', 'a3921fbd-8a89-4d82-b3b8-7a24a16f4df4', 280, NULL, NULL, NULL, '2023-09-07 09:36:47.07', 'Denis Rouzaud', '2023-09-07 09:39:36.121', 'Denis Rouzaud', false, 0, 0); INSERT INTO signalo_db.azimut (id, fk_support, azimut, usr_azimut_1, usr_azimut_2, usr_azimut_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, offset_x, offset_y) VALUES ('b3fd2055-2ab4-4da8-9dbc-a3aeba311fe7', 'f17d39cc-bac3-4134-9b9c-ea14e228d4b4', 290, NULL, NULL, NULL, '2023-08-31 16:15:55.608', 'Denis Rouzaud', '2023-11-14 08:33:25.694', 'Rouzaud Denis', false, 0, 0); diff --git a/data_model/demo_data/frame_content.sql b/data_model/demo_data/frame_content.sql index 2e057892..de47d12c 100644 --- a/data_model/demo_data/frame_content.sql +++ b/data_model/demo_data/frame_content.sql @@ -16,10 +16,12 @@ INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixin INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('642de2ea-089c-11eb-b19a-0242ac110002', 'dd9e3482-089b-11eb-8b8b-0242ac110002', 2, 3, 11, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-02-22 08:31:38.118357', NULL, '2023-02-22 08:31:38.118357', NULL, false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('68cb0b0b-2082-49cc-bf6d-b106c861dada', '9dcc763a-1af7-4fb8-9e32-085f74a3ef77', 3, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-09-07 09:42:33.329', 'Denis Rouzaud', '2023-09-07 09:42:33.329', 'Denis Rouzaud', false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('75f4bf9f-5f5e-4362-a4ce-fb29bb8c0123', 'b3fd2055-2ab4-4da8-9dbc-a3aeba311fe7', 2, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-08-31 16:19:50.073', 'Denis Rouzaud', '2023-08-31 16:19:50.074', 'Denis Rouzaud', false, 'CENTER'); +INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('79bf0ed6-b98e-4aab-af05-885612053033', '779ffe5a-2538-41ed-8abe-79e6825a1b56', 1, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-01-30 10:16:30.856', 'Rouzaud Denis', '2024-01-30 10:18:06.917', 'Rouzaud Denis', false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('a088c423-b088-4306-8b7f-a3b1151682ec', '55ffc93c-fd0f-4c67-8fe7-da217124a793', 1, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:22:23.311', 'Denis Rouzaud', '2023-11-08 13:28:04.949', 'Rouzaud Denis', false, 'RIGHT'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('a49c33b0-0926-11eb-b4e5-0242ac110002', 'dd9e3482-089b-11eb-8b8b-0242ac110002', 3, 12, 2, false, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-02-22 08:31:38.152963', NULL, '2023-02-22 08:31:38.152963', NULL, false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('a899745b-f562-47ca-9175-ef2e19ac18de', 'b3fd2055-2ab4-4da8-9dbc-a3aeba311fe7', 1, NULL, NULL, true, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-08-31 16:16:15.957', 'Denis Rouzaud', '2023-08-31 16:20:57.428', 'Denis Rouzaud', false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('bc6eb427-308e-4ff2-a94a-c1a2be2fc5af', '0e2cd688-3984-46b5-9f70-e052305e2cac', 1, 10, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-02-22 10:07:20.883', 'Denis Rouzaud', '2023-02-22 10:07:20.883', 'Denis Rouzaud', false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('c167ced0-efb2-4874-9816-1707f3b6ffec', 'd8a1e45b-7f4c-4c71-a12a-3a2df6d42045', 1, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-11-08 13:29:16.487', 'Rouzaud Denis', '2023-11-08 13:31:10.687', 'Rouzaud Denis', false, 'LEFT'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('da131ba0-42ed-4a60-a13d-ac35cea9edc5', 'bbb63098-ee04-4a0d-963d-4df18af5fa7a', 1, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:22:23.311', 'Denis Rouzaud', '2023-09-06 09:27:48.611', 'Denis Rouzaud', false, 'RIGHT'); +INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('de543457-a30a-4a5c-b470-6cffb7df792c', '38d32a6b-2145-4ac7-b890-7459d67cd167', 1, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2024-01-30 10:16:30.856', 'Rouzaud Denis', '2024-01-30 10:16:30.856', 'Rouzaud Denis', false, 'CENTER'); INSERT INTO signalo_db.frame (id, fk_azimut, rank, fk_frame_type, fk_frame_fixing_type, double_sided, fk_status, fk_provider, comment, picture, dimension_1, dimension_2, usr_frame_1, usr_frame_2, usr_frame_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, anchor) VALUES ('fdc08784-e5a6-4b0a-a299-2cc3e67a0079', '55ffc93c-fd0f-4c67-8fe7-da217124a793', 2, NULL, NULL, false, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:23:15.419', 'Denis Rouzaud', '2023-11-08 13:28:04.973', 'Rouzaud Denis', false, 'LEFT'); diff --git a/data_model/demo_data/sign_content.sql b/data_model/demo_data/sign_content.sql index 1896efcd..61e5b7dc 100644 --- a/data_model/demo_data/sign_content.sql +++ b/data_model/demo_data/sign_content.sql @@ -15,8 +15,10 @@ INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_offic INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('440440ae-7e32-11ee-bbd5-0242ac110002', 'a088c423-b088-4306-8b7f-a3b1151682ec', 1, false, 11, '4.32-1', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'Vevey', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:22:32.096', 'Denis Rouzaud', '2023-11-08 13:28:04.958', 'Rouzaud Denis', false, NULL, true, 'RECTO-VERSO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('4406af6a-7e32-11ee-bbd5-0242ac110002', 'fdc08784-e5a6-4b0a-a299-2cc3e67a0079', 1, false, 11, '4.32-1', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'Genève', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:23:21.671', 'Denis Rouzaud', '2023-11-08 13:28:04.979', 'Rouzaud Denis', false, NULL, true, 'RECTO-VERSO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('4d82377c-4c86-11ee-a7f4-0242ac110002', '1d945e23-3ba7-4a34-b3df-c9ac17b9827e', 1, false, 11, '4.32-1', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'Vevey', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-09-06 09:23:21.671', 'Denis Rouzaud', '2023-11-14 05:57:47.721', 'Rouzaud Denis', false, NULL, true, 'RECTO'); +INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('54e7a8a2-bf50-11ee-a144-0242ac110002', 'de543457-a30a-4a5c-b470-6cffb7df792c', 1, false, 13, NULL, NULL, 11, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2024-01-30 10:16:35.661', 'Rouzaud Denis', '2024-01-30 10:16:35.662', 'Rouzaud Denis', false, NULL, true, 'RECTO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('642e4438-089c-11eb-b19a-0242ac110002', '642de2ea-089c-11eb-b19a-0242ac110002', 1, false, 11, '1.05', NULL, NULL, NULL, '811a5b2a-0894-11eb-adef-0242ac110002', NULL, 2, 3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 11, 3, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-02-22 08:31:38.509558', NULL, '2023-02-22 08:31:38.509558', NULL, false, NULL, true, 'RECTO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('7358585e-b290-11ed-839a-0242ac110002', 'bc6eb427-308e-4ff2-a94a-c1a2be2fc5af', 1, false, 14, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'Rue des cygneaux', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-02-22 10:07:35.455', 'Denis Rouzaud', '2023-02-22 10:07:35.455', 'Denis Rouzaud', false, NULL, true, 'RECTO'); +INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('7a8a60ae-bf50-11ee-9efd-0242ac110002', '79bf0ed6-b98e-4aab-af05-885612053033', 1, false, 13, NULL, NULL, 12, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10, NULL, NULL, false, true, NULL, NULL, NULL, NULL, NULL, '2024-01-30 10:16:35.661', 'Rouzaud Denis', '2024-01-30 10:18:28.622', 'Rouzaud Denis', false, NULL, true, 'RECTO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('815f840e-4809-11ee-b1dc-0242ac110002', '75f4bf9f-5f5e-4362-a4ce-fb29bb8c0123', 1, false, 11, '2.32', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-08-31 16:19:54.172', 'Denis Rouzaud', '2023-08-31 16:20:35.183', 'Denis Rouzaud', false, NULL, true, 'RECTO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('8ed40678-7e32-11ee-9c43-0242ac110002', 'c167ced0-efb2-4874-9816-1707f3b6ffec', 1, false, 11, '4.49', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'OPENGIS.ch', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-11-08 13:29:18.774', 'Rouzaud Denis', '2023-11-08 13:29:18.774', 'Rouzaud Denis', false, NULL, true, 'RECTO'); INSERT INTO signalo_db.sign (id, fk_frame, rank, complex, fk_sign_type, fk_official_sign, fk_marker_type, fk_mirror_shape, fk_parent, fk_owner, fk_provider, fk_durability, fk_status, installation_date, manufacturing_date, case_id, case_decision, inscription_1, inscription_2, inscription_3, fk_coating, fk_lighting, comment, picture, mirror_protruding, mirror_red_frame, dimension_1, dimension_2, usr_sign_1, usr_sign_2, usr_sign_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, fk_user_sign, natural_direction_or_left, hanging_mode) VALUES ('9e8acdb6-4d51-11ee-b653-0242ac110002', '3c7fe8c4-d4bf-481c-9bb6-cfbe89c5c103', 1, false, 11, '4.33-1', NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, 'Gare', NULL, NULL, NULL, 10, NULL, NULL, false, false, NULL, NULL, NULL, NULL, NULL, '2023-09-07 09:37:43.359', 'Denis Rouzaud', '2023-09-07 09:42:22.182', 'Denis Rouzaud', false, NULL, true, 'RECTO'); diff --git a/data_model/demo_data/support_content.sql b/data_model/demo_data/support_content.sql index 20d4df0a..723e34f5 100644 --- a/data_model/demo_data/support_content.sql +++ b/data_model/demo_data/support_content.sql @@ -1,10 +1,12 @@ INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('00000000-0000-0000-0000-000000000002', NULL, 3, NULL, NULL, 2, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, '010100002008080000D7A370BDE85D434185EB513800963141', NULL, NULL, NULL, '2023-02-22 08:31:37.390486', NULL, '2023-02-22 08:31:37.390486', NULL, false, false, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('00000000-0000-0000-0000-0000000000a1', NULL, 17, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0101000020080800000B5CF94FA75C43411230DACDD6953141', NULL, NULL, NULL, NULL, 'Denis Rouzaud', '2023-09-07 09:43:52.317', 'Denis Rouzaud', false, true, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('2e988298-0897-11eb-8771-0242ac110002', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '010100002008080000C5E07FA4E65B43412E137A1C3E973141', NULL, NULL, NULL, '2023-02-22 08:31:37.401948', NULL, '2023-02-22 08:31:37.401948', NULL, false, false, NULL); +INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('3dbc19a5-b7bf-4acd-94d0-ba4b0b17ddc0', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '010100002008080000695437F02D5C43411DC707E6DE953141', NULL, NULL, NULL, '2024-01-30 10:16:13.613', 'Rouzaud Denis', '2024-01-30 10:54:03.024', 'Rouzaud Denis', false, true, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('4478bbcc-0236-46ee-b284-4c586e6af8a9', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '010100002008080000252FE84F125C43415140D9C4CA953141', NULL, NULL, NULL, '2023-06-21 08:36:14.555', 'Denis Rouzaud', '2023-09-07 09:45:41.314', 'Denis Rouzaud', false, false, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('70104932-54ff-4668-90b0-6946352d5544', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '010100002008080000D787DBE9695C434106D2DA8FF1953141', NULL, NULL, NULL, '2023-09-06 09:16:42.169', 'Denis Rouzaud', '2023-09-07 09:17:22.807', 'Denis Rouzaud', false, true, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('814da66a-0894-11eb-99f5-0242ac110002', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, '01010000200808000000000000CA5D4341CDCCCCCC4D963141', NULL, NULL, NULL, '2023-02-22 08:31:37.40358', NULL, '2023-02-22 08:31:37.40358', NULL, false, false, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('82f3002b-ebdf-4621-9a19-951639fc18bd', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01010000200808000065EF178C215C4341FEE7169213963141', NULL, NULL, NULL, '2023-09-06 09:16:42.169', 'Denis Rouzaud', '2023-09-07 09:18:20.141', 'Denis Rouzaud', false, true, NULL); +INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('94ff73df-fc80-4319-b2b9-7aa06ca4f806', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0101000020080800006E4ACFC2155C4341C63A7B2BEB953141', NULL, NULL, NULL, '2024-01-30 10:16:13.613', 'Rouzaud Denis', '2024-01-30 10:53:57.824', 'Rouzaud Denis', false, true, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('a3921fbd-8a89-4d82-b3b8-7a24a16f4df4', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0101000020080800004CFA6D0A0F5C4341DBDFED42AE953141', NULL, NULL, NULL, '2023-09-07 09:36:39.163', 'Denis Rouzaud', '2023-09-07 09:36:39.164', 'Denis Rouzaud', false, false, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('bbdb5d1e-4973-4900-8838-889357a60e65', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01010000200808000085E0E8F7D25B43413587DEC00D963141', NULL, NULL, NULL, '2023-09-06 09:16:42.169', 'Denis Rouzaud', '2023-11-08 13:28:41.075', 'Rouzaud Denis', false, true, NULL); INSERT INTO signalo_db.support (id, address, fk_support_type, fk_owner, fk_provider, fk_support_base_type, road_segment, height, height_free_under_signal, date_install, date_last_stability_check, fk_status, comment, picture, geometry, usr_support_1, usr_support_2, usr_support_3, _inserted_date, _inserted_user, _last_modified_date, _last_modified_user, _edited, group_by_anchor, picture_2) VALUES ('f17d39cc-bac3-4134-9b9c-ea14e228d4b4', NULL, 17, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0101000020080800004D41C2489A5C4341AB33A3FADD953141', NULL, NULL, NULL, '2023-08-31 16:15:34.605', 'Denis Rouzaud', '2023-09-07 09:43:49.619', 'Denis Rouzaud', false, true, NULL); diff --git a/data_model/setup.sh b/data_model/setup.sh index 39748bd8..e2f3cd4d 100755 --- a/data_model/setup.sh +++ b/data_model/setup.sh @@ -73,7 +73,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/0007/0007_anchor-point.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0007/0007_support_photo2.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0007/0007_user_signs_img.sql - +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0007/0007_indexes.sql if [[ $demo_data == True ]]; then echo "*** inserting demo_data" diff --git a/project/images/other/editable/mirror-circular-noframe.svg b/project/images/other/editable/mirror-circular-noframe.svg new file mode 100644 index 00000000..646c4c0c --- /dev/null +++ b/project/images/other/editable/mirror-circular-noframe.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/images/other/editable/mirror-circular.svg b/project/images/other/editable/mirror-circular.svg new file mode 100644 index 00000000..44acddff --- /dev/null +++ b/project/images/other/editable/mirror-circular.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/images/other/editable/mirror-noframe.svg b/project/images/other/editable/mirror-noframe.svg index 37ebcae2..c66c7b93 100644 --- a/project/images/other/editable/mirror-noframe.svg +++ b/project/images/other/editable/mirror-noframe.svg @@ -5,8 +5,8 @@ viewBox="0 0 100 80" version="1.1" id="svg891" - sodipodi:docname="mirror.svg" - inkscape:version="1.2.2 (b0a8486, 2022-12-01)" + sodipodi:docname="mirror-noframe.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -36,7 +36,7 @@ offset="0" id="stop860" /> @@ -49,7 +49,7 @@ x2="98.75" y2="50.000004" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.98205187,0,0,1.0103963,0.89740381,-10.519813)" /> + gradientTransform="matrix(1.031288,0,0,1.0746122,-1.5644016,-13.730608)" /> + width="99.471588" + height="79.471588" + x="0.2642065" + y="0.2642065" /> + width="99.471588" + height="79.471588" + x="0.2642065" + y="0.2642065" /> diff --git a/project/images/other/editable/mirror.svg b/project/images/other/editable/mirror.svg index e722baea..d8afd14d 100644 --- a/project/images/other/editable/mirror.svg +++ b/project/images/other/editable/mirror.svg @@ -5,8 +5,8 @@ viewBox="0 0 100 80" version="1.1" id="svg891" - sodipodi:docname="mirror.svg" - inkscape:version="1.2.2 (b0a8486, 2022-12-01)" + sodipodi:docname="mirror-rect-frame.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -36,7 +36,7 @@ offset="0" id="stop860" /> @@ -49,7 +49,7 @@ x2="98.75" y2="50.000004" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.031288,0,0,1.0746122,-1.5644016,-13.730608)" /> + gradientTransform="matrix(0.98205187,0,0,1.0103963,0.89740381,-10.519813)" /> + width="94.72258" + height="74.72258" + x="2.63871" + y="2.63871" /> + width="94.72258" + height="74.72258" + x="2.63871" + y="2.63871" /> diff --git a/project/images/other/original/mirror-circular-noframe.svg b/project/images/other/original/mirror-circular-noframe.svg new file mode 100644 index 00000000..646c4c0c --- /dev/null +++ b/project/images/other/original/mirror-circular-noframe.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/images/other/original/mirror-circular.svg b/project/images/other/original/mirror-circular.svg new file mode 100644 index 00000000..44acddff --- /dev/null +++ b/project/images/other/original/mirror-circular.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/images/other/original/mirror-noframe.svg b/project/images/other/original/mirror-noframe.svg index 37ebcae2..c66c7b93 100644 --- a/project/images/other/original/mirror-noframe.svg +++ b/project/images/other/original/mirror-noframe.svg @@ -5,8 +5,8 @@ viewBox="0 0 100 80" version="1.1" id="svg891" - sodipodi:docname="mirror.svg" - inkscape:version="1.2.2 (b0a8486, 2022-12-01)" + sodipodi:docname="mirror-noframe.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -36,7 +36,7 @@ offset="0" id="stop860" /> @@ -49,7 +49,7 @@ x2="98.75" y2="50.000004" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.98205187,0,0,1.0103963,0.89740381,-10.519813)" /> + gradientTransform="matrix(1.031288,0,0,1.0746122,-1.5644016,-13.730608)" /> + width="99.471588" + height="79.471588" + x="0.2642065" + y="0.2642065" /> + width="99.471588" + height="79.471588" + x="0.2642065" + y="0.2642065" /> diff --git a/project/images/other/original/mirror.svg b/project/images/other/original/mirror.svg index e722baea..d8afd14d 100644 --- a/project/images/other/original/mirror.svg +++ b/project/images/other/original/mirror.svg @@ -5,8 +5,8 @@ viewBox="0 0 100 80" version="1.1" id="svg891" - sodipodi:docname="mirror.svg" - inkscape:version="1.2.2 (b0a8486, 2022-12-01)" + sodipodi:docname="mirror-rect-frame.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -36,7 +36,7 @@ offset="0" id="stop860" /> @@ -49,7 +49,7 @@ x2="98.75" y2="50.000004" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.031288,0,0,1.0746122,-1.5644016,-13.730608)" /> + gradientTransform="matrix(0.98205187,0,0,1.0103963,0.89740381,-10.519813)" /> + width="94.72258" + height="74.72258" + x="2.63871" + y="2.63871" /> + width="94.72258" + height="74.72258" + x="2.63871" + y="2.63871" /> diff --git a/project/signalo.qgs b/project/signalo.qgs index bb192b3e..0b0da369 100644 --- a/project/signalo.qgs +++ b/project/signalo.qgs @@ -1,5 +1,5 @@ - + Signalo - Demo @@ -167,9 +167,9 @@ - - + + @@ -193,10 +193,10 @@ meters - 2537201.78926040325313807 - 1152333.50271277572028339 - 2537743.9898305693641305 - 1152701.01339640724472702 + 2537484.14173737168312073 + 1152444.50175221986137331 + 2537643.73349062167108059 + 1152552.67514334036968648 0 @@ -1247,16 +1247,10 @@ @@ -14064,7 +14058,7 @@ def my_form_open(dialog, layer, feature): - +