fix option line overriding #77
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
Codecov Report
@@ Coverage Diff @@
## master #77 +/- ##
==========================================
- Coverage 55.35% 55.32% -0.04%
==========================================
Files 15 15
Lines 2184 2422 +238
==========================================
+ Hits 1209 1340 +131
- Misses 975 1082 +107
Continue to review full report at Codecov.
|
uchchwhash
requested changes
Mar 26, 2018
datacube_stats/main.py
Outdated
| @@ -239,8 +239,11 @@ def from_configuration_file(cls, config, index=None, tile_indexes=None, output_l | |||
| :return: read to run StatsApp | |||
| """ | |||
| input_region = config.get('input_region') | |||
| if tile_indexes and not input_region: | |||
| input_region = {'tiles': tile_indexes} | |||
| if tile_indexes: | |||
There was a problem hiding this comment.
Notice that config.get('input_region') might return None since there
may be no input region specified. Both of the checks below will then crash.
So how about:
if tile_indexes is not None:
if input_region is None:
input_region = {'tiles': tile_indexes'}
elif 'geometry' in input_region:
input_region['tiles'] = tile_indexes
datacube_stats/tasks.py
Outdated
| if input_region is None or input_region == {}: | ||
| _LOG.info('No input_region specified. Generating full available spatial region, gridded files.') | ||
| return GriddedTaskGenerator(storage) | ||
|
|
||
| elif 'geometry' in input_region: # Larger spatial region |
There was a problem hiding this comment.
This is perfectly fine. However, notice that you could merge those
two branches into one:
return GriddedTaskGenerator(storage, geopolygon=geometry, tile_indexes=input_region.get('tiles'))
uchchwhash
approved these changes
Mar 26, 2018
|
All good: 😄 |
vnewey
pushed a commit
that referenced
this pull request
Apr 4, 2018
emmaai
added a commit
that referenced
this pull request
Apr 11, 2018
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.
With the requirement from Dale