Skip to content

Add possibility to have unembedded GeoJSON. #290

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

Merged
ocefpaf merged 2 commits into from
Dec 5, 2015
Merged

Add possibility to have unembedded GeoJSON. #290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba01ffa
Add possibility to have unembedded GeoJSON.
Dec 5, 2015
47c6296
Improve type tests in GeoJson
Dec 5, 2015
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
40 changes: 26 additions & 14 deletions folium/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import json

from .utilities import (color_brewer, _parse_size, legend_scaler,
_locations_mirror, _locations_tolist, image_to_url)
_locations_mirror, _locations_tolist, image_to_url,
text_type, binary_type)

from .element import Element, Figure, JavascriptLink, CssLink, MacroElement
from .map import TileLayer, Icon
Expand Down Expand Up @@ -192,7 +193,6 @@ def render(self, **kwargs):
vg.parse.spec(spec, function(chart) { chart({el:div}).update(); });}"""), # noqa
name='vega_parse')


class GeoJson(MacroElement):
def __init__(self, data, style_function=None):
"""
Expand All @@ -213,8 +213,10 @@ def __init__(self, data, style_function=None):

Examples
--------
>>> # Providing file.
>>> # Providing file that shall be embeded.
>>> GeoJson(open('foo.json'))
>>> # Providing filename that shall not be embeded.
>>> GeoJson('foo.json')
>>> # Providing dict.
>>> GeoJson(json.load(open('foo.json')))
>>> # Providing string.
Expand All @@ -226,33 +228,43 @@ def __init__(self, data, style_function=None):
"""
super(GeoJson, self).__init__()
self._name = 'GeoJson'
if 'read' in dir(data):
if hasattr(data,'read'):
self.embed = True
self.data = json.load(data)
elif type(data) is dict:
elif isinstance(data,dict):
self.embed = True
self.data = data
elif isinstance(data, text_type) or isinstance(data, binary_type):
if data.lstrip()[0] in '[{': # This is a GeoJSON inline string
self.embed = True
self.data = json.loads(data)
else: # This is a filename
self.embed = False
self.data = data
else:
self.data = json.loads(data)

if 'features' not in self.data.keys():
# Catch case when GeoJSON is just a single Feature or a geometry.
if not (isinstance(self.data, dict) and 'geometry' in self.data.keys()):
# Catch case when GeoJSON is just a geometry.
self.data = {'type' : 'Feature', 'geometry' : self.data}
self.data = {'type' : 'FeatureCollection', 'features' : [self.data]}
raise ValueError('Unhandled data type.')

if style_function is None:
style_function = lambda x: {}
self.style_function = style_function

self._template = Template(u"""
{% macro script(this, kwargs) %}
var {{this.get_name()}} = L.geoJson({{this.style_data()}})
var {{this.get_name()}} = L.geoJson(
{% if this.embed %}{{this.style_data()}}{% else %}"{{this.data}}"{% endif %})
.addTo({{this._parent.get_name()}})
.setStyle(function(feature) {return feature.properties.style;});
{% endmacro %}
""") # noqa

def style_data(self):
if 'features' not in self.data.keys():
# Catch case when GeoJSON is just a single Feature or a geometry.
if not (isinstance(self.data, dict) and 'geometry' in self.data.keys()):
# Catch case when GeoJSON is just a geometry.
self.data = {'type' : 'Feature', 'geometry' : self.data}
self.data = {'type' : 'FeatureCollection', 'features' : [self.data]}

for feature in self.data['features']:
feature.setdefault('properties',{}).setdefault('style',{}).update(
self.style_function(feature))
Expand Down