Skip to content

Commit 6978ad3

Browse files
authored
Merge pull request #1003 from jasongrout/changelog
Update changelog for 0.17 and reintroduce embedded jupyterlite
2 parents 9f79385 + 436c60e commit 6978ad3

File tree

5 files changed

+79
-25
lines changed

5 files changed

+79
-25
lines changed

CHANGELOG.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
1-
## v0.16.0
1+
## v0.17.0
2+
### New Features
3+
4+
* Make it possible to use Choropleth layer with data containing NaNs [#972](https://github.com/jupyter-widgets/ipyleaflet/pull/972)
5+
* Add Map panes [#999](https://github.com/jupyter-widgets/ipyleaflet/pull/999)
6+
* Allow setting Map.dragging [#1001](https://github.com/jupyter-widgets/ipyleaflet/pull/1001)
7+
* Add visible attribute to GeoJSON layer [#1002](https://github.com/jupyter-widgets/ipyleaflet/pull/1002)
8+
* [BREAKING CHANGE] Remove get and set decorators in LegendControl [#979](https://github.com/jupyter-widgets/ipyleaflet/pull/979)
9+
10+
## Maintenance
11+
12+
* Compute the public path automatically [#988](https://github.com/jupyter-widgets/ipyleaflet/pull/988)
213

3-
## What's Changed
14+
### Docs
415

16+
* Document use of multiple basemaps [#971](https://github.com/jupyter-widgets/ipyleaflet/pull/971)
17+
* Add a small introduction text [#992](https://github.com/jupyter-widgets/ipyleaflet/pull/992)
18+
19+
**Full Changelog**: https://github.com/jupyter-widgets/ipyleaflet/compare/0.16.0...0.17.0
20+
21+
## v0.16.0
522
### New features
623

724
* Add bounds attribute to TileLayer by @davidbrochart in https://github.com/jupyter-widgets/ipyleaflet/pull/907
@@ -44,7 +61,7 @@
4461
* @PROgram52bc made their first contribution in https://github.com/jupyter-widgets/ipyleaflet/pull/914
4562
* @HaudinFlorence made their first contribution in https://github.com/jupyter-widgets/ipyleaflet/pull/953
4663

47-
**Full Changelog**: https://github.com/jupyter-widgets/ipyleaflet/compare/0.15.0...master
64+
**Full Changelog**: https://github.com/jupyter-widgets/ipyleaflet/compare/0.15.0...0.16.0
4865

4966
## v0.15.0
5067

docs/environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ dependencies:
1818

1919
- pip:
2020
- ..
21-
- jupyterlite-sphinx
21+
- jupyterlite-sphinx
22+
- jupyterlite>=0.1.0b9

docs/source/index.rst

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
Introduction to ipyleaflet
22
==========================
3-
Ipyleaflet is a Jupyter / Leaflet bridge enabling interactive maps in the Jupyter notebook. It is an interactive widgets library, based on ipywidgets. This means that everything in ipyleaflet (e.g. the Map, TileLayers, Layers, Controls…) is interactive: you can dynamically update attributes from Python or from the Notebook interface.
3+
Ipyleaflet is a `Jupyter widget <https://ipywidgets.readthedocs.io>`_ for
4+
`Leaflet.js <https://leafletjs.com/>`_ , enabling interactive maps in the
5+
Jupyter notebook. Every object in ipyleaflet (including the Map, TileLayers, Layers,
6+
Controls, etc.) is interactive: you can dynamically update attributes from
7+
Python or from the browser.
48

59
.. image:: _static/gallery.gif
610
:width: 1200
711

812
Try it online
913
-------------
1014

11-
You can give ipyleaflet a try in this documentation by clicking on `Try it on RetroLite <https://ipyleaflet.readthedocs.io/en/latest/lite/retro>`__ or
12-
`Try it on JupyterLite <https://ipyleaflet.readthedocs.io/en/latest/lite/lab>`__.
15+
You can try ipyleaflet below, or open the example in a new browser tab with
16+
`RetroLite <./lite/retro/notebooks?path=ipyleaflet.ipynb>`_ or
17+
`JupyterLite <./lite/lab?path=ipyleaflet.ipynb>`_.
1318

14-
Index
15-
-----
19+
.. retrolite:: ipyleaflet.ipynb
20+
21+
Table of Contents
22+
-----------------
1623

1724
.. toctree::
1825
:maxdepth: 2

docs/source/ipyleaflet.ipynb

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,58 @@
33
{
44
"cell_type": "code",
55
"execution_count": null,
6-
"id": "1d3b8b34",
6+
"id": "f2fda73d-1e28-41a8-bf5b-901e3f38866c",
77
"metadata": {},
88
"outputs": [],
99
"source": [
1010
"import piplite\n",
11-
"await piplite.install('ipyleaflet');"
11+
"await piplite.install('ipyleaflet')"
1212
]
1313
},
1414
{
1515
"cell_type": "code",
1616
"execution_count": null,
17-
"id": "48a5cc23",
17+
"id": "644c9514-a50f-4e9e-b95f-f8560f1052de",
1818
"metadata": {},
1919
"outputs": [],
2020
"source": [
21-
"from ipyleaflet import Map, basemaps, basemap_to_tiles\n",
21+
"from ipyleaflet import Map, Marker\n",
22+
"center = (52.204793, 360.121558)\n",
23+
"map = Map(center=center, zoom=12)\n",
2224
"\n",
23-
"m = Map(\n",
24-
" basemap=basemap_to_tiles(basemaps.OpenStreetMap.Mapnik),\n",
25-
" center=(48.204793, 350.121558),\n",
26-
" zoom=3\n",
27-
" )\n",
28-
"m"
25+
"# Add a draggable marker to the map\n",
26+
"# Dragging the marker updates the marker.location value in Python\n",
27+
"marker = Marker(location=center, draggable=True)\n",
28+
"map.add_control(marker)\n",
29+
"\n",
30+
"display(map)"
31+
]
32+
},
33+
{
34+
"cell_type": "code",
35+
"execution_count": null,
36+
"id": "790628ed-dfd6-4ac4-af2c-6ea91d1d16ef",
37+
"metadata": {},
38+
"outputs": [],
39+
"source": [
40+
"# We can also update the marker location from Python\n",
41+
"marker.location = (52.2, 360.1)"
42+
]
43+
},
44+
{
45+
"cell_type": "code",
46+
"execution_count": null,
47+
"id": "253e96c1-7673-43c8-86dc-9d5244ff10d0",
48+
"metadata": {},
49+
"outputs": [],
50+
"source": [
51+
"# We can run a python function when the marker location changes\n",
52+
"# Here we'll adjust the center of the map to follow the marker\n",
53+
"def on_location_changed(value):\n",
54+
" map.center = value.new\n",
55+
"\n",
56+
"# Call the on_location_changed function when marker.location changes\n",
57+
"marker.observe(on_location_changed, 'location')"
2958
]
3059
}
3160
],
@@ -45,7 +74,7 @@
4574
"name": "python",
4675
"nbconvert_exporter": "python",
4776
"pygments_lexer": "ipython3",
48-
"version": "3.9.12"
77+
"version": "3.10.5"
4978
}
5079
},
5180
"nbformat": 4,

docs/source/jupyterlite_config.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"LiteBuildConfig": {
33
"federated_extensions": [
4-
"https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2",
5-
"https://github.com/conda-forge/releases/releases/download/noarch/ipyleaflet-0.16.0-pyhd8ed1ab_3.tar.bz2/ipyleaflet-0.16.0-pyhd8ed1ab_3.tar.bz2"
4+
"https://files.pythonhosted.org/packages/py3/j/jupyterlab-widgets/jupyterlab_widgets-1.1.1-py3-none-any.whl",
5+
"https://files.pythonhosted.org/packages/py2.py3/i/ipyleaflet/ipyleaflet-0.16.0-py2.py3-none-any.whl"
66
],
77
"ignore_sys_prefix": true,
88
"piplite_urls": [
99
"https://files.pythonhosted.org/packages/py2.py3/i/ipyleaflet/ipyleaflet-0.16.0-py2.py3-none-any.whl",
1010
"https://files.pythonhosted.org/packages/py2.py3/i/ipython-genutils/ipython_genutils-0.2.0-py2.py3-none-any.whl",
11-
"https://files.pythonhosted.org/packages/py2.py3/i/ipywidgets/ipywidgets-7.6.5-py2.py3-none-any.whl",
11+
"https://files.pythonhosted.org/packages/py2.py3/i/ipywidgets/ipywidgets-7.7.1-py2.py3-none-any.whl",
1212
"https://files.pythonhosted.org/packages/py2.py3/r/requests/requests-2.27.1-py2.py3-none-any.whl",
1313
"https://files.pythonhosted.org/packages/py2.py3/t/traittypes/traittypes-0.2.1-py2.py3-none-any.whl",
1414
"https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.8-py2.py3-none-any.whl",
1515
"https://files.pythonhosted.org/packages/py3/b/branca/branca-0.4.2-py3-none-any.whl",
1616
"https://files.pythonhosted.org/packages/py3/i/ipython/ipython-8.0.1-py3-none-any.whl",
1717
"https://files.pythonhosted.org/packages/py3/j/jupyter-client/jupyter_client-7.1.2-py3-none-any.whl",
1818
"https://files.pythonhosted.org/packages/py3/j/jupyter-core/jupyter_core-4.9.2-py3-none-any.whl",
19-
"https://files.pythonhosted.org/packages/py3/j/jupyterlab-widgets/jupyterlab_widgets-1.0.2-py3-none-any.whl",
19+
"https://files.pythonhosted.org/packages/py3/j/jupyterlab-widgets/jupyterlab_widgets-1.1.1-py3-none-any.whl",
2020
"https://files.pythonhosted.org/packages/py3/n/nest-asyncio/nest_asyncio-1.5.4-py3-none-any.whl",
2121
"https://files.pythonhosted.org/packages/py3/n/notebook/notebook-6.4.8-py3-none-any.whl",
22-
"https://files.pythonhosted.org/packages/py3/t/traitlets/traitlets-5.1.1-py3-none-any.whl"
22+
"https://files.pythonhosted.org/packages/py3/t/traitlets/traitlets-5.3.0-py3-none-any.whl"
2323
]
2424
}
2525
}

0 commit comments

Comments
 (0)