From 777b051b6f0bedae228d436111d1f98e6fa365bd Mon Sep 17 00:00:00 2001 From: Isabel Kiefer Date: Mon, 25 Mar 2024 17:20:37 +0100 Subject: [PATCH] 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +