Fix broken attribution for built-in tiles. #1128
Merged
Conversation
This file contains hidden or 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
Conengmo
reviewed
Apr 8, 2019
tests/test_folium.py
Outdated
| url = m._env.get_template(url(tiles)).render() | ||
| attr = m._env.get_template(attr(tiles)).render() | ||
| tiles = "".join(tiles.lower().strip().split()) | ||
| url = f"tiles/{tiles}/tiles.txt" |
There was a problem hiding this comment.
f-strings are great, but folium still supports Python 3.5. Right now we don't run tests for Python 3.5, but that's something we should probably do. Can you use normal format() instead?
There was a problem hiding this comment.
Ok @Conengmo , sorry for that, it is corrected now.
One question: I wanted to add also a test for tiles needing an API key (cloudmade and mapbox), but I noticed that you suppressed one in your previous commit (test_cloudmade). Any reason for that ?
- Going back to format instead of f-string (folium supports python 3.5) - Change a little the attribution text ((c) replaced by ©) - Corrected a dead link in mapbox attribution
|
It seems the previous CI tests have failed , but not sure it comes from the modifcations I made. |
|
Thanks for fixing this @FabeG! It's appreciated. |
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.
Small correction to fix broken attribution for built-in tiles (Closes #1117).
self.attr(fromMap) has been removed (attributionnow set withoptions)Maybe the attribution files (
attr.txt) should be reviewed and updated too ?