From d8563501bd03bdf48ab6b3b9cf7b4b8560acbea9 Mon Sep 17 00:00:00 2001 From: pedro Camargo Date: Mon, 28 Dec 2020 15:36:07 +1000 Subject: [PATCH 1/2] Addresses issue 191 --- aequilibrae/parameters.yml | 5 ++--- aequilibrae/project/about.py | 1 + aequilibrae/project/database_specification/tables/about.sql | 5 ++++- tests/data/SiouxFalls_project/parameters.yml | 4 ++-- tests/data/no_triggers_project/parameters.yml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/aequilibrae/parameters.yml b/aequilibrae/parameters.yml index 012a34d50..b40828c80 100644 --- a/aequilibrae/parameters.yml +++ b/aequilibrae/parameters.yml @@ -209,9 +209,8 @@ osm: system: cpus: 0 - default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt - driving side: right + default_directory: C:\ logging: true logging_directory: /temp/ - spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64 + spatialite_path: C:\mod_spatialite-NG-win-amd64 temp directory: /temp diff --git a/aequilibrae/project/about.py b/aequilibrae/project/about.py index e721a5f7a..3896ee021 100644 --- a/aequilibrae/project/about.py +++ b/aequilibrae/project/about.py @@ -42,6 +42,7 @@ def create(self): if cursor.fetchone()[0] is None: cursor.execute(f"UPDATE 'about' set infovalue='{release_version}' where infoname='aequilibrae_version'") cursor.execute(f"UPDATE 'about' set infovalue='{uuid.uuid4().hex}' where infoname='project_ID'") + cursor.execute(f"UPDATE 'about' set infovalue='right' where infoname='driving_side'") self.__conn.commit() self.__load() diff --git a/aequilibrae/project/database_specification/tables/about.sql b/aequilibrae/project/database_specification/tables/about.sql index 6cfbe1178..db5546e1b 100644 --- a/aequilibrae/project/database_specification/tables/about.sql +++ b/aequilibrae/project/database_specification/tables/about.sql @@ -31,8 +31,11 @@ INSERT INTO 'about' (infoname) VALUES('aequilibrae_version'); # INSERT INTO 'about' (infoname) VALUES('projection'); +# +INSERT INTO 'about' (infoname) VALUES('driving_side'); + # INSERT INTO 'about' (infoname) VALUES('license'); # -INSERT INTO 'about' (infoname) VALUES('scenario_name'); \ No newline at end of file +INSERT INTO 'about' (infoname) VALUES('scenario_name'); diff --git a/tests/data/SiouxFalls_project/parameters.yml b/tests/data/SiouxFalls_project/parameters.yml index 437255e51..3f308cd0c 100644 --- a/tests/data/SiouxFalls_project/parameters.yml +++ b/tests/data/SiouxFalls_project/parameters.yml @@ -191,9 +191,9 @@ network: unknown_tags: true system: cpus: 0 - default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt + default_directory: C:\ driving side: right logging: true logging_directory: /temp/ - spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64 + spatialite_path: C:\mod_spatialite-NG-win-amd64 temp directory: /temp diff --git a/tests/data/no_triggers_project/parameters.yml b/tests/data/no_triggers_project/parameters.yml index 97487ec1f..bc3268e44 100644 --- a/tests/data/no_triggers_project/parameters.yml +++ b/tests/data/no_triggers_project/parameters.yml @@ -200,9 +200,9 @@ network: unknown_tags: true system: cpus: 0 - default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt + default_directory: C:\ driving side: right logging: true logging_directory: D:/no_triggers_project - spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64 + spatialite_path: C:\mod_spatialite-NG-win-amd64 temp directory: /temp From a432f037266978e4668f24c69a04a50776948cc4 Mon Sep 17 00:00:00 2001 From: pedro Camargo Date: Mon, 28 Dec 2020 15:52:06 +1000 Subject: [PATCH 2/2] Addresses issue 191 --- aequilibrae/project/about.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aequilibrae/project/about.py b/aequilibrae/project/about.py index 3896ee021..ef9a8d36e 100644 --- a/aequilibrae/project/about.py +++ b/aequilibrae/project/about.py @@ -42,7 +42,7 @@ def create(self): if cursor.fetchone()[0] is None: cursor.execute(f"UPDATE 'about' set infovalue='{release_version}' where infoname='aequilibrae_version'") cursor.execute(f"UPDATE 'about' set infovalue='{uuid.uuid4().hex}' where infoname='project_ID'") - cursor.execute(f"UPDATE 'about' set infovalue='right' where infoname='driving_side'") + cursor.execute("UPDATE 'about' set infovalue='right' where infoname='driving_side'") self.__conn.commit() self.__load()