From b2c47e484c3f24f80fee50256414c10b23e5766d Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Mon, 25 Mar 2024 14:33:43 +0100 Subject: [PATCH 01/11] 4.77 signs --- datamodel/changelogs/0100/0100_08_477_signs | 43 +++++++ project/images/official/editable/477_1.svg | 42 +++++++ project/images/official/editable/477_10.svg | 46 +++++++ project/images/official/editable/477_11-1.svg | 50 ++++++++ .../editable/{477-1.svg => 477_11-2.svg} | 34 ++--- project/images/official/editable/477_12.svg | 46 +++++++ project/images/official/editable/477_13.svg | 50 ++++++++ project/images/official/editable/477_14.svg | 50 ++++++++ project/images/official/editable/477_15.svg | 54 ++++++++ project/images/official/editable/477_16.svg | 42 +++++++ project/images/official/editable/477_17.svg | 42 +++++++ project/images/official/editable/477_18.svg | 46 +++++++ project/images/official/editable/477_19.svg | 46 +++++++ project/images/official/editable/477_2.svg | 46 +++++++ project/images/official/editable/477_20.svg | 46 +++++++ project/images/official/editable/477_21.svg | 46 +++++++ project/images/official/editable/477_22.svg | 46 +++++++ project/images/official/editable/477_23.svg | 46 +++++++ project/images/official/editable/477_24.svg | 90 +++++++++++++ project/images/official/editable/477_25.svg | 46 +++++++ project/images/official/editable/477_26.svg | 58 +++++++++ project/images/official/editable/477_27.svg | 54 ++++++++ project/images/official/editable/477_28-1.svg | 62 +++++++++ project/images/official/editable/477_28-2.svg | 119 ++++++++++++++++++ project/images/official/editable/477_29.svg | 54 ++++++++ project/images/official/editable/477_3.svg | 46 +++++++ project/images/official/editable/477_4.svg | 46 +++++++ project/images/official/editable/477_5.svg | 46 +++++++ project/images/official/editable/477_6.svg | 50 ++++++++ project/images/official/editable/477_7.svg | 50 ++++++++ project/images/official/editable/477_8.svg | 50 ++++++++ project/images/official/editable/477_9.svg | 50 ++++++++ project/images/official/original/477_1.svg | 42 +++++++ project/images/official/original/477_10.svg | 46 +++++++ project/images/official/original/477_11-1.svg | 50 ++++++++ .../original/{477-1.svg => 477_11-2.svg} | 0 project/images/official/original/477_12.svg | 46 +++++++ project/images/official/original/477_13.svg | 50 ++++++++ project/images/official/original/477_14.svg | 50 ++++++++ project/images/official/original/477_15.svg | 54 ++++++++ project/images/official/original/477_16.svg | 42 +++++++ project/images/official/original/477_17.svg | 42 +++++++ project/images/official/original/477_18.svg | 46 +++++++ project/images/official/original/477_19.svg | 46 +++++++ project/images/official/original/477_2.svg | 46 +++++++ project/images/official/original/477_20.svg | 46 +++++++ project/images/official/original/477_21.svg | 46 +++++++ project/images/official/original/477_22.svg | 46 +++++++ project/images/official/original/477_23.svg | 46 +++++++ project/images/official/original/477_24.svg | 90 +++++++++++++ project/images/official/original/477_25.svg | 46 +++++++ project/images/official/original/477_26.svg | 58 +++++++++ project/images/official/original/477_27.svg | 54 ++++++++ project/images/official/original/477_28-1.svg | 62 +++++++++ project/images/official/original/477_28-2.svg | 86 +++++++++++++ project/images/official/original/477_29.svg | 54 ++++++++ project/images/official/original/477_3.svg | 46 +++++++ project/images/official/original/477_4.svg | 46 +++++++ project/images/official/original/477_5.svg | 46 +++++++ project/images/official/original/477_6.svg | 50 ++++++++ project/images/official/original/477_7.svg | 50 ++++++++ project/images/official/original/477_8.svg | 50 ++++++++ project/images/official/original/477_9.svg | 50 ++++++++ 63 files changed, 3157 insertions(+), 17 deletions(-) create mode 100644 datamodel/changelogs/0100/0100_08_477_signs create mode 100644 project/images/official/editable/477_1.svg create mode 100644 project/images/official/editable/477_10.svg create mode 100644 project/images/official/editable/477_11-1.svg rename project/images/official/editable/{477-1.svg => 477_11-2.svg} (93%) create mode 100644 project/images/official/editable/477_12.svg create mode 100644 project/images/official/editable/477_13.svg create mode 100644 project/images/official/editable/477_14.svg create mode 100644 project/images/official/editable/477_15.svg create mode 100644 project/images/official/editable/477_16.svg create mode 100644 project/images/official/editable/477_17.svg create mode 100644 project/images/official/editable/477_18.svg create mode 100644 project/images/official/editable/477_19.svg create mode 100644 project/images/official/editable/477_2.svg create mode 100644 project/images/official/editable/477_20.svg create mode 100644 project/images/official/editable/477_21.svg create mode 100644 project/images/official/editable/477_22.svg create mode 100644 project/images/official/editable/477_23.svg create mode 100644 project/images/official/editable/477_24.svg create mode 100644 project/images/official/editable/477_25.svg create mode 100644 project/images/official/editable/477_26.svg create mode 100644 project/images/official/editable/477_27.svg create mode 100644 project/images/official/editable/477_28-1.svg create mode 100644 project/images/official/editable/477_28-2.svg create mode 100644 project/images/official/editable/477_29.svg create mode 100644 project/images/official/editable/477_3.svg create mode 100644 project/images/official/editable/477_4.svg create mode 100644 project/images/official/editable/477_5.svg create mode 100644 project/images/official/editable/477_6.svg create mode 100644 project/images/official/editable/477_7.svg create mode 100644 project/images/official/editable/477_8.svg create mode 100644 project/images/official/editable/477_9.svg create mode 100644 project/images/official/original/477_1.svg create mode 100644 project/images/official/original/477_10.svg create mode 100644 project/images/official/original/477_11-1.svg rename project/images/official/original/{477-1.svg => 477_11-2.svg} (100%) create mode 100644 project/images/official/original/477_12.svg create mode 100644 project/images/official/original/477_13.svg create mode 100644 project/images/official/original/477_14.svg create mode 100644 project/images/official/original/477_15.svg create mode 100644 project/images/official/original/477_16.svg create mode 100644 project/images/official/original/477_17.svg create mode 100644 project/images/official/original/477_18.svg create mode 100644 project/images/official/original/477_19.svg create mode 100644 project/images/official/original/477_2.svg create mode 100644 project/images/official/original/477_20.svg create mode 100644 project/images/official/original/477_21.svg create mode 100644 project/images/official/original/477_22.svg create mode 100644 project/images/official/original/477_23.svg create mode 100644 project/images/official/original/477_24.svg create mode 100644 project/images/official/original/477_25.svg create mode 100644 project/images/official/original/477_26.svg create mode 100644 project/images/official/original/477_27.svg create mode 100644 project/images/official/original/477_28-1.svg create mode 100644 project/images/official/original/477_28-2.svg create mode 100644 project/images/official/original/477_29.svg create mode 100644 project/images/official/original/477_3.svg create mode 100644 project/images/official/original/477_4.svg create mode 100644 project/images/official/original/477_5.svg create mode 100644 project/images/official/original/477_6.svg create mode 100644 project/images/official/original/477_7.svg create mode 100644 project/images/official/original/477_8.svg create mode 100644 project/images/official/original/477_9.svg diff --git a/datamodel/changelogs/0100/0100_08_477_signs b/datamodel/changelogs/0100/0100_08_477_signs new file mode 100644 index 00000000..8c78a300 --- /dev/null +++ b/datamodel/changelogs/0100/0100_08_477_signs @@ -0,0 +1,43 @@ + +-- Vermehrung von Fahrstreifen, Augmentation du nombre de voies de circulation - 4.77 1-3 +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/01', true, 'Vermehrung von Fahrstreifen (1)', 'Augmentation du nombre de voies de circulation (1)', 'Aumento del numero di corsie di traffico (1)', NULL, NULL, NULL, NULL, NULL, '477_1.svg', '477_1.svg', '477_1.svg', '477_1.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/02', true, 'Vermehrung von Fahrstreifen (2)', 'Augmentation du nombre de voies de circulation (2)', 'Aumento del numero di corsie di traffico (2)', NULL, NULL, NULL, NULL, NULL, '477_2.svg', '477_2.svg', '477_2.svg', '477_2.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/03', true, 'Vermehrung von Fahrstreifen (3)', 'Augmentation du nombre de voies de circulation (3)', 'Aumento del numero di corsie di traffico (3)', NULL, NULL, NULL, NULL, NULL, '477_3.svg', '477_3.svg', '477_3.svg', '477_3.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); + +-- Zusammenführung von Fahrbahnen, Convergence de chaussées - 4.77 4-9 +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/04', true, 'Zusammenführung von Fahrbahnen (von rechts)', 'Convergence de chaussées (de droite)', 'Convergenza stradale (destra)', NULL, NULL, NULL, NULL, NULL, '477_4.svg', '477_4.svg', '477_4.svg', '477_4.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/05', true, 'Zusammenführung von Fahrbahnen (von links)', 'Convergence de chaussées (de gauche)', 'Convergenza stradale (sinistra)', NULL, NULL, NULL, NULL, NULL, '477_5.svg', '477_5.svg', '477_5.svg', '477_5.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/06', true, 'Zusammenführung von Fahrbahnen (zwei von rechts)', 'Convergence de chaussées (deux de droite)', 'Convergenza stradale (due a destra)', NULL, NULL, NULL, NULL, NULL, '477_6.svg', '477_6.svg', '477_6.svg', '477_6.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/07', true, 'Zusammenführung von Fahrbahnen (eine von rechts)', 'Convergence de chaussées (une de droite)', 'Convergenza stradale (una a destra)', NULL, NULL, NULL, NULL, NULL, '477_7.svg', '477_7.svg', '477_7.svg', '477_7.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/08', true, 'Zusammenführung von Fahrbahnen (eine von links)', 'Convergence de chaussées (une de gauche)', 'Convergenza stradale (una a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_8.svg', '477_8.svg', '477_8.svg', '477_8.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/09', true, 'Zusammenführung von Fahrbahnen (zwei von links)', 'Convergence de chaussées (deux de gauche)', 'Convergenza stradale (due a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_9.svg', '477_9.svg', '477_9.svg', '477_9.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); + +-- Bestätigung der Anzahl Fahrstreifen, Confirmation du nombre de voies de circulation - 4.77 10-15 +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/10', true, 'Bestätigung der Anzahl Fahrstreifen (zwei)', 'Confirmation du nombre de voies de circulation (deux)', 'Conferma del numero di corsie di traffico (due)', NULL, NULL, NULL, NULL, NULL, '477_10.svg', '477_10.svg', '477_10.svg', '477_10.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-1', true, 'Bestätigung der Anzahl Fahrstreifen (drei)', 'Confirmation du nombre de voies de circulation (trois)', 'Conferma del numero di corsie di traffico (tre)', NULL, NULL, NULL, NULL, NULL, '477_11-1.svg', '477_11-1.svg', '477_11-1.svg', '477_11-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-2', true, 'Bestätigung der Anzahl Fahrstreifen (drei, mit Geschwindigkeitsbegrenzung)', 'Confirmation du nombre de voies de circulation (trois, avec réduction de vitesse)', 'Conferma del numero di corsie di traffico (tre, con riduzione della velocità)', NULL, NULL, NULL, NULL, NULL, '477_11-2.svg', '477_11-2.svg', '477_11-2.svg', '477_11-2.svg', 100, 100, 1, '80', NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/12', true, 'Bestätigung der Anzahl Fahrstreifen (zwei, Gegenverkehr)', 'Confirmation du nombre de voies de circulation (deux, circulation à contresens)', 'Conferma del numero di corsie di traffico (due, traffico bidirezionale)', NULL, NULL, NULL, NULL, NULL, '477_12.svg', '477_12.svg', '477_12.svg', '477_12.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/13', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr einspurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens une voie)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in una corsia)', NULL, NULL, NULL, NULL, NULL, '477_13.svg', '477_13.svg', '477_13.svg', '477_13.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/14', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr zweispurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens deux voies)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in due corsie)', NULL, NULL, NULL, NULL, NULL, '477_14.svg', '477_14.svg', '477_14.svg', '477_14.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/15', true, 'Bestätigung der Anzahl Fahrstreifen (vier, doppelspurig)', 'Confirmation du nombre de voies de circulation (quatre, double voies)', 'Conferma del numero di corsie di traffico (quattro, doppio binario)', NULL, NULL, NULL, NULL, NULL, '477_15.svg', '477_15.svg', '477_15.svg', '477_15.svg', 100, 125, 0, NULL, NULL, NULL, NULL, false); + +-- Verminderung von Fahrstreifen, Diminution du nombre de voies de circulation - 4.77 16-19 +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/16', true, 'Verminderung von Fahrstreifen (einer, rechts)', 'Diminution du nombre de voies de circulation (une, droite)', 'Riduzione del numero di corsie di traffico (una, a destra)', NULL, NULL, NULL, NULL, NULL, '477_16.svg', '477_16.svg', '477_16.svg', '477_16.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/17', true, 'Verminderung von Fahrstreifen (einer, links)', 'Diminution du nombre de voies de circulation (une, gauche)', 'Riduzione del numero di corsie di traffico (una, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_17.svg', '477_17.svg', '477_17.svg', '477_17.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/18', true, 'Verminderung von Fahrstreifen (zwei, links)', 'Diminution du nombre de voies de circulation (deux, gauche)', 'Riduzione del numero di corsie di traffico (due, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_18.svg', '477_18.svg', '477_18.svg', '477_18.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/19', true, 'Verminderung von Fahrstreifen (einer, links, mit Gegenverkehr)', 'Diminution du nombre de voies de circulation (une, gauche, avec circulation à contresens)', 'Riduzione del numero di corsie di traffico (una, a sinistra, con traffico in controcorrente)', NULL, NULL, NULL, NULL, NULL, '477_19.svg', '477_19.svg', '477_19.svg', '477_19.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); + +-- Anzeige des Fahrstreifenverlaufs, Indication du tracé des voies de circulation - 4.77 20-29 +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/20', true, 'Anzeige des Fahrstreifenverlaufs (nach links)', 'Indication du tracé des voies de circulation (à gauche)', 'Segnaletica di corsia (sinistra)', NULL, NULL, NULL, NULL, NULL, '477_20.svg', '477_20.svg', '477_20.svg', '477_20.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/21', true, 'Anzeige des Fahrstreifenverlaufs (nach rechts)', 'Indication du tracé des voies de circulation (à droite)', 'Segnaletica di corsia (destra)', NULL, NULL, NULL, NULL, NULL, '477_21.svg', '477_21.svg', '477_21.svg', '477_21.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/22', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach links)', 'Indication du tracé des voies de circulation (évitement à gauche)', 'Segnaletica di corsia (sterzare a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_22.svg', '477_22.svg', '477_22.svg', '477_22.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/23', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach rechts)', 'Indication du tracé des voies de circulation (évitement à droite)', 'Segnaletica di corsia (sterzare a destra)', NULL, NULL, NULL, NULL, NULL, '477_23.svg', '477_23.svg', '477_23.svg', '477_23.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); + +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/24', true, 'Verschwenkung von Fahrstreifen (Hindernis links)', 'Déplacement latéral des voies de circulation (obstacle à gauche)', 'Spostamento laterale delle corsie di traffico (ostacolo a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_24.svg', '477_24.svg', '477_24.svg', '477_24.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/25', true, 'Verschwenkung von Fahrstreifen (Hindernis mittig)', 'Déplacement latéral des voies de circulation (obstacle au milieu)', 'Spostamento laterale delle corsie di traffico (nel mezzo)', NULL, NULL, NULL, NULL, NULL, '477_25.svg', '477_25.svg', '477_25.svg', '477_25.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); + +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/26', true, 'Überleitung und Rückführung von Fahrstreifen (einspurig)', 'Dégagement et retour des voies de circulation (à une voie)', 'Sgombero e ripristino delle corsie di traffico (a una corsia)', NULL, NULL, NULL, NULL, NULL, '477_26.svg', '477_26.svg', '477_26.svg', '477_26.svg', 100, 72, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/27', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach links)', 'Dégagement et retour des voies de circulation (à deux voies à gauche)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_27.svg', '477_27.svg', '477_27.svg', '477_27.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-1', true, 'Überleitung und Rückführung von Fahrstreifen (eine Spur)', 'Dégagement et retour des voies de circulation (une voie)', 'Sgombero e ripristino delle corsie di traffico (due corsie)', NULL, NULL, NULL, NULL, NULL, '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-2', true, 'Überleitung und Rückführung von Fahrstreifen (Spurverengung)', 'Dégagement et retour des voies de circulation (rétrécissement de la voie)', 'Sgombero e ripristino delle corsie di traffico (restringimento della corsia)', NULL, NULL, NULL, NULL, NULL, '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', 100, 100, 1, '2 m', NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477_29.svg', '477_29.svg', '477_29.svg', '477_29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); \ No newline at end of file diff --git a/project/images/official/editable/477_1.svg b/project/images/official/editable/477_1.svg new file mode 100644 index 00000000..2393b73b --- /dev/null +++ b/project/images/official/editable/477_1.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_10.svg b/project/images/official/editable/477_10.svg new file mode 100644 index 00000000..88c636f7 --- /dev/null +++ b/project/images/official/editable/477_10.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_11-1.svg b/project/images/official/editable/477_11-1.svg new file mode 100644 index 00000000..a081ae2e --- /dev/null +++ b/project/images/official/editable/477_11-1.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477-1.svg b/project/images/official/editable/477_11-2.svg similarity index 93% rename from project/images/official/editable/477-1.svg rename to project/images/official/editable/477_11-2.svg index 22b86f19..4f4028b0 100644 --- a/project/images/official/editable/477-1.svg +++ b/project/images/official/editable/477_11-2.svg @@ -1,18 +1,18 @@ + sodipodi:docname="477_11-2.svg" + inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -21,7 +21,6 @@ image/svg+xml - @@ -37,16 +36,17 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-height="1147" id="namedview1120" showgrid="false" inkscape:zoom="2.7777778" - inkscape:cx="133.91508" - inkscape:cy="76.720259" - inkscape:window-x="3832" - inkscape:window-y="-3" + inkscape:cx="133.92" + inkscape:cy="76.859999" + inkscape:window-x="0" + inkscape:window-y="25" inkscape:window-maximized="1" - inkscape:current-layer="svg1118" /> + inkscape:current-layer="g1116" + inkscape:pagecheckerboard="0" /> param(text1) diff --git a/project/images/official/editable/477_12.svg b/project/images/official/editable/477_12.svg new file mode 100644 index 00000000..4ca95eb5 --- /dev/null +++ b/project/images/official/editable/477_12.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_13.svg b/project/images/official/editable/477_13.svg new file mode 100644 index 00000000..69987b77 --- /dev/null +++ b/project/images/official/editable/477_13.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_14.svg b/project/images/official/editable/477_14.svg new file mode 100644 index 00000000..83a94fa9 --- /dev/null +++ b/project/images/official/editable/477_14.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_15.svg b/project/images/official/editable/477_15.svg new file mode 100644 index 00000000..ee4560e1 --- /dev/null +++ b/project/images/official/editable/477_15.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_16.svg b/project/images/official/editable/477_16.svg new file mode 100644 index 00000000..9af65d0c --- /dev/null +++ b/project/images/official/editable/477_16.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_17.svg b/project/images/official/editable/477_17.svg new file mode 100644 index 00000000..d0c25a8c --- /dev/null +++ b/project/images/official/editable/477_17.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_18.svg b/project/images/official/editable/477_18.svg new file mode 100644 index 00000000..ac4fea83 --- /dev/null +++ b/project/images/official/editable/477_18.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_19.svg b/project/images/official/editable/477_19.svg new file mode 100644 index 00000000..19a040f2 --- /dev/null +++ b/project/images/official/editable/477_19.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_2.svg b/project/images/official/editable/477_2.svg new file mode 100644 index 00000000..16e5e1b8 --- /dev/null +++ b/project/images/official/editable/477_2.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_20.svg b/project/images/official/editable/477_20.svg new file mode 100644 index 00000000..b0dc7ecb --- /dev/null +++ b/project/images/official/editable/477_20.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_21.svg b/project/images/official/editable/477_21.svg new file mode 100644 index 00000000..b76f390a --- /dev/null +++ b/project/images/official/editable/477_21.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_22.svg b/project/images/official/editable/477_22.svg new file mode 100644 index 00000000..3a5218db --- /dev/null +++ b/project/images/official/editable/477_22.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_23.svg b/project/images/official/editable/477_23.svg new file mode 100644 index 00000000..e8997792 --- /dev/null +++ b/project/images/official/editable/477_23.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_24.svg b/project/images/official/editable/477_24.svg new file mode 100644 index 00000000..485889f1 --- /dev/null +++ b/project/images/official/editable/477_24.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_25.svg b/project/images/official/editable/477_25.svg new file mode 100644 index 00000000..3cb5c304 --- /dev/null +++ b/project/images/official/editable/477_25.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_26.svg b/project/images/official/editable/477_26.svg new file mode 100644 index 00000000..f27319be --- /dev/null +++ b/project/images/official/editable/477_26.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_27.svg b/project/images/official/editable/477_27.svg new file mode 100644 index 00000000..6a2d6ac0 --- /dev/null +++ b/project/images/official/editable/477_27.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_28-1.svg b/project/images/official/editable/477_28-1.svg new file mode 100644 index 00000000..4a3abc7c --- /dev/null +++ b/project/images/official/editable/477_28-1.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_28-2.svg b/project/images/official/editable/477_28-2.svg new file mode 100644 index 00000000..18d8b786 --- /dev/null +++ b/project/images/official/editable/477_28-2.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + param(text1)m + + + + diff --git a/project/images/official/editable/477_29.svg b/project/images/official/editable/477_29.svg new file mode 100644 index 00000000..31ca780c --- /dev/null +++ b/project/images/official/editable/477_29.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_3.svg b/project/images/official/editable/477_3.svg new file mode 100644 index 00000000..01f588c2 --- /dev/null +++ b/project/images/official/editable/477_3.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_4.svg b/project/images/official/editable/477_4.svg new file mode 100644 index 00000000..785e8308 --- /dev/null +++ b/project/images/official/editable/477_4.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_5.svg b/project/images/official/editable/477_5.svg new file mode 100644 index 00000000..ba3e1c30 --- /dev/null +++ b/project/images/official/editable/477_5.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_6.svg b/project/images/official/editable/477_6.svg new file mode 100644 index 00000000..700af5ac --- /dev/null +++ b/project/images/official/editable/477_6.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_7.svg b/project/images/official/editable/477_7.svg new file mode 100644 index 00000000..be573f96 --- /dev/null +++ b/project/images/official/editable/477_7.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_8.svg b/project/images/official/editable/477_8.svg new file mode 100644 index 00000000..53014bc0 --- /dev/null +++ b/project/images/official/editable/477_8.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/477_9.svg b/project/images/official/editable/477_9.svg new file mode 100644 index 00000000..efffd95c --- /dev/null +++ b/project/images/official/editable/477_9.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_1.svg b/project/images/official/original/477_1.svg new file mode 100644 index 00000000..2393b73b --- /dev/null +++ b/project/images/official/original/477_1.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_10.svg b/project/images/official/original/477_10.svg new file mode 100644 index 00000000..88c636f7 --- /dev/null +++ b/project/images/official/original/477_10.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_11-1.svg b/project/images/official/original/477_11-1.svg new file mode 100644 index 00000000..a081ae2e --- /dev/null +++ b/project/images/official/original/477_11-1.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477-1.svg b/project/images/official/original/477_11-2.svg similarity index 100% rename from project/images/official/original/477-1.svg rename to project/images/official/original/477_11-2.svg diff --git a/project/images/official/original/477_12.svg b/project/images/official/original/477_12.svg new file mode 100644 index 00000000..4ca95eb5 --- /dev/null +++ b/project/images/official/original/477_12.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_13.svg b/project/images/official/original/477_13.svg new file mode 100644 index 00000000..69987b77 --- /dev/null +++ b/project/images/official/original/477_13.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_14.svg b/project/images/official/original/477_14.svg new file mode 100644 index 00000000..83a94fa9 --- /dev/null +++ b/project/images/official/original/477_14.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_15.svg b/project/images/official/original/477_15.svg new file mode 100644 index 00000000..ee4560e1 --- /dev/null +++ b/project/images/official/original/477_15.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_16.svg b/project/images/official/original/477_16.svg new file mode 100644 index 00000000..9af65d0c --- /dev/null +++ b/project/images/official/original/477_16.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_17.svg b/project/images/official/original/477_17.svg new file mode 100644 index 00000000..d0c25a8c --- /dev/null +++ b/project/images/official/original/477_17.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_18.svg b/project/images/official/original/477_18.svg new file mode 100644 index 00000000..ac4fea83 --- /dev/null +++ b/project/images/official/original/477_18.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_19.svg b/project/images/official/original/477_19.svg new file mode 100644 index 00000000..19a040f2 --- /dev/null +++ b/project/images/official/original/477_19.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_2.svg b/project/images/official/original/477_2.svg new file mode 100644 index 00000000..16e5e1b8 --- /dev/null +++ b/project/images/official/original/477_2.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_20.svg b/project/images/official/original/477_20.svg new file mode 100644 index 00000000..b0dc7ecb --- /dev/null +++ b/project/images/official/original/477_20.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_21.svg b/project/images/official/original/477_21.svg new file mode 100644 index 00000000..b76f390a --- /dev/null +++ b/project/images/official/original/477_21.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_22.svg b/project/images/official/original/477_22.svg new file mode 100644 index 00000000..3a5218db --- /dev/null +++ b/project/images/official/original/477_22.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_23.svg b/project/images/official/original/477_23.svg new file mode 100644 index 00000000..e8997792 --- /dev/null +++ b/project/images/official/original/477_23.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_24.svg b/project/images/official/original/477_24.svg new file mode 100644 index 00000000..485889f1 --- /dev/null +++ b/project/images/official/original/477_24.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_25.svg b/project/images/official/original/477_25.svg new file mode 100644 index 00000000..3cb5c304 --- /dev/null +++ b/project/images/official/original/477_25.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_26.svg b/project/images/official/original/477_26.svg new file mode 100644 index 00000000..f27319be --- /dev/null +++ b/project/images/official/original/477_26.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_27.svg b/project/images/official/original/477_27.svg new file mode 100644 index 00000000..6a2d6ac0 --- /dev/null +++ b/project/images/official/original/477_27.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_28-1.svg b/project/images/official/original/477_28-1.svg new file mode 100644 index 00000000..4a3abc7c --- /dev/null +++ b/project/images/official/original/477_28-1.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_28-2.svg b/project/images/official/original/477_28-2.svg new file mode 100644 index 00000000..c64d42a3 --- /dev/null +++ b/project/images/official/original/477_28-2.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_29.svg b/project/images/official/original/477_29.svg new file mode 100644 index 00000000..31ca780c --- /dev/null +++ b/project/images/official/original/477_29.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_3.svg b/project/images/official/original/477_3.svg new file mode 100644 index 00000000..01f588c2 --- /dev/null +++ b/project/images/official/original/477_3.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_4.svg b/project/images/official/original/477_4.svg new file mode 100644 index 00000000..785e8308 --- /dev/null +++ b/project/images/official/original/477_4.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_5.svg b/project/images/official/original/477_5.svg new file mode 100644 index 00000000..ba3e1c30 --- /dev/null +++ b/project/images/official/original/477_5.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_6.svg b/project/images/official/original/477_6.svg new file mode 100644 index 00000000..700af5ac --- /dev/null +++ b/project/images/official/original/477_6.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_7.svg b/project/images/official/original/477_7.svg new file mode 100644 index 00000000..be573f96 --- /dev/null +++ b/project/images/official/original/477_7.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_8.svg b/project/images/official/original/477_8.svg new file mode 100644 index 00000000..53014bc0 --- /dev/null +++ b/project/images/official/original/477_8.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/477_9.svg b/project/images/official/original/477_9.svg new file mode 100644 index 00000000..efffd95c --- /dev/null +++ b/project/images/official/original/477_9.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + From 11070df9407514731e902aa0786dfc6082b08208 Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Mon, 25 Mar 2024 14:57:32 +0100 Subject: [PATCH 02/11] correction of svg files --- project/images/official/editable/132.svg | 86 ++++++-- project/images/official/editable/216.svg | 30 +-- project/images/official/editable/407a.svg | 10 +- project/images/official/editable/450-1-l.svg | 192 ++++++------------ project/images/official/editable/450-1-r.svg | 192 ++++++------------ project/images/official/editable/450-3-l.svg | 167 +++++----------- project/images/official/editable/450-3-r.svg | 167 +++++----------- project/images/official/editable/450-4-l.svg | 126 +++++------- project/images/official/editable/450-4-r.svg | 86 ++++---- project/images/official/editable/450-5.svg | 66 +++++- project/images/official/editable/450-6.svg | 66 +++++- project/images/official/editable/451-2.svg | 70 ++++++- project/images/official/editable/451-4.svg | 93 ++++++++- project/images/official/editable/467.svg | 200 +++++++++---------- project/images/official/editable/473.svg | 12 +- project/images/official/editable/492.svg | 78 +++++++- project/images/official/editable/493.svg | 123 ++++++++++-- project/images/official/editable/494.svg | 73 ++++++- project/images/official/editable/495.svg | 83 +++++++- project/images/official/original/132.svg | 86 ++++++-- project/images/official/original/450-4-l.svg | 109 +++++----- project/images/official/original/450-4-r.svg | 69 +++---- project/images/official/original/450-5.svg | 66 +++++- project/images/official/original/450-6.svg | 66 +++++- project/images/official/original/451-2.svg | 70 ++++++- project/images/official/original/451-4.svg | 93 ++++++++- project/images/official/original/492.svg | 78 +++++++- project/images/official/original/493.svg | 123 ++++++++++-- project/images/official/original/494.svg | 73 ++++++- project/images/official/original/495.svg | 83 +++++++- 30 files changed, 1830 insertions(+), 1006 deletions(-) diff --git a/project/images/official/editable/132.svg b/project/images/official/editable/132.svg index fe1b8b31..a8efc497 100644 --- a/project/images/official/editable/132.svg +++ b/project/images/official/editable/132.svg @@ -1,14 +1,74 @@ - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/216.svg b/project/images/official/editable/216.svg index 0e1dc270..e0fe18fc 100644 --- a/project/images/official/editable/216.svg +++ b/project/images/official/editable/216.svg @@ -41,11 +41,12 @@ showgrid="false" inkscape:zoom="3.494423" inkscape:cx="-7.2048738" - inkscape:cy="-11.862481" - inkscape:window-x="3832" - inkscape:window-y="-3" + inkscape:cy="-34.756103" + inkscape:window-x="5752" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="svg1707" /> + inkscape:current-layer="svg1707" + inkscape:document-rotation="0" /> @@ -94,27 +95,8 @@ font-size="20px" id="svg_14" y="49.93866" - x="17.726891" + x="25" stroke-width="0" stroke="#000000" fill="#000000">param(text1) - t diff --git a/project/images/official/editable/407a.svg b/project/images/official/editable/407a.svg index 3818a9fd..d6625312 100644 --- a/project/images/official/editable/407a.svg +++ b/project/images/official/editable/407a.svg @@ -167,16 +167,16 @@ d="m 241.93749,210.25779 c 2.53124,1.6094 4.90624,3.46876 7,5.56252 l 18.0156,-18.09376 -14.125,-15.07812 -10.8906,27.60936" /> param(text1) diff --git a/project/images/official/editable/450-1-l.svg b/project/images/official/editable/450-1-l.svg index c032ad81..371ed5a7 100644 --- a/project/images/official/editable/450-1-l.svg +++ b/project/images/official/editable/450-1-l.svg @@ -1,33 +1,31 @@ + inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="metadata2022"> image/svg+xml - + id="defs2020" /> - - - - - - - - - - - - - - - - - - - - + inkscape:current-layer="svg2016" + inkscape:document-rotation="0" + inkscape:pagecheckerboard="0" /> + + + background + + + + + + transform="matrix(-0.17556393,0,0,0.17556393,180.44333,0.7734457)"> param(text1) + fill="#ffffff">param(text1) diff --git a/project/images/official/editable/450-1-r.svg b/project/images/official/editable/450-1-r.svg index 555759ec..de698e60 100644 --- a/project/images/official/editable/450-1-r.svg +++ b/project/images/official/editable/450-1-r.svg @@ -1,33 +1,31 @@ + inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + id="metadata2022"> image/svg+xml - + id="defs2020" /> - - - - - - - - - - - - - - - - - - - - + inkscape:current-layer="svg2016" + inkscape:document-rotation="0" + inkscape:pagecheckerboard="0" /> + + + background + + + + + + transform="matrix(0.17556393,0,0,0.17556393,4.8794665,0.7734457)"> param(text1) + fill="#ffffff">param(text1) diff --git a/project/images/official/editable/450-3-l.svg b/project/images/official/editable/450-3-l.svg index 57280bad..28b9d049 100644 --- a/project/images/official/editable/450-3-l.svg +++ b/project/images/official/editable/450-3-l.svg @@ -7,15 +7,14 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="86pt" - height="22pt" - viewBox="0 0 86 22" + width="185" + height="36" version="1.1" - id="svg5103" - sodipodi:docname="450-3-l.svg" + id="svg323" + sodipodi:docname="450-3-g.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + id="metadata329"> @@ -27,7 +26,7 @@ + id="defs327" /> - - - - - - - - - - - - - - - - - - - - + + + background + + + + + + transform="matrix(-0.17345093,0,0,0.17345093,180.97038,0.5657733)"> param(text1) + fill="#ffffff">param(text1) diff --git a/project/images/official/editable/450-3-r.svg b/project/images/official/editable/450-3-r.svg index a9d2bebe..d7e1bd23 100644 --- a/project/images/official/editable/450-3-r.svg +++ b/project/images/official/editable/450-3-r.svg @@ -7,15 +7,14 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="86pt" - height="22pt" - viewBox="0 0 86 22" + width="185" + height="36" version="1.1" - id="svg5103" - sodipodi:docname="450-3-r.svg" + id="svg323" + sodipodi:docname="450-3-d.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"> + id="metadata329"> @@ -27,7 +26,7 @@ + id="defs327" /> - - - - - - - - - - - - - - - - - - - - + + + background + + + + + + transform="matrix(0.17345093,0,0,0.17345093,7.519522,0.5657733)"> param(text1) + fill="#ffffff">param(text1) diff --git a/project/images/official/editable/450-4-l.svg b/project/images/official/editable/450-4-l.svg index ff1d1c99..f7f4f200 100644 --- a/project/images/official/editable/450-4-l.svg +++ b/project/images/official/editable/450-4-l.svg @@ -1,19 +1,15 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,62 +18,11 @@ image/svg+xml - - - - - - - - - - + + + + + + + + + param(text1) + + diff --git a/project/images/official/editable/450-4-r.svg b/project/images/official/editable/450-4-r.svg index e472b18e..3a1637f2 100644 --- a/project/images/official/editable/450-4-r.svg +++ b/project/images/official/editable/450-4-r.svg @@ -1,19 +1,15 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,52 +18,42 @@ image/svg+xml - - - - - + aria-label="i" + id="text10957" + style="font-style:italic;font-size:12px;line-height:1.25;-inkscape-font-specification:'sans-serif Italic';fill:#ffffff;stroke-width:0.75"> + + + + + + + param(text1) + diff --git a/project/images/official/editable/450-5.svg b/project/images/official/editable/450-5.svg index 8ead9ccc..6c96d8d5 100644 --- a/project/images/official/editable/450-5.svg +++ b/project/images/official/editable/450-5.svg @@ -1,7 +1,61 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + diff --git a/project/images/official/editable/450-6.svg b/project/images/official/editable/450-6.svg index f709486b..9fa9a772 100644 --- a/project/images/official/editable/450-6.svg +++ b/project/images/official/editable/450-6.svg @@ -1,7 +1,61 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + diff --git a/project/images/official/editable/451-2.svg b/project/images/official/editable/451-2.svg index 68df8c50..a73aac0a 100644 --- a/project/images/official/editable/451-2.svg +++ b/project/images/official/editable/451-2.svg @@ -1,7 +1,65 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + diff --git a/project/images/official/editable/451-4.svg b/project/images/official/editable/451-4.svg index 9ecf9a28..d9f84bec 100644 --- a/project/images/official/editable/451-4.svg +++ b/project/images/official/editable/451-4.svg @@ -1,11 +1,84 @@ - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/467.svg b/project/images/official/editable/467.svg index 813fbd7a..3536c6e9 100644 --- a/project/images/official/editable/467.svg +++ b/project/images/official/editable/467.svg @@ -7,8 +7,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="151pt" - height="95pt" + width="154" + height="100" version="1.1" id="svg936" sodipodi:docname="467.svg" @@ -40,113 +40,107 @@ inkscape:window-height="1017" id="namedview938" showgrid="false" - units="pt" + units="px" inkscape:zoom="2.8557214" inkscape:cx="100.5" inkscape:cy="65" - inkscape:window-x="3832" - inkscape:window-y="-3" + inkscape:window-x="5752" + inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="svg936" /> + inkscape:current-layer="svg936" + inkscape:document-rotation="0" /> + - - background - - - - - - - Layer 1 - image/svg+xml - - - - - - - - - param(text1) - param(text2) - param(text3) m - + + + + + + + + + + param(text1) + param(text2) + param(text3) m diff --git a/project/images/official/editable/473.svg b/project/images/official/editable/473.svg index 0d334ac6..928b21f1 100644 --- a/project/images/official/editable/473.svg +++ b/project/images/official/editable/473.svg @@ -43,10 +43,18 @@ inkscape:zoom="6.4119718" inkscape:cx="48.773836" inkscape:cy="18.814767" - inkscape:window-x="5752" + inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="svg943" /> + inkscape:current-layer="svg943" + inkscape:document-rotation="0" /> + - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/project/images/official/editable/493.svg b/project/images/official/editable/493.svg index 6d2517d2..0b778b58 100644 --- a/project/images/official/editable/493.svg +++ b/project/images/official/editable/493.svg @@ -1,15 +1,110 @@ - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/494.svg b/project/images/official/editable/494.svg index df00c39d..31bbc71a 100644 --- a/project/images/official/editable/494.svg +++ b/project/images/official/editable/494.svg @@ -1,7 +1,68 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/project/images/official/editable/495.svg b/project/images/official/editable/495.svg index 77ed76e8..59c2a763 100644 --- a/project/images/official/editable/495.svg +++ b/project/images/official/editable/495.svg @@ -1,7 +1,78 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/images/official/original/132.svg b/project/images/official/original/132.svg index fe1b8b31..a8efc497 100644 --- a/project/images/official/original/132.svg +++ b/project/images/official/original/132.svg @@ -1,14 +1,74 @@ - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/images/official/original/450-4-l.svg b/project/images/official/original/450-4-l.svg index ab0b3808..b16e3a99 100644 --- a/project/images/official/original/450-4-l.svg +++ b/project/images/official/original/450-4-l.svg @@ -1,19 +1,15 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,51 +18,11 @@ image/svg+xml - - - - - - - - - + + + + + + + + + + + diff --git a/project/images/official/original/450-4-r.svg b/project/images/official/original/450-4-r.svg index 15bae306..c619e197 100644 --- a/project/images/official/original/450-4-r.svg +++ b/project/images/official/original/450-4-r.svg @@ -1,19 +1,15 @@ + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -22,41 +18,36 @@ image/svg+xml - - - - + aria-label="i" + id="text10957" + style="font-style:italic;font-size:12px;line-height:1.25;-inkscape-font-specification:'sans-serif Italic';fill:#ffffff;stroke-width:0.75"> + + + + + + + + diff --git a/project/images/official/original/450-5.svg b/project/images/official/original/450-5.svg index 8ead9ccc..6c96d8d5 100644 --- a/project/images/official/original/450-5.svg +++ b/project/images/official/original/450-5.svg @@ -1,7 +1,61 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + diff --git a/project/images/official/original/450-6.svg b/project/images/official/original/450-6.svg index f709486b..9fa9a772 100644 --- a/project/images/official/original/450-6.svg +++ b/project/images/official/original/450-6.svg @@ -1,7 +1,61 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + diff --git a/project/images/official/original/451-2.svg b/project/images/official/original/451-2.svg index 68df8c50..a73aac0a 100644 --- a/project/images/official/original/451-2.svg +++ b/project/images/official/original/451-2.svg @@ -1,7 +1,65 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + diff --git a/project/images/official/original/451-4.svg b/project/images/official/original/451-4.svg index 9ecf9a28..d9f84bec 100644 --- a/project/images/official/original/451-4.svg +++ b/project/images/official/original/451-4.svg @@ -1,11 +1,84 @@ - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/images/official/original/492.svg b/project/images/official/original/492.svg index 6bb0bc7f..a4450972 100644 --- a/project/images/official/original/492.svg +++ b/project/images/official/original/492.svg @@ -1,8 +1,72 @@ - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/project/images/official/original/493.svg b/project/images/official/original/493.svg index 6d2517d2..0b778b58 100644 --- a/project/images/official/original/493.svg +++ b/project/images/official/original/493.svg @@ -1,15 +1,110 @@ - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/494.svg b/project/images/official/original/494.svg index df00c39d..31bbc71a 100644 --- a/project/images/official/original/494.svg +++ b/project/images/official/original/494.svg @@ -1,7 +1,68 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/project/images/official/original/495.svg b/project/images/official/original/495.svg index 77ed76e8..59c2a763 100644 --- a/project/images/official/original/495.svg +++ b/project/images/official/original/495.svg @@ -1,7 +1,78 @@ - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + From 98ac7cd9221bff6199109233109a8088cfd86fc2 Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Mon, 25 Mar 2024 16:04:44 +0100 Subject: [PATCH 03/11] setup with 08 migration --- datamodel/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/datamodel/setup.sh b/datamodel/setup.sh index 68d08778..3d676cde 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -77,6 +77,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_05_change_official.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_06_direction_user_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_07_missing_left_right.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477_signs.sql if [[ $demo_data == True ]]; then echo "*** inserting demo_data" From 777b051b6f0bedae228d436111d1f98e6fa365bd Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Mon, 25 Mar 2024 17:20:37 +0100 Subject: [PATCH 04/11] exception and autorisation signs --- .../changelogs/0100/0100_09_exceptes.sql | 6 + datamodel/setup.sh | 1 + .../official/editable/500-exception-a.svg | 49 ++++ .../official/editable/500-exception-b.svg | 49 ++++ .../official/editable/525-530-531-a.svg | 149 ++++++++++++ .../official/editable/525-530-531-b.svg | 176 ++++++++++++++ project/images/official/editable/531-1-a.svg | 97 ++++++++ project/images/official/editable/531-1-b.svg | 89 ++++++++ project/images/official/editable/531-2-a.svg | 57 +++++ project/images/official/editable/531-2-b.svg | 57 +++++ project/images/official/editable/531-3-a.svg | 100 ++++++++ project/images/official/editable/531-3-b.svg | 77 +++++++ .../official/original/500-exception-a.svg | 49 ++++ .../official/original/500-exception-b.svg | 72 ++++++ .../official/original/525-530-531-a.svg | 214 ++++++++++++++++++ .../official/original/525-530-531-b.svg | 206 +++++++++++++++++ project/images/official/original/531-1-a.svg | 134 +++++++++++ project/images/official/original/531-1-b.svg | 123 ++++++++++ project/images/official/original/531-2-a.svg | 122 ++++++++++ project/images/official/original/531-2-b.svg | 110 +++++++++ project/images/official/original/531-3-a.svg | 174 ++++++++++++++ project/images/official/original/531-3-b.svg | 158 +++++++++++++ 22 files changed, 2269 insertions(+) create mode 100644 datamodel/changelogs/0100/0100_09_exceptes.sql create mode 100644 project/images/official/editable/500-exception-a.svg create mode 100644 project/images/official/editable/500-exception-b.svg create mode 100644 project/images/official/editable/525-530-531-a.svg create mode 100644 project/images/official/editable/525-530-531-b.svg create mode 100644 project/images/official/editable/531-1-a.svg create mode 100644 project/images/official/editable/531-1-b.svg create mode 100644 project/images/official/editable/531-2-a.svg create mode 100644 project/images/official/editable/531-2-b.svg create mode 100644 project/images/official/editable/531-3-a.svg create mode 100644 project/images/official/editable/531-3-b.svg create mode 100644 project/images/official/original/500-exception-a.svg create mode 100644 project/images/official/original/500-exception-b.svg create mode 100644 project/images/official/original/525-530-531-a.svg create mode 100644 project/images/official/original/525-530-531-b.svg create mode 100644 project/images/official/original/531-1-a.svg create mode 100644 project/images/official/original/531-1-b.svg create mode 100644 project/images/official/original/531-2-a.svg create mode 100644 project/images/official/original/531-2-b.svg create mode 100644 project/images/official/original/531-3-a.svg create mode 100644 project/images/official/original/531-3-b.svg diff --git a/datamodel/changelogs/0100/0100_09_exceptes.sql b/datamodel/changelogs/0100/0100_09_exceptes.sql new file mode 100644 index 00000000..3a0f7041 --- /dev/null +++ b/datamodel/changelogs/0100/0100_09_exceptes.sql @@ -0,0 +1,6 @@ +-- Exceptions et autorisations (vélos, etc.) +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('5.31-1', true, 'Fahrräder gestattet', 'Cycles autorisés', 'Cicli autorizzati', NULL, NULL, NULL, NULL, NULL, '531-1-a.svg', '531-1-b.svg', '531-1-a.svg', '531-1-a.svg', 50, 95, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('5.31-2', true, 'Ausgenommen Fahrräder', 'Exceptés cycles', 'Esclusi i cicli', NULL, NULL, NULL, NULL, NULL, '531-2-a.svg', '531-2-b.svg', '531-2-a.svg', '531-2-a.svg', 50, 95, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('5.31-3', true, 'Ausgenommen Fahrräder und ...', 'Exceptés cycles et ...', 'Esclusi i cicli e ...', NULL, NULL, NULL, NULL, NULL, '531-3-a.svg', '531-3-b.svg', '531-3-a.svg', '531-3-a.svg', 70, 95, 1, 'Taxis', NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('5.25-5.30-5.31', true, 'Ausgenommen Busse, Mofas, Fahrräder', 'Exceptés bus, cyclomoteurs, cycles', 'Esclusi autobus, ciclomotori, cicli', NULL, NULL, NULL, NULL, NULL, '525-530-531-a.svg', '525-530-531-b.svg', '525-530-531-a.svg', '525-530-531-a.svg', 70, 95, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('5.00-exception', true, 'Ausgenommen (+Freitext)', 'Exceptés (+texte)', 'Esclusi (+testo)', NULL, NULL, NULL, NULL, NULL, '500-exception-a.svg', '500-exception-b.svg', '500-exception-a.svg', '500-exception-a.svg', 50, 95, 2, 'Busse, Velos', 'Landwirt. Verkehr', NULL, NULL, false); diff --git a/datamodel/setup.sh b/datamodel/setup.sh index 3d676cde..a518d2bf 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -78,6 +78,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_06_direction_user_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_07_missing_left_right.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477_signs.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_09_exceptes.sql if [[ $demo_data == True ]]; then echo "*** inserting demo_data" diff --git a/project/images/official/editable/500-exception-a.svg b/project/images/official/editable/500-exception-a.svg new file mode 100644 index 00000000..c24d400b --- /dev/null +++ b/project/images/official/editable/500-exception-a.svg @@ -0,0 +1,49 @@ + + + + + ausgenommen + param(text1) + param(text2) + diff --git a/project/images/official/editable/500-exception-b.svg b/project/images/official/editable/500-exception-b.svg new file mode 100644 index 00000000..84b657b0 --- /dev/null +++ b/project/images/official/editable/500-exception-b.svg @@ -0,0 +1,49 @@ + + + + + exceptés + param(text1) + param(text2) + diff --git a/project/images/official/editable/525-530-531-a.svg b/project/images/official/editable/525-530-531-a.svg new file mode 100644 index 00000000..4c3c12c5 --- /dev/null +++ b/project/images/official/editable/525-530-531-a.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + ausgenommen + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/525-530-531-b.svg b/project/images/official/editable/525-530-531-b.svg new file mode 100644 index 00000000..a864ff6b --- /dev/null +++ b/project/images/official/editable/525-530-531-b.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + exceptés + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/editable/531-1-a.svg b/project/images/official/editable/531-1-a.svg new file mode 100644 index 00000000..95961fa7 --- /dev/null +++ b/project/images/official/editable/531-1-a.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + gestattet + + diff --git a/project/images/official/editable/531-1-b.svg b/project/images/official/editable/531-1-b.svg new file mode 100644 index 00000000..0193f754 --- /dev/null +++ b/project/images/official/editable/531-1-b.svg @@ -0,0 +1,89 @@ + + + + + + + autorisés + + + + + + + + + + diff --git a/project/images/official/editable/531-2-a.svg b/project/images/official/editable/531-2-a.svg new file mode 100644 index 00000000..cfb93071 --- /dev/null +++ b/project/images/official/editable/531-2-a.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + ausgenommen + diff --git a/project/images/official/editable/531-2-b.svg b/project/images/official/editable/531-2-b.svg new file mode 100644 index 00000000..5144b435 --- /dev/null +++ b/project/images/official/editable/531-2-b.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + exceptés + diff --git a/project/images/official/editable/531-3-a.svg b/project/images/official/editable/531-3-a.svg new file mode 100644 index 00000000..ac69416f --- /dev/null +++ b/project/images/official/editable/531-3-a.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + ausgenommen + param(text1) + et + diff --git a/project/images/official/editable/531-3-b.svg b/project/images/official/editable/531-3-b.svg new file mode 100644 index 00000000..09cef832 --- /dev/null +++ b/project/images/official/editable/531-3-b.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + exceptés + param(text1) + et + diff --git a/project/images/official/original/500-exception-a.svg b/project/images/official/original/500-exception-a.svg new file mode 100644 index 00000000..c1f42574 --- /dev/null +++ b/project/images/official/original/500-exception-a.svg @@ -0,0 +1,49 @@ + + + + + ausgenommen + Busse, Velos + Landwirt. Verkehr + diff --git a/project/images/official/original/500-exception-b.svg b/project/images/official/original/500-exception-b.svg new file mode 100644 index 00000000..9a5f5c94 --- /dev/null +++ b/project/images/official/original/500-exception-b.svg @@ -0,0 +1,72 @@ + + + + + + exceptés + Bus, vélos + Trafic agricole + diff --git a/project/images/official/original/525-530-531-a.svg b/project/images/official/original/525-530-531-a.svg new file mode 100644 index 00000000..96890f78 --- /dev/null +++ b/project/images/official/original/525-530-531-a.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/525-530-531-b.svg b/project/images/official/original/525-530-531-b.svg new file mode 100644 index 00000000..5f8df72f --- /dev/null +++ b/project/images/official/original/525-530-531-b.svg @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-1-a.svg b/project/images/official/original/531-1-a.svg new file mode 100644 index 00000000..506e9375 --- /dev/null +++ b/project/images/official/original/531-1-a.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-1-b.svg b/project/images/official/original/531-1-b.svg new file mode 100644 index 00000000..e656b0b1 --- /dev/null +++ b/project/images/official/original/531-1-b.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-2-a.svg b/project/images/official/original/531-2-a.svg new file mode 100644 index 00000000..9d8d36e0 --- /dev/null +++ b/project/images/official/original/531-2-a.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-2-b.svg b/project/images/official/original/531-2-b.svg new file mode 100644 index 00000000..28b7f4d2 --- /dev/null +++ b/project/images/official/original/531-2-b.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-3-a.svg b/project/images/official/original/531-3-a.svg new file mode 100644 index 00000000..fa4a0172 --- /dev/null +++ b/project/images/official/original/531-3-a.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/images/official/original/531-3-b.svg b/project/images/official/original/531-3-b.svg new file mode 100644 index 00000000..9fa215a7 --- /dev/null +++ b/project/images/official/original/531-3-b.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 89022a9d338c8b9079f8f5c1c7cdc2b311c8b2df Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:26:20 +0000 Subject: [PATCH 05/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- datamodel/changelogs/0100/0100_08_477_signs | 2 +- project/images/official/editable/407a.svg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datamodel/changelogs/0100/0100_08_477_signs b/datamodel/changelogs/0100/0100_08_477_signs index 8c78a300..939aa759 100644 --- a/datamodel/changelogs/0100/0100_08_477_signs +++ b/datamodel/changelogs/0100/0100_08_477_signs @@ -40,4 +40,4 @@ INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_i INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/27', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach links)', 'Dégagement et retour des voies de circulation (à deux voies à gauche)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_27.svg', '477_27.svg', '477_27.svg', '477_27.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-1', true, 'Überleitung und Rückführung von Fahrstreifen (eine Spur)', 'Dégagement et retour des voies de circulation (une voie)', 'Sgombero e ripristino delle corsie di traffico (due corsie)', NULL, NULL, NULL, NULL, NULL, '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-2', true, 'Überleitung und Rückführung von Fahrstreifen (Spurverengung)', 'Dégagement et retour des voies de circulation (rétrécissement de la voie)', 'Sgombero e ripristino delle corsie di traffico (restringimento della corsia)', NULL, NULL, NULL, NULL, NULL, '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', 100, 100, 1, '2 m', NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477_29.svg', '477_29.svg', '477_29.svg', '477_29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); \ No newline at end of file +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477_29.svg', '477_29.svg', '477_29.svg', '477_29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); diff --git a/project/images/official/editable/407a.svg b/project/images/official/editable/407a.svg index d6625312..3ecf2595 100644 --- a/project/images/official/editable/407a.svg +++ b/project/images/official/editable/407a.svg @@ -167,8 +167,8 @@ d="m 241.93749,210.25779 c 2.53124,1.6094 4.90624,3.46876 7,5.56252 l 18.0156,-18.09376 -14.125,-15.07812 -10.8906,27.60936" /> Date: Thu, 28 Mar 2024 14:32:59 +0100 Subject: [PATCH 06/11] Rename 0100_08_477_signs to 0100_08_477_signs.sql --- .../changelogs/0100/{0100_08_477_signs => 0100_08_477_signs.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename datamodel/changelogs/0100/{0100_08_477_signs => 0100_08_477_signs.sql} (100%) diff --git a/datamodel/changelogs/0100/0100_08_477_signs b/datamodel/changelogs/0100/0100_08_477_signs.sql similarity index 100% rename from datamodel/changelogs/0100/0100_08_477_signs rename to datamodel/changelogs/0100/0100_08_477_signs.sql From ad4b47be8dbebe98692aa3d0bfa29f0e614ef855 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 28 Mar 2024 14:46:46 +0100 Subject: [PATCH 07/11] replace _ by - --- .../changelogs/0100/0100_08_477_signs.sql | 62 +++++++++---------- datamodel/setup.sh | 2 +- .../editable/{477_1.svg => 477-1.svg} | 0 .../editable/{477_10.svg => 477-10.svg} | 0 .../editable/{477_11-1.svg => 477-11-1.svg} | 0 .../editable/{477_11-2.svg => 477-11-2.svg} | 2 +- .../editable/{477_12.svg => 477-12.svg} | 0 .../editable/{477_13.svg => 477-13.svg} | 0 .../editable/{477_14.svg => 477-14.svg} | 0 .../editable/{477_15.svg => 477-15.svg} | 0 .../editable/{477_16.svg => 477-16.svg} | 0 .../editable/{477_17.svg => 477-17.svg} | 0 .../editable/{477_18.svg => 477-18.svg} | 0 .../editable/{477_19.svg => 477-19.svg} | 0 .../editable/{477_2.svg => 477-2.svg} | 0 .../editable/{477_20.svg => 477-20.svg} | 0 .../editable/{477_21.svg => 477-21.svg} | 0 .../editable/{477_22.svg => 477-22.svg} | 0 .../editable/{477_23.svg => 477-23.svg} | 0 .../editable/{477_24.svg => 477-24.svg} | 0 .../editable/{477_25.svg => 477-25.svg} | 0 .../editable/{477_26.svg => 477-26.svg} | 0 .../editable/{477_27.svg => 477-27.svg} | 0 .../editable/{477_28-1.svg => 477-28-1.svg} | 0 .../editable/{477_28-2.svg => 477-28-2.svg} | 2 +- .../editable/{477_29.svg => 477-29.svg} | 0 .../editable/{477_3.svg => 477-3.svg} | 0 .../editable/{477_4.svg => 477-4.svg} | 0 .../editable/{477_5.svg => 477-5.svg} | 0 .../editable/{477_6.svg => 477-6.svg} | 0 .../editable/{477_7.svg => 477-7.svg} | 0 .../editable/{477_8.svg => 477-8.svg} | 0 .../editable/{477_9.svg => 477-9.svg} | 0 .../original/{477_1.svg => 477-1.svg} | 0 .../original/{477_10.svg => 477-10.svg} | 0 .../original/{477_11-1.svg => 477-11-1.svg} | 0 .../original/{477_11-2.svg => 477-11-2.svg} | 0 .../original/{477_12.svg => 477-12.svg} | 0 .../original/{477_13.svg => 477-13.svg} | 0 .../original/{477_14.svg => 477-14.svg} | 0 .../original/{477_15.svg => 477-15.svg} | 0 .../original/{477_16.svg => 477-16.svg} | 0 .../original/{477_17.svg => 477-17.svg} | 0 .../original/{477_18.svg => 477-18.svg} | 0 .../original/{477_19.svg => 477-19.svg} | 0 .../original/{477_2.svg => 477-2.svg} | 0 .../original/{477_20.svg => 477-20.svg} | 0 .../original/{477_21.svg => 477-21.svg} | 0 .../original/{477_22.svg => 477-22.svg} | 0 .../original/{477_23.svg => 477-23.svg} | 0 .../original/{477_24.svg => 477-24.svg} | 0 .../original/{477_25.svg => 477-25.svg} | 0 .../original/{477_26.svg => 477-26.svg} | 0 .../original/{477_27.svg => 477-27.svg} | 0 .../original/{477_28-1.svg => 477-28-1.svg} | 0 .../original/{477_28-2.svg => 477-28-2.svg} | 0 .../original/{477_29.svg => 477-29.svg} | 0 .../original/{477_3.svg => 477-3.svg} | 0 .../original/{477_4.svg => 477-4.svg} | 0 .../original/{477_5.svg => 477-5.svg} | 0 .../original/{477_6.svg => 477-6.svg} | 0 .../original/{477_7.svg => 477-7.svg} | 0 .../original/{477_8.svg => 477-8.svg} | 0 .../original/{477_9.svg => 477-9.svg} | 0 64 files changed, 34 insertions(+), 34 deletions(-) rename project/images/official/editable/{477_1.svg => 477-1.svg} (100%) rename project/images/official/editable/{477_10.svg => 477-10.svg} (100%) rename project/images/official/editable/{477_11-1.svg => 477-11-1.svg} (100%) rename project/images/official/editable/{477_11-2.svg => 477-11-2.svg} (99%) rename project/images/official/editable/{477_12.svg => 477-12.svg} (100%) rename project/images/official/editable/{477_13.svg => 477-13.svg} (100%) rename project/images/official/editable/{477_14.svg => 477-14.svg} (100%) rename project/images/official/editable/{477_15.svg => 477-15.svg} (100%) rename project/images/official/editable/{477_16.svg => 477-16.svg} (100%) rename project/images/official/editable/{477_17.svg => 477-17.svg} (100%) rename project/images/official/editable/{477_18.svg => 477-18.svg} (100%) rename project/images/official/editable/{477_19.svg => 477-19.svg} (100%) rename project/images/official/editable/{477_2.svg => 477-2.svg} (100%) rename project/images/official/editable/{477_20.svg => 477-20.svg} (100%) rename project/images/official/editable/{477_21.svg => 477-21.svg} (100%) rename project/images/official/editable/{477_22.svg => 477-22.svg} (100%) rename project/images/official/editable/{477_23.svg => 477-23.svg} (100%) rename project/images/official/editable/{477_24.svg => 477-24.svg} (100%) rename project/images/official/editable/{477_25.svg => 477-25.svg} (100%) rename project/images/official/editable/{477_26.svg => 477-26.svg} (100%) rename project/images/official/editable/{477_27.svg => 477-27.svg} (100%) rename project/images/official/editable/{477_28-1.svg => 477-28-1.svg} (100%) rename project/images/official/editable/{477_28-2.svg => 477-28-2.svg} (99%) rename project/images/official/editable/{477_29.svg => 477-29.svg} (100%) rename project/images/official/editable/{477_3.svg => 477-3.svg} (100%) rename project/images/official/editable/{477_4.svg => 477-4.svg} (100%) rename project/images/official/editable/{477_5.svg => 477-5.svg} (100%) rename project/images/official/editable/{477_6.svg => 477-6.svg} (100%) rename project/images/official/editable/{477_7.svg => 477-7.svg} (100%) rename project/images/official/editable/{477_8.svg => 477-8.svg} (100%) rename project/images/official/editable/{477_9.svg => 477-9.svg} (100%) rename project/images/official/original/{477_1.svg => 477-1.svg} (100%) rename project/images/official/original/{477_10.svg => 477-10.svg} (100%) rename project/images/official/original/{477_11-1.svg => 477-11-1.svg} (100%) rename project/images/official/original/{477_11-2.svg => 477-11-2.svg} (100%) rename project/images/official/original/{477_12.svg => 477-12.svg} (100%) rename project/images/official/original/{477_13.svg => 477-13.svg} (100%) rename project/images/official/original/{477_14.svg => 477-14.svg} (100%) rename project/images/official/original/{477_15.svg => 477-15.svg} (100%) rename project/images/official/original/{477_16.svg => 477-16.svg} (100%) rename project/images/official/original/{477_17.svg => 477-17.svg} (100%) rename project/images/official/original/{477_18.svg => 477-18.svg} (100%) rename project/images/official/original/{477_19.svg => 477-19.svg} (100%) rename project/images/official/original/{477_2.svg => 477-2.svg} (100%) rename project/images/official/original/{477_20.svg => 477-20.svg} (100%) rename project/images/official/original/{477_21.svg => 477-21.svg} (100%) rename project/images/official/original/{477_22.svg => 477-22.svg} (100%) rename project/images/official/original/{477_23.svg => 477-23.svg} (100%) rename project/images/official/original/{477_24.svg => 477-24.svg} (100%) rename project/images/official/original/{477_25.svg => 477-25.svg} (100%) rename project/images/official/original/{477_26.svg => 477-26.svg} (100%) rename project/images/official/original/{477_27.svg => 477-27.svg} (100%) rename project/images/official/original/{477_28-1.svg => 477-28-1.svg} (100%) rename project/images/official/original/{477_28-2.svg => 477-28-2.svg} (100%) rename project/images/official/original/{477_29.svg => 477-29.svg} (100%) rename project/images/official/original/{477_3.svg => 477-3.svg} (100%) rename project/images/official/original/{477_4.svg => 477-4.svg} (100%) rename project/images/official/original/{477_5.svg => 477-5.svg} (100%) rename project/images/official/original/{477_6.svg => 477-6.svg} (100%) rename project/images/official/original/{477_7.svg => 477-7.svg} (100%) rename project/images/official/original/{477_8.svg => 477-8.svg} (100%) rename project/images/official/original/{477_9.svg => 477-9.svg} (100%) diff --git a/datamodel/changelogs/0100/0100_08_477_signs.sql b/datamodel/changelogs/0100/0100_08_477_signs.sql index 939aa759..a1ca9774 100644 --- a/datamodel/changelogs/0100/0100_08_477_signs.sql +++ b/datamodel/changelogs/0100/0100_08_477_signs.sql @@ -1,43 +1,43 @@ -- Vermehrung von Fahrstreifen, Augmentation du nombre de voies de circulation - 4.77 1-3 -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/01', true, 'Vermehrung von Fahrstreifen (1)', 'Augmentation du nombre de voies de circulation (1)', 'Aumento del numero di corsie di traffico (1)', NULL, NULL, NULL, NULL, NULL, '477_1.svg', '477_1.svg', '477_1.svg', '477_1.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/02', true, 'Vermehrung von Fahrstreifen (2)', 'Augmentation du nombre de voies de circulation (2)', 'Aumento del numero di corsie di traffico (2)', NULL, NULL, NULL, NULL, NULL, '477_2.svg', '477_2.svg', '477_2.svg', '477_2.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/03', true, 'Vermehrung von Fahrstreifen (3)', 'Augmentation du nombre de voies de circulation (3)', 'Aumento del numero di corsie di traffico (3)', NULL, NULL, NULL, NULL, NULL, '477_3.svg', '477_3.svg', '477_3.svg', '477_3.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/01', true, 'Vermehrung von Fahrstreifen (1)', 'Augmentation du nombre de voies de circulation (1)', 'Aumento del numero di corsie di traffico (1)', NULL, NULL, NULL, NULL, NULL, '477-1.svg', '477-1.svg', '477-1.svg', '477-1.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/02', true, 'Vermehrung von Fahrstreifen (2)', 'Augmentation du nombre de voies de circulation (2)', 'Aumento del numero di corsie di traffico (2)', NULL, NULL, NULL, NULL, NULL, '477-2.svg', '477-2.svg', '477-2.svg', '477-2.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/03', true, 'Vermehrung von Fahrstreifen (3)', 'Augmentation du nombre de voies de circulation (3)', 'Aumento del numero di corsie di traffico (3)', NULL, NULL, NULL, NULL, NULL, '477-3.svg', '477-3.svg', '477-3.svg', '477-3.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -- Zusammenführung von Fahrbahnen, Convergence de chaussées - 4.77 4-9 -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/04', true, 'Zusammenführung von Fahrbahnen (von rechts)', 'Convergence de chaussées (de droite)', 'Convergenza stradale (destra)', NULL, NULL, NULL, NULL, NULL, '477_4.svg', '477_4.svg', '477_4.svg', '477_4.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/05', true, 'Zusammenführung von Fahrbahnen (von links)', 'Convergence de chaussées (de gauche)', 'Convergenza stradale (sinistra)', NULL, NULL, NULL, NULL, NULL, '477_5.svg', '477_5.svg', '477_5.svg', '477_5.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/06', true, 'Zusammenführung von Fahrbahnen (zwei von rechts)', 'Convergence de chaussées (deux de droite)', 'Convergenza stradale (due a destra)', NULL, NULL, NULL, NULL, NULL, '477_6.svg', '477_6.svg', '477_6.svg', '477_6.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/07', true, 'Zusammenführung von Fahrbahnen (eine von rechts)', 'Convergence de chaussées (une de droite)', 'Convergenza stradale (una a destra)', NULL, NULL, NULL, NULL, NULL, '477_7.svg', '477_7.svg', '477_7.svg', '477_7.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/08', true, 'Zusammenführung von Fahrbahnen (eine von links)', 'Convergence de chaussées (une de gauche)', 'Convergenza stradale (una a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_8.svg', '477_8.svg', '477_8.svg', '477_8.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/09', true, 'Zusammenführung von Fahrbahnen (zwei von links)', 'Convergence de chaussées (deux de gauche)', 'Convergenza stradale (due a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_9.svg', '477_9.svg', '477_9.svg', '477_9.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/04', true, 'Zusammenführung von Fahrbahnen (von rechts)', 'Convergence de chaussées (de droite)', 'Convergenza stradale (destra)', NULL, NULL, NULL, NULL, NULL, '477-4.svg', '477-4.svg', '477-4.svg', '477-4.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/05', true, 'Zusammenführung von Fahrbahnen (von links)', 'Convergence de chaussées (de gauche)', 'Convergenza stradale (sinistra)', NULL, NULL, NULL, NULL, NULL, '477-5.svg', '477-5.svg', '477-5.svg', '477-5.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/06', true, 'Zusammenführung von Fahrbahnen (zwei von rechts)', 'Convergence de chaussées (deux de droite)', 'Convergenza stradale (due a destra)', NULL, NULL, NULL, NULL, NULL, '477-6.svg', '477-6.svg', '477-6.svg', '477-6.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/07', true, 'Zusammenführung von Fahrbahnen (eine von rechts)', 'Convergence de chaussées (une de droite)', 'Convergenza stradale (una a destra)', NULL, NULL, NULL, NULL, NULL, '477-7.svg', '477-7.svg', '477-7.svg', '477-7.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/08', true, 'Zusammenführung von Fahrbahnen (eine von links)', 'Convergence de chaussées (une de gauche)', 'Convergenza stradale (una a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-8.svg', '477-8.svg', '477-8.svg', '477-8.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/09', true, 'Zusammenführung von Fahrbahnen (zwei von links)', 'Convergence de chaussées (deux de gauche)', 'Convergenza stradale (due a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-9.svg', '477-9.svg', '477-9.svg', '477-9.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -- Bestätigung der Anzahl Fahrstreifen, Confirmation du nombre de voies de circulation - 4.77 10-15 -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/10', true, 'Bestätigung der Anzahl Fahrstreifen (zwei)', 'Confirmation du nombre de voies de circulation (deux)', 'Conferma del numero di corsie di traffico (due)', NULL, NULL, NULL, NULL, NULL, '477_10.svg', '477_10.svg', '477_10.svg', '477_10.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-1', true, 'Bestätigung der Anzahl Fahrstreifen (drei)', 'Confirmation du nombre de voies de circulation (trois)', 'Conferma del numero di corsie di traffico (tre)', NULL, NULL, NULL, NULL, NULL, '477_11-1.svg', '477_11-1.svg', '477_11-1.svg', '477_11-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-2', true, 'Bestätigung der Anzahl Fahrstreifen (drei, mit Geschwindigkeitsbegrenzung)', 'Confirmation du nombre de voies de circulation (trois, avec réduction de vitesse)', 'Conferma del numero di corsie di traffico (tre, con riduzione della velocità)', NULL, NULL, NULL, NULL, NULL, '477_11-2.svg', '477_11-2.svg', '477_11-2.svg', '477_11-2.svg', 100, 100, 1, '80', NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/12', true, 'Bestätigung der Anzahl Fahrstreifen (zwei, Gegenverkehr)', 'Confirmation du nombre de voies de circulation (deux, circulation à contresens)', 'Conferma del numero di corsie di traffico (due, traffico bidirezionale)', NULL, NULL, NULL, NULL, NULL, '477_12.svg', '477_12.svg', '477_12.svg', '477_12.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/13', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr einspurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens une voie)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in una corsia)', NULL, NULL, NULL, NULL, NULL, '477_13.svg', '477_13.svg', '477_13.svg', '477_13.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/14', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr zweispurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens deux voies)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in due corsie)', NULL, NULL, NULL, NULL, NULL, '477_14.svg', '477_14.svg', '477_14.svg', '477_14.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/15', true, 'Bestätigung der Anzahl Fahrstreifen (vier, doppelspurig)', 'Confirmation du nombre de voies de circulation (quatre, double voies)', 'Conferma del numero di corsie di traffico (quattro, doppio binario)', NULL, NULL, NULL, NULL, NULL, '477_15.svg', '477_15.svg', '477_15.svg', '477_15.svg', 100, 125, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/10', true, 'Bestätigung der Anzahl Fahrstreifen (zwei)', 'Confirmation du nombre de voies de circulation (deux)', 'Conferma del numero di corsie di traffico (due)', NULL, NULL, NULL, NULL, NULL, '477-10.svg', '477-10.svg', '477-10.svg', '477-10.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-1', true, 'Bestätigung der Anzahl Fahrstreifen (drei)', 'Confirmation du nombre de voies de circulation (trois)', 'Conferma del numero di corsie di traffico (tre)', NULL, NULL, NULL, NULL, NULL, '477-11-1.svg', '477-11-1.svg', '477-11-1.svg', '477-11-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/11-2', true, 'Bestätigung der Anzahl Fahrstreifen (drei, mit Geschwindigkeitsbegrenzung)', 'Confirmation du nombre de voies de circulation (trois, avec réduction de vitesse)', 'Conferma del numero di corsie di traffico (tre, con riduzione della velocità)', NULL, NULL, NULL, NULL, NULL, '477-11-2.svg', '477-11-2.svg', '477-11-2.svg', '477-11-2.svg', 100, 100, 1, '80', NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/12', true, 'Bestätigung der Anzahl Fahrstreifen (zwei, Gegenverkehr)', 'Confirmation du nombre de voies de circulation (deux, circulation à contresens)', 'Conferma del numero di corsie di traffico (due, traffico bidirezionale)', NULL, NULL, NULL, NULL, NULL, '477-12.svg', '477-12.svg', '477-12.svg', '477-12.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/13', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr einspurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens une voie)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in una corsia)', NULL, NULL, NULL, NULL, NULL, '477-13.svg', '477-13.svg', '477-13.svg', '477-13.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/14', true, 'Bestätigung der Anzahl Fahrstreifen (drei, Gegenverkehr zweispurig)', 'Confirmation du nombre de voies de circulation (trois, circulation à contresens deux voies)', 'Conferma del numero di corsie di traffico (tre, traffico in controcorrente in due corsie)', NULL, NULL, NULL, NULL, NULL, '477-14.svg', '477-14.svg', '477-14.svg', '477-14.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/15', true, 'Bestätigung der Anzahl Fahrstreifen (vier, doppelspurig)', 'Confirmation du nombre de voies de circulation (quatre, double voies)', 'Conferma del numero di corsie di traffico (quattro, doppio binario)', NULL, NULL, NULL, NULL, NULL, '477-15.svg', '477-15.svg', '477-15.svg', '477-15.svg', 100, 125, 0, NULL, NULL, NULL, NULL, false); -- Verminderung von Fahrstreifen, Diminution du nombre de voies de circulation - 4.77 16-19 -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/16', true, 'Verminderung von Fahrstreifen (einer, rechts)', 'Diminution du nombre de voies de circulation (une, droite)', 'Riduzione del numero di corsie di traffico (una, a destra)', NULL, NULL, NULL, NULL, NULL, '477_16.svg', '477_16.svg', '477_16.svg', '477_16.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/17', true, 'Verminderung von Fahrstreifen (einer, links)', 'Diminution du nombre de voies de circulation (une, gauche)', 'Riduzione del numero di corsie di traffico (una, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_17.svg', '477_17.svg', '477_17.svg', '477_17.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/18', true, 'Verminderung von Fahrstreifen (zwei, links)', 'Diminution du nombre de voies de circulation (deux, gauche)', 'Riduzione del numero di corsie di traffico (due, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_18.svg', '477_18.svg', '477_18.svg', '477_18.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/19', true, 'Verminderung von Fahrstreifen (einer, links, mit Gegenverkehr)', 'Diminution du nombre de voies de circulation (une, gauche, avec circulation à contresens)', 'Riduzione del numero di corsie di traffico (una, a sinistra, con traffico in controcorrente)', NULL, NULL, NULL, NULL, NULL, '477_19.svg', '477_19.svg', '477_19.svg', '477_19.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/16', true, 'Verminderung von Fahrstreifen (einer, rechts)', 'Diminution du nombre de voies de circulation (une, droite)', 'Riduzione del numero di corsie di traffico (una, a destra)', NULL, NULL, NULL, NULL, NULL, '477-16.svg', '477-16.svg', '477-16.svg', '477-16.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/17', true, 'Verminderung von Fahrstreifen (einer, links)', 'Diminution du nombre de voies de circulation (une, gauche)', 'Riduzione del numero di corsie di traffico (una, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-17.svg', '477-17.svg', '477-17.svg', '477-17.svg', 100, 70, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/18', true, 'Verminderung von Fahrstreifen (zwei, links)', 'Diminution du nombre de voies de circulation (deux, gauche)', 'Riduzione del numero di corsie di traffico (due, a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-18.svg', '477-18.svg', '477-18.svg', '477-18.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/19', true, 'Verminderung von Fahrstreifen (einer, links, mit Gegenverkehr)', 'Diminution du nombre de voies de circulation (une, gauche, avec circulation à contresens)', 'Riduzione del numero di corsie di traffico (una, a sinistra, con traffico in controcorrente)', NULL, NULL, NULL, NULL, NULL, '477-19.svg', '477-19.svg', '477-19.svg', '477-19.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -- Anzeige des Fahrstreifenverlaufs, Indication du tracé des voies de circulation - 4.77 20-29 -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/20', true, 'Anzeige des Fahrstreifenverlaufs (nach links)', 'Indication du tracé des voies de circulation (à gauche)', 'Segnaletica di corsia (sinistra)', NULL, NULL, NULL, NULL, NULL, '477_20.svg', '477_20.svg', '477_20.svg', '477_20.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/21', true, 'Anzeige des Fahrstreifenverlaufs (nach rechts)', 'Indication du tracé des voies de circulation (à droite)', 'Segnaletica di corsia (destra)', NULL, NULL, NULL, NULL, NULL, '477_21.svg', '477_21.svg', '477_21.svg', '477_21.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/22', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach links)', 'Indication du tracé des voies de circulation (évitement à gauche)', 'Segnaletica di corsia (sterzare a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_22.svg', '477_22.svg', '477_22.svg', '477_22.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/23', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach rechts)', 'Indication du tracé des voies de circulation (évitement à droite)', 'Segnaletica di corsia (sterzare a destra)', NULL, NULL, NULL, NULL, NULL, '477_23.svg', '477_23.svg', '477_23.svg', '477_23.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/20', true, 'Anzeige des Fahrstreifenverlaufs (nach links)', 'Indication du tracé des voies de circulation (à gauche)', 'Segnaletica di corsia (sinistra)', NULL, NULL, NULL, NULL, NULL, '477-20.svg', '477-20.svg', '477-20.svg', '477-20.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/21', true, 'Anzeige des Fahrstreifenverlaufs (nach rechts)', 'Indication du tracé des voies de circulation (à droite)', 'Segnaletica di corsia (destra)', NULL, NULL, NULL, NULL, NULL, '477-21.svg', '477-21.svg', '477-21.svg', '477-21.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/22', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach links)', 'Indication du tracé des voies de circulation (évitement à gauche)', 'Segnaletica di corsia (sterzare a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-22.svg', '477-22.svg', '477-22.svg', '477-22.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/23', true, 'Anzeige des Fahrstreifenverlaufs (ausweichen nach rechts)', 'Indication du tracé des voies de circulation (évitement à droite)', 'Segnaletica di corsia (sterzare a destra)', NULL, NULL, NULL, NULL, NULL, '477-23.svg', '477-23.svg', '477-23.svg', '477-23.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/24', true, 'Verschwenkung von Fahrstreifen (Hindernis links)', 'Déplacement latéral des voies de circulation (obstacle à gauche)', 'Spostamento laterale delle corsie di traffico (ostacolo a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_24.svg', '477_24.svg', '477_24.svg', '477_24.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/25', true, 'Verschwenkung von Fahrstreifen (Hindernis mittig)', 'Déplacement latéral des voies de circulation (obstacle au milieu)', 'Spostamento laterale delle corsie di traffico (nel mezzo)', NULL, NULL, NULL, NULL, NULL, '477_25.svg', '477_25.svg', '477_25.svg', '477_25.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/24', true, 'Verschwenkung von Fahrstreifen (Hindernis links)', 'Déplacement latéral des voies de circulation (obstacle à gauche)', 'Spostamento laterale delle corsie di traffico (ostacolo a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-24.svg', '477-24.svg', '477-24.svg', '477-24.svg', 100, 80, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/25', true, 'Verschwenkung von Fahrstreifen (Hindernis mittig)', 'Déplacement latéral des voies de circulation (obstacle au milieu)', 'Spostamento laterale delle corsie di traffico (nel mezzo)', NULL, NULL, NULL, NULL, NULL, '477-25.svg', '477-25.svg', '477-25.svg', '477-25.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/26', true, 'Überleitung und Rückführung von Fahrstreifen (einspurig)', 'Dégagement et retour des voies de circulation (à une voie)', 'Sgombero e ripristino delle corsie di traffico (a una corsia)', NULL, NULL, NULL, NULL, NULL, '477_26.svg', '477_26.svg', '477_26.svg', '477_26.svg', 100, 72, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/27', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach links)', 'Dégagement et retour des voies de circulation (à deux voies à gauche)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a sinistra)', NULL, NULL, NULL, NULL, NULL, '477_27.svg', '477_27.svg', '477_27.svg', '477_27.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-1', true, 'Überleitung und Rückführung von Fahrstreifen (eine Spur)', 'Dégagement et retour des voies de circulation (une voie)', 'Sgombero e ripristino delle corsie di traffico (due corsie)', NULL, NULL, NULL, NULL, NULL, '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', '477_28-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-2', true, 'Überleitung und Rückführung von Fahrstreifen (Spurverengung)', 'Dégagement et retour des voies de circulation (rétrécissement de la voie)', 'Sgombero e ripristino delle corsie di traffico (restringimento della corsia)', NULL, NULL, NULL, NULL, NULL, '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', '477_28-2.svg', 100, 100, 1, '2 m', NULL, NULL, NULL, false); -INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477_29.svg', '477_29.svg', '477_29.svg', '477_29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/26', true, 'Überleitung und Rückführung von Fahrstreifen (einspurig)', 'Dégagement et retour des voies de circulation (à une voie)', 'Sgombero e ripristino delle corsie di traffico (a una corsia)', NULL, NULL, NULL, NULL, NULL, '477-26.svg', '477-26.svg', '477-26.svg', '477-26.svg', 100, 72, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/27', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach links)', 'Dégagement et retour des voies de circulation (à deux voies à gauche)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a sinistra)', NULL, NULL, NULL, NULL, NULL, '477-27.svg', '477-27.svg', '477-27.svg', '477-27.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-1', true, 'Überleitung und Rückführung von Fahrstreifen (eine Spur)', 'Dégagement et retour des voies de circulation (une voie)', 'Sgombero e ripristino delle corsie di traffico (due corsie)', NULL, NULL, NULL, NULL, NULL, '477-28-1.svg', '477-28-1.svg', '477-28-1.svg', '477-28-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-2', true, 'Überleitung und Rückführung von Fahrstreifen (Spurverengung)', 'Dégagement et retour des voies de circulation (rétrécissement de la voie)', 'Sgombero e ripristino delle corsie di traffico (restringimento della corsia)', NULL, NULL, NULL, NULL, NULL, '477-28-2.svg', '477-28-2.svg', '477-28-2.svg', '477-28-2.svg', 100, 100, 1, '2 m', NULL, NULL, NULL, false); +INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477-29.svg', '477-29.svg', '477-29.svg', '477-29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); diff --git a/datamodel/setup.sh b/datamodel/setup.sh index a518d2bf..4f6e2dfa 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -77,7 +77,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_05_change_official.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_06_direction_user_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_07_missing_left_right.sql -psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477_signs.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477-signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_09_exceptes.sql if [[ $demo_data == True ]]; then diff --git a/project/images/official/editable/477_1.svg b/project/images/official/editable/477-1.svg similarity index 100% rename from project/images/official/editable/477_1.svg rename to project/images/official/editable/477-1.svg diff --git a/project/images/official/editable/477_10.svg b/project/images/official/editable/477-10.svg similarity index 100% rename from project/images/official/editable/477_10.svg rename to project/images/official/editable/477-10.svg diff --git a/project/images/official/editable/477_11-1.svg b/project/images/official/editable/477-11-1.svg similarity index 100% rename from project/images/official/editable/477_11-1.svg rename to project/images/official/editable/477-11-1.svg diff --git a/project/images/official/editable/477_11-2.svg b/project/images/official/editable/477-11-2.svg similarity index 99% rename from project/images/official/editable/477_11-2.svg rename to project/images/official/editable/477-11-2.svg index 4f4028b0..c3ad7e1c 100644 --- a/project/images/official/editable/477_11-2.svg +++ b/project/images/official/editable/477-11-2.svg @@ -4,7 +4,7 @@ height="153" version="1.1" id="svg1118" - sodipodi:docname="477_11-2.svg" + sodipodi:docname="477-11-2.svg" inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" diff --git a/project/images/official/editable/477_12.svg b/project/images/official/editable/477-12.svg similarity index 100% rename from project/images/official/editable/477_12.svg rename to project/images/official/editable/477-12.svg diff --git a/project/images/official/editable/477_13.svg b/project/images/official/editable/477-13.svg similarity index 100% rename from project/images/official/editable/477_13.svg rename to project/images/official/editable/477-13.svg diff --git a/project/images/official/editable/477_14.svg b/project/images/official/editable/477-14.svg similarity index 100% rename from project/images/official/editable/477_14.svg rename to project/images/official/editable/477-14.svg diff --git a/project/images/official/editable/477_15.svg b/project/images/official/editable/477-15.svg similarity index 100% rename from project/images/official/editable/477_15.svg rename to project/images/official/editable/477-15.svg diff --git a/project/images/official/editable/477_16.svg b/project/images/official/editable/477-16.svg similarity index 100% rename from project/images/official/editable/477_16.svg rename to project/images/official/editable/477-16.svg diff --git a/project/images/official/editable/477_17.svg b/project/images/official/editable/477-17.svg similarity index 100% rename from project/images/official/editable/477_17.svg rename to project/images/official/editable/477-17.svg diff --git a/project/images/official/editable/477_18.svg b/project/images/official/editable/477-18.svg similarity index 100% rename from project/images/official/editable/477_18.svg rename to project/images/official/editable/477-18.svg diff --git a/project/images/official/editable/477_19.svg b/project/images/official/editable/477-19.svg similarity index 100% rename from project/images/official/editable/477_19.svg rename to project/images/official/editable/477-19.svg diff --git a/project/images/official/editable/477_2.svg b/project/images/official/editable/477-2.svg similarity index 100% rename from project/images/official/editable/477_2.svg rename to project/images/official/editable/477-2.svg diff --git a/project/images/official/editable/477_20.svg b/project/images/official/editable/477-20.svg similarity index 100% rename from project/images/official/editable/477_20.svg rename to project/images/official/editable/477-20.svg diff --git a/project/images/official/editable/477_21.svg b/project/images/official/editable/477-21.svg similarity index 100% rename from project/images/official/editable/477_21.svg rename to project/images/official/editable/477-21.svg diff --git a/project/images/official/editable/477_22.svg b/project/images/official/editable/477-22.svg similarity index 100% rename from project/images/official/editable/477_22.svg rename to project/images/official/editable/477-22.svg diff --git a/project/images/official/editable/477_23.svg b/project/images/official/editable/477-23.svg similarity index 100% rename from project/images/official/editable/477_23.svg rename to project/images/official/editable/477-23.svg diff --git a/project/images/official/editable/477_24.svg b/project/images/official/editable/477-24.svg similarity index 100% rename from project/images/official/editable/477_24.svg rename to project/images/official/editable/477-24.svg diff --git a/project/images/official/editable/477_25.svg b/project/images/official/editable/477-25.svg similarity index 100% rename from project/images/official/editable/477_25.svg rename to project/images/official/editable/477-25.svg diff --git a/project/images/official/editable/477_26.svg b/project/images/official/editable/477-26.svg similarity index 100% rename from project/images/official/editable/477_26.svg rename to project/images/official/editable/477-26.svg diff --git a/project/images/official/editable/477_27.svg b/project/images/official/editable/477-27.svg similarity index 100% rename from project/images/official/editable/477_27.svg rename to project/images/official/editable/477-27.svg diff --git a/project/images/official/editable/477_28-1.svg b/project/images/official/editable/477-28-1.svg similarity index 100% rename from project/images/official/editable/477_28-1.svg rename to project/images/official/editable/477-28-1.svg diff --git a/project/images/official/editable/477_28-2.svg b/project/images/official/editable/477-28-2.svg similarity index 99% rename from project/images/official/editable/477_28-2.svg rename to project/images/official/editable/477-28-2.svg index 18d8b786..5b070465 100644 --- a/project/images/official/editable/477_28-2.svg +++ b/project/images/official/editable/477-28-2.svg @@ -7,7 +7,7 @@ viewBox="0 0 100 100" version="1.1" id="svg1635" - sodipodi:docname="477_28-2.svg" + sodipodi:docname="477-28-2.svg" inkscape:version="1.1.2 (b8e25be8, 2022-02-05)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" diff --git a/project/images/official/editable/477_29.svg b/project/images/official/editable/477-29.svg similarity index 100% rename from project/images/official/editable/477_29.svg rename to project/images/official/editable/477-29.svg diff --git a/project/images/official/editable/477_3.svg b/project/images/official/editable/477-3.svg similarity index 100% rename from project/images/official/editable/477_3.svg rename to project/images/official/editable/477-3.svg diff --git a/project/images/official/editable/477_4.svg b/project/images/official/editable/477-4.svg similarity index 100% rename from project/images/official/editable/477_4.svg rename to project/images/official/editable/477-4.svg diff --git a/project/images/official/editable/477_5.svg b/project/images/official/editable/477-5.svg similarity index 100% rename from project/images/official/editable/477_5.svg rename to project/images/official/editable/477-5.svg diff --git a/project/images/official/editable/477_6.svg b/project/images/official/editable/477-6.svg similarity index 100% rename from project/images/official/editable/477_6.svg rename to project/images/official/editable/477-6.svg diff --git a/project/images/official/editable/477_7.svg b/project/images/official/editable/477-7.svg similarity index 100% rename from project/images/official/editable/477_7.svg rename to project/images/official/editable/477-7.svg diff --git a/project/images/official/editable/477_8.svg b/project/images/official/editable/477-8.svg similarity index 100% rename from project/images/official/editable/477_8.svg rename to project/images/official/editable/477-8.svg diff --git a/project/images/official/editable/477_9.svg b/project/images/official/editable/477-9.svg similarity index 100% rename from project/images/official/editable/477_9.svg rename to project/images/official/editable/477-9.svg diff --git a/project/images/official/original/477_1.svg b/project/images/official/original/477-1.svg similarity index 100% rename from project/images/official/original/477_1.svg rename to project/images/official/original/477-1.svg diff --git a/project/images/official/original/477_10.svg b/project/images/official/original/477-10.svg similarity index 100% rename from project/images/official/original/477_10.svg rename to project/images/official/original/477-10.svg diff --git a/project/images/official/original/477_11-1.svg b/project/images/official/original/477-11-1.svg similarity index 100% rename from project/images/official/original/477_11-1.svg rename to project/images/official/original/477-11-1.svg diff --git a/project/images/official/original/477_11-2.svg b/project/images/official/original/477-11-2.svg similarity index 100% rename from project/images/official/original/477_11-2.svg rename to project/images/official/original/477-11-2.svg diff --git a/project/images/official/original/477_12.svg b/project/images/official/original/477-12.svg similarity index 100% rename from project/images/official/original/477_12.svg rename to project/images/official/original/477-12.svg diff --git a/project/images/official/original/477_13.svg b/project/images/official/original/477-13.svg similarity index 100% rename from project/images/official/original/477_13.svg rename to project/images/official/original/477-13.svg diff --git a/project/images/official/original/477_14.svg b/project/images/official/original/477-14.svg similarity index 100% rename from project/images/official/original/477_14.svg rename to project/images/official/original/477-14.svg diff --git a/project/images/official/original/477_15.svg b/project/images/official/original/477-15.svg similarity index 100% rename from project/images/official/original/477_15.svg rename to project/images/official/original/477-15.svg diff --git a/project/images/official/original/477_16.svg b/project/images/official/original/477-16.svg similarity index 100% rename from project/images/official/original/477_16.svg rename to project/images/official/original/477-16.svg diff --git a/project/images/official/original/477_17.svg b/project/images/official/original/477-17.svg similarity index 100% rename from project/images/official/original/477_17.svg rename to project/images/official/original/477-17.svg diff --git a/project/images/official/original/477_18.svg b/project/images/official/original/477-18.svg similarity index 100% rename from project/images/official/original/477_18.svg rename to project/images/official/original/477-18.svg diff --git a/project/images/official/original/477_19.svg b/project/images/official/original/477-19.svg similarity index 100% rename from project/images/official/original/477_19.svg rename to project/images/official/original/477-19.svg diff --git a/project/images/official/original/477_2.svg b/project/images/official/original/477-2.svg similarity index 100% rename from project/images/official/original/477_2.svg rename to project/images/official/original/477-2.svg diff --git a/project/images/official/original/477_20.svg b/project/images/official/original/477-20.svg similarity index 100% rename from project/images/official/original/477_20.svg rename to project/images/official/original/477-20.svg diff --git a/project/images/official/original/477_21.svg b/project/images/official/original/477-21.svg similarity index 100% rename from project/images/official/original/477_21.svg rename to project/images/official/original/477-21.svg diff --git a/project/images/official/original/477_22.svg b/project/images/official/original/477-22.svg similarity index 100% rename from project/images/official/original/477_22.svg rename to project/images/official/original/477-22.svg diff --git a/project/images/official/original/477_23.svg b/project/images/official/original/477-23.svg similarity index 100% rename from project/images/official/original/477_23.svg rename to project/images/official/original/477-23.svg diff --git a/project/images/official/original/477_24.svg b/project/images/official/original/477-24.svg similarity index 100% rename from project/images/official/original/477_24.svg rename to project/images/official/original/477-24.svg diff --git a/project/images/official/original/477_25.svg b/project/images/official/original/477-25.svg similarity index 100% rename from project/images/official/original/477_25.svg rename to project/images/official/original/477-25.svg diff --git a/project/images/official/original/477_26.svg b/project/images/official/original/477-26.svg similarity index 100% rename from project/images/official/original/477_26.svg rename to project/images/official/original/477-26.svg diff --git a/project/images/official/original/477_27.svg b/project/images/official/original/477-27.svg similarity index 100% rename from project/images/official/original/477_27.svg rename to project/images/official/original/477-27.svg diff --git a/project/images/official/original/477_28-1.svg b/project/images/official/original/477-28-1.svg similarity index 100% rename from project/images/official/original/477_28-1.svg rename to project/images/official/original/477-28-1.svg diff --git a/project/images/official/original/477_28-2.svg b/project/images/official/original/477-28-2.svg similarity index 100% rename from project/images/official/original/477_28-2.svg rename to project/images/official/original/477-28-2.svg diff --git a/project/images/official/original/477_29.svg b/project/images/official/original/477-29.svg similarity index 100% rename from project/images/official/original/477_29.svg rename to project/images/official/original/477-29.svg diff --git a/project/images/official/original/477_3.svg b/project/images/official/original/477-3.svg similarity index 100% rename from project/images/official/original/477_3.svg rename to project/images/official/original/477-3.svg diff --git a/project/images/official/original/477_4.svg b/project/images/official/original/477-4.svg similarity index 100% rename from project/images/official/original/477_4.svg rename to project/images/official/original/477-4.svg diff --git a/project/images/official/original/477_5.svg b/project/images/official/original/477-5.svg similarity index 100% rename from project/images/official/original/477_5.svg rename to project/images/official/original/477-5.svg diff --git a/project/images/official/original/477_6.svg b/project/images/official/original/477-6.svg similarity index 100% rename from project/images/official/original/477_6.svg rename to project/images/official/original/477-6.svg diff --git a/project/images/official/original/477_7.svg b/project/images/official/original/477-7.svg similarity index 100% rename from project/images/official/original/477_7.svg rename to project/images/official/original/477-7.svg diff --git a/project/images/official/original/477_8.svg b/project/images/official/original/477-8.svg similarity index 100% rename from project/images/official/original/477_8.svg rename to project/images/official/original/477-8.svg diff --git a/project/images/official/original/477_9.svg b/project/images/official/original/477-9.svg similarity index 100% rename from project/images/official/original/477_9.svg rename to project/images/official/original/477-9.svg From f40ed0bce3070b8ebc901923f19956ecd2eddc7c Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 28 Mar 2024 14:50:05 +0100 Subject: [PATCH 08/11] Update setup.sh --- datamodel/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodel/setup.sh b/datamodel/setup.sh index 4f6e2dfa..a518d2bf 100755 --- a/datamodel/setup.sh +++ b/datamodel/setup.sh @@ -77,7 +77,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_05_change_official.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_06_direction_user_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_07_missing_left_right.sql -psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477-signs.sql +psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_08_477_signs.sql psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_09_exceptes.sql if [[ $demo_data == True ]]; then From 054087b8e4e834feb36578da0ec967c7548ffeb9 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 28 Mar 2024 18:12:12 +0100 Subject: [PATCH 09/11] remove old 4.77.1 --- datamodel/changelogs/0100/0100_08_477_signs.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datamodel/changelogs/0100/0100_08_477_signs.sql b/datamodel/changelogs/0100/0100_08_477_signs.sql index a1ca9774..4a4ed182 100644 --- a/datamodel/changelogs/0100/0100_08_477_signs.sql +++ b/datamodel/changelogs/0100/0100_08_477_signs.sql @@ -41,3 +41,7 @@ INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_i INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-1', true, 'Überleitung und Rückführung von Fahrstreifen (eine Spur)', 'Dégagement et retour des voies de circulation (une voie)', 'Sgombero e ripristino delle corsie di traffico (due corsie)', NULL, NULL, NULL, NULL, NULL, '477-28-1.svg', '477-28-1.svg', '477-28-1.svg', '477-28-1.svg', 100, 100, 0, NULL, NULL, NULL, NULL, false); INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/28-2', true, 'Überleitung und Rückführung von Fahrstreifen (Spurverengung)', 'Dégagement et retour des voies de circulation (rétrécissement de la voie)', 'Sgombero e ripristino delle corsie di traffico (restringimento della corsia)', NULL, NULL, NULL, NULL, NULL, '477-28-2.svg', '477-28-2.svg', '477-28-2.svg', '477-28-2.svg', 100, 100, 1, '2 m', NULL, NULL, NULL, false); INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477-29.svg', '477-29.svg', '477-29.svg', '477-29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); + +-- DROP OLD 4.77.1 +UPDATE signalo.sign SET fk_official_sign = '4.77/01' WHERE fk_official_sign = '4.77.1'; +DELETE from signalo_db.vl_official_sign where id = '4.77.1'; From e27288182d1029427376cbeefe977b1e6ade7755 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 28 Mar 2024 18:12:12 +0100 Subject: [PATCH 10/11] remove old 4.77.1 --- datamodel/changelogs/0100/0100_08_477_signs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodel/changelogs/0100/0100_08_477_signs.sql b/datamodel/changelogs/0100/0100_08_477_signs.sql index 4a4ed182..6fa61d2a 100644 --- a/datamodel/changelogs/0100/0100_08_477_signs.sql +++ b/datamodel/changelogs/0100/0100_08_477_signs.sql @@ -43,5 +43,5 @@ INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_i INSERT INTO signalo_db.vl_official_sign (id, active, value_de, value_fr, value_it, value_ro, description_de, description_fr, description_it, description_ro, img_de, img_fr, img_it, img_ro, img_height, img_width, no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3, default_inscription4, directional_sign) VALUES ('4.77/29', true, 'Überleitung und Rückführung von Fahrstreifen (doppelspurig nach rechts)', 'Dégagement et retour des voies de circulation (à deux voies à droite)', 'Sgombero e ripristino delle corsie di traffico (a due corsie a destra)', NULL, NULL, NULL, NULL, NULL, '477-29.svg', '477-29.svg', '477-29.svg', '477-29.svg', 100, 85, 0, NULL, NULL, NULL, NULL, false); -- DROP OLD 4.77.1 -UPDATE signalo.sign SET fk_official_sign = '4.77/01' WHERE fk_official_sign = '4.77.1'; +UPDATE signalo_db.sign SET fk_official_sign = '4.77/01' WHERE fk_official_sign = '4.77.1'; DELETE from signalo_db.vl_official_sign where id = '4.77.1'; From b9d487346ceee6a79cab250a47fab4651605fe79 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 28 Mar 2024 18:28:43 +0100 Subject: [PATCH 11/11] complete error message --- test/official_sign_images.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/official_sign_images.sh b/test/official_sign_images.sh index dad98912..910761f7 100755 --- a/test/official_sign_images.sh +++ b/test/official_sign_images.sh @@ -42,7 +42,7 @@ for _IMG_DIR in "${_IMG_DIRS[@]}"; do IMAGE=$(basename ${FILE}) COUNT=$(psql -t -c "SELECT COUNT(id) FROM signalo_db.vl_official_sign WHERE img_de='${IMAGE}' OR img_fr='${IMAGE}' OR img_it='${IMAGE}' OR img_ro='${IMAGE}' OR img_de_right='${IMAGE}' OR img_fr_right='${IMAGE}' OR img_it_right='${IMAGE}' OR img_ro_right='${IMAGE}'") if [[ ${COUNT} -ne "1" ]]; then - echo "*** Image ${IMAGE} is not used once in signalo_db.vl_official_sign" + echo "*** Image ${IMAGE} is not used once in signalo_db.vl_official_sign (or maybe more than once, checkout)" return_code=1 elif [[ ${_IMG_DIR} = editable ]]; then ih=$(exiftool -ImageHeight ${FILE} | sed "s/.*: //;s/pt//g")