Fix CRS in test_map_build (3)

Martin Journois · Martin Journois · commit 04c55c731c8c · 2015-12-10T17:23:30.000+01:00
diff --git a/folium/map.py b/folium/map.py
@@ -153,7 +153,7 @@ def __init__(self, location=None, width='100%', height='100%',
                                            zoom: {{this.zoom_start}},
                                            maxBounds: bounds,
                                            layers: [],
-                                           crs: L.CRS.{{this.crs}},
+                                           crs: L.CRS.{{this.crs}}
                                          });
         {% endmacro %}
         """)
diff --git a/folium/templates/fol_template.html b/folium/templates/fol_template.html
@@ -64,7 +64,8 @@
         center:[{{ lat }}, {{ lon }}],
         zoom: {{ zoom_level }},
         maxBounds: bounds,
-        layers: []
+        layers: [],
+        crs: L.CRS.{{tile['crs']}}
         });
 
     {% for tile in tile_layers %}
@@ -74,8 +75,7 @@
                 maxZoom: {{tile['max_zoom']}},
                 minZoom: {{tile['min_zoom']}},
                 attribution: '{{tile['attr']}}',
-                detectRetina: {{tile['detect_retina'].__str__().lower()}},
-                crs: L.CRS.{{tile['crs']}},
+                detectRetina: {{tile['detect_retina'].__str__().lower()}}
                 }
             ).addTo({{ map_id }});
     {% endfor %}
diff --git a/tests/test_folium.py b/tests/test_folium.py
@@ -473,7 +473,7 @@ def test_map_build(self):
                 'max_lat': 90,
                 'min_lon': -180,
                 'max_lon': 180,
-                'tile_layers': tile_layers,
+                'tile_layers': tile_layers
                }
         HTML = html_templ.render(tmpl, plugins={})
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ def test_map_build(self):`
`473`	`473`	`'max_lat': 90,`
`474`	`474`	`'min_lon': -180,`
`475`	`475`	`'max_lon': 180,`
`476`		`- 'tile_layers': tile_layers,`
	`476`	`+ 'tile_layers': tile_layers`
`477`	`477`	`}`
`478`	`478`	`HTML = html_templ.render(tmpl, plugins={})`
`479`	`479`