Skip to content

Commit 6f8cf21

Browse files
jyaistMapjyaistMap
committed
merging andrews sedf changes
2 parents 4fe8ef0 + 2a44a42 commit 6f8cf21

25 files changed

+3912
-6524
lines changed

‎guide/04-feature-data-and-analysis/editing-features.ipynb

Lines changed: 34 additions & 1030 deletions
Large diffs are not rendered by default.

‎guide/04-feature-data-and-analysis/summarizing-feature-data.ipynb

Lines changed: 213 additions & 819 deletions
Large diffs are not rendered by default.

‎guide/04-feature-data-and-analysis/working-with-feature-layers-and-features.ipynb

Lines changed: 477 additions & 539 deletions
Large diffs are not rendered by default.

‎guide/05-working-with-the-spatial-dataframe/advanced-topics.ipynb

Lines changed: 841 additions & 637 deletions
Large diffs are not rendered by default.

‎guide/05-working-with-the-spatial-dataframe/data.zip

770 KB
Binary file not shown.

‎guide/05-working-with-the-spatial-dataframe/introduction-to-the-spatial-dataframe.ipynb

Lines changed: 181 additions & 280 deletions
Large diffs are not rendered by default.

‎guide/05-working-with-the-spatial-dataframe/visualizing-data-with-the-spatial-dataframe.ipynb

Lines changed: 379 additions & 1116 deletions
Large diffs are not rendered by default.

‎guide/06-imagery-and-raster-analysis/raster-analysis-advanced-concepts.ipynb

Lines changed: 38 additions & 110 deletions
Large diffs are not rendered by default.

‎guide/11-performing-network-analyses/performing-network-analysis-tasks-asynchronously.ipynb

Lines changed: 42 additions & 172 deletions
Large diffs are not rendered by default.

‎labs/load_spatial_data_frame.ipynb

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
},
1313
{
1414
"cell_type": "code",
15-
"execution_count": null,
16-
"metadata": {
17-
"collapsed": true
18-
},
15+
"execution_count": 1,
16+
"metadata": {},
1917
"outputs": [],
2018
"source": [
2119
"from arcgis.gis import GIS\n",
22-
"from arcgis.features import SpatialDataFrame"
20+
"import pandas as pd\n",
21+
"from arcgis.features import GeoAccessor, GeoSeriesAccessor"
2322
]
2423
},
2524
{
@@ -32,9 +31,7 @@
3231
{
3332
"cell_type": "code",
3433
"execution_count": null,
35-
"metadata": {
36-
"collapsed": true
37-
},
34+
"metadata": {},
3835
"outputs": [],
3936
"source": [
4037
"gis = GIS(\"https://www.arcgis.com\", \"username\", \"password\")"
@@ -50,9 +47,7 @@
5047
{
5148
"cell_type": "code",
5249
"execution_count": null,
53-
"metadata": {
54-
"collapsed": true
55-
},
50+
"metadata": {},
5651
"outputs": [],
5752
"source": [
5853
"feature_service_srch_results = gis.content.search(query='title: \"Griffith*\" AND type: \"Feature Service\"')\n",
@@ -69,9 +64,7 @@
6964
{
7065
"cell_type": "code",
7166
"execution_count": null,
72-
"metadata": {
73-
"collapsed": true
74-
},
67+
"metadata": {},
7568
"outputs": [],
7669
"source": [
7770
"feature_service_item = feature_service_srch_results[0]\n",
@@ -83,18 +76,16 @@
8376
"cell_type": "markdown",
8477
"metadata": {},
8578
"source": [
86-
"Build the [Spatial Data Frame](https://esri.github.io/arcgis-python-api/apidoc/html/arcgis.features.toc.html#spatialdataframe)!"
79+
"Build the [Spatially Enabled Data Frame](https://esri.github.io/arcgis-python-api/apidoc/html/arcgis.features.toc.html#geoaccessor)!"
8780
]
8881
},
8982
{
9083
"cell_type": "code",
9184
"execution_count": null,
92-
"metadata": {
93-
"collapsed": true
94-
},
85+
"metadata": {},
9586
"outputs": [],
9687
"source": [
97-
"sdf = SpatialDataFrame.from_layer(feature_layer)\n",
88+
"sdf = pd.DataFrame.spatial.from_layer(feature_layer)\n",
9889
"sdf.head()"
9990
]
10091
}
@@ -115,7 +106,7 @@
115106
"name": "python",
116107
"nbconvert_exporter": "python",
117108
"pygments_lexer": "ipython3",
118-
"version": "3.6.3"
109+
"version": "3.6.5"
119110
}
120111
},
121112
"nbformat": 4,

‎samples/02_power_users_developers/building_a_change_detection_app_using_jupyter_dashboard.ipynb

Lines changed: 16 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@
4949
},
5050
{
5151
"cell_type": "code",
52-
"execution_count": 19,
52+
"execution_count": null,
5353
"metadata": {
54-
"collapsed": true,
5554
"extensions": {
5655
"jupyter_dashboards": {
5756
"version": 1,
@@ -94,7 +93,7 @@
9493
},
9594
{
9695
"cell_type": "code",
97-
"execution_count": 20,
96+
"execution_count": null,
9897
"metadata": {
9998
"code_folding": [
10099
9
@@ -117,17 +116,7 @@
117116
}
118117
}
119118
},
120-
"outputs": [
121-
{
122-
"data": {
123-
"application/vnd.jupyter.widget-view+json": {
124-
"model_id": "25395f4f1dd64b68bcb1f3f38b042cbe"
125-
}
126-
},
127-
"metadata": {},
128-
"output_type": "display_data"
129-
}
130-
],
119+
"outputs": [],
131120
"source": [
132121
"import ipywidgets as widgets\n",
133122
"\n",
@@ -165,7 +154,7 @@
165154
},
166155
{
167156
"cell_type": "code",
168-
"execution_count": 27,
157+
"execution_count": null,
169158
"metadata": {
170159
"extensions": {
171160
"jupyter_dashboards": {
@@ -185,17 +174,7 @@
185174
}
186175
}
187176
},
188-
"outputs": [
189-
{
190-
"data": {
191-
"application/vnd.jupyter.widget-view+json": {
192-
"model_id": "5128a449a00147909fa224dc07bffd89"
193-
}
194-
},
195-
"metadata": {},
196-
"output_type": "display_data"
197-
}
198-
],
177+
"outputs": [],
199178
"source": [
200179
"m = gis.map(location.value)\n",
201180
"m.add_layer(landsat)\n",
@@ -212,7 +191,7 @@
212191
},
213192
{
214193
"cell_type": "code",
215-
"execution_count": 22,
194+
"execution_count": null,
216195
"metadata": {
217196
"code_folding": [
218197
2,
@@ -236,25 +215,15 @@
236215
}
237216
}
238217
},
239-
"outputs": [
240-
{
241-
"data": {
242-
"application/vnd.jupyter.widget-view+json": {
243-
"model_id": "b28d51f013434e5886ee09bb7123b320"
244-
}
245-
},
246-
"metadata": {},
247-
"output_type": "display_data"
248-
}
249-
],
218+
"outputs": [],
250219
"source": [
251220
"oldindex = 0 # int(len(df)/2)\n",
252221
"\n",
253222
"# before image date slider\n",
254223
"oldslider = widgets.IntSlider(value=oldindex, min=0,max=10, #len(df) - 1,\n",
255224
" step=1, description='Older:', disabled=False,\n",
256225
" continuous_update=True, orientation='horizontal',\n",
257-
" readout=False, readout_format='', slider_color='white')\n",
226+
" readout=False, readout_format='f', slider_color='white')\n",
258227
"\n",
259228
"old_label = widgets.Label(value='')#str(df.Time.iloc[oldindex].date()))\n",
260229
"\n",
@@ -275,7 +244,7 @@
275244
},
276245
{
277246
"cell_type": "code",
278-
"execution_count": 23,
247+
"execution_count": null,
279248
"metadata": {
280249
"code_folding": [
281250
2,
@@ -299,25 +268,15 @@
299268
}
300269
}
301270
},
302-
"outputs": [
303-
{
304-
"data": {
305-
"application/vnd.jupyter.widget-view+json": {
306-
"model_id": "a932e8894c2049ec9e1960df9ba793e9"
307-
}
308-
},
309-
"metadata": {},
310-
"output_type": "display_data"
311-
}
312-
],
271+
"outputs": [],
313272
"source": [
314273
"newindex = 0 # len(df) - 1\n",
315274
"\n",
316275
"# after image date slider\n",
317276
"newslider = widgets.IntSlider(value=newindex, min=0, max=10, #len(df) - 1,\n",
318277
" step=1, description='Newer:', disabled=False,\n",
319278
" continuous_update=True, orientation='horizontal',\n",
320-
" readout=False, readout_format='', slider_color='white')\n",
279+
" readout=False, readout_format='f', slider_color='white')\n",
321280
"\n",
322281
"new_label = widgets.Label(value='') #str(df.Time.iloc[newindex].date()))\n",
323282
"\n",
@@ -345,12 +304,11 @@
345304
},
346305
{
347306
"cell_type": "code",
348-
"execution_count": 24,
307+
"execution_count": null,
349308
"metadata": {
350309
"code_folding": [
351310
0
352311
],
353-
"collapsed": true,
354312
"extensions": {
355313
"jupyter_dashboards": {
356314
"version": 1,
@@ -396,7 +354,7 @@
396354
" return_geometry=True,\n",
397355
" return_distinct_values=False,\n",
398356
" order_by_fields=\"AcquisitionDate\")\n",
399-
" tdf = fs.df\n",
357+
" tdf = fs.sdf\n",
400358
" df = tdf\n",
401359
" tdf['Time'] = pd.to_datetime(tdf['AcquisitionDate'], unit='ms') \n",
402360
" \n",
@@ -410,9 +368,8 @@
410368
},
411369
{
412370
"cell_type": "code",
413-
"execution_count": 25,
371+
"execution_count": null,
414372
"metadata": {
415-
"collapsed": true,
416373
"extensions": {
417374
"jupyter_dashboards": {
418375
"version": 1,
@@ -442,7 +399,7 @@
442399
},
443400
{
444401
"cell_type": "code",
445-
"execution_count": 26,
402+
"execution_count": null,
446403
"metadata": {
447404
"code_folding": [
448405
0
@@ -465,17 +422,7 @@
465422
}
466423
}
467424
},
468-
"outputs": [
469-
{
470-
"data": {
471-
"application/vnd.jupyter.widget-view+json": {
472-
"model_id": "9f58ad635da64e2b8c1f678665e3a8af"
473-
}
474-
},
475-
"metadata": {},
476-
"output_type": "display_data"
477-
}
478-
],
425+
"outputs": [],
479426
"source": [
480427
"# create the action button\n",
481428
"diffbtn = widgets.Button(description='Detect changes', disabled=False,\n",

0 commit comments

Comments
 (0)