Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.2.9
ADDED:
- get transport_exceptionnel field of bdtopo in pgr data

## 2.2.8
FIXED:
- wrong import in _lua_builder.py
Expand Down
6 changes: 4 additions & 2 deletions r2gg/_pivot_to_pgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
matieres_dangereuses_interdites boolean,
cpx_gestionnaire text,
cpx_numero_route_europeenne text,
cpx_classement_administratif text
cpx_classement_administratif text,
transport_exceptionnel boolean
);""".format(ways_table_name)
logger.debug("SQL: {}".format(create_table))
cursor_out.execute(create_table)
Expand Down Expand Up @@ -256,7 +257,8 @@ def pivot_to_pgr(source, cost_calculation_file_path, connection_work, connection
'matieres_dangereuses_interdites as matieres_dangereuses_interdites',
'cpx_gestionnaire as cpx_gestionnaire',
'cpx_numero_route_europeenne as cpx_numero_route_europeenne',
'cpx_classement_administratif as cpx_classement_administratif'
'cpx_classement_administratif as cpx_classement_administratif',
'transport_exceptionnel as transport_exceptionnel'
]
in_columns = attribute_columns.copy()
for variable in costs["variables"]:
Expand Down
7 changes: 5 additions & 2 deletions sql/bdtopo_v3.3.sql
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ CREATE TABLE IF NOT EXISTS {output_schema}.edges (
matieres_dangereuses_interdites boolean,
cpx_gestionnaire text,
cpx_numero_route_europeenne text,
cpx_classement_administratif text
cpx_classement_administratif text,
transport_exceptionnel boolean
);


Expand Down Expand Up @@ -205,6 +206,7 @@ CREATE TEMP TABLE IF NOT EXISTS bduni_troncon AS
t.cpx_gestionnaire as cpx_gestionnaire,
t.cpx_numero_route_europeenne as cpx_numero_route_europeenne,
t.cpx_classement_administratif as cpx_classement_administratif,
t.transport_exceptionnel as transport_exceptionnel,

-- géométrie du troncon
ST_Force2D(ST_Transform(t.geom, 4326)) as geom
Expand Down Expand Up @@ -288,7 +290,8 @@ INSERT INTO {output_schema}.edges
matieres_dangereuses_interdites as matieres_dangereuses_interdites,
cpx_gestionnaire as cpx_gestionnaire,
cpx_numero_route_europeenne as cpx_numero_route_europeenne,
cpx_classement_administratif as cpx_classement_administratif
cpx_classement_administratif as cpx_classement_administratif,
transport_exceptionnel as transport_exceptionnel
FROM bduni_troncon
;

Expand Down