Crosscade #294
Merged
Crosscade #294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…is used for POints
…ach other is resolved. has to test. Road cleaned, still should be used
…nd connect the graph as far as possible
… when want to define edges to remove
…us attempt to exclude bridges was not sufficient
… multi-od analysis
…ave these attributes. needed for the osmnx function used
…to include edge attributes in the graph, e.g., bridge
…ibutes already exist. Otherwise bridge attributes were overwritten and became nan which was wrong. It had to do with the used osmnx function
…t file. It gave error when making gpkg
…move conditions updated to exclude bridges with the right criteria
…nput road network
3 tasks
Carsopre
reviewed
Mar 12, 2024
ra2ce/graph/network_config_data/network_config_data_validator.py
Outdated
Show resolved
Hide resolved
Carsopre
requested changes
Mar 21, 2024
ra2ce/graph/network_config_data/network_config_data_validator.py
Outdated
Show resolved
Hide resolved
ra2ce/graph/origins_destinations.py
Outdated
| inverse_nodes_dict, | ||
| graph, | ||
| ) | ||
| assert len(new_lines) == 2 |
There was a problem hiding this comment.
This is not going to happen at this point (you entered the if condition with len(new_lines) == 1.
ra2ce/graph/origins_destinations.py
Outdated
| graph, | ||
| ) | ||
| assert len(new_lines) == 2 | ||
| assert len([match_od_point]) == 1 |
There was a problem hiding this comment.
You should be doing this outside this if, rather than after spending time with find_closest_node.
There was a problem hiding this comment.
No need for further action as this was the previous behavior
ra2ce/graph/origins_destinations.py
Outdated
| inverse_vertices_dict, | ||
| ) | ||
|
|
||
| except (KeyError, AssertionError): |
There was a problem hiding this comment.
I'm not a fan of having try-except, the second one (AssertionError) can be avoided with relative small code modifications, but how is the first one ( KeyError) triggered?
# Conflicts: # ra2ce/analyses/indirect/analyses_indirect.py # ra2ce/analysis/indirect/origin_closest_destination.py # ra2ce/network/network_wrappers/vector_network_wrapper.py # ra2ce/network/networks_utils.py # ra2ce/network/origins_destinations.py
…ion which had to modify
Carsopre
approved these changes
Mar 28, 2024
Carsopre
added a commit
that referenced
this pull request
Apr 12, 2024
* chore: origins_destinations.py is adjusted to Point Z structure that is used for POints * chore: update_edges_with_new_node updated and node adding on top of each other is resolved. has to test. Road cleaned, still should be used * chore: update edege of graph is modified to correct the direction of the u-new_v etc. * fix/feat: allowing mapping ods to all nodes at one location and required changes * minor * feat trace has_path origins 1 * chore: node_checked_has_path added _find_optimal_toute * feat: _delete_duplicate_nodes added to remove graph node duplicates and connect the graph as far as possible * feat: minor * feat: None check added _find_optimal_route * fix: hazard shp get_hazard files is corrected * feat; include more road types * feat; include bridge attribute in the graph. Also exclude bridge==yes when want to define edges to remove * feat; exclude bridge==yes when want to define edges to remove. previous attempt to exclude bridges was not sufficient * feat; exclude bridge==yes when want to define edges to remove for the multi-od analysis * feat: _include_attributes updated to add x y for nodes if they dont have these attributes. needed for the osmnx function used * feat: in VectorNetworkWrapper.get_network() a functionality is added to include edge attributes in the graph, e.g., bridge * fix: fid removed * fix: _include_attributes updated to exclude being activated when attributes already exist. Otherwise bridge attributes were overwritten and became nan which was wrong. It had to do with the used osmnx function * fix: fid is excluded from being considered when reading the road input file. It gave error when making gpkg * fix: in od analysis multi_link_origin_closest_destination edges_to_remove conditions updated to exclude bridges with the right criteria * feat: Simplify functionality added when introducing shapefile as an input road network * docs: isolated locations * chore: gpd import * feat: bridges control and exclusion from the analysis * chore: Indentation reformatted. * chore: corrections because of the created enums. * chore: Obsolete imports are resolved * chore: Obsolete imports are resolved and standardised the osmnx function which had to modify * chore: Obsolete imports are resolved. * chore: edge_attributes_to_include=None is resolved * chore: check if attributes to include exist in gdf * chore: check if attributes to include exist in gdf * chore: Updated call and fixed test * chore: small corrections and fixed failing tests * chore: Removed irrelevant file * chore: Fixed return of closest_node to be the same return type as earlier * chore: Fixed incorrect reference to analysis threshold * feat: bridge controlling is updated * chore: _is_not_none(value) is added --------- Co-authored-by: Carles S. Soriano Perez <carles.sorianoperez@deltares.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.