Time dynamic geo json #741
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
stickler-ci
reviewed
Oct 6, 2017
| raise ValueError('Each item in styledict must be a dictionary, got {!r}'.format(val)) | ||
|
|
||
|
|
||
| # Make set of timestamps. |
stickler-ci
reviewed
Oct 6, 2017
| assert isinstance(figure, Figure), ('You cannot render this Element ' | ||
| 'if it is not in a Figure.') | ||
| figure.header.add_child( | ||
| JavascriptLink('https://d3js.org/d3.v4.min.js'), |
There was a problem hiding this comment.
E122 continuation line missing indentation or outdented
stickler-ci
reviewed
Oct 6, 2017
| 'if it is not in a Figure.') | ||
| figure.header.add_child( | ||
| JavascriptLink('https://d3js.org/d3.v4.min.js'), | ||
| name='d3v4' |
There was a problem hiding this comment.
E122 continuation line missing indentation or outdented
ocefpaf
commented
Oct 6, 2017
| super(TimeDynamicGeoJson, self).__init__(data, **kwargs) | ||
| assert isinstance(styledict, dict), 'styledict must be a dictionary' | ||
| class TimeSliderChoropleth(GeoJson): | ||
| def __init__(self, data, styledict, name=None, overlay=True, control=True, **kwargs): |
| for val in styledict.values(): | ||
| assert isinstance(val, dict), 'each item in styledict must be a dictionary' | ||
| if not isinstance(val, dict): | ||
| raise ValueError('Each item in styledict must be a dictionary, got {!r}'.format(val)) |
| self.timestamps.update(set(feature.keys())) | ||
| self.timestamps = sorted(list(self.timestamps)) | ||
| self.timestamps = json.dumps(timestamps) | ||
| self.styledict = json.dumps(styledict, sort_keys=True, indent=2) |
There was a problem hiding this comment.
By dumping json strings we avoid the u'' in the code and fix the py27 failures.
| "'1472569200', '1475161200', '1477839600'];") | ||
| #assert expected_timestamps in out | ||
| # We verify that data has been inserted correctly | ||
| expected_timestamps = """var timestamps = ["1454198400", "1456704000", "1459382400"];""" # noqa |
There was a problem hiding this comment.
I reduced this to make it easier to compare.
Not to self: these values are not the same on Travis-CI and locally. I need to double check this!
|
@ocefpaf I see a lot of people are submitting PRs, so you're probably pretty swamped :). Is there anything I can do to wrap up this PR? Cheers, |
|
I'm traveling at the moment but I'll tackle this one first once I get back.
…On Oct 20, 2017 8:48 PM, "Halfdan Rump" ***@***.***> wrote:
@ocefpaf <https://github.com/ocefpaf> I see a lot of people are
submitting PRs, so you're probably pretty swamped :). Is there anything I
can do to wrap up this PR?
Cheers,
Halfdan
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#741 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AA6BL-VRkdaS4HGhzzayuPhs-wcJr4jIks5suTFUgaJpZM4Pv4jN>
.
|
|
@halfdanrump I am merging this but we could use a re-write of the docs later. Thanks for the PR! |
sanga
pushed a commit
to sanga/folium
that referenced
this pull request
Oct 24, 2017
…eoJson Time dynamic geo json
|
@ocefpaf Got it, I'll add docs after the PR is complete and then issue a new PR :). Enjoy your trip! |
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.
Same as #736 with some minor fixes.
Ping @halfdanrump