Feature/graph analysis ipyleaflet visualisation #47
Conversation
…leaflet-visualisation
Add habitat layer selection to widget in GeoGraphViewer. Also includes other minor fixes for GeoGraphViewer
Added because of Jasmin server instability.
Also includes minor fixes: - fix node color - fix node, edge drawing order
…leaflet-visualisation
…sis-ipyleaflet-visualisation
…into feature/graph-analysis-ipyleaflet-visualisation
This factors the GeoGraphViewer control functionality into separate widgets for better readability.
These traits can be used by multiple control widgets to determine their content.
…ture/graph-analysis-ipyleaflet-visualisation
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
|
Love it already before reviewing! 😉 😍 |
| node_gdf = gpd.GeoDataFrame(columns=["id", "geometry"]) | ||
| rep_points = graph.nodes(data="rep_point") | ||
| for idx, rep_point in rep_points: | ||
| node_gdf.loc[idx] = [idx, rep_point] |
There was a problem hiding this comment.
Since .loc is quite slow, you should be able to speed this up quite a lot by just initialising the node_gdf using rep_points: https://www.geeksforgeeks.org/creating-a-pandas-dataframe-using-list-of-tuples/
There was a problem hiding this comment.
Good point! I added a performance improvement issue, so I don't forget it in the future. I think the cost of this compared to components is minor, therefore I will focus on other things first.
| point_b = rep_points[node_b] | ||
| line = shapely.geometry.LineString([point_a, point_b]) | ||
|
|
||
| edge_gdf.loc[idx] = [idx, line] |
There was a problem hiding this comment.
And similarly here, but you'll need to build the list of tuples in the loop first then make the edge_gdf from it at the end.
And fix typo.
|
Thanks a lot for the review @herbiebradley! Was able to address most points in 42eae9e, and created Issue #50 for the remaining performance improvements, to be dealt with at a later point. |
Introducing
GeoGraphViewer🎉 ... this PR adds theGeoGraphViewervisualisation class and a bunch of code that enables it. As theGeoGraphVieweris a fairly complex widget, this PR is somewhat lengthy, apologies in advance! Thanks a lot for your review!Main changes:
visualisation/*. The oldmodels/visualisation.pyhas been removed.GeoGraphViewerclass (invisualisation/geoviewer.py): this allows us to visualise GeoGraphs interactively.visualisation/control_widgets.py): these make up the side control panel seen in demos. See architecture image below for a rough outline how they relate and are added to theGeoGraphViewer.Other changes:
GeoGraphViewer. These are invisualisation/widget_utils.pyvisualisation/folium_utils.py(old functions fromvisualisation.py, no need to review)visualisation/graph_utils.py(old functions fromvisualisation.py, no need to review)data_loading/test_data.pyvisualisation/style.pythat contains constants defining the plotting style of graph, etc. inGeoGraphViewer.requirements/dev-requirements.txtnotebooks/exploratory/rdnfn-8-polesia-geographviewer-demo.ipynbwill likely be interesting, which is the demo on the Polesia data. Feel free to use it, it should work with the environment created viamake env(if you updated it to new requirements)FoliumGeoGraphViewerclass (ingeoviewer.py)Architecture
GeoGraphViewer demo
