Skip to content

Show pre-1970 features in TimestampedGeoJson #2303

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.

Sign up for GitHub

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

Open
xecanto wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −2
Open

Show pre-1970 features in TimestampedGeoJson #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion folium/plugins/timestamped_geo_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,18 @@ class TimestampedGeoJson(JSCSSMixin, MacroElement):
addlastPoint: {{ this.add_last_point|tojson }},
duration: {{ this.duration }},
}
).addTo({{this._parent.get_name()}});
);
// Without a duration Leaflet.TimeDimension starts at time 0, which
// hides features whose times are all before 1970.
{{this.get_name()}}._getFeatureBetweenDates = function(feature, minTime, maxTime) {
if (!this._duration) {
minTime = -Infinity;
}
return L.TimeDimension.Layer.GeoJson.prototype._getFeatureBetweenDates.call(
this, feature, minTime, maxTime
);
};
{{this.get_name()}}.addTo({{this._parent.get_name()}});
{% endmacro %}
""") # noqa

Expand Down
13 changes: 12 additions & 1 deletion tests/plugins/test_timestamped_geo_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,18 @@ def test_timestamped_geo_json():
addlastPoint: {{ this.add_last_point|tojson }},
duration: {{ this.duration }},
}
).addTo({{this._parent.get_name()}});
);
// Without a duration Leaflet.TimeDimension starts at time 0, which
// hides features whose times are all before 1970.
{{this.get_name()}}._getFeatureBetweenDates = function(feature, minTime, maxTime) {
if (!this._duration) {
minTime = -Infinity;
}
return L.TimeDimension.Layer.GeoJson.prototype._getFeatureBetweenDates.call(
this, feature, minTime, maxTime
);
};
{{this.get_name()}}.addTo({{this._parent.get_name()}});
""") # noqa
expected = normalize(tmpl.render(this=tgj))
assert expected in out
Expand Down