-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
GeoJsonTooltip warn for GeometryCollection #988
Merged
Conengmo
merged 135 commits into
python-visualization:master
from
jtbaker:GeoJsonTooltipUpdate
Dec 9, 2018
Merged
Changes from 130 commits
Commits
Show all changes
135 commits
Select commit
Hold shift + click to select a range
287ac36
Update features.py
jtbaker 2491e19
Cleaned up code linting for this commit.
jtbaker 6290a5b
Update features.py
jtbaker fda9729
Further linting.
jtbaker bde7a2b
Hopefully last linting.
jtbaker b5f9282
Update features.py
jtbaker 8e5168c
Update features.py
jtbaker 73b1f4d
Update features.py
jtbaker d03bf2f
lint
jtbaker 8ce80a6
lint
jtbaker bb325f4
lint
jtbaker bd2a12f
lint
jtbaker c73686e
lint
jtbaker 5b9cb8b
lint
jtbaker 5525df0
Update features.py
jtbaker cc89971
Update features.py
jtbaker bb825f0
Update features.py
jtbaker 5c9c425
More lint checking.
jtbaker 16d44f0
Update features.py
jtbaker 2fb3437
Update features.py
jtbaker 9933f58
Update features.py
jtbaker c8d404d
Update features.py
jtbaker 90d7de9
Update features.py
jtbaker bfd277b
Merge pull request #1 from python-visualization/master
jtbaker 84811a0
PC-2018.1.2 <jasonbaker@Earl.local Overwrite remote https://github.co…
jtbaker 76c9622
PC-2018.1.2 <jasonbaker@Earl.local Create baseRefactoring.xml, Intell…
jtbaker f69bb30
Revert "PC-2018.1.2 <jasonbaker@Earl.local Create baseRefactoring.xml…
jtbaker cf116fe
Revert "PC-2018.1.2 <jasonbaker@Earl.local Overwrite remote https://g…
jtbaker f9e3eb8
PC-2018.1.2 <jasonbaker@Earl.local Update vcs.xml
jtbaker d9f4109
PC-2018.1.2 <jasonbaker@Earl.local Merge branch 'master'
jtbaker ac3e03e
PC-2018.1.2 <jasonbaker@Earl.local Create code.style.schemes, laf.xml…
jtbaker 3dc30cb
Updated code for line length limitation, verbiage, and indentations.
jtbaker 25e80a1
Merge pull request #2 from jtbaker/New-Tooltip
jtbaker 405245c
Merge branch 'patch-2' into master
jtbaker ee8c427
Merge pull request #3 from jtbaker/master
jtbaker 12e04f8
Missed a line remove when resolving conflicts.
jtbaker 5a00b8b
Updated code for line length limitation, verbiage, and indentations.
jtbaker f40d145
Merge pull request #4 from jtbaker/New-Tooltip
jtbaker e1431a2
PC-2018.1.2 <jasonbaker@Earl.local Update Default.xml
jtbaker 86b29df
PC-2018.1.2 <jasonbaker@Earl.local Create editor.xml
jtbaker 844ec5b
PC-2018.1.2 <jasonbaker@Earl.local Merge branch 'master'
jtbaker 9364c3f
Updated code for line length limitation, verbiage, and indentations.
jtbaker b95f840
Merge branch 'patch-2' into New-Tooltip
jtbaker 856aa80
Merge pull request #5 from jtbaker/New-Tooltip
jtbaker 7eaa85e
Merge pull request #6 from jtbaker/patch-2
jtbaker e4978be
Updated code for line length limitation, verbiage, and indentations.
jtbaker 1e5242f
Updated code for line length limitation, verbiage, and indentations.
jtbaker de5606a
PC-2018.1.2 <jasonbaker@Earl.local Create laf.xml, filetypes.xml, key…
jtbaker 76af841
PC-2018.1.2 <jasonbaker@Earl.local Create github_settings.xml, Defaul…
jtbaker 31a7685
PC-2018.1.2 <jasonbaker@Earl.local Create git.xml
jtbaker c0ea0b5
PC-2018.1.2 <jasonbaker@Earl.local Create ui.lnf.xml, Default.xml
jtbaker 8fa9122
PC-2018.1.2 <jasonbaker@Earl.local Update Default.xml
jtbaker 2478531
PC-2018.1.2 <jasonbaker@Earl.local Create diff.xml
jtbaker eac16da
PC-2018.1.2 <jasonbaker@Earl.local Update github_settings.xml
jtbaker 0725b4b
Update features.py
jtbaker 99db68d
Cleaned up code linting for this commit.
jtbaker 200155b
Update features.py
jtbaker f7cee1b
Further linting.
jtbaker 9b5ecc8
Hopefully last linting.
jtbaker 4e54b19
Update features.py
jtbaker 6ef92db
Update features.py
jtbaker 1f3c402
Update features.py
jtbaker f860855
lint
jtbaker 292d54d
lint
jtbaker 7a7ee05
lint
jtbaker cdda09d
lint
jtbaker bbfbb49
lint
jtbaker 98e7f45
lint
jtbaker 461bf11
Update features.py
jtbaker 875c6ba
Update features.py
jtbaker 3eb8816
Update features.py
jtbaker c2fa01e
More lint checking.
jtbaker 9226117
Update features.py
jtbaker e5e3e48
Update features.py
jtbaker 9d00638
Update features.py
jtbaker 46a8f05
Update features.py
jtbaker a530153
Update features.py
jtbaker f8eea8a
PC-2018.1.2 <jasonbaker@Earl.local Overwrite remote https://github.co…
jtbaker 3f9ebab
PC-2018.1.2 <jasonbaker@Earl.local Create baseRefactoring.xml, Intell…
jtbaker 812ec07
Revert "PC-2018.1.2 <jasonbaker@Earl.local Create baseRefactoring.xml…
jtbaker f3e66a4
Revert "PC-2018.1.2 <jasonbaker@Earl.local Overwrite remote https://g…
jtbaker a3d9af2
PC-2018.1.2 <jasonbaker@Earl.local Create code.style.schemes, laf.xml…
jtbaker 4c5f94a
Updated code for line length limitation, verbiage, and indentations.
jtbaker 1774c1b
Updated code for line length limitation, verbiage, and indentations.
jtbaker aad6580
PC-2018.1.2 <jasonbaker@Earl.local Update Default.xml
jtbaker 2d536db
PC-2018.1.2 <jasonbaker@Earl.local Create editor.xml
jtbaker 9098a75
Updated code for line length limitation, verbiage, and indentations.
jtbaker 0be87d5
Updated code for line length limitation, verbiage, and indentations.
jtbaker 919f7d9
Merge branch 'master' of https://github.com/jtbaker/folium
jtbaker cc74c27
Rebasing my master.
jtbaker cba08d6
PC-2018.1.2 <jasonbaker@Earl.local Create vcs.xml
jtbaker bd51b9e
PC-2018.1.2 <jasonbaker@Earl.local Merge branch 'master'
jtbaker 09b410a
PC-2018.1.2 <jasonbaker@Earl.local Create ide.general.xml
jtbaker 742d5e3
PC-2018.1.2 <jasonbaker@Earl.local Update ide.general.xml
jtbaker 888096c
Merge pull request #20 from python-visualization/master
jtbaker 6ae615b
PC-2018.1.2 <jasonbaker@Earl.local Merge branch 'master'
jtbaker 8493787
PC-2018.1.2 <jasonbaker@Earl.local Update Default.xml Create code.sty…
jtbaker a2d4206
PC-2018.1.2 <jasonbaker@Earl.local Update filetypes.xml
jtbaker 61e61e6
PC-2018.1.2 <jasonbaker@Earl.local Create ignore.xml
jtbaker 6824b32
Merge pull request #24 from python-visualization/master
jtbaker 7a3ffb5
PC-2018.1.2 <jasonbaker@Earl.local Merge branch 'master'
jtbaker 49970a2
PC-2018.1.2 <jasonbaker@Earl.local Update vcs.xml
jtbaker 28ddf28
PC-2018.1.2 <jasonbaker@Earl.local Update vcs.xml
jtbaker 7ebceb8
PC-2018.1.2 <jasonbaker@Earl.local Update ignore.xml
jtbaker 04bbcc4
Merge pull request #25 from python-visualization/master
jtbaker 0d14fe6
Update GeoJsonTooltip to warn user about incompatibility if a tooltip
jtbaker ecce466
Delete git.xml
jtbaker 1f01ff5
Delete keymap.xml
jtbaker ab64d08
Delete laf.xml
jtbaker e4cfdef
Delete code.style.schemes
jtbaker 7732c10
Delete Default.xml
jtbaker eb61a00
Delete vcs.xml
jtbaker fe884d6
Delete ui.lnf.xml
jtbaker d392d09
Delete github_settings.xml
jtbaker 3694a40
Delete debugger.xml
jtbaker 1d5cfa0
Delete diff.xml
jtbaker 8fce636
Delete filetypes.xml
jtbaker f5bfa3e
Delete ide.general.xml
jtbaker 60a1220
Delete Default.xml
jtbaker 7ba38b3
Delete ignore.xml
jtbaker b7bebed
Fixes for whitespace, and separate lines for import.
jtbaker bb3b9db
Merge remote-tracking branch 'origin/GeoJsonTooltipUpdate' into GeoJs…
jtbaker d909e4b
Rework Warning lines, and split `geom_collection` list comprehension
jtbaker 071b220
Rework check to class method.
jtbaker 2bdfb99
Add file with GeometryCollection geometry for test.
jtbaker 2a09446
Refactor warning for more general feature warning since not all featu…
jtbaker 7ecb4fe
Add Test for GeometryCollection warning with GeoJsonTooltip.
jtbaker 19f6d9b
Stickler fixes.
jtbaker 4aebbc9
Stickler fixes.
jtbaker 4a8eec2
Stickler fixes.
jtbaker d913b41
Stickler fixes.
jtbaker bf68fa9
Filepath name fix for CI integration.
jtbaker 8de05c3
Change test to subclass method. Sorry for the delay on this @Conengmo.
jtbaker cf71841
Merge branch 'master' into GeoJsonTooltipUpdate
ocefpaf 0d23dec
Merge remote-tracking branch 'upstream/master' into GeoJsonTooltipUpdate
jtbaker File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,8 @@ | |
|
||
import os | ||
|
||
import warnings | ||
|
||
from branca.element import Element | ||
from branca.six import text_type | ||
|
||
|
@@ -104,3 +106,15 @@ def test_color_line(): | |
opacity=1) | ||
m.add_child(color_line) | ||
m._repr_html_() | ||
|
||
|
||
# GeoJsonTooltip GeometryCollection | ||
def test_geojson_tooltip(): | ||
m = folium.Map([30.5, -97.5], zoom_start=10) | ||
folium.GeoJson("./kuntarajat.geojson", | ||
tooltip=folium.GeoJsonTooltip(fields=['code','name']) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. E231 missing whitespace after ',' |
||
).add_to(m) | ||
with warnings.catch_warnings(record=True) as w: | ||
warnings.simplefilter('always') | ||
m._repr_html_() | ||
assert isinstance(w[-1].category, UserWarning), "GeoJsonTooltip GeometryCollection test failed." |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
E302 expected 2 blank lines, found 1