Making PolarRoute-server compatible with latest PolarRoute and MeshiPhi versions#175
Making PolarRoute-server compatible with latest PolarRoute and MeshiPhi versions#175thomaszwagerman wants to merge 8 commits into
Conversation
|
I appreciate this is still in draft, but looks good so far, I'm very pleased to finally be getting rid of the need to deal with tempfiles now we can use the python interface more directly. Feel free to make any other improvements to this function you feel are necessary. I'm sure you will, but don't forget to restrict the polar-route version in the pyproject.toml from this point. |
Coverage Report
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Satisfied this successfully runs and returns routes |
davidwyld
left a comment
There was a problem hiding this comment.
As I've said, this is a huge improvement, thanks for doing this.
I wonder if we should add to the testing of this functionality in test_utils? I'm happy to write a test if you don't have time.
Don't forget to update the changelog in this PR too.
Co-authored-by: David Wyld <24752124+davidwyld@users.noreply.github.com>
|
I've added Opened an issue in PolarRoute for related issues within |
davidwyld
left a comment
There was a problem hiding this comment.
Worth discussing whether we want to expose route_type in the API?
Want me to implement a test for evaluate_route? Or we can just open an issue since there isn't one to begin with so I don't want it to hold back this branch.
| info: | ||
| title: PolarRoute-Server | ||
| version: 0.2.7 | ||
| version: 0.2.8.dev6+gc5ccc2e7e |
There was a problem hiding this comment.
I'm a bit unsure what to do about this, I guess we just leave the dynamic version numbers in the history then they get sorted out at tag/release time?
|
|
||
|
|
||
| def evaluate_route(route_json: dict, mesh: Mesh) -> dict: | ||
| def evaluate_route(route_json: dict, mesh: Mesh, route_type: str = "smoothed") -> dict: |
There was a problem hiding this comment.
I'm unsure whether we need to expose route_type in this function, but I guess there's no harm in it as long as we think about whether it ultimately gets exposed in the API. I think this is fine.
| df = pd.DataFrame(df_data) | ||
|
|
||
| # Get start and end waypoint names | ||
| from_wp = "waypoint_0" |
There was a problem hiding this comment.
I'm not sure if it's possible for the submitted route to have waypoint names, we may want to preserve those in the future, but lets leave this as is for now, they don't really matter for SIIS at least.
| data = request.data | ||
| route_json = data.get("route", None) | ||
| custom_mesh_id = data.get("custom_mesh_id", None) | ||
| route_type = data.get("route_type", "smoothed") |
There was a problem hiding this comment.
Ah okay so we are exposing route_type in the api. Do we actually want to do this?
Specifically updating how
evaluate_routeworks with PolarRoute changes toroute_calcapi:Also removing all
TempFilerelated code, as now longer required for new API.