Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix signs v1 #208

Merged
merged 11 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions datamodel/changelogs/0100/0100_08_477_signs.sql

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions datamodel/changelogs/0100/0100_09_exceptes.sql
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 2 additions & 0 deletions datamodel/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ 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_09_exceptes.sql

if [[ $demo_data == True ]]; then
echo "*** inserting demo_data"
Expand Down
86 changes: 73 additions & 13 deletions project/images/official/editable/132.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 6 additions & 24 deletions project/images/official/editable/216.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions project/images/official/editable/407a.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading