Merge pull request #508 from ocefpaf/continuousWorld

continuousWorld

Author: ocefpaf

CHANGES.txt

@@ -1,14 +1,15 @@
 0.3.0
 ~~~~~
 
-- Added fullscreen plugin (sanga #437)
-- Added ColorLine object (bibmartin #449)
-- Added smooth_factor option to GeoJSON, TopoJSON and Choropleth (JamesGardiner #428)
-- Added options to fullscreen plugin (qingkaikong #468)
-- Added options to LayerControl (qingkaikong #473)
-- Added text path (talespaiva #451 and #474)
+- Added `continuous_world`, `world_copy_jump`, and `no_wrap` options (ocefpaf #508)
 - Update font-awesome to 4.6.3 (ocefpaf #478)
-- Add highlight function to GeoJSON, and Chrorpleth (JoshuaCano #341)
+- Added text path (talespaiva #451 and ocefpaf #474)
+- More options to `LayerControl` (qingkaikong #473)
+- More options to `fullscreen` plugin (qingkaikong #468)
+- Added `ColorLine` object (bibmartin #449)
+- Add highlight function to `GeoJSON`, and `Chrorpleth` (JoshuaCano #341)
+- Added `fullscreen` plugin (sanga #437)
+- Added `smooth_factor `option to `GeoJSON`, `TopoJSON` and `Choropleth` (JamesGardiner #428)
 
 Bug Fixes
 

examples/ContinuousWorld.ipynb

@@ -16,7 +16,8 @@
 
 from branca.six import text_type, binary_type
 from branca.utilities import _parse_size
-from branca.element import Element, Figure, MacroElement, Html, JavascriptLink, CssLink
+from branca.element import (Element, Figure, MacroElement, Html,
+                            JavascriptLink, CssLink)
 
 ENV = Environment(loader=PackageLoader('folium', 'templates'))
 
@@ -135,8 +136,9 @@ class LegacyMap(MacroElement):
     def __init__(self, location=None, width='100%', height='100%',
                  left="0%", top="0%", position='relative',
                  tiles='OpenStreetMap', API_key=None, max_zoom=18, min_zoom=1,
-                 zoom_start=10, attr=None, min_lat=-90, max_lat=90,
-                 min_lon=-180, max_lon=180, detect_retina=False,
+                 zoom_start=10, continuous_world=False, world_copy_jump=False,
+                 no_wrap=False, attr=None, min_lat=-90, max_lat=90,
+                 min_lon=-180, max_lon=180, max_bounds=True, detect_retina=False,
                  crs='EPSG3857', control_scale=False):
         super(LegacyMap, self).__init__()
         self._name = 'Map'
@@ -163,14 +165,18 @@ def __init__(self, location=None, width='100%', height='100%',
         self.max_lat = max_lat
         self.min_lon = min_lon
         self.max_lon = max_lon
+        self.max_bounds = max_bounds
+        self.continuous_world = continuous_world
+        self.no_wrap = no_wrap
+        self.world_copy_jump = world_copy_jump
 
         self.crs = crs
         self.control_scale = control_scale
 
         if tiles:
             self.add_tile_layer(tiles=tiles, min_zoom=min_zoom, max_zoom=max_zoom,
-                                attr=attr, API_key=API_key,
-                                detect_retina=detect_retina)
+                                continuous_world=continuous_world, no_wrap=no_wrap,
+                                attr=attr, API_key=API_key, detect_retina=detect_retina)
 
         self._template = Template(u"""
         {% macro header(this, kwargs) %}
@@ -189,20 +195,26 @@ def __init__(self, location=None, width='100%', height='100%',
 
         {% macro script(this, kwargs) %}
 
-            var southWest = L.latLng({{ this.min_lat }}, {{ this.min_lon }});
-            var northEast = L.latLng({{ this.max_lat }}, {{ this.max_lon }});
-            var bounds = L.latLngBounds(southWest, northEast);
-
-            var {{this.get_name()}} = L.map('{{this.get_name()}}', {
-                                           center:[{{this.location[0]}},{{this.location[1]}}],
-                                           zoom: {{this.zoom_start}},
-                                           maxBounds: bounds,
-                                           layers: [],
-                                           crs: L.CRS.{{this.crs}}
-                                         });
+            {% if this.max_bounds %}
+                var southWest = L.latLng({{ this.min_lat }}, {{ this.min_lon }});
+                var northEast = L.latLng({{ this.max_lat }}, {{ this.max_lon }});
+                var bounds = L.latLngBounds(southWest, northEast);
+            {% else %}
+                var bounds = null;
+            {% endif %}
+
+            var {{this.get_name()}} = L.map(
+                                  '{{this.get_name()}}',
+                                  {center: [{{this.location[0]}},{{this.location[1]}}],
+                                  zoom: {{this.zoom_start}},
+                                  maxBounds: bounds,
+                                  layers: [],
+                                  worldCopyJump: {{this.world_copy_jump.__str__().lower()}},
+                                  crs: L.CRS.{{this.crs}}
+                                 });
             {% if this.control_scale %}L.control.scale().addTo({{this.get_name()}});{% endif %}
         {% endmacro %}
-        """)
+        """)  # noqa
 
     def _repr_html_(self, **kwargs):
         """Displays the Map in a Jupyter notebook.
@@ -217,8 +229,10 @@ def _repr_html_(self, **kwargs):
 
     def add_tile_layer(self, tiles='OpenStreetMap', name=None,
                        API_key=None, max_zoom=18, min_zoom=1,
-                       attr=None, tile_name=None, tile_url=None,
-                       active=False, detect_retina=False, **kwargs):
+                       continuous_world=False, attr=None,
+                       tile_name=None, tile_url=None,
+                       active=False, detect_retina=False, no_wrap=False,
+                       **kwargs):
         """Add a tile layer to the map.
 
         See TileLayer for options."""
@@ -232,7 +246,9 @@ def add_tile_layer(self, tiles='OpenStreetMap', name=None,
         tile_layer = TileLayer(tiles=tiles, name=name,
                                min_zoom=min_zoom, max_zoom=max_zoom,
                                attr=attr, API_key=API_key,
-                               detect_retina=detect_retina)
+                               detect_retina=detect_retina,
+                               continuous_world=continuous_world,
+                               no_wrap=no_wrap)
         self.add_child(tile_layer, name=tile_layer.tile_name)
 
     def render(self, **kwargs):
@@ -333,7 +349,8 @@ class TileLayer(Layer):
     """
     def __init__(self, tiles='OpenStreetMap', min_zoom=1, max_zoom=18,
                  attr=None, API_key=None, detect_retina=False,
-                 name=None, overlay=False, control=True):
+                 continuous_world=False, name=None, overlay=False,
+                 control=True, no_wrap=False):
         self.tile_name = (name if name is not None else
                           ''.join(tiles.lower().strip().split()))
         super(TileLayer, self).__init__(name=self.tile_name, overlay=overlay,
@@ -343,6 +360,8 @@ def __init__(self, tiles='OpenStreetMap', min_zoom=1, max_zoom=18,
 
         self.min_zoom = min_zoom
         self.max_zoom = max_zoom
+        self.no_wrap = no_wrap
+        self.continuous_world = continuous_world
 
         self.detect_retina = detect_retina
 
@@ -374,6 +393,8 @@ def __init__(self, tiles='OpenStreetMap', min_zoom=1, max_zoom=18,
                 {
                     maxZoom: {{this.max_zoom}},
                     minZoom: {{this.min_zoom}},
+                    continuousWorld: {{this.continuous_world.__str__().lower()}},
+                    noWrap: {{this.no_wrap.__str__().lower()}},
                     attribution: '{{this.attr}}',
                     detectRetina: {{this.detect_retina.__str__().lower()}}
                     }

folium/map.py

@@ -66,6 +66,7 @@
         zoom: {{ zoom_level }},
         maxBounds: bounds,
         layers: [],
+        worldCopyJump: {{ world_copy_jump.__str__().lower() }},
         crs: L.CRS.{{crs}}
         });
 
@@ -75,6 +76,8 @@
             {
                 maxZoom: {{tile['max_zoom']}},
                 minZoom: {{tile['min_zoom']}},
+                continuousWorld: {{tile['continuous_world'].__str__().lower()}},
+                noWrap: {{tile['no_wrap'].__str__().lower()}},
                 attribution: '{{tile['attr']}}',
                 detectRetina: {{tile['detect_retina'].__str__().lower()}}
                 }

folium/templates/fol_template.html

@@ -434,8 +434,8 @@ def test_geo_json_simple(self):
                           [71.285909, -66.979601]], bounds
 
     def test_geo_json_str(self):
-        # No data binding.
         self.map = folium.Map([43, -100], zoom_start=4)
+        # No data binding.
         path = os.path.join(rootpath, 'us-counties.json')
 
         data = json.load(open(path))
@@ -635,6 +635,8 @@ def test_map_build(self):
              'max_zoom': 20,
              'min_zoom': 1,
              'detect_retina': False,
+             'no_wrap': False,
+             'continuous_world': False
              }]
         tmpl = {'map_id': 'map_' + '0' * 32,
                 'lat': 45.5236, 'lon': -122.675,
@@ -646,6 +648,7 @@ def test_map_build(self):
                 'max_lon': 180,
                 'tile_layers': tile_layers,
                 'crs': 'EPSG3857',
+                'world_copy_jump': False
                 }
         HTML = html_templ.render(tmpl, plugins={})