This repository has been archived by the owner on Jan 4, 2022. It is now read-only.
ISS 777: Fix hardcoded TmsImage url #789
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
mgregor-oa
changed the title
|
Tests pass locally for me |
drwelby
reviewed
Oct 30, 2019
| self._name = "image-{}".format(str(uuid.uuid4())) | ||
| self._url_template = url + "?access_token={token}" |
There was a problem hiding this comment.
Since we're no longer doing templating let's get rid of ._url_template and just make it ._url
There was a problem hiding this comment.
Sounds good to me. I wanted to edit as little as possible, but that change makes sense to me.
drwelby
reviewed
Oct 30, 2019
gbdxtools/images/tms_image.py
Outdated
|
|
||
| Instead of an ID the zoom level to use can be specified (default is 22). Changing the zoom level will change the resolution of the image. Note that different image sources are used at different zoom levels. | ||
| Instead of an ID the zoom level to use can be specified (default is 18). Changing the zoom level will change the resolution of the image. Note that different image sources are used at different zoom levels. |
There was a problem hiding this comment.
You can drop the part about "Different image sources are used at different zoom levels
There was a problem hiding this comment.
Good point. I was using a DG test that does this, but depending on the service this isn't applicable.
gbdxtools/images/tms_image.py
Outdated
| bbox (list): (optional) Bounding box of AOI, if aoi() method is not used. | ||
|
|
||
| Example: | ||
| >>> img = TmsImage(zoom=13, bbox=[-109.84, 43.19, -109.59, 43.34])''' | ||
| >>> img = TmsImage(url=r"https://earthwatch.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService@EPSG:3857@jpg/{z}/{x}/{y}.jpg?connectId=", zoom=13, bbox=[-109.84, 43.19, -109.59, 43.34])''' |
There was a problem hiding this comment.
No need to use url= here since it's positional and required
drwelby
reviewed
Oct 30, 2019
| @@ -66,7 +68,8 @@ def test_tms_image_aoi(self): | |||
| # a 1 x 4 chunk of tiles, so 256 x 1024 pixels | |||
| # then offset by 1/2 tile in x and y | |||
| bbox = [-74.71046447753906, 40.53624234037728, -74.70909118652344, 40.54041698756514] | |||
| img = self.gbdx.tms_image(zoom=18) | |||
| url = r"https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" | |||
| img = TmsImage(url=url, zoom=18) | |||
|
Looks good, thanks for the fix |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I updated the functionality of the class. It now requires you to pass a url to the class. I have removed all reference to mapbox and access_tokens. This should now work for any tms service passed to it.