Feature offset3 #101
Merged
Feature offset3 #101
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
…ecifications, fixed now
…, this time all test merge should be in the right format
Also added first pass version of dividing by N for that number of feature_collections
Fix bug where merge_inferences() was treated like a class rather than a function
🍹
|
jonaraphael
requested changes
Nov 6, 2023
| @@ -44,6 +44,7 @@ def upgrade() -> None: | |||
| session = orm.Session(bind=bind) | |||
|
|
|||
| eez = get_eez_from_url() # geojson.load(open("EEZ_and_HighSeas_20230410.json")) | |||
| eez = {"features": []} # noqa | |||
There was a problem hiding this comment.
This line needs to be deleted before Merging
| @@ -36,6 +36,7 @@ def upgrade() -> None: | |||
| session = orm.Session(bind=bind) | |||
|
|
|||
| iho = get_iho_from_url() | |||
| iho = {"features": []} # noqa | |||
There was a problem hiding this comment.
This line needs to be deleted before Merging
| @@ -36,6 +36,7 @@ def upgrade() -> None: | |||
| session = orm.Session(bind=bind) | |||
|
|
|||
| mpa = get_mpa_from_url() | |||
| mpa = {"features": []} # noqa | |||
There was a problem hiding this comment.
This line needs to be deleted before Merging
| print(f"Offset 2 offset_group_bounds: {offset_2_group_bounds}") | ||
|
|
||
| print( | ||
| f"Original tiles are {len(base_tiles)}, {len(offset_group_bounds)}, {len(offset_2_group_bounds)}" |
There was a problem hiding this comment.
offset_group_bounds and offset_2_group_bounds are the wrong variables here.
I think you want offset_tiles_bounds and offset_2_tiles_bounds
There was a problem hiding this comment.
Resolving this for next push
There was a problem hiding this comment.
Yep, changes made will be reflected in the next push
| @@ -407,13 +423,25 @@ async def _orchestrate( | |||
| "offset tiles", | |||
| ) | |||
|
|
|||
| offset_2_tiles_inference = await perform_inference( | |||
| offset_2_tiles_bounds, | |||
| cloud_run_inference.get_offset_tile_inference, # THIS FUNCTION NEEDS TO BE EDITTED | |||
There was a problem hiding this comment.
Is this comment still correct?
There was a problem hiding this comment.
Nope, taking this out for the next push
| @@ -523,7 +551,7 @@ async def _orchestrate( | |||
| async with db_client.session.begin(): | |||
| orchestrator_run.success = True | |||
| orchestrator_run.inference_end_time = end_time | |||
|
|
|||
| # XXXC >> reduce num variables to a list of featureCollection, ala the merging approach | |||
There was a problem hiding this comment.
Clean up this comment?
| - offset_tile_fc: The secondary FeatureCollection to be merged with the primary. | ||
| - isolated_conf_multiplier: A multiplier for the confidence of isolated features (default is 1). | ||
| - feature_collections: A list of FeatureCollecitons to be merged, a primary and any secondary FeatureCollections | ||
| - isolated_conf_multiplier: A multiplier for the confidence of isolated features (default is 1 / len(feature_collections)). |
| offset_gdf = gpd.GeoDataFrame.from_features( | ||
| offset_tile_fc["features"], crs=4326 | ||
| gdfs_for_processing = [ | ||
| reproject_to_utm( |
There was a problem hiding this comment.
Maybe add a comment about the reproject_to_utm() assumption?
🍹
|
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.
Updates to feature offsetting