jupyter-widgets · martinRenou · Nov 27, 2023 · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ build/
 *.py[cod]
 node_modules/
 *package-lock.json
+js/.yarn/
 
 # Compiled javascript
 ipyleaflet/nbextension/

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -6,4 +6,4 @@ build:
     python: "mambaforge-4.10"
 
 conda:
-  environment: docs/environment.yml
+  environment: docs/build-environment.yml
diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/source/_static/gallery.gif → docs/_static/gallery.gif b/docs/source/_static/gallery.gif → docs/_static/gallery.gif
diff --git a/docs/source/_static/main_stylesheet.css → docs/_static/main_stylesheet.css b/docs/source/_static/main_stylesheet.css → docs/_static/main_stylesheet.css
diff --git a/docs/source/api_reference/index.rst → docs/api_reference/index.rst b/docs/source/api_reference/index.rst → docs/api_reference/index.rst
diff --git a/docs/build-environment.yml b/docs/build-environment.yml
@@ -0,0 +1,21 @@
+name: ipyleaflet-docs
+
+channels:
+  - conda-forge
+
+dependencies:
+  - yarn~=1.0
+  - jupyterlab~=3.6.0
+  - jupyter-packaging~=0.12
+  - jupyter-sphinx
+  - scipy
+  - netcdf4
+  - geopandas
+  - xarray
+  - branca
+  - shapely
+  - pydata-sphinx-theme
+  - jupyterlite-sphinx
+  - jupyterlite-xeus-python >=0.9.2,<0.10
+  - pip:
+    - ..
diff --git a/docs/source/changelog.rst → docs/changelog.rst b/docs/source/changelog.rst → docs/changelog.rst
diff --git a/docs/source/conf.py → docs/conf.py b/docs/source/conf.py → docs/conf.py
@@ -6,7 +6,7 @@
 
 templates_path = ['_templates']
 
-jupyterlite_config = "jupyterlite_config.json"
+jupyterlite_dir = "."
 jupyterlite_contents = [
     "../../examples/europe_110.geo.json",
     "../../examples/bars.json",

diff --git a/docs/source/controls/draw_control.rst → docs/controls/draw_control.rst b/docs/source/controls/draw_control.rst → docs/controls/draw_control.rst
@@ -9,7 +9,7 @@ Example
 
     from ipyleaflet import Map, basemaps, basemap_to_tiles, DrawControl
 
-    watercolor = basemap_to_tiles(basemaps.Stamen.Watercolor)
+    watercolor = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
 
     m = Map(layers=(watercolor, ), center=(50, 354), zoom=5)
 

diff --git a/docs/source/controls/fullscreen_control.rst → docs/controls/fullscreen_control.rst b/docs/source/controls/fullscreen_control.rst → docs/controls/fullscreen_control.rst
diff --git a/docs/source/controls/index.rst → docs/controls/index.rst b/docs/source/controls/index.rst → docs/controls/index.rst
diff --git a/docs/source/controls/layers_control.rst → docs/controls/layers_control.rst b/docs/source/controls/layers_control.rst → docs/controls/layers_control.rst
diff --git a/docs/source/controls/legend_control.rst → docs/controls/legend_control.rst b/docs/source/controls/legend_control.rst → docs/controls/legend_control.rst
diff --git a/docs/source/controls/measure_control.rst → docs/controls/measure_control.rst b/docs/source/controls/measure_control.rst → docs/controls/measure_control.rst
diff --git a/docs/source/controls/scale_control.rst → docs/controls/scale_control.rst b/docs/source/controls/scale_control.rst → docs/controls/scale_control.rst
diff --git a/docs/source/controls/search_control.rst → docs/controls/search_control.rst b/docs/source/controls/search_control.rst → docs/controls/search_control.rst
diff --git a/docs/source/controls/split_map_control.rst → docs/controls/split_map_control.rst b/docs/source/controls/split_map_control.rst → docs/controls/split_map_control.rst
diff --git a/docs/source/controls/widget_control.rst → docs/controls/widget_control.rst b/docs/source/controls/widget_control.rst → docs/controls/widget_control.rst
@@ -9,7 +9,7 @@ Example
     from ipyleaflet import Map, basemaps, WidgetControl
     from ipywidgets import IntSlider, ColorPicker, jslink
 
-    m = Map(center=(46.01, 6.16), zoom=12, basemap=basemaps.Stamen.Terrain)
+    m = Map(center=(46.01, 6.16), zoom=12, basemap=basemaps.Stadia.StamenTerrain)
     zoom_slider = IntSlider(description='Zoom level:', min=0, max=15, value=7)
     jslink((zoom_slider, 'value'), (m, 'zoom'))
     widget_control1 = WidgetControl(widget=zoom_slider, position='topright')

diff --git a/docs/source/controls/zoom_control.rst → docs/controls/zoom_control.rst b/docs/source/controls/zoom_control.rst → docs/controls/zoom_control.rst
diff --git a/docs/environment.yml b/docs/environment.yml
@@ -1,22 +1,12 @@
-name: ipyleaflet-docs
-
+name: ipycanvas
 channels:
-  - conda-forge
-
+  - https://repo.mamba.pm/emscripten-forge
+  - https://repo.mamba.pm/conda-forge
 dependencies:
-  - yarn~=1.0
-  - jupyterlab~=3.6.0
-  - jupyter-packaging~=0.12
-  - jupyter-sphinx
-  - scipy
-  - netcdf4
-  - geopandas
-  - xarray
+  - numpy
+  - ipywidgets
+  - traittypes
+  - xyzservices
   - branca
-  - shapely
-  - pydata-sphinx-theme
-
   - pip:
     - ..
-    - jupyterlite-sphinx
-    - jupyterlite>=0.1.0b9
diff --git a/docs/source/index.rst → docs/index.rst b/docs/source/index.rst → docs/index.rst
diff --git a/docs/source/installation/index.rst → docs/installation/index.rst b/docs/source/installation/index.rst → docs/installation/index.rst
diff --git a/docs/source/ipyleaflet.ipynb → docs/ipyleaflet.ipynb b/docs/source/ipyleaflet.ipynb → docs/ipyleaflet.ipynb
@@ -1,16 +1,5 @@
 {
  "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f2fda73d-1e28-41a8-bf5b-901e3f38866c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import piplite\n",
-    "await piplite.install('ipyleaflet')"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

diff --git a/docs/jupyterlite_config.json b/docs/jupyterlite_config.json
diff --git a/docs/source/layers/antpath.rst → docs/layers/antpath.rst b/docs/source/layers/antpath.rst → docs/layers/antpath.rst
diff --git a/docs/source/layers/awesome_icon.rst → docs/layers/awesome_icon.rst b/docs/source/layers/awesome_icon.rst → docs/layers/awesome_icon.rst
diff --git a/docs/source/layers/choropleth.rst → docs/layers/choropleth.rst b/docs/source/layers/choropleth.rst → docs/layers/choropleth.rst
diff --git a/docs/source/layers/circle.rst → docs/layers/circle.rst b/docs/source/layers/circle.rst → docs/layers/circle.rst
@@ -8,7 +8,7 @@ Example
 
     from ipyleaflet import Map, basemaps, basemap_to_tiles, Circle
 
-    watercolor = basemap_to_tiles(basemaps.Stamen.Watercolor)
+    watercolor = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
 
     m = Map(layers=(watercolor, ), center=(53, 354), zoom=5)
 

diff --git a/docs/source/layers/circle_marker.rst → docs/layers/circle_marker.rst b/docs/source/layers/circle_marker.rst → docs/layers/circle_marker.rst
@@ -8,7 +8,7 @@ Example
 
     from ipyleaflet import Map, basemaps, basemap_to_tiles, CircleMarker
 
-    watercolor = basemap_to_tiles(basemaps.Stamen.Watercolor)
+    watercolor = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
 
     m = Map(layers=(watercolor, ), center=(53, 354), zoom=5)
 

diff --git a/docs/source/layers/divicon.rst → docs/layers/divicon.rst b/docs/source/layers/divicon.rst → docs/layers/divicon.rst
diff --git a/docs/source/layers/geo_json.rst → docs/layers/geo_json.rst b/docs/source/layers/geo_json.rst → docs/layers/geo_json.rst
diff --git a/docs/source/layers/geodata.rst → docs/layers/geodata.rst b/docs/source/layers/geodata.rst → docs/layers/geodata.rst
diff --git a/docs/source/layers/heatmap.rst → docs/layers/heatmap.rst b/docs/source/layers/heatmap.rst → docs/layers/heatmap.rst
diff --git a/docs/source/layers/icon.rst → docs/layers/icon.rst b/docs/source/layers/icon.rst → docs/layers/icon.rst
diff --git a/docs/source/layers/image_service.rst → docs/layers/image_service.rst b/docs/source/layers/image_service.rst → docs/layers/image_service.rst
diff --git a/docs/source/layers/image_video_overlay.rst → docs/layers/image_video_overlay.rst b/docs/source/layers/image_video_overlay.rst → docs/layers/image_video_overlay.rst
diff --git a/docs/source/layers/index.rst → docs/layers/index.rst b/docs/source/layers/index.rst → docs/layers/index.rst
diff --git a/docs/source/layers/layer_group.rst → docs/layers/layer_group.rst b/docs/source/layers/layer_group.rst → docs/layers/layer_group.rst
@@ -11,7 +11,7 @@ Example
         Circle, Marker, Rectangle, LayerGroup
     )
 
-    toner = basemap_to_tiles(basemaps.Stamen.Toner)
+    toner = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
 
     m = Map(layers=(toner, ), center=(50, 354), zoom=5)
 

diff --git a/docs/source/layers/layer_like.rst → docs/layers/layer_like.rst b/docs/source/layers/layer_like.rst → docs/layers/layer_like.rst
diff --git a/docs/source/layers/local_tile_layer.rst → docs/layers/local_tile_layer.rst b/docs/source/layers/local_tile_layer.rst → docs/layers/local_tile_layer.rst
diff --git a/docs/source/layers/magnifying_glass.rst → docs/layers/magnifying_glass.rst b/docs/source/layers/magnifying_glass.rst → docs/layers/magnifying_glass.rst
diff --git a/docs/source/layers/marker.rst → docs/layers/marker.rst b/docs/source/layers/marker.rst → docs/layers/marker.rst
diff --git a/docs/source/layers/marker_cluster.rst → docs/layers/marker_cluster.rst b/docs/source/layers/marker_cluster.rst → docs/layers/marker_cluster.rst
diff --git a/docs/source/layers/polygon.rst → docs/layers/polygon.rst b/docs/source/layers/polygon.rst → docs/layers/polygon.rst
diff --git a/docs/source/layers/polyline.rst → docs/layers/polyline.rst b/docs/source/layers/polyline.rst → docs/layers/polyline.rst
diff --git a/docs/source/layers/popup.rst → docs/layers/popup.rst b/docs/source/layers/popup.rst → docs/layers/popup.rst
diff --git a/docs/source/layers/rectangle.rst → docs/layers/rectangle.rst b/docs/source/layers/rectangle.rst → docs/layers/rectangle.rst
@@ -8,7 +8,7 @@ Example
 
     from ipyleaflet import Map, basemaps, basemap_to_tiles, Rectangle
 
-    watercolor = basemap_to_tiles(basemaps.Stamen.Watercolor)
+    watercolor = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
 
     m = Map(layers=(watercolor, ), center=(53, 354), zoom=5)
 

diff --git a/docs/source/layers/tile_layer.rst → docs/layers/tile_layer.rst b/docs/source/layers/tile_layer.rst → docs/layers/tile_layer.rst
@@ -43,7 +43,7 @@ These layers can then be passed in an array to ``Map(layers)``:
 
     mapnik = basemap_to_tiles(basemaps.OpenStreetMap.Mapnik)
     mapnik.base = True
-    toner = basemap_to_tiles(basemaps.Stamen.Toner)
+    toner = basemap_to_tiles(basemaps.Stadia.StamenTerrain)
     toner.base = True
 
     m = Map(layers=[mapnik, toner], center=(52.204793, 360.121558), zoom=9)

diff --git a/docs/source/layers/vector_tile.rst → docs/layers/vector_tile.rst b/docs/source/layers/vector_tile.rst → docs/layers/vector_tile.rst
diff --git a/docs/source/layers/velocity.rst → docs/layers/velocity.rst b/docs/source/layers/velocity.rst → docs/layers/velocity.rst
diff --git a/docs/source/layers/wkt_layer.rst → docs/layers/wkt_layer.rst b/docs/source/layers/wkt_layer.rst → docs/layers/wkt_layer.rst
diff --git a/docs/source/layers/wms_layer.rst → docs/layers/wms_layer.rst b/docs/source/layers/wms_layer.rst → docs/layers/wms_layer.rst