Merge pull request #549 from martinRenou/release_cleaning

Release cleaning

Author: martinRenou

docs/Makefile

@@ -55,7 +55,6 @@ clean:
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	sed -i 's/div.jupyter_container \*/div.jupyter_container/g' $(BUILDDIR)/html/_static/jupyter-sphinx.css
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 

docs/requirements.txt

@@ -1,5 +1,5 @@
 ipyleaflet
-jupyter-sphinx>=0.2.3,<0.3
+jupyter-sphinx==0.2.4a1
 scipy
 netcdf4
 geopandas

docs/source/conf.py

@@ -9,7 +9,7 @@
 
 
 def setup(app):
-    app.add_stylesheet("main_stylesheet.css")
+    app.add_css_file("main_stylesheet.css")
 
 master_doc = 'index'
 source_suffix = '.rst'

examples/Vector Tiles Example.ipynb renamed to examples/VectorTiles.ipynb

@@ -17,9 +17,9 @@
    "source": [
     "from traitlets import Unicode, Dict\n",
     "\n",
+    "# This is a custom VectorTileLayer subclass, allowing to pass our api key to the url\n",
     "class CustomVectorTileLayer(VectorTileLayer):\n",
-    "    api_key = Unicode('gCZXZglvRQa6sB2z7JzL1w').tag(sync=True, o=True)\n",
-    "    attribution = Unicode('<a href=\"https://nextzen.com/\">&copy; NextZen</a>, <a href=\"http://www.openstreetmap.org/copyright\">&copy; OpenStreetMap</a> contributors').tag(sync=True, o=True)\n"
+    "    api_key = Unicode('gCZXZglvRQa6sB2z7JzL1w').tag(sync=True, o=True)"
    ]
   },
   {
@@ -80,12 +80,15 @@
     "aeroway = dict(\n",
     "    weight=1, fillColor=\"#51aeb5\", color=\"#51aeb5\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "road = dict(\n",
     "    weight=1, fillColor=\"#f2b648\", color=\"#f2b648\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "transit = dict(\n",
     "    weight=0.5, fillColor=\"#f2b648\", color=\"#f2b648\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "buildings = dict(\n",
     "    fill=\"true\",\n",
     "    weight=1,\n",
@@ -94,27 +97,33 @@
     "    fillOpacity=0.2,\n",
     "    opacity=0.4,\n",
     ")\n",
+    "\n",
     "water_name = dict(\n",
     "    weight=1, fillColor=\"#022c5b\", color=\"#022c5b\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "transportation_name = dict(\n",
     "    weight=1, fillColor=\"#bc6b38\", color=\"#bc6b38\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "place = dict(\n",
     "    weight=1, fillColor=\"#f20e93\", color=\"#f20e93\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "housenumber = dict(\n",
     "    weight=1, fillColor=\"#ef4c8b\", color=\"#ef4c8b\", fillOpacity=0.2, opacity=0.4\n",
     ")\n",
+    "\n",
     "poi = dict(weight=1, fillColor=\"#3bb50a\", color=\"#3bb50a\", fillOpacity=0.2, opacity=0.4)\n",
+    "\n",
     "earth = dict(\n",
     "    fill=\"true\",\n",
     "    weight=1,\n",
     "    fillColor=\"#c0c0c0\",\n",
     "    color=\"#c0c0c0\",\n",
     "    fillOpacity=0.2,\n",
     "    opacity=0.4,\n",
-    ")\n"
+    ")"
    ]
   },
   {
@@ -124,25 +133,28 @@
    "outputs": [],
    "source": [
     "url = 'https://tile.nextzen.org/tilezen/vector/v1/512/all/{z}/{x}/{y}.mvt?api_key={apiKey}'\n",
-    "vectorTileLayerStyles=dict(water=water_style,\n",
-    "                                         waterway=waterway_style,\n",
-    "                                         admin=admin_style,\n",
-    "                                         andcover=landcover_style,\n",
-    "                                         landuse=landuse_style,\n",
-    "                                         park=park_style,\n",
-    "                                         boundaries=boundary_style,\n",
-    "                                         aeroway=aeroway,\n",
-    "                                         roads=road,\n",
-    "                                         transit=transit,\n",
-    "                                         buildings=buildings,\n",
-    "                                         water_name=water_name,\n",
-    "                                         transportation_name=transportation_name,\n",
-    "                                         places=place,\n",
-    "                                         housenumber=housenumber,\n",
-    "                                         pois=poi,\n",
-    "                                         earth=earth,)\n",
+    "vector_tile_layer_styles = dict(\n",
+    "    water=water_style,\n",
+    "    waterway=waterway_style,\n",
+    "    admin=admin_style,\n",
+    "    andcover=landcover_style,\n",
+    "    landuse=landuse_style,\n",
+    "    park=park_style,\n",
+    "    boundaries=boundary_style,\n",
+    "    aeroway=aeroway,\n",
+    "    roads=road,\n",
+    "    transit=transit,\n",
+    "    buildings=buildings,\n",
+    "    water_name=water_name,\n",
+    "    transportation_name=transportation_name,\n",
+    "    places=place,\n",
+    "    housenumber=housenumber,\n",
+    "    pois=poi,\n",
+    "    earth=earth\n",
+    ")\n",
+    "\n",
     "m = Map(center=(52.204793, 360.121558), zoom=9)\n",
-    "vl = CustomVectorTileLayer(url=url, vector_tile_layer_styles=vectorTileLayerStyles)\n",
+    "vl = CustomVectorTileLayer(url=url, vector_tile_layer_styles=vector_tile_layer_styles)\n",
     "m.add_layer(vl)\n",
     "m"
    ]
@@ -153,7 +165,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "m.zoom=3.58"
+    "m.zoom = 3.58"
    ]
   },
   {
@@ -164,15 +176,6 @@
    "source": [
     "vl.url = \"https://basemaps.arcgis.com/v1/arcgis/rest/services/World_Basemap/VectorTileServer/tile/{z}/{y}/{x}.pbf\""
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "m.remove_layer(m.layers[0])"
-   ]
   }
  ],
  "metadata": {
@@ -191,7 +194,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.8.2"
   }
  },
  "nbformat": 4,

ipyleaflet/leaflet.py

@@ -393,19 +393,14 @@ class VectorTileLayer(Layer):
     _model_name = Unicode('LeafletVectorTileLayerModel').tag(sync=True)
 
     url = Unicode().tag(sync=True, o=True)
+    attribution = Unicode().tag(sync=True, o=True)
+
     vector_tile_layer_styles = Dict().tag(sync=True, o=True)
 
     def __init__(self, **kwargs):
         super(VectorTileLayer, self).__init__(**kwargs)
         self.on_msg(self._handle_leaflet_event)
 
-    def _handle_leaflet_event(self, _, content, buffers):
-        if content.get('event', '') == 'load':
-            self._load_callbacks(**content)
-
-    def on_load(self, callback, remove=False):
-        self._load_callbacks.register_callback(callback, remove=remove)
-
     def redraw(self):
         self.send({'msg': 'redraw'})