From 79eadd6cb253bb16273994ee5ea571ab09e19dca Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Thu, 1 Feb 2024 18:05:37 +0100 Subject: [PATCH 1/5] issue #103 multiple line signs for 4.27 and 4.29 --- .../changelogs/0100/0100_change_official.sql | 71 ++++++++++ project/images/official/editable/427-1.svg | 121 ++++++++++++++++ project/images/official/editable/427-2.svg | 131 +++++++++++++++++ .../official/editable/{427.svg => 427-3.svg} | 0 .../official/editable/{429.svg => 429-1.svg} | 0 project/images/official/editable/429-2.svg | 134 ++++++++++++++++++ project/images/official/original/427-1.svg | 86 +++++++++++ project/images/official/original/427-2.svg | 130 +++++++++++++++++ .../official/original/{427.svg => 427-3.svg} | 0 .../official/original/{429.svg => 429-1.svg} | 0 project/images/official/original/429-2.svg | 88 ++++++++++++ 11 files changed, 761 insertions(+) create mode 100644 datamodel/changelogs/0100/0100_change_official.sql create mode 100644 project/images/official/editable/427-1.svg create mode 100644 project/images/official/editable/427-2.svg rename project/images/official/editable/{427.svg => 427-3.svg} (100%) rename project/images/official/editable/{429.svg => 429-1.svg} (100%) create mode 100644 project/images/official/editable/429-2.svg create mode 100644 project/images/official/original/427-1.svg create mode 100644 project/images/official/original/427-2.svg rename project/images/official/original/{427.svg => 427-3.svg} (100%) rename project/images/official/original/{429.svg => 429-1.svg} (100%) create mode 100644 project/images/official/original/429-2.svg diff --git a/datamodel/changelogs/0100/0100_change_official.sql b/datamodel/changelogs/0100/0100_change_official.sql new file mode 100644 index 00000000..46e16f40 --- /dev/null +++ b/datamodel/changelogs/0100/0100_change_official.sql @@ -0,0 +1,71 @@ +INSERT INTO signalo_db.vl_official_sign( + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, + directional_sign) + VALUES ( + '4.27-1',true,'Ortsbeginn auf Hauptstrassen (1 Linie)', + 'Début de localité sur route principale (1 ligne)', + 'Inizio della località sulle strade principali (1 ligne)', + '427-1.svg', '427-1.svg', '427-1.svg', '427-1.svg', 80, 110, + 0, 'Biel', + false); + +INSERT INTO signalo_db.vl_official_sign( + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, + directional_sign) + VALUES ( + '4.27-2',true,'Ortsbeginn auf Hauptstrassen (2 Linien)', + 'Début de localité sur route principale (2 lignes)', + 'Inizio della località sulle strade principali (2 ligne)', + '427-2.svg', '427-2.svg', '427-2.svg', '427-2.svg', 80, 110, + 0, 'Biel', 'Bienne', + false); + +INSERT INTO signalo_db.vl_official_sign( + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, + directional_sign) + VALUES ( + '4.27-3',true,'Ortsbeginn auf Hauptstrassen (3 Linien)', + 'Début de localité sur route principale (3 lignes)', + 'Inizio della località sulle strade principali (3 ligne)', + '427-3.svg', '427-3.svg', '427-3.svg', '427-3.svg', 80, 110, + 0, 'Biel', 'Bienne', 'BE', + false); + +INSERT INTO signalo_db.vl_official_sign( + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, + directional_sign) + VALUES ( + '4.29-1', true, 'Ortsbeginn auf Nebenstrassen (1 Linie)', + 'Début de localité sur route secondaire (1 ligne)', + 'Inizio della località sulle strade secondarie (1 ligne)', + '429-1.svg', '429-1.svg', '429-1.svg', '429-1.svg', 80, 109, + 0, 'Maur', + false); + +INSERT INTO signalo_db.vl_official_sign( + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, + directional_sign) + VALUES ( + '4.29-2', true, 'Ortsbeginn auf Nebenstrassen (2 Linien)', + 'Début de localité sur route secondaire (2 lignes)', + 'Inizio della località sulle strade secondarie (2 ligne)', + '429-2.svg', '429-2.svg', '429-2.svg', '429-2.svg', 80, 109, + 0, 'Maur', '(ZH)', + false); + + +UPDATE signalo_db.sign SET fk_official_sign = '4.27-3' where fk_official_sign = '4.27'; +UPDATE signalo_db.sign SET fk_official_sign = '4.29-1' where fk_official_sign = '4.29'; + +DELETE from signalo_db.vl_official_sign where id = '4.27'; +DELETE from signalo_db.vl_official_sign where id = '4.29'; \ No newline at end of file diff --git a/project/images/official/editable/427-1.svg b/project/images/official/editable/427-1.svg new file mode 100644 index 00000000..eaca768e --- /dev/null +++ b/project/images/official/editable/427-1.svg @@ -0,0 +1,121 @@ + + + + + + image/svg+xml + + + + + + + + + + background + + + + + + + Layer 1 + image/svg+xml + + + + + + param(text1) + + diff --git a/project/images/official/editable/427-2.svg b/project/images/official/editable/427-2.svg new file mode 100644 index 00000000..6d0d6e6d --- /dev/null +++ b/project/images/official/editable/427-2.svg @@ -0,0 +1,131 @@ + + + + + + image/svg+xml + + + + + + + + + + background + + + + + + + Layer 1 + image/svg+xml + + + + + + param(text1) + param(text2) + + diff --git a/project/images/official/editable/427.svg b/project/images/official/editable/427-3.svg similarity index 100% rename from project/images/official/editable/427.svg rename to project/images/official/editable/427-3.svg diff --git a/project/images/official/editable/429.svg b/project/images/official/editable/429-1.svg similarity index 100% rename from project/images/official/editable/429.svg rename to project/images/official/editable/429-1.svg diff --git a/project/images/official/editable/429-2.svg b/project/images/official/editable/429-2.svg new file mode 100644 index 00000000..485aaa9a --- /dev/null +++ b/project/images/official/editable/429-2.svg @@ -0,0 +1,134 @@ + + + + + + image/svg+xml + + + + + + + + + background + + + + + + + Layer 1 + image/svg+xml + + + + + + param(text1) + param(text2) + + diff --git a/project/images/official/original/427-1.svg b/project/images/official/original/427-1.svg new file mode 100644 index 00000000..1e86e8b4 --- /dev/null +++ b/project/images/official/original/427-1.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/427-2.svg b/project/images/official/original/427-2.svg new file mode 100644 index 00000000..6fa72a80 --- /dev/null +++ b/project/images/official/original/427-2.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/427.svg b/project/images/official/original/427-3.svg similarity index 100% rename from project/images/official/original/427.svg rename to project/images/official/original/427-3.svg diff --git a/project/images/official/original/429.svg b/project/images/official/original/429-1.svg similarity index 100% rename from project/images/official/original/429.svg rename to project/images/official/original/429-1.svg diff --git a/project/images/official/original/429-2.svg b/project/images/official/original/429-2.svg new file mode 100644 index 00000000..4bbdb7c2 --- /dev/null +++ b/project/images/official/original/429-2.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + (ZH) + + + From 94e42ddd4ede464e90777ada5f6c91b04ffd35ac Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Thu, 1 Feb 2024 18:23:29 +0100 Subject: [PATCH 2/5] truncate too long texts in dynamic signs --- project/signalo.qgs | 13515 +++++++++++++++++++++--------------------- 1 file changed, 6749 insertions(+), 6766 deletions(-) diff --git a/project/signalo.qgs b/project/signalo.qgs index dc4ab29e..2f7ef231 100644 --- a/project/signalo.qgs +++ b/project/signalo.qgs @@ -1,5 +1,5 @@ - + Signalo - Demo @@ -21,141 +21,141 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -171,39 +171,39 @@ vw_azimut_edit_b7acca0e_e618_4f1d_8de3_08e2eb5bf359 - + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + meters - 2537450.29980725701898336 - 1152258.46691280556842685 - 2537915.8805440803989768 - 1152574.04366485821083188 + 2537532.56743369530886412 + 1152523.09258587122894824 + 2537549.06223299447447062 + 1152535.71745148790068924 0 @@ -224,165 +224,140 @@ - + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - degrees - - 0 - 0 - 0 - 0 - - 0 - - - GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - EPSG:7030 - true - - - 0 - - - + Annotations_12d93f67_97ee_4956_a1a1_ce69a09e6c74 @@ -433,18 +408,18 @@ - + 2419995.7488073636777699 - 1027366.07117159117478877 + 1027366.07117159408517182 2916216.88054902898147702 1350004.29247884848155081 - 5.01386794076819697 - 45.32503147953931233 + 5.0138679407681952 + 45.32503147953937628 11.6953415659446609 - 48.30010787128171046 + 48.30010787128173888 Landeskarten__farbig__a4d140cf_7103_4db6_a9bc_52ef09d7ea6b contextualWMSLegend=0&crs=EPSG:2056&dpiMode=7&featureCount=10&format=image/jpeg&layers=ch.swisstopo.pixelkarte-farbe&styles=ch.swisstopo.pixelkarte-farbe&tileDimensions=Time%3Dcurrent&tileMatrixSet=2056_27&url=https://wmts.geo.admin.ch/EPSG/2056/1.0.0/WMTSCapabilities.xml @@ -492,7 +467,7 @@ wms - + @@ -504,97 +479,97 @@ 0 0 - + - + - + - - - + - - - + - + None @@ -633,14 +608,14 @@ 2 - - + + resamplingFilter 0 - + -20037508.34278924390673637 -20037508.34278924763202667 @@ -700,7 +675,7 @@ wms - + @@ -712,97 +687,97 @@ 0 0 - + - + - + - - - + - - - + - + None @@ -841,25 +816,25 @@ 2 - - + + resamplingFilter 0 - + 2419995.7488073636777699 - 1027366.07117159117478877 + 1027366.07117159408517182 2916216.88054902898147702 1350004.29247884848155081 - 5.01386794076819697 - 45.32503147953931233 + 5.0138679407681952 + 45.32503147953937628 11.6953415659446609 - 48.30010787128171046 + 48.30010787128173888 SWISSIMAGE_Fond_de_plan_7d61cf38_35d1_4208_a775_1d854d304e6f contextualWMSLegend=0&crs=EPSG:2056&dpiMode=7&featureCount=10&format=image/jpeg&layers=ch.swisstopo.swissimage&styles=ch.swisstopo.swissimage&tileMatrixSet=2056_28&tileDimensions=Time%3Dcurrent&url=https://wmts.geo.admin.ch/EPSG/2056/1.0.0/WMTSCapabilities.xml?lang=fr @@ -907,7 +882,7 @@ wms - + @@ -919,97 +894,97 @@ 0 0 - + - + - + - - - + - - - + - + None @@ -1048,14 +1023,14 @@ 2 - - + + resamplingFilter 0 - + azimut_f5e94397_ee15_4ae1_95b8_af8a412676b3 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."azimut" @@ -1108,7 +1083,7 @@ - + @@ -1133,138 +1108,138 @@ 1 0 - + - + - + - - - + - - - + - - - @@ -1301,8 +1268,8 @@ - - + + @@ -1310,8 +1277,8 @@ @@ -1320,18 +1287,18 @@ @@ -1340,12 +1307,12 @@ @@ -1354,8 +1321,8 @@ @@ -1378,8 +1345,8 @@ @@ -1388,8 +1355,8 @@ @@ -1398,8 +1365,8 @@ @@ -1408,8 +1375,8 @@ @@ -1418,8 +1385,8 @@ @@ -1428,12 +1395,12 @@ @@ -1442,97 +1409,97 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - @@ -1565,59 +1532,59 @@ def my_form_open(dialog, layer, feature): tablayout - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -1635,39 +1602,39 @@ 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" @@ -1728,138 +1695,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -1928,42 +1895,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -1986,7 +1953,7 @@ def my_form_open(dialog, layer, feature): - + durability_a4cef524_85b2_4913_84a1_926afcce6000 service='pg_signalo' sslmode=disable key='id' checkPrimaryKeyUnicity='1' table="signalo_db"."vl_durability" @@ -2047,138 +2014,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -2247,42 +2214,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -2305,7 +2272,7 @@ 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" @@ -2358,7 +2325,7 @@ def my_form_open(dialog, layer, feature): - + @@ -2383,138 +2350,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -2551,8 +2518,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -2560,8 +2527,8 @@ def my_form_open(dialog, layer, feature): @@ -2570,18 +2537,18 @@ def my_form_open(dialog, layer, feature): @@ -2590,12 +2557,12 @@ def my_form_open(dialog, layer, feature): @@ -2604,19 +2571,19 @@ def my_form_open(dialog, layer, feature): @@ -2625,19 +2592,19 @@ def my_form_open(dialog, layer, feature): @@ -2646,9 +2613,9 @@ def my_form_open(dialog, layer, feature): @@ -2657,19 +2624,19 @@ def my_form_open(dialog, layer, feature): @@ -2678,19 +2645,19 @@ def my_form_open(dialog, layer, feature): @@ -2699,8 +2666,8 @@ def my_form_open(dialog, layer, feature): @@ -2709,21 +2676,21 @@ def my_form_open(dialog, layer, feature): - @@ -2732,12 +2699,12 @@ def my_form_open(dialog, layer, feature): @@ -2746,12 +2713,12 @@ def my_form_open(dialog, layer, feature): @@ -2781,8 +2748,8 @@ def my_form_open(dialog, layer, feature): @@ -2791,8 +2758,8 @@ def my_form_open(dialog, layer, feature): @@ -2801,8 +2768,8 @@ def my_form_open(dialog, layer, feature): @@ -2811,8 +2778,8 @@ def my_form_open(dialog, layer, feature): @@ -2821,8 +2788,8 @@ def my_form_open(dialog, layer, feature): @@ -2833,13 +2800,13 @@ def my_form_open(dialog, layer, feature): @@ -2848,125 +2815,125 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -2999,107 +2966,107 @@ def my_form_open(dialog, layer, feature): tablayout - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -3125,47 +3092,47 @@ 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" @@ -3226,138 +3193,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -3426,42 +3393,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -3484,7 +3451,7 @@ 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" @@ -3545,138 +3512,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -3745,42 +3712,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -3803,7 +3770,7 @@ 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" @@ -3864,138 +3831,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -4064,49 +4031,49 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -4129,7 +4096,7 @@ 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" @@ -4182,7 +4149,7 @@ def my_form_open(dialog, layer, feature): - + @@ -4207,138 +4174,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -4376,9 +4343,9 @@ def my_form_open(dialog, layer, feature): @@ -4413,50 +4380,50 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -4488,12 +4455,12 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - + + + + + + @@ -4504,19 +4471,19 @@ 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" @@ -4569,7 +4536,7 @@ def my_form_open(dialog, layer, feature): - + @@ -4594,138 +4561,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -4765,8 +4732,8 @@ def my_form_open(dialog, layer, feature): @@ -4775,8 +4742,8 @@ def my_form_open(dialog, layer, feature): @@ -4785,8 +4752,8 @@ def my_form_open(dialog, layer, feature): @@ -4807,50 +4774,50 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -4882,12 +4849,12 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - + + + + + + @@ -4898,19 +4865,19 @@ 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" @@ -4971,138 +4938,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -5314,145 +5281,145 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -5475,7 +5442,7 @@ 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" @@ -5528,7 +5495,7 @@ def my_form_open(dialog, layer, feature): - + @@ -5553,138 +5520,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -5714,8 +5681,8 @@ def my_form_open(dialog, layer, feature): @@ -5724,8 +5691,8 @@ def my_form_open(dialog, layer, feature): @@ -5734,8 +5701,8 @@ def my_form_open(dialog, layer, feature): @@ -5765,8 +5732,8 @@ def my_form_open(dialog, layer, feature): @@ -5775,8 +5742,8 @@ def my_form_open(dialog, layer, feature): @@ -5785,8 +5752,8 @@ def my_form_open(dialog, layer, feature): @@ -5795,78 +5762,78 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - @@ -5898,16 +5865,16 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - + + + + + + + + + + @@ -5922,23 +5889,23 @@ 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" @@ -5991,7 +5958,7 @@ def my_form_open(dialog, layer, feature): - + @@ -6016,138 +5983,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -6184,8 +6151,8 @@ def my_form_open(dialog, layer, feature): @@ -6194,8 +6161,8 @@ def my_form_open(dialog, layer, feature): @@ -6225,8 +6192,8 @@ def my_form_open(dialog, layer, feature): @@ -6235,8 +6202,8 @@ def my_form_open(dialog, layer, feature): @@ -6245,8 +6212,8 @@ def my_form_open(dialog, layer, feature): @@ -6255,78 +6222,78 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - @@ -6358,16 +6325,16 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - + + + + + + + + + + @@ -6382,23 +6349,23 @@ 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" @@ -6451,7 +6418,7 @@ def my_form_open(dialog, layer, feature): - + @@ -6462,8 +6429,8 @@ def my_form_open(dialog, layer, feature): postgres - - + + @@ -6479,138 +6446,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -6638,14 +6606,14 @@ def my_form_open(dialog, layer, feature): - - + + - - + + - - + + @@ -6653,8 +6621,8 @@ def my_form_open(dialog, layer, feature): @@ -6663,18 +6631,18 @@ def my_form_open(dialog, layer, feature): @@ -6683,8 +6651,8 @@ def my_form_open(dialog, layer, feature): @@ -6693,9 +6661,9 @@ def my_form_open(dialog, layer, feature): @@ -6704,19 +6672,19 @@ def my_form_open(dialog, layer, feature): @@ -6725,21 +6693,21 @@ def my_form_open(dialog, layer, feature): @@ -6748,19 +6716,19 @@ def my_form_open(dialog, layer, feature): @@ -6769,19 +6737,19 @@ def my_form_open(dialog, layer, feature): @@ -6790,19 +6758,19 @@ def my_form_open(dialog, layer, feature): @@ -6811,19 +6779,19 @@ def my_form_open(dialog, layer, feature): @@ -6832,19 +6800,19 @@ def my_form_open(dialog, layer, feature): @@ -6853,19 +6821,19 @@ def my_form_open(dialog, layer, feature): @@ -6874,19 +6842,19 @@ def my_form_open(dialog, layer, feature): @@ -6895,11 +6863,11 @@ def my_form_open(dialog, layer, feature): @@ -6908,11 +6876,11 @@ def my_form_open(dialog, layer, feature): @@ -6921,8 +6889,8 @@ def my_form_open(dialog, layer, feature): @@ -6931,8 +6899,8 @@ def my_form_open(dialog, layer, feature): @@ -6941,8 +6909,8 @@ def my_form_open(dialog, layer, feature): @@ -6951,8 +6919,8 @@ def my_form_open(dialog, layer, feature): @@ -6961,8 +6929,8 @@ def my_form_open(dialog, layer, feature): @@ -6971,19 +6939,19 @@ def my_form_open(dialog, layer, feature): @@ -6992,19 +6960,19 @@ def my_form_open(dialog, layer, feature): @@ -7013,8 +6981,8 @@ def my_form_open(dialog, layer, feature): @@ -7023,21 +6991,21 @@ def my_form_open(dialog, layer, feature): - @@ -7046,9 +7014,9 @@ def my_form_open(dialog, layer, feature): @@ -7057,9 +7025,9 @@ def my_form_open(dialog, layer, feature): @@ -7103,8 +7071,8 @@ def my_form_open(dialog, layer, feature): @@ -7113,8 +7081,8 @@ def my_form_open(dialog, layer, feature): @@ -7123,8 +7091,8 @@ def my_form_open(dialog, layer, feature): @@ -7133,8 +7101,8 @@ def my_form_open(dialog, layer, feature): @@ -7143,8 +7111,8 @@ def my_form_open(dialog, layer, feature): @@ -7153,21 +7121,21 @@ def my_form_open(dialog, layer, feature): @@ -7176,9 +7144,9 @@ def my_form_open(dialog, layer, feature): @@ -7194,9 +7162,9 @@ def my_form_open(dialog, layer, feature): @@ -7205,8 +7173,8 @@ def my_form_open(dialog, layer, feature): @@ -7299,12 +7267,12 @@ def my_form_open(dialog, layer, feature): @@ -7521,440 +7489,440 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -7987,305 +7955,305 @@ def my_form_open(dialog, layer, feature): tablayout - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8400,121 +8368,121 @@ 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" @@ -8575,138 +8543,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -8776,50 +8744,50 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -8842,7 +8810,7 @@ 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" @@ -8903,138 +8871,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -9103,42 +9071,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -9161,7 +9129,7 @@ def my_form_open(dialog, layer, feature): - + 2537381.93679434293881059 1152420.06054681539535522 @@ -9226,7 +9194,7 @@ def my_form_open(dialog, layer, feature): - + @@ -9240,8 +9208,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -9254,181 +9222,181 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - @@ -9455,54 +9423,54 @@ def my_form_open(dialog, layer, feature): 0 0 1 - - - - + + + + - + - + @@ -9510,12 +9478,12 @@ def my_form_open(dialog, layer, feature): - + @@ -9530,8 +9498,8 @@ def my_form_open(dialog, layer, feature): @@ -9540,8 +9508,8 @@ def my_form_open(dialog, layer, feature): @@ -9550,19 +9518,19 @@ def my_form_open(dialog, layer, feature): @@ -9571,19 +9539,19 @@ def my_form_open(dialog, layer, feature): @@ -9592,19 +9560,19 @@ def my_form_open(dialog, layer, feature): @@ -9613,19 +9581,19 @@ def my_form_open(dialog, layer, feature): @@ -9634,8 +9602,8 @@ def my_form_open(dialog, layer, feature): @@ -9644,8 +9612,8 @@ def my_form_open(dialog, layer, feature): @@ -9654,8 +9622,8 @@ def my_form_open(dialog, layer, feature): @@ -9664,11 +9632,11 @@ def my_form_open(dialog, layer, feature): @@ -9677,11 +9645,11 @@ def my_form_open(dialog, layer, feature): @@ -9690,19 +9658,19 @@ def my_form_open(dialog, layer, feature): @@ -9711,8 +9679,8 @@ def my_form_open(dialog, layer, feature): @@ -9721,21 +9689,21 @@ def my_form_open(dialog, layer, feature): - @@ -9744,8 +9712,8 @@ def my_form_open(dialog, layer, feature): @@ -9754,8 +9722,8 @@ def my_form_open(dialog, layer, feature): @@ -9764,8 +9732,8 @@ def my_form_open(dialog, layer, feature): @@ -9774,8 +9742,8 @@ def my_form_open(dialog, layer, feature): @@ -9784,8 +9752,8 @@ def my_form_open(dialog, layer, feature): @@ -9794,8 +9762,8 @@ def my_form_open(dialog, layer, feature): @@ -9804,8 +9772,8 @@ def my_form_open(dialog, layer, feature): @@ -9814,8 +9782,8 @@ def my_form_open(dialog, layer, feature): @@ -9824,9 +9792,9 @@ def my_form_open(dialog, layer, feature): @@ -9835,21 +9803,21 @@ def my_form_open(dialog, layer, feature): - @@ -9858,8 +9826,8 @@ def my_form_open(dialog, layer, feature): @@ -9868,161 +9836,161 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - @@ -10055,140 +10023,140 @@ def my_form_open(dialog, layer, feature): tablayout - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10223,48 +10191,48 @@ 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" @@ -10325,138 +10293,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -10525,42 +10493,42 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + @@ -10583,7 +10551,7 @@ 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" @@ -10636,7 +10604,7 @@ def my_form_open(dialog, layer, feature): - + @@ -10661,138 +10629,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - @@ -10823,8 +10791,8 @@ def my_form_open(dialog, layer, feature): @@ -10866,49 +10834,49 @@ def my_form_open(dialog, layer, feature): - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - @@ -10940,11 +10908,11 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - + + + + + @@ -10954,18 +10922,18 @@ 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" @@ -11018,7 +10986,7 @@ def my_form_open(dialog, layer, feature): - + @@ -11043,138 +11011,138 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - @@ -11214,8 +11182,8 @@ def my_form_open(dialog, layer, feature): @@ -11362,125 +11330,125 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -11512,27 +11480,27 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -11558,34 +11526,34 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + "id" || ' ' || attribute(concat('value_',@qgis_locale)) - + 2537381.93679434293881059 1152420.06054681539535522 @@ -11658,211 +11626,211 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - - - + 2537381.93679434293881059 1152420.06054681539535522 @@ -12008,224 +11976,224 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - - + + - + - - - + - - @@ -12249,7 +12217,7 @@ def my_form_open(dialog, layer, feature): 1 - @@ -12272,30 +12240,30 @@ def my_form_open(dialog, layer, feature): - - + + - - + + - - + + - - + + - + - + - @@ -12318,7 +12286,7 @@ def my_form_open(dialog, layer, feature): "id" - + 2537381.93679434293881059 1152420.06054681539535522 @@ -12383,7 +12351,7 @@ def my_form_open(dialog, layer, feature): - + @@ -12394,22 +12362,22 @@ def my_form_open(dialog, layer, feature): postgres - + - + - + - + @@ -12429,280 +12397,280 @@ def my_form_open(dialog, layer, feature): 1 0 - + - + - + - - - + - - - + - - - + - + - + - - - - - - - @@ -12711,195 +12679,195 @@ def my_form_open(dialog, layer, feature): - + - - - - + + + + - + - + - + - + - - - + + + - + - 0 0 1 - - - - + + + + - + - + @@ -12907,12 +12875,12 @@ def my_form_open(dialog, layer, feature): - + @@ -12927,8 +12895,8 @@ def my_form_open(dialog, layer, feature): @@ -12937,8 +12905,8 @@ def my_form_open(dialog, layer, feature): @@ -12947,11 +12915,11 @@ def my_form_open(dialog, layer, feature): @@ -12960,8 +12928,8 @@ def my_form_open(dialog, layer, feature): @@ -12970,11 +12938,11 @@ def my_form_open(dialog, layer, feature): @@ -12983,8 +12951,8 @@ def my_form_open(dialog, layer, feature): @@ -12993,8 +12961,8 @@ def my_form_open(dialog, layer, feature): @@ -13003,8 +12971,8 @@ def my_form_open(dialog, layer, feature): @@ -13013,8 +12981,8 @@ def my_form_open(dialog, layer, feature): @@ -13023,8 +12991,8 @@ def my_form_open(dialog, layer, feature): @@ -13033,8 +13001,8 @@ def my_form_open(dialog, layer, feature): @@ -13043,8 +13011,8 @@ def my_form_open(dialog, layer, feature): @@ -13053,19 +13021,19 @@ def my_form_open(dialog, layer, feature): @@ -13074,19 +13042,19 @@ def my_form_open(dialog, layer, feature): @@ -13095,19 +13063,19 @@ def my_form_open(dialog, layer, feature): @@ -13116,12 +13084,12 @@ def my_form_open(dialog, layer, feature): @@ -13130,12 +13098,12 @@ def my_form_open(dialog, layer, feature): @@ -13144,14 +13112,14 @@ def my_form_open(dialog, layer, feature): @@ -13160,19 +13128,19 @@ def my_form_open(dialog, layer, feature): @@ -13181,8 +13149,8 @@ def my_form_open(dialog, layer, feature): @@ -13191,8 +13159,8 @@ def my_form_open(dialog, layer, feature): @@ -13201,19 +13169,19 @@ def my_form_open(dialog, layer, feature): @@ -13222,19 +13190,19 @@ def my_form_open(dialog, layer, feature): @@ -13243,14 +13211,14 @@ def my_form_open(dialog, layer, feature): @@ -13266,8 +13234,8 @@ def my_form_open(dialog, layer, feature): @@ -13276,8 +13244,8 @@ def my_form_open(dialog, layer, feature): @@ -13286,8 +13254,8 @@ def my_form_open(dialog, layer, feature): @@ -13296,11 +13264,11 @@ def my_form_open(dialog, layer, feature): @@ -13309,11 +13277,11 @@ def my_form_open(dialog, layer, feature): @@ -13322,9 +13290,9 @@ def my_form_open(dialog, layer, feature): @@ -13333,9 +13301,9 @@ def my_form_open(dialog, layer, feature): @@ -13344,9 +13312,9 @@ def my_form_open(dialog, layer, feature): @@ -13355,8 +13323,8 @@ def my_form_open(dialog, layer, feature): @@ -13365,8 +13333,8 @@ def my_form_open(dialog, layer, feature): @@ -13375,8 +13343,8 @@ def my_form_open(dialog, layer, feature): @@ -13385,8 +13353,8 @@ def my_form_open(dialog, layer, feature): @@ -13395,21 +13363,21 @@ def my_form_open(dialog, layer, feature): - + - + @@ -13419,8 +13387,8 @@ def my_form_open(dialog, layer, feature): @@ -13429,11 +13397,11 @@ def my_form_open(dialog, layer, feature): @@ -13442,8 +13410,8 @@ def my_form_open(dialog, layer, feature): @@ -13452,11 +13420,11 @@ def my_form_open(dialog, layer, feature): @@ -13465,8 +13433,8 @@ def my_form_open(dialog, layer, feature): @@ -13482,8 +13450,8 @@ def my_form_open(dialog, layer, feature): @@ -13492,8 +13460,8 @@ def my_form_open(dialog, layer, feature): @@ -13502,8 +13470,8 @@ def my_form_open(dialog, layer, feature): @@ -13512,9 +13480,9 @@ def my_form_open(dialog, layer, feature): @@ -13523,14 +13491,14 @@ def my_form_open(dialog, layer, feature): @@ -13539,19 +13507,19 @@ def my_form_open(dialog, layer, feature): @@ -13560,19 +13528,19 @@ def my_form_open(dialog, layer, feature): @@ -13581,8 +13549,8 @@ def my_form_open(dialog, layer, feature): @@ -13591,19 +13559,19 @@ def my_form_open(dialog, layer, feature): @@ -13612,8 +13580,8 @@ def my_form_open(dialog, layer, feature): @@ -13622,12 +13590,12 @@ def my_form_open(dialog, layer, feature): @@ -13636,8 +13604,8 @@ def my_form_open(dialog, layer, feature): @@ -13646,8 +13614,8 @@ def my_form_open(dialog, layer, feature): @@ -13656,8 +13624,8 @@ def my_form_open(dialog, layer, feature): @@ -13666,12 +13634,12 @@ def my_form_open(dialog, layer, feature): @@ -13680,8 +13648,8 @@ def my_form_open(dialog, layer, feature): @@ -13690,9 +13658,9 @@ def my_form_open(dialog, layer, feature): @@ -13701,12 +13669,12 @@ def my_form_open(dialog, layer, feature): @@ -13715,9 +13683,9 @@ def my_form_open(dialog, layer, feature): @@ -13726,8 +13694,8 @@ def my_form_open(dialog, layer, feature): @@ -13736,8 +13704,8 @@ def my_form_open(dialog, layer, feature): @@ -13746,8 +13714,8 @@ def my_form_open(dialog, layer, feature): @@ -13756,8 +13724,8 @@ def my_form_open(dialog, layer, feature): @@ -13766,8 +13734,8 @@ def my_form_open(dialog, layer, feature): @@ -13776,8 +13744,8 @@ def my_form_open(dialog, layer, feature): @@ -13786,8 +13754,8 @@ def my_form_open(dialog, layer, feature): @@ -13796,8 +13764,8 @@ def my_form_open(dialog, layer, feature): @@ -13806,8 +13774,8 @@ def my_form_open(dialog, layer, feature): @@ -13816,8 +13784,8 @@ def my_form_open(dialog, layer, feature): @@ -13826,8 +13794,8 @@ def my_form_open(dialog, layer, feature): @@ -13836,8 +13804,8 @@ def my_form_open(dialog, layer, feature): @@ -13846,12 +13814,12 @@ def my_form_open(dialog, layer, feature): @@ -13860,12 +13828,12 @@ def my_form_open(dialog, layer, feature): @@ -13874,25 +13842,25 @@ def my_form_open(dialog, layer, feature): - + - + @@ -13909,9 +13877,9 @@ def my_form_open(dialog, layer, feature): @@ -13920,8 +13888,8 @@ def my_form_open(dialog, layer, feature): @@ -13930,8 +13898,8 @@ def my_form_open(dialog, layer, feature): @@ -13940,8 +13908,8 @@ def my_form_open(dialog, layer, feature): @@ -13950,8 +13918,8 @@ def my_form_open(dialog, layer, feature): @@ -13960,12 +13928,12 @@ def my_form_open(dialog, layer, feature): @@ -13974,8 +13942,8 @@ def my_form_open(dialog, layer, feature): @@ -13984,8 +13952,8 @@ def my_form_open(dialog, layer, feature): @@ -13994,8 +13962,8 @@ def my_form_open(dialog, layer, feature): @@ -14004,14 +13972,14 @@ def my_form_open(dialog, layer, feature): - + @@ -14021,8 +13989,8 @@ def my_form_open(dialog, layer, feature): @@ -14057,515 +14025,515 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -14598,585 +14566,592 @@ def my_form_open(dialog, layer, feature): tablayout - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15197,6 +15172,7 @@ def my_form_open(dialog, layer, feature): + @@ -15271,6 +15247,8 @@ def my_form_open(dialog, layer, feature): + + @@ -15297,112 +15275,117 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -15572,9 +15555,9 @@ END @@ -15601,83 +15584,83 @@ END - - - + + + - + - + - - - + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - + - + - + 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 @@ -15829,40 +15812,40 @@ END - + - + - + - + From e23ce61847d32c9d3a7350ac9778bebcaa0d4b70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:25:15 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../changelogs/0100/0100_change_official.sql | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/datamodel/changelogs/0100/0100_change_official.sql b/datamodel/changelogs/0100/0100_change_official.sql index 46e16f40..7ad991fd 100644 --- a/datamodel/changelogs/0100/0100_change_official.sql +++ b/datamodel/changelogs/0100/0100_change_official.sql @@ -1,71 +1,71 @@ INSERT INTO signalo_db.vl_official_sign( - id, active, value_de, value_fr, value_it, - img_de, img_fr, img_it, img_ro, img_height, img_width, - no_dynamic_inscription, default_inscription1, + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, directional_sign) VALUES ( - '4.27-1',true,'Ortsbeginn auf Hauptstrassen (1 Linie)', - 'Début de localité sur route principale (1 ligne)', - 'Inizio della località sulle strade principali (1 ligne)', - '427-1.svg', '427-1.svg', '427-1.svg', '427-1.svg', 80, 110, - 0, 'Biel', + '4.27-1',true,'Ortsbeginn auf Hauptstrassen (1 Linie)', + 'Début de localité sur route principale (1 ligne)', + 'Inizio della località sulle strade principali (1 ligne)', + '427-1.svg', '427-1.svg', '427-1.svg', '427-1.svg', 80, 110, + 0, 'Biel', false); - + INSERT INTO signalo_db.vl_official_sign( - id, active, value_de, value_fr, value_it, - img_de, img_fr, img_it, img_ro, img_height, img_width, - no_dynamic_inscription, default_inscription1, default_inscription2, + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, directional_sign) VALUES ( - '4.27-2',true,'Ortsbeginn auf Hauptstrassen (2 Linien)', - 'Début de localité sur route principale (2 lignes)', - 'Inizio della località sulle strade principali (2 ligne)', - '427-2.svg', '427-2.svg', '427-2.svg', '427-2.svg', 80, 110, + '4.27-2',true,'Ortsbeginn auf Hauptstrassen (2 Linien)', + 'Début de localité sur route principale (2 lignes)', + 'Inizio della località sulle strade principali (2 ligne)', + '427-2.svg', '427-2.svg', '427-2.svg', '427-2.svg', 80, 110, 0, 'Biel', 'Bienne', false); INSERT INTO signalo_db.vl_official_sign( - id, active, value_de, value_fr, value_it, - img_de, img_fr, img_it, img_ro, img_height, img_width, - no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, directional_sign) VALUES ( - '4.27-3',true,'Ortsbeginn auf Hauptstrassen (3 Linien)', - 'Début de localité sur route principale (3 lignes)', - 'Inizio della località sulle strade principali (3 ligne)', - '427-3.svg', '427-3.svg', '427-3.svg', '427-3.svg', 80, 110, + '4.27-3',true,'Ortsbeginn auf Hauptstrassen (3 Linien)', + 'Début de localité sur route principale (3 lignes)', + 'Inizio della località sulle strade principali (3 ligne)', + '427-3.svg', '427-3.svg', '427-3.svg', '427-3.svg', 80, 110, 0, 'Biel', 'Bienne', 'BE', false); INSERT INTO signalo_db.vl_official_sign( - id, active, value_de, value_fr, value_it, - img_de, img_fr, img_it, img_ro, img_height, img_width, - no_dynamic_inscription, default_inscription1, + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, directional_sign) VALUES ( - '4.29-1', true, 'Ortsbeginn auf Nebenstrassen (1 Linie)', - 'Début de localité sur route secondaire (1 ligne)', - 'Inizio della località sulle strade secondarie (1 ligne)', - '429-1.svg', '429-1.svg', '429-1.svg', '429-1.svg', 80, 109, - 0, 'Maur', + '4.29-1', true, 'Ortsbeginn auf Nebenstrassen (1 Linie)', + 'Début de localité sur route secondaire (1 ligne)', + 'Inizio della località sulle strade secondarie (1 ligne)', + '429-1.svg', '429-1.svg', '429-1.svg', '429-1.svg', 80, 109, + 0, 'Maur', false); INSERT INTO signalo_db.vl_official_sign( - id, active, value_de, value_fr, value_it, - img_de, img_fr, img_it, img_ro, img_height, img_width, - no_dynamic_inscription, default_inscription1, default_inscription2, + id, active, value_de, value_fr, value_it, + img_de, img_fr, img_it, img_ro, img_height, img_width, + no_dynamic_inscription, default_inscription1, default_inscription2, directional_sign) VALUES ( - '4.29-2', true, 'Ortsbeginn auf Nebenstrassen (2 Linien)', - 'Début de localité sur route secondaire (2 lignes)', - 'Inizio della località sulle strade secondarie (2 ligne)', - '429-2.svg', '429-2.svg', '429-2.svg', '429-2.svg', 80, 109, + '4.29-2', true, 'Ortsbeginn auf Nebenstrassen (2 Linien)', + 'Début de localité sur route secondaire (2 lignes)', + 'Inizio della località sulle strade secondarie (2 ligne)', + '429-2.svg', '429-2.svg', '429-2.svg', '429-2.svg', 80, 109, 0, 'Maur', '(ZH)', false); - - + + UPDATE signalo_db.sign SET fk_official_sign = '4.27-3' where fk_official_sign = '4.27'; UPDATE signalo_db.sign SET fk_official_sign = '4.29-1' where fk_official_sign = '4.29'; DELETE from signalo_db.vl_official_sign where id = '4.27'; -DELETE from signalo_db.vl_official_sign where id = '4.29'; \ No newline at end of file +DELETE from signalo_db.vl_official_sign where id = '4.29'; From 265852fee0f7dee0aa5b1a10015a6146af52c1fc Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Thu, 1 Feb 2024 18:38:38 +0100 Subject: [PATCH 4/5] setup with new migration --- datamodel/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/datamodel/setup.sh b/datamodel/setup.sh index 12458125..e2aa77d7 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -74,6 +74,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_support_photo2.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_add_signs_img.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_indexes.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_change_official.sql if [[ $demo_data == True ]]; then echo "*** inserting demo_data" From 25190d08af7f61fea226d6e5c3dd0d395106d512 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Fri, 2 Feb 2024 08:07:05 +0100 Subject: [PATCH 5/5] fix number of inscription --- datamodel/changelogs/0100/0100_change_official.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datamodel/changelogs/0100/0100_change_official.sql b/datamodel/changelogs/0100/0100_change_official.sql index 7ad991fd..4ac03f6d 100644 --- a/datamodel/changelogs/0100/0100_change_official.sql +++ b/datamodel/changelogs/0100/0100_change_official.sql @@ -8,7 +8,7 @@ INSERT INTO signalo_db.vl_official_sign( 'Début de localité sur route principale (1 ligne)', 'Inizio della località sulle strade principali (1 ligne)', '427-1.svg', '427-1.svg', '427-1.svg', '427-1.svg', 80, 110, - 0, 'Biel', + 1, 'Biel', false); INSERT INTO signalo_db.vl_official_sign( @@ -21,7 +21,7 @@ INSERT INTO signalo_db.vl_official_sign( 'Début de localité sur route principale (2 lignes)', 'Inizio della località sulle strade principali (2 ligne)', '427-2.svg', '427-2.svg', '427-2.svg', '427-2.svg', 80, 110, - 0, 'Biel', 'Bienne', + 2, 'Biel', 'Bienne', false); INSERT INTO signalo_db.vl_official_sign( @@ -34,7 +34,7 @@ INSERT INTO signalo_db.vl_official_sign( 'Début de localité sur route principale (3 lignes)', 'Inizio della località sulle strade principali (3 ligne)', '427-3.svg', '427-3.svg', '427-3.svg', '427-3.svg', 80, 110, - 0, 'Biel', 'Bienne', 'BE', + 3, 'Biel', 'Bienne', 'BE', false); INSERT INTO signalo_db.vl_official_sign( @@ -47,7 +47,7 @@ INSERT INTO signalo_db.vl_official_sign( 'Début de localité sur route secondaire (1 ligne)', 'Inizio della località sulle strade secondarie (1 ligne)', '429-1.svg', '429-1.svg', '429-1.svg', '429-1.svg', 80, 109, - 0, 'Maur', + 1, 'Maur', false); INSERT INTO signalo_db.vl_official_sign( @@ -60,7 +60,7 @@ INSERT INTO signalo_db.vl_official_sign( 'Début de localité sur route secondaire (2 lignes)', 'Inizio della località sulle strade secondarie (2 ligne)', '429-2.svg', '429-2.svg', '429-2.svg', '429-2.svg', 80, 109, - 0, 'Maur', '(ZH)', + 2, 'Maur', '(ZH)', false);