Skip to content

Commit 1f58ec5

Browse files
author
Tom Augspurger
authored
Fixed error from contextily provider (#284)
1 parent 95bd38a commit 1f58ec5

File tree

10 files changed

+1327
-388
lines changed

10 files changed

+1327
-388
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919
- uses: actions/setup-python@v2
20+
with:
21+
python-version: "3.11"
2022
- uses: pre-commit/[email protected]

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
repos:
22
- repo: https://github.com/nbQA-dev/nbQA
3-
rev: 0.12.0
3+
rev: 1.7.0
44
hooks:
55
- id: nbqa-black
66
additional_dependencies: [black==22.3.0]
77
args: [--nbqa-mutate]
88
- id: nbqa-flake8
9-
additional_dependencies: [flake8==3.9.2]
9+
additional_dependencies: [flake8==6.1.0]
1010
- repo: local
1111
hooks:
1212
- id: check-headers

‎datasets/fws-nwi/fws-nwi-example.ipynb‎

Lines changed: 17 additions & 4 deletions
Large diffs are not rendered by default.

‎datasets/ms-buildings/ms-buildings-example.ipynb‎

Lines changed: 43 additions & 30 deletions
Large diffs are not rendered by default.

‎datasets/us-census/us-census-example.ipynb‎

Lines changed: 274 additions & 12 deletions
Large diffs are not rendered by default.

‎quickstarts/reading-stac.ipynb‎

Lines changed: 120 additions & 93 deletions
Large diffs are not rendered by default.

‎quickstarts/reading-tabular-data.ipynb‎

Lines changed: 116 additions & 108 deletions
Large diffs are not rendered by default.

‎quickstarts/stac-geoparquet.ipynb‎

Lines changed: 74 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -82,60 +82,60 @@
8282
" <td>Feature</td>\n",
8383
" <td>1.0.0</td>\n",
8484
" <td>[https://stac-extensions.github.io/projection/...</td>\n",
85-
" <td>05L-2017</td>\n",
85+
" <td>12Q-2017</td>\n",
8686
" <td>...</td>\n",
8787
" <td>2018-01-01 00:00:00+00:00</td>\n",
88-
" <td>[10.0, 0.0, 169260.0, 0.0, -10.0, 9115700.0]</td>\n",
88+
" <td>[10.0, 0.0, 178910.0, 0.0, -10.0, 2657470.0]</td>\n",
8989
" <td>2017-01-01 00:00:00+00:00</td>\n",
90-
" <td>05L</td>\n",
90+
" <td>12Q</td>\n",
9191
" </tr>\n",
9292
" <tr>\n",
9393
" <th>1</th>\n",
9494
" <td>Feature</td>\n",
9595
" <td>1.0.0</td>\n",
9696
" <td>[https://stac-extensions.github.io/projection/...</td>\n",
97-
" <td>05M-2017</td>\n",
97+
" <td>15R-2017</td>\n",
9898
" <td>...</td>\n",
9999
" <td>2018-01-01 00:00:00+00:00</td>\n",
100-
" <td>[10.0, 0.0, 166024.76778650173, 0.0, -10.0, 99...</td>\n",
100+
" <td>[10.0, 0.0, 194773.70566898846, 0.0, -10.0, 35...</td>\n",
101101
" <td>2017-01-01 00:00:00+00:00</td>\n",
102-
" <td>05M</td>\n",
102+
" <td>15R</td>\n",
103103
" </tr>\n",
104104
" <tr>\n",
105105
" <th>2</th>\n",
106106
" <td>Feature</td>\n",
107107
" <td>1.0.0</td>\n",
108108
" <td>[https://stac-extensions.github.io/projection/...</td>\n",
109-
" <td>05Q-2017</td>\n",
109+
" <td>16M-2017</td>\n",
110110
" <td>...</td>\n",
111111
" <td>2018-01-01 00:00:00+00:00</td>\n",
112-
" <td>[10.0, 0.0, 178900.28857004497, 0.0, -10.0, 26...</td>\n",
112+
" <td>[10.0, 0.0, 166023.6435927535, 0.0, -10.0, 999...</td>\n",
113113
" <td>2017-01-01 00:00:00+00:00</td>\n",
114-
" <td>05Q</td>\n",
114+
" <td>16M</td>\n",
115115
" </tr>\n",
116116
" <tr>\n",
117117
" <th>3</th>\n",
118118
" <td>Feature</td>\n",
119119
" <td>1.0.0</td>\n",
120120
" <td>[https://stac-extensions.github.io/projection/...</td>\n",
121-
" <td>12Q-2017</td>\n",
121+
" <td>20L-2022</td>\n",
122122
" <td>...</td>\n",
123-
" <td>2018-01-01 00:00:00+00:00</td>\n",
124-
" <td>[10.0, 0.0, 178910.0, 0.0, -10.0, 2657470.0]</td>\n",
125-
" <td>2017-01-01 00:00:00+00:00</td>\n",
126-
" <td>12Q</td>\n",
123+
" <td>2023-01-01 00:00:00+00:00</td>\n",
124+
" <td>[10.0, 0.0, 169256.89710350422, 0.0, -10.0, 91...</td>\n",
125+
" <td>2022-01-01 00:00:00+00:00</td>\n",
126+
" <td>20L</td>\n",
127127
" </tr>\n",
128128
" <tr>\n",
129129
" <th>4</th>\n",
130130
" <td>Feature</td>\n",
131131
" <td>1.0.0</td>\n",
132132
" <td>[https://stac-extensions.github.io/projection/...</td>\n",
133-
" <td>16M-2017</td>\n",
133+
" <td>20M-2019</td>\n",
134134
" <td>...</td>\n",
135-
" <td>2018-01-01 00:00:00+00:00</td>\n",
136-
" <td>[10.0, 0.0, 166023.6435927535, 0.0, -10.0, 999...</td>\n",
137-
" <td>2017-01-01 00:00:00+00:00</td>\n",
138-
" <td>16M</td>\n",
135+
" <td>2020-01-01 00:00:00+00:00</td>\n",
136+
" <td>[10.0, 0.0, 166023.6435927521, 0.0, -10.0, 999...</td>\n",
137+
" <td>2019-01-01 00:00:00+00:00</td>\n",
138+
" <td>20M</td>\n",
139139
" </tr>\n",
140140
" </tbody>\n",
141141
"</table>\n",
@@ -151,25 +151,25 @@
151151
"4 Feature 1.0.0 [https://stac-extensions.github.io/projection/... \n",
152152
"\n",
153153
" id ... end_datetime \\\n",
154-
"0 05L-2017 ... 2018-01-01 00:00:00+00:00 \n",
155-
"1 05M-2017 ... 2018-01-01 00:00:00+00:00 \n",
156-
"2 05Q-2017 ... 2018-01-01 00:00:00+00:00 \n",
157-
"3 12Q-2017 ... 2018-01-01 00:00:00+00:00 \n",
158-
"4 16M-2017 ... 2018-01-01 00:00:00+00:00 \n",
154+
"0 12Q-2017 ... 2018-01-01 00:00:00+00:00 \n",
155+
"1 15R-2017 ... 2018-01-01 00:00:00+00:00 \n",
156+
"2 16M-2017 ... 2018-01-01 00:00:00+00:00 \n",
157+
"3 20L-2022 ... 2023-01-01 00:00:00+00:00 \n",
158+
"4 20M-2019 ... 2020-01-01 00:00:00+00:00 \n",
159159
"\n",
160160
" proj:transform \\\n",
161-
"0 [10.0, 0.0, 169260.0, 0.0, -10.0, 9115700.0] \n",
162-
"1 [10.0, 0.0, 166024.76778650173, 0.0, -10.0, 99... \n",
163-
"2 [10.0, 0.0, 178900.28857004497, 0.0, -10.0, 26... \n",
164-
"3 [10.0, 0.0, 178910.0, 0.0, -10.0, 2657470.0] \n",
165-
"4 [10.0, 0.0, 166023.6435927535, 0.0, -10.0, 999... \n",
161+
"0 [10.0, 0.0, 178910.0, 0.0, -10.0, 2657470.0] \n",
162+
"1 [10.0, 0.0, 194773.70566898846, 0.0, -10.0, 35... \n",
163+
"2 [10.0, 0.0, 166023.6435927535, 0.0, -10.0, 999... \n",
164+
"3 [10.0, 0.0, 169256.89710350422, 0.0, -10.0, 91... \n",
165+
"4 [10.0, 0.0, 166023.6435927521, 0.0, -10.0, 999... \n",
166166
"\n",
167167
" start_datetime io:supercell_id \n",
168-
"0 2017-01-01 00:00:00+00:00 05L \n",
169-
"1 2017-01-01 00:00:00+00:00 05M \n",
170-
"2 2017-01-01 00:00:00+00:00 05Q \n",
171-
"3 2017-01-01 00:00:00+00:00 12Q \n",
172-
"4 2017-01-01 00:00:00+00:00 16M \n",
168+
"0 2017-01-01 00:00:00+00:00 12Q \n",
169+
"1 2017-01-01 00:00:00+00:00 15R \n",
170+
"2 2017-01-01 00:00:00+00:00 16M \n",
171+
"3 2022-01-01 00:00:00+00:00 20L \n",
172+
"4 2019-01-01 00:00:00+00:00 20M \n",
173173
"\n",
174174
"[5 rows x 18 columns]"
175175
]
@@ -211,18 +211,19 @@
211211
{
212212
"data": {
213213
"text/plain": [
214-
"32616 50\n",
215-
"32719 50\n",
216-
"32638 50\n",
217-
"32649 50\n",
218-
"32615 50\n",
214+
"proj:epsg\n",
215+
"32616 60\n",
216+
"32638 60\n",
217+
"32650 60\n",
218+
"32648 60\n",
219+
"32617 60\n",
219220
" ..\n",
220-
"32726 9\n",
221-
"32710 9\n",
222-
"32708 8\n",
223-
"32727 5\n",
224-
"32711 5\n",
225-
"Name: proj:epsg, Length: 120, dtype: int64"
221+
"32714 12\n",
222+
"32710 11\n",
223+
"32708 10\n",
224+
"32711 6\n",
225+
"32727 6\n",
226+
"Name: count, Length: 120, dtype: int64"
226227
]
227228
},
228229
"execution_count": 3,
@@ -264,7 +265,7 @@
264265
"<img src=\"https://ai4edatasetspublicassets.blob.core.windows.net/assets/notebook-output/quickstarts-stac-geoparquet.ipynb/5.png\"/>"
265266
],
266267
"text/plain": [
267-
"<Figure size 288x1440 with 1 Axes>"
268+
"<Figure size 400x2000 with 1 Axes>"
268269
]
269270
},
270271
"metadata": {},
@@ -275,7 +276,9 @@
275276
"import contextily\n",
276277
"\n",
277278
"ax = subset.plot(figsize=(4, 20), color=\"none\", edgecolor=\"yellow\")\n",
278-
"contextily.add_basemap(ax, crs=df.crs.to_string())\n",
279+
"contextily.add_basemap(\n",
280+
" ax, crs=df.crs.to_string(), source=contextily.providers.Esri.NatGeoWorldMap\n",
281+
")\n",
279282
"\n",
280283
"ax.set_axis_off()"
281284
]
@@ -341,11 +344,11 @@
341344
{
342345
"data": {
343346
"text/plain": [
344-
"['items/sentinel-2-l2a.parquet/part-0000_2015-06-29T10:25:31+00:00_2015-07-06T10:25:31+00:00.parquet',\n",
345-
" 'items/sentinel-2-l2a.parquet/part-0001_2015-07-06T10:25:31+00:00_2015-07-13T10:25:31+00:00.parquet',\n",
346-
" 'items/sentinel-2-l2a.parquet/part-0002_2015-07-13T10:25:31+00:00_2015-07-20T10:25:31+00:00.parquet',\n",
347-
" 'items/sentinel-2-l2a.parquet/part-0003_2015-07-20T10:25:31+00:00_2015-07-27T10:25:31+00:00.parquet',\n",
348-
" 'items/sentinel-2-l2a.parquet/part-0004_2015-07-27T10:25:31+00:00_2015-08-03T10:25:31+00:00.parquet']"
347+
"['items/sentinel-2-l2a.parquet/part-0001_2015-06-29T10:25:31+00:00_2015-07-06T10:25:31+00:00.parquet',\n",
348+
" 'items/sentinel-2-l2a.parquet/part-0002_2015-07-06T10:25:31+00:00_2015-07-13T10:25:31+00:00.parquet',\n",
349+
" 'items/sentinel-2-l2a.parquet/part-0003_2015-07-13T10:25:31+00:00_2015-07-20T10:25:31+00:00.parquet',\n",
350+
" 'items/sentinel-2-l2a.parquet/part-0004_2015-07-20T10:25:31+00:00_2015-07-27T10:25:31+00:00.parquet',\n",
351+
" 'items/sentinel-2-l2a.parquet/part-0005_2015-07-27T10:25:31+00:00_2015-08-03T10:25:31+00:00.parquet']"
349352
]
350353
},
351354
"execution_count": 7,
@@ -796,11 +799,11 @@
796799
{
797800
"data": {
798801
"text/plain": [
799-
"0 {'data': {'file:size': 53437205, 'file:values'...\n",
800-
"1 {'data': {'file:size': 53622304, 'file:values'...\n",
801-
"2 {'data': {'file:size': 55015984, 'file:values'...\n",
802-
"3 {'data': {'file:size': 53208880, 'file:values'...\n",
803-
"4 {'data': {'file:size': 53981476, 'file:values'...\n",
802+
"0 {'data': {'file:size': 53208880, 'file:values'...\n",
803+
"1 {'data': {'file:size': 114187155, 'file:values...\n",
804+
"2 {'data': {'file:size': 53981476, 'file:values'...\n",
805+
"3 {'data': {'file:size': 165601021, 'file:values...\n",
806+
"4 {'data': {'file:size': 97175834, 'file:values'...\n",
804807
"Name: assets, dtype: object"
805808
]
806809
},
@@ -862,7 +865,7 @@
862865
" <tbody>\n",
863866
" <tr>\n",
864867
" <th>0</th>\n",
865-
" <td>53437205</td>\n",
868+
" <td>53208880</td>\n",
866869
" <td>[{'summary': 'No Data', 'values': [0]}, {'summ...</td>\n",
867870
" <td>https://ai4edataeuwest.blob.core.windows.net/i...</td>\n",
868871
" <td>[{'nodata': 0, 'spatial_resolution': 10}]</td>\n",
@@ -874,7 +877,7 @@
874877
" </tr>\n",
875878
" <tr>\n",
876879
" <th>1</th>\n",
877-
" <td>53622304</td>\n",
880+
" <td>114187155</td>\n",
878881
" <td>[{'summary': 'No Data', 'values': [0]}, {'summ...</td>\n",
879882
" <td>https://ai4edataeuwest.blob.core.windows.net/i...</td>\n",
880883
" <td>[{'nodata': 0, 'spatial_resolution': 10}]</td>\n",
@@ -886,7 +889,7 @@
886889
" </tr>\n",
887890
" <tr>\n",
888891
" <th>2</th>\n",
889-
" <td>55015984</td>\n",
892+
" <td>53981476</td>\n",
890893
" <td>[{'summary': 'No Data', 'values': [0]}, {'summ...</td>\n",
891894
" <td>https://ai4edataeuwest.blob.core.windows.net/i...</td>\n",
892895
" <td>[{'nodata': 0, 'spatial_resolution': 10}]</td>\n",
@@ -898,7 +901,7 @@
898901
" </tr>\n",
899902
" <tr>\n",
900903
" <th>3</th>\n",
901-
" <td>53208880</td>\n",
904+
" <td>165601021</td>\n",
902905
" <td>[{'summary': 'No Data', 'values': [0]}, {'summ...</td>\n",
903906
" <td>https://ai4edataeuwest.blob.core.windows.net/i...</td>\n",
904907
" <td>[{'nodata': 0, 'spatial_resolution': 10}]</td>\n",
@@ -910,7 +913,7 @@
910913
" </tr>\n",
911914
" <tr>\n",
912915
" <th>4</th>\n",
913-
" <td>53981476</td>\n",
916+
" <td>97175834</td>\n",
914917
" <td>[{'summary': 'No Data', 'values': [0]}, {'summ...</td>\n",
915918
" <td>https://ai4edataeuwest.blob.core.windows.net/i...</td>\n",
916919
" <td>[{'nodata': 0, 'spatial_resolution': 10}]</td>\n",
@@ -927,11 +930,11 @@
927930
],
928931
"text/plain": [
929932
" data.file:size data.file:values \\\n",
930-
"0 53437205 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
931-
"1 53622304 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
932-
"2 55015984 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
933-
"3 53208880 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
934-
"4 53981476 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
933+
"0 53208880 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
934+
"1 114187155 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
935+
"2 53981476 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
936+
"3 165601021 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
937+
"4 97175834 [{'summary': 'No Data', 'values': [0]}, {'summ... \n",
935938
"\n",
936939
" data.href \\\n",
937940
"0 https://ai4edataeuwest.blob.core.windows.net/i... \n",
@@ -1014,7 +1017,9 @@
10141017
"cell_type": "code",
10151018
"execution_count": 15,
10161019
"id": "ca1df1b1-aa63-4c0f-ae97-b6fc890ff642",
1017-
"metadata": {},
1020+
"metadata": {
1021+
"tags": []
1022+
},
10181023
"outputs": [
10191024
{
10201025
"data": {
@@ -1098,7 +1103,7 @@
10981103
"name": "python",
10991104
"nbconvert_exporter": "python",
11001105
"pygments_lexer": "ipython3",
1101-
"version": "3.8.13"
1106+
"version": "3.11.4"
11021107
},
11031108
"widgets": {
11041109
"application/vnd.jupyter.widget-state+json": {

‎scripts/slim.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import sys
88
import nbformat
99
import azure.storage.blob
10+
import azure.identity
1011
import base64
1112
import tempfile
1213

@@ -45,7 +46,7 @@ def replace_images(nb, path, credential):
4546
if __name__ == "__main__":
4647
path = sys.argv[1]
4748
print("Processing", path)
48-
credential = os.environ["PLANETARY_COMPUTER_EXAMPLES_SAS"]
49+
credential = azure.identity.DefaultAzureCredential()
4950
nb = nbformat.read(path, as_version=4)
5051
replace_images(nb, path, credential)
5152
nbformat.write(nb, path)

0 commit comments

Comments
 (0)