Skip to content

Better use of geopandas in MapReader#495

Merged
rwood-97 merged 29 commits intomainfrom
436-geopandas
Sep 12, 2024
Merged

Better use of geopandas in MapReader#495
rwood-97 merged 29 commits intomainfrom
436-geopandas

Conversation

@rwood-97
Copy link
Copy Markdown
Collaborator

@rwood-97 rwood-97 commented Aug 23, 2024

Summary

At the moment MapReader doesn't make full use of geopandas. This PR addresses this and brings in geopandas wherever possible into the MapReader pipeline.

Fixes #436
Fixes #467

Describe your changes

  • SEE CHANGELOG

Checklist before assigning a reviewer (update as needed)

  • Self-review code
  • Ensure submission passes current tests
  • Add tests
  • Update relevant docs
  • Update changelog

Reviewer checklist

Please add anything you want reviewers to specifically focus/comment on.

  • Everything looks ok?

@review-notebook-app
Copy link
Copy Markdown

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@rwood-97 rwood-97 marked this pull request as draft August 23, 2024 14:35
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 23, 2024

Codecov Report

Attention: Patch coverage is 91.28788% with 92 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
mapreader/download/sheet_downloader.py 79.38% 27 Missing ⚠️
mapreader/spot_text/runner_base.py 0.00% 24 Missing ⚠️
mapreader/spot_text/deepsolo_runner.py 0.00% 8 Missing ⚠️
mapreader/spot_text/dptext_detr_runner.py 0.00% 8 Missing ⚠️
mapreader/spot_text/maptext_runner.py 0.00% 8 Missing ⚠️
tests/test_classify/test_datasets.py 94.11% 4 Missing ⚠️
mapreader/classify/load_annotations.py 81.25% 3 Missing ⚠️
mapreader/download/downloader.py 0.00% 3 Missing ⚠️
mapreader/classify/datasets.py 93.33% 2 Missing ⚠️
mapreader/load/images.py 98.36% 2 Missing ⚠️
... and 2 more
Flag Coverage Δ
unittests 68.56% <91.28%> (+2.52%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
mapreader/download/tile_merging.py 77.94% <100.00%> (+1.88%) ⬆️
mapreader/process/occlusion_analysis.py 99.21% <100.00%> (-0.02%) ⬇️
mapreader/utils/load_frames.py 100.00% <100.00%> (ø)
tests/test_annotate/test_annotator.py 100.00% <100.00%> (ø)
tests/test_classify/test_annotations_loader.py 100.00% <100.00%> (ø)
tests/test_download/test_sheet_downloader.py 99.77% <100.00%> (+<0.01%) ⬆️
tests/test_load/test_images.py 100.00% <100.00%> (ø)
tests/test_load/test_images_load_parents.py 100.00% <100.00%> (ø)
tests/test_load/test_loader.py 100.00% <100.00%> (ø)
tests/test_load/test_loader_load_patches.py 100.00% <100.00%> (ø)
... and 15 more

... and 1 file with indirect coverage changes

@rwood-97 rwood-97 marked this pull request as ready for review September 4, 2024 11:06
@rwood-97 rwood-97 mentioned this pull request Sep 6, 2024
6 tasks
@rwood-97
Copy link
Copy Markdown
Collaborator Author

@kallewesterling how do you feel if merge this? I feel pretty sure it won't break anything (and we can always revert to previous version if there is an issue) and will be helpful for the Oct workshop with visualising text outputs.

@rwood-97 rwood-97 merged commit d3f2c91 into main Sep 12, 2024
@rwood-97 rwood-97 deleted the 436-geopandas branch September 12, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Create a base/utils for loading csv files into dataframes Replace pandas with geopandas wherever possible in MapReader code

2 participants