Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement local caching for WMTS requests #2316

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

dnowacki-usgs
Copy link

This is an in-progress PR to implement local caching of WMTS image tiles. It is based heavily on the caching approach and code implemented in #1533. No tests added yet; this is really a working proof of concept.

Rationale

The rationale is described in #2314.

Briefly, this PR implements local caching of image tiles so repeated WMTSRasterSource calls do not incur additional network traffic.

Implications

  • Reduced network usage for repeated calls.
  • Creation of files on disk in a temporary directory.
  • Ability to work offline and use WMTSRasterSource

Copy link
Contributor

@greglucas greglucas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable. There is a lot of duplicated code here between this and the other cache PR, so I am curious if there would be a good way to consolidate some of it into helper functions or class to be shared somehow. That can be a follow-up PR as well though if you don't want to expand the scope here.

lib/cartopy/io/ogc_clients.py Show resolved Hide resolved
lib/cartopy/io/ogc_clients.py Outdated Show resolved Hide resolved
lib/cartopy/io/ogc_clients.py Outdated Show resolved Hide resolved
lib/cartopy/io/ogc_clients.py Outdated Show resolved Hide resolved
@CLAassistant
Copy link

CLAassistant commented Mar 4, 2024

CLA assistant check
All committers have signed the CLA.

@dnowacki-usgs
Copy link
Author

Thanks for your feedback. Working on implementing these suggestions!

@greglucas
Copy link
Contributor

@dnowacki-usgs , sorry for losing track of this one. Were you still making updates to it or is it ready for review now? It looks like at a minimum it would be good to add a test for the caching. Could you rebase on the latest main branch updates to get all the checks passing again?

@dnowacki-usgs
Copy link
Author

Hi Greg--I did make some progress as I recall but it's been a few months. I will look back into how far I got and update the PR.

@dnowacki-usgs
Copy link
Author

After merging the updated main branch and adding a missing import the PR is running again, but the cache is wonky--only some of the tiles are being saved and/or loaded with gaps. This wasn't the case when I was working on this months ago, so this will take a deeper dive.

@dnowacki-usgs
Copy link
Author

dnowacki-usgs commented Nov 21, 2024

More testing and I can't reproduce the gaps I was experiencing the other day. As far as I can tell, this PR is working. Multiple requests do not result in re-downloading of the tiles, and the .npy files are successfully being saved in the cache directory.

The following test code, adapted from the initial issue, is working for me with cache=True

plt.figure()
ax = plt.subplot(1,1,1,projection=ccrs.Mercator())
ax.set_extent([-122.55, -122, 37.4, 37.85], crs=ccrs.PlateCarree())
ax.add_wmts('https://basemap.nationalmap.gov/arcgis/rest/services/USGSImageryOnly/MapServer/WMTS/1.0.0/WMTSCapabilities.xml', layer_name='USGSImageryOnly', cache=True)
plt.show()

I think this is ready for review.

Copy link
Contributor

@greglucas greglucas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Thanks for looking into all of this! Overall looks good to me, just some minor nits. Could you also add a similar test to the GoogleImageTiles one for this new addition too?

def test_cache(cache_dir, tmp_path):

if self._default_cache:
warnings.warn(
'Cartopy created the following directory to cache '
'WMTSRasterSource tiles: {}'.format(cache_dir))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'WMTSRasterSource tiles: {}'.format(cache_dir))
f'WMTSRasterSource tiles: {cache_dir}')

warnings.warn(
'Cartopy created the following directory to cache '
'WMTSRasterSource tiles: {}'.format(cache_dir))
self.cache = self.cache.union(set(os.listdir(cache_dir)))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.cache = self.cache.union(set(os.listdir(cache_dir)))
self.cache = self.cache.union(set(cache_dir.iterdir()))

Comment on lines +686 to +689
cached_file = os.path.join(
self._cache_dir,
filename
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cached_file = os.path.join(
self._cache_dir,
filename
)
cached_file = self._cache_dir / filename

filename = None
cached_file = None

if filename in self.cache:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is some bouncing back and forth between pathlib and str-like paths. So if you change the previous around, I think this would also need to be the Path version.

Suggested change
if filename in self.cache:
if cached_file in self.cache:

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.

3 participants