Fix running MapShed on AoIs with no streams #2546
Merged
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
Previously, if no streams intersected the area of interest, instead of an array of stringified GeoJSON MultiLines, a singleton array would be sent with the only value being null. This caused parse issues in the geoprocessing service. Now this case is caught on the Celery task itself, and if so we return an empty object immediately, and do not invoke the geoprocessing service at all. This short circuit makes the feedback faster and removes unnecessary communication. Refs #2518 🐛
|
Taking a look now. |
|
Thanks for taking a look! |
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.
Overview
Previously, if no streams intersected the area of interest, instead of an array of stringified GeoJSON MultiLines, a singleton array would be sent with the only value being null. This caused parse issues in the geoprocessing service.
Now this case is caught on the Celery task itself, and if so we return an empty object immediately, and do not invoke the geoprocessing service at all. This short circuit makes the feedback faster and removes unnecessary communication.
Connects #2518
Demo
Testing Instructions
Check out this branch and restart Celery
Go to :8000/ and turn on the streams overlay
Draw a shape deliberately avoiding streams
Model with MapShed. Ensure that it works successfully.
Download and run this file: mmw-cli.py.txt, which has the test shape from the original issue.