Skip to content

Commit 70dd26c

Browse files
banesullivangiswqs
banesullivan
and
giswqs
authored
Bump localtileserver>=0.10.0 (opengeos#666)
* Bump localtileserver>=0.10.0 * Fix bokeh notebook error * Change camp to colormap --------- Co-authored-by: Qiusheng Wu <giswqs@gmail.com>
1 parent 9f375e9 commit 70dd26c

17 files changed

+413
-395
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM jupyter/scipy-notebook:latest
2-
RUN mamba install -c conda-forge leafmap geopandas localtileserver osmnx -y && \
2+
RUN mamba install -c conda-forge leafmap geopandas "localtileserver>=0.10.0" osmnx -y && \
33
pip install -U leafmap jsonschema==4.18.0 lonboard h5py && \
44
fix-permissions "${CONDA_DIR}" && \
55
fix-permissions "/home/${NB_USER}"
@@ -14,4 +14,4 @@ ENV PROJ_LIB='/opt/conda/share/proj'
1414

1515
USER root
1616
RUN chown -R ${NB_UID} ${HOME}
17-
USER ${NB_USER}
17+
USER ${NB_USER}

‎docs/notebooks/58_bokeh.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"outputs": [],
164164
"source": [
165165
"m = leafmap.Map()\n",
166-
"m.add_raster('dem.tif', palette='terrain')\n",
166+
"m.add_raster('dem.tif', colormap='terrain')\n",
167167
"m"
168168
]
169169
},

‎docs/notebooks/80_solar.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@
115115
"m = leafmap.Map()\n",
116116
"m.add_raster(files['rgb'], layer_name=\"RGB\")\n",
117117
"m.add_raster(files['mask'], layer_name=\"Mask\")\n",
118-
"m.add_raster(files['dsm'], cmap='terrain', layer_name=\"DSM\", visible=False)\n",
119-
"m.add_raster(files['annualFlux'], cmap='plasma', layer_name=\"annualFlux\")\n",
118+
"m.add_raster(files['dsm'], colormap='terrain', layer_name=\"DSM\", visible=False)\n",
119+
"m.add_raster(files['annualFlux'], colormap='plasma', layer_name=\"annualFlux\")\n",
120120
"m.add_raster(\n",
121121
" files['monthlyFlux'],\n",
122-
" cmap='plasma',\n",
122+
" colormap='plasma',\n",
123123
" band=[7],\n",
124124
" layer_name=\"monthlyFlux\",\n",
125125
" visible=False,\n",

‎docs/notebooks/89_image_array_viz.ipynb

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"source": [
104104
"m = leafmap.Map()\n",
105105
"m.add_raster(satellite, band=[1, 2, 3], nodata=-1, layer_name=\"Landsat 7\")\n",
106-
"m.add_raster(ndvi_image, cmap=\"Greens\", layer_name=\"NDVI\")\n",
106+
"m.add_raster(ndvi_image, colormap=\"Greens\", layer_name=\"NDVI\")\n",
107107
"m"
108108
]
109109
},
@@ -189,7 +189,7 @@
189189
"source": [
190190
"m = leafmap.Map()\n",
191191
"m.add_raster(satellite, band=[1, 2, 3], nodata=-1, layer_name=\"Landsat 7\")\n",
192-
"m.add_raster(ndvi_image, cmap=\"Greens\", layer_name=\"NDVI\")\n",
192+
"m.add_raster(ndvi_image, colormap=\"Greens\", layer_name=\"NDVI\")\n",
193193
"m"
194194
]
195195
},
@@ -257,8 +257,8 @@
257257
"outputs": [],
258258
"source": [
259259
"m = leafmap.Map()\n",
260-
"m.add_raster(dem, cmap=\"terrain\", layer_name=\"DEM\")\n",
261-
"m.add_raster(image, cmap=\"coolwarm\", layer_name=\"Classified DEM\")\n",
260+
"m.add_raster(dem, colormap=\"terrain\", layer_name=\"DEM\")\n",
261+
"m.add_raster(image, colormap=\"coolwarm\", layer_name=\"Classified DEM\")\n",
262262
"m"
263263
]
264264
}

‎docs/workshops/EarthCube_2023.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
"outputs": [],
223223
"source": [
224224
"m = leafmap.Map()\n",
225-
"m.add_raster(\"srtm90.tif\", cmap=\"terrain\", layer_name=\"Local COG\")\n",
225+
"m.add_raster(\"srtm90.tif\", colormap=\"terrain\", layer_name=\"Local COG\")\n",
226226
"m.add_colormap(vmin=0, vmax=4000, cmap='terrain', label='Elevation (m)')\n",
227227
"m"
228228
]

‎environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- keplergl
1717
- laspy
1818
- leafmap>=0.11.3
19-
- localtileserver>=0.4.0
19+
- localtileserver>=0.10.0
2020
- osmnx
2121
- pip
2222
- pydeck

‎examples/notebooks/32_local_tile.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
"metadata": {},
127127
"outputs": [],
128128
"source": [
129-
"m.add_raster(dem, cmap='viridis', layer_name=\"DEM\")"
129+
"m.add_raster(dem, colormap='viridis', layer_name=\"DEM\")"
130130
]
131131
},
132132
{

‎examples/notebooks/58_bokeh.ipynb

+13-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"outputs": [],
164164
"source": [
165165
"m = leafmap.Map()\n",
166-
"m.add_raster('dem.tif', palette='terrain')\n",
166+
"m.add_raster('dem.tif', colormap='terrain')\n",
167167
"m"
168168
]
169169
},
@@ -231,6 +231,18 @@
231231
"display_name": "Python 3",
232232
"language": "python",
233233
"name": "python3"
234+
},
235+
"language_info": {
236+
"codemirror_mode": {
237+
"name": "ipython",
238+
"version": 3
239+
},
240+
"file_extension": ".py",
241+
"mimetype": "text/x-python",
242+
"name": "python",
243+
"nbconvert_exporter": "python",
244+
"pygments_lexer": "ipython3",
245+
"version": "3.11.7"
234246
}
235247
},
236248
"nbformat": 4,

‎examples/notebooks/80_solar.ipynb

+3-2
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,15 @@
109109
{
110110
"cell_type": "code",
111111
"execution_count": null,
112+
"id": "cae6d546",
112113
"metadata": {},
113114
"outputs": [],
114115
"source": [
115116
"m = leafmap.Map()\n",
116117
"m.add_raster(files['rgb'], layer_name=\"RGB\")\n",
117118
"m.add_raster(files['mask'], layer_name=\"Mask\")\n",
118-
"m.add_raster(files['dsm'], cmap='terrain', layer_name=\"DSM\", visible=False)\n",
119-
"m.add_raster(files['annualFlux'], cmap='plasma', layer_name=\"annualFlux\")\n",
119+
"m.add_raster(files['dsm'], colormap='terrain', layer_name=\"DSM\", visible=False)\n",
120+
"m.add_raster(files['annualFlux'], colormap='plasma', layer_name=\"annualFlux\")\n",
120121
"m.add_raster(\n",
121122
" files['monthlyFlux'],\n",
122123
" cmap='plasma',\n",

0 commit comments

Comments
 (0)