Skip to content

Commit

Permalink
Issues v1.0.0 (#180)
Browse files Browse the repository at this point in the history
* issue #103 multiple line signs for 4.27 and 4.29

* truncate too long texts in dynamic signs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* setup with new migration

* fix number of inscription

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Denis Rouzaud <[email protected]>
  • Loading branch information
3 people authored Feb 2, 2024
1 parent b12139e commit 1c0cdeb
Show file tree
Hide file tree
Showing 13 changed files with 7,511 additions and 6,766 deletions.
71 changes: 71 additions & 0 deletions datamodel/changelogs/0100/0100_change_official.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
INSERT INTO signalo_db.vl_official_sign(
id, active, value_de, value_fr, value_it,
img_de, img_fr, img_it, img_ro, img_height, img_width,
no_dynamic_inscription, default_inscription1,
directional_sign)
VALUES (
'4.27-1',true,'Ortsbeginn auf Hauptstrassen (1 Linie)',
'Début de localité sur route principale (1 ligne)',
'Inizio della località sulle strade principali (1 ligne)',
'427-1.svg', '427-1.svg', '427-1.svg', '427-1.svg', 80, 110,
1, 'Biel',
false);

INSERT INTO signalo_db.vl_official_sign(
id, active, value_de, value_fr, value_it,
img_de, img_fr, img_it, img_ro, img_height, img_width,
no_dynamic_inscription, default_inscription1, default_inscription2,
directional_sign)
VALUES (
'4.27-2',true,'Ortsbeginn auf Hauptstrassen (2 Linien)',
'Début de localité sur route principale (2 lignes)',
'Inizio della località sulle strade principali (2 ligne)',
'427-2.svg', '427-2.svg', '427-2.svg', '427-2.svg', 80, 110,
2, 'Biel', 'Bienne',
false);

INSERT INTO signalo_db.vl_official_sign(
id, active, value_de, value_fr, value_it,
img_de, img_fr, img_it, img_ro, img_height, img_width,
no_dynamic_inscription, default_inscription1, default_inscription2, default_inscription3,
directional_sign)
VALUES (
'4.27-3',true,'Ortsbeginn auf Hauptstrassen (3 Linien)',
'Début de localité sur route principale (3 lignes)',
'Inizio della località sulle strade principali (3 ligne)',
'427-3.svg', '427-3.svg', '427-3.svg', '427-3.svg', 80, 110,
3, 'Biel', 'Bienne', 'BE',
false);

INSERT INTO signalo_db.vl_official_sign(
id, active, value_de, value_fr, value_it,
img_de, img_fr, img_it, img_ro, img_height, img_width,
no_dynamic_inscription, default_inscription1,
directional_sign)
VALUES (
'4.29-1', true, 'Ortsbeginn auf Nebenstrassen (1 Linie)',
'Début de localité sur route secondaire (1 ligne)',
'Inizio della località sulle strade secondarie (1 ligne)',
'429-1.svg', '429-1.svg', '429-1.svg', '429-1.svg', 80, 109,
1, 'Maur',
false);

INSERT INTO signalo_db.vl_official_sign(
id, active, value_de, value_fr, value_it,
img_de, img_fr, img_it, img_ro, img_height, img_width,
no_dynamic_inscription, default_inscription1, default_inscription2,
directional_sign)
VALUES (
'4.29-2', true, 'Ortsbeginn auf Nebenstrassen (2 Linien)',
'Début de localité sur route secondaire (2 lignes)',
'Inizio della località sulle strade secondarie (2 ligne)',
'429-2.svg', '429-2.svg', '429-2.svg', '429-2.svg', 80, 109,
2, 'Maur', '(ZH)',
false);


UPDATE signalo_db.sign SET fk_official_sign = '4.27-3' where fk_official_sign = '4.27';
UPDATE signalo_db.sign SET fk_official_sign = '4.29-1' where fk_official_sign = '4.29';

DELETE from signalo_db.vl_official_sign where id = '4.27';
DELETE from signalo_db.vl_official_sign where id = '4.29';
1 change: 1 addition & 0 deletions datamodel/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changel
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_support_photo2.sql
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_add_signs_img.sql
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_indexes.sql
psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=${SRID} -f ${DIR}/changelogs/0100/0100_change_official.sql

if [[ $demo_data == True ]]; then
echo "*** inserting demo_data"
Expand Down
121 changes: 121 additions & 0 deletions project/images/official/editable/427-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
131 changes: 131 additions & 0 deletions project/images/official/editable/427-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Loading

0 comments on commit 1c0cdeb

Please sign in to comment.