Merge pull request #297 from BibMartin/crs

Add CRS map option

Author: ocefpaf

examples/CRS comparison.ipynb

@@ -21,7 +21,8 @@ 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):
+                 min_lon=-180, max_lon=180, detect_retina=False,
+                 crs='EPSG3857'):
         """Create a Map with Folium and Leaflet.js
 
         Generate a base map of given width and height with either default
@@ -62,6 +63,20 @@ def __init__(self, location=None, width='100%', height='100%',
             If true and user is on a retina display, it will request four
             tiles of half the specified size and a bigger zoom level in place
             of one to utilize the high resolution.
+        crs : str, default 'EPSG3857'
+            Defines coordinate reference systems for projecting geographical points
+            into pixel (screen) coordinates and back.
+            You can use Leaflet's values :
+            * EPSG3857 : The most common CRS for online maps, used by almost all
+              free and commercial tile providers. Uses Spherical Mercator projection.
+              Set in by default in Map's crs option.
+            * EPSG4326 : A common CRS among GIS enthusiasts. Uses simple Equirectangular
+              projection.
+            * EPSG3395 : Rarely used by some commercial tile providers. Uses Elliptical
+              Mercator projection.
+            * Simple : A simple CRS that maps longitude and latitude into x and y directly.
+              May be used for maps of flat surfaces (e.g. game maps). Note that the y axis
+              should still be inverted (going from bottom to top).
 
         Returns
         -------
@@ -105,6 +120,8 @@ def __init__(self, location=None, width='100%', height='100%',
         self.min_lon = min_lon
         self.max_lon = max_lon
 
+        self.crs = crs
+
         self.add_tile_layer(tiles=tiles, min_zoom=min_zoom, max_zoom=max_zoom,
                             attr=attr, API_key=API_key,
                             detect_retina=detect_retina)
@@ -134,7 +151,8 @@ def __init__(self, location=None, width='100%', height='100%',
                                            center:[{{this.location[0]}},{{this.location[1]}}],
                                            zoom: {{this.zoom_start}},
                                            maxBounds: bounds,
-                                           layers: []
+                                           layers: [],
+                                           crs: L.CRS.{{this.crs}}
                                          });
         {% endmacro %}
         """)

folium/map.py

@@ -64,7 +64,8 @@
         center:[{{ lat }}, {{ lon }}],
         zoom: {{ zoom_level }},
         maxBounds: bounds,
-        layers: []
+        layers: [],
+        crs: L.CRS.{{crs}}
         });
 
     {% for tile in tile_layers %}

folium/templates/fol_template.html

@@ -529,7 +529,9 @@ def test_map_build(self):
                 'max_lat': 90,
                 'min_lon': -180,
                 'max_lon': 180,
-                'tile_layers': tile_layers}
+                'tile_layers': tile_layers,
+                'crs' : 'EPSG3857',
+               }
         HTML = html_templ.render(tmpl, plugins={})
 
         assert ''.join(out.split()) == ''.join(HTML.split())