diff --git a/workshop/jupyter/Dockerfile b/workshop/jupyter/Dockerfile
index 17e8c07..0829ac6 100644
--- a/workshop/jupyter/Dockerfile
+++ b/workshop/jupyter/Dockerfile
@@ -41,8 +41,8 @@ ARG ADD_PIP_PACKAGES=""
ENV TZ=${TZ} \
LANG=${LANG} \
DEBIAN_FRONTEND="noninteractive" \
- DEB_BUILD_DEPS="software-properties-common build-essential python3-pip apt-utils" \
- DEB_PACKAGES="locales locales-all python3-setuptools python3-gdal python3-fiona python3-rasterio python3-pyproj ${ADD_DEB_PACKAGES}" \
+ DEB_BUILD_DEPS="software-properties-common build-essential apt-utils" \
+ DEB_PACKAGES="locales locales-all python3-setuptools python3-pip python3-gdal python3-fiona python3-rasterio python3-pyproj ${ADD_DEB_PACKAGES}" \
PIP_PACKAGES="jupyter wheel ${ADD_PIP_PACKAGES}"
COPY ./requirements.txt /jupyter/requirements.txt
@@ -57,11 +57,11 @@ RUN \
&& apt-get --no-install-recommends install -y ${DEB_PACKAGES} \
&& update-locale LANG=${LANG} \
&& echo "For ${TZ} date=$(date)" && echo "Locale=$(locale)" \
- && pip3 install ${PIP_PACKAGES} \
- && pip3 install -r /jupyter/requirements.txt \
&& apt-get remove --purge ${DEB_BUILD_DEPS} -y \
&& apt autoremove -y \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && pip3 install ${PIP_PACKAGES} \
+ && pip3 install -r /jupyter/requirements.txt
COPY ./entrypoint.sh /jupyter/start.sh
diff --git a/workshop/jupyter/content/notebooks/07-visualization.ipynb b/workshop/jupyter/content/notebooks/07-visualization.ipynb
index 9ce413f..a747c1e 100644
--- a/workshop/jupyter/content/notebooks/07-visualization.ipynb
+++ b/workshop/jupyter/content/notebooks/07-visualization.ipynb
@@ -196,17 +196,32 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 21,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
- "outputs": [],
+ "outputs": [
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "9cc6e853951f471381e1448ed719f004",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "Map(center=[44.4, 26.1], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_out…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
"source": [
"from ipyleaflet import *\n",
"\n",
- "m = Map(center=(44.4, 26.1), zoom=4, basemap=basemaps.Hydda.Full)\n",
+ "m = Map(center=(44.4, 26.1), zoom=4, basemap=basemaps.OpenStreetMap.Mapnik)\n",
"m"
]
},
@@ -219,16 +234,31 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 22,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
- "outputs": [],
- "source": [
- "strata_all = basemap_to_tiles(basemaps.Strava.All)\n",
- "m.add_layer(strata_all)\n",
+ "outputs": [
+ {
+ "data": {
+ "application/vnd.jupyter.widget-view+json": {
+ "model_id": "9cc6e853951f471381e1448ed719f004",
+ "version_major": 2,
+ "version_minor": 0
+ },
+ "text/plain": [
+ "Map(bottom=1683.0, center=[44.4, 26.1], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_ti…"
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
+ "source": [
+ "strava_all = basemap_to_tiles(basemaps.Strava.All)\n",
+ "m.add_layer(strava_all)\n",
"m"
]
},
@@ -250,7 +280,7 @@
},
"outputs": [],
"source": [
- "m.remove_layer(strata_all)\n",
+ "m.remove_layer(strava_all)\n",
"\n",
"from ipywidgets import Label\n",
"\n",
@@ -794,7 +824,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
@@ -808,7 +838,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.7.3"
+ "version": "3.8.10"
},
"pycharm": {
"stem_cell": {
diff --git a/workshop/jupyter/content/notebooks/test/07-folium-1.html b/workshop/jupyter/content/notebooks/test/07-folium-1.html
index 8450469..ded07b3 100644
--- a/workshop/jupyter/content/notebooks/test/07-folium-1.html
+++ b/workshop/jupyter/content/notebooks/test/07-folium-1.html
@@ -7,23 +7,23 @@
L_DISABLE_3D = false;
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+