Merge pull request #429 from martinRenou/localtilelayer

LocalTileLayer fix + doc fix

Author: martinRenou

docs/source/api_reference/local_tile_layer.rst

@@ -9,15 +9,21 @@ Example
     from ipyleaflet import Map, LocalTileLayer
 
     m = Map(center=(52.204793, 360.121558), zoom=9)
-    m.add_layer(LocalTileLayer(url='./tiles/{z}/{x}/{y}.png'))
+    m.add_layer(LocalTileLayer(path='tiles/{z}/{x}/{y}.png'))
 
     m
 
+Note that the behavior is different in Jupyter Notebook and in JupyterLab.
+
+In the classic Jupyter Notebook, the path is relative to the Notebook you are working on.
+
+In JupyterLab, the path is relative to the server (where you started JupyterLab) and you need to prefix the path with "files/".
+
 Attributes
 ----------
 
 ===============    =================  =====
 Attribute          Default Value      Doc
 ===============    =================  =====
-url                ""                 Relative URL (e.g. './tiles/{z}/{x}/{y}.png')
+path               ""                 Relative URL (e.g. 'tiles/{z}/{x}/{y}.png' or 'files/tiles/{z}/{x}/{y}.png' in JupyterLab)
 ===============    =================  =====

ipyleaflet/leaflet.py

@@ -239,6 +239,7 @@ class TileLayer(RasterLayer):
     attribution = Unicode('Map data (c) <a href="https://openstreetmap.org">OpenStreetMap</a> contributors').tag(sync=True, o=True)
     detect_retina = Bool(False).tag(sync=True, o=True)
     no_wrap = Bool(False).tag(sync=True, o=True)
+    tms = Bool(False).tag(sync=True, o=True)
 
     _load_callbacks = Instance(CallbackDispatcher, ())
 

js/src/layers/LocalTileLayer.js

@@ -16,7 +16,8 @@ var LeafletLocalTileLayerModel = LeafletTileLayerModel.extend({
 
 var LeafletLocalTileLayerView = LeafletTileLayerView.extend({
     create_obj: function () {
-        this.model.set('url', window.location.href.replace(/[^/]*$/, '') + this.model.get('path'));
+        this.model.set('url', this.model.get('path'));
+        this.model.save_changes();
         LeafletLocalTileLayerView.__super__.create_obj.apply(this, arguments);
     }
 });

js/src/layers/TileLayer.js

@@ -16,7 +16,8 @@ var LeafletTileLayerModel = LeafletRasterLayerModel.extend({
         max_zoom : 18,
         tile_size : 256,
         attribution : 'Map data (c) <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',
-        detect_retina : false
+        detect_retina : false,
+        tms: false,
     })
 });