Skip to content

Commit

Permalink
Merge pull request #66 from digitalearthafrica/lewis-minty-fresh
Browse files Browse the repository at this point in the history
Changes for transition
  • Loading branch information
eefaye committed Jun 1, 2021
2 parents 4a6a4e8 + 75f2c8d commit d9a6ede
Show file tree
Hide file tree
Showing 44 changed files with 3,040 additions and 3,446 deletions.
54 changes: 36 additions & 18 deletions docs/Course_wrap-up.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"source": [
"Over the six sessions, you have learnt how to\n",
"\n",
"\n",
"* Run data analysis notebooks in the Digital Earth Africa Sandbox.\n",
"* Check data availability for an area of interest using the Digital Earth Africa Maps portal and Metadata Explorer.\n",
"* Load Earth observation data from a variety of products, including Landsat 8 and Sentinel-2.\n",
Expand All @@ -28,14 +29,16 @@
"* Select a suitable band index for analysis purposes.\n",
"* Visualise data by plotting maps.\n",
"\n",
"\n",
"In the Sandbox, you are able to\n",
"\n",
"\n",
"* Set up a notebook with common packages and functions.\n",
"* Connect to the Open Data Cube to retrieve data.\n",
"* Load data both with and without cloud masking.\n",
"* Create geomedian composites.\n",
"* Calculate band indices such as NDVI.\n",
"* Construct complete case studies based on vegetation or water indices."
"* Construct complete case studies based on vegetation or water indices.\n"
]
},
{
Expand All @@ -49,13 +52,8 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"<img align=\"middle\" src=\"./_static/other_information/finalpage_1.PNG\" alt=\"Plot montage\" width=\"700\">"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"<img align=\"middle\" src=\"./_static/other_information/finalpage_1.PNG\" alt=\"Plot montage\" width=\"700\" />\n",
"\n",
"*A snapshot of some of the different plots you have created over the course of the six training sessions.*"
]
},
Expand All @@ -79,9 +77,9 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### 1. Complete the training course participant survey.\n",
"### 1. Complete the training course participant survey\n",
"\n",
"Your feedback, suggestions and ideas are very important to us. Filling in this [short survey](https://forms.gle/QSuoFWXuevyKTgVZ7) will provide us with insight to continue refining and developing training material tailored for Digital Earth Africa users.\n"
"Your feedback, suggestions and ideas are very important to us. Filling in this [short survey](https://forms.gle/QSuoFWXuevyKTgVZ7) will provide us with insight to continue refining and developing training material tailored for Digital Earth Africa users."
]
},
{
Expand Down Expand Up @@ -116,8 +114,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"During the six sessions, we gradually introduced Python coding concepts with hands-on examples. If you would like to study the theory behind some of the functions and commands we used, have a look at the [Extra session: Python basics](./python_basics/01_jupyter.ipynb) module, and the **Beginners_guide** folder in the Sandbox.\n",
"\n",
"During the six sessions, we gradually introduced Python coding concepts with hands-on examples. If you would like to study the theory behind some of the functions and commands we used, have a look at the [Extra session: Python basics](./python_basics/01_jupyter.ipynb) module, and the **Beginners_guide** folder in the Sandbox."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"The **Beginners_guide** series of notebooks provide background information, code examples, and a range of applications. Some of this material will be familiar to you, but many of the notebooks contain extra details that can help solidify your understanding of the Sandbox mechanics."
]
},
Expand All @@ -132,10 +135,20 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"The case studies we created in Sessions 5 and 6 were based off more complex analyses documented in the **Real_world_examples** folder of the Sandbox.\n",
"\n",
"These case studies often have a few more data processing steps than the exercises in the training course. After reviewing the Beginner's Guide contents, these steps should be more accessible and easy to understand.\n",
"\n",
"The case studies we created in Sessions 5 and 6 were based off more complex analyses documented in the **Real_world_examples** folder of the Sandbox."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"These case studies often have a few more data processing steps than the exercises in the training course. After reviewing the Beginner's Guide contents, these steps should be more accessible and easy to understand."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Use the real world example notebooks to inspire your analysis and improve your data processing technique."
]
},
Expand All @@ -150,8 +163,13 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Real world examples are great for generating ideas and providing examples of case study structure. However, when you are writing your own case studies, you may find code snippets in the **Frequently_used_code** folder even more helpful. \n",
"\n",
"Real world examples are great for generating ideas and providing examples of case study structure. However, when you are writing your own case studies, you may find code snippets in the **Frequently_used_code** folder even more helpful. "
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"The **Frequently_used_code** folder contains a series of notebooks demonstrating code doing useful and common functions. This includes plotting boundary or contour lines, exporting files, incorporating external datasets and masking data. They can be easily adapted into your own notebooks."
]
},
Expand Down
10 changes: 10 additions & 0 deletions docs/Quiz_index.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
"# Quiz index"
]
},
{
"cell_type": "raw",
"metadata": {
"raw_mimetype": "text/restructuredtext"
},
"source": [
".. note:: \n",
" The Digital Earth Africa Training website will experience a scheduled downtime from 31 May 2021 to 2 June 2021 to upgrade data hosting services. During this time, the Sandbox will be cleared of personal user data. The Sandbox may be inaccessible and you may experience some code errors with notebooks and quizzes. Sandbox users will have received an email regarding these changes. This Training website will be updated to reflect changes to data loading processes following the upgrade. "
]
},
{
"cell_type": "markdown",
"metadata": {},
Expand Down
Binary file modified docs/_static/session_1/crophealth14.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/session_1/crophealth18.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_static/session_1/crophealth19.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_1/sandbox-default-env.PNG
Binary file not shown.
Binary file added docs/_static/session_1/sandbox-default-env.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/session_1/sandbox-register-form.PNG
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_1/sandbox-register-form.png
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 50 additions & 11 deletions docs/_static/session_2/Load_data_solution.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,18 @@
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"/env/lib/python3.6/site-packages/geopandas/_compat.py:88: UserWarning: The Shapely GEOS version (3.7.2-CAPI-1.11.0 ) is incompatible with the GEOS version PyGEOS was compiled with (3.9.1-CAPI-1.14.2). Conversions between both will be slow.\n",
" shapely_geos_version, geos_capi_version_string\n"
]
}
],
"source": [
"%matplotlib inline\n",
"\n",
Expand All @@ -44,9 +53,18 @@
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"/env/lib/python3.6/site-packages/datacube/drivers/postgres/_connections.py:87: SADeprecationWarning: Calling URL() directly is deprecated and will be disabled in a future release. The public constructor for URL is now the URL.create() method.\n",
" username=username, password=password,\n"
]
}
],
"source": [
"dc = datacube.Datacube(app=\"Load_data\")"
]
Expand All @@ -67,9 +85,23 @@
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"execution_count": 3,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"<div style=\"width:100%;\"><div style=\"position:relative;width:100%;height:0;padding-bottom:60%;\"><iframe src=\"data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+CjxoZWFkPiAgICAKICAgIDxtZXRhIGh0dHAtZXF1aXY9ImNvbnRlbnQtdHlwZSIgY29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PVVURi04IiAvPgogICAgCiAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICAgTF9OT19UT1VDSCA9IGZhbHNlOwogICAgICAgICAgICBMX0RJU0FCTEVfM0QgPSBmYWxzZTsKICAgICAgICA8L3NjcmlwdD4KICAgIAogICAgPHN0eWxlPmh0bWwsIGJvZHkge3dpZHRoOiAxMDAlO2hlaWdodDogMTAwJTttYXJnaW46IDA7cGFkZGluZzogMDt9PC9zdHlsZT4KICAgIDxzdHlsZT4jbWFwIHtwb3NpdGlvbjphYnNvbHV0ZTt0b3A6MDtib3R0b206MDtyaWdodDowO2xlZnQ6MDt9PC9zdHlsZT4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS42LjAvZGlzdC9sZWFmbGV0LmpzIj48L3NjcmlwdD4KICAgIDxzY3JpcHQgc3JjPSJodHRwczovL2NvZGUuanF1ZXJ5LmNvbS9qcXVlcnktMS4xMi40Lm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvanMvYm9vdHN0cmFwLm1pbi5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IHNyYz0iaHR0cHM6Ly9jZG5qcy5jbG91ZGZsYXJlLmNvbS9hamF4L2xpYnMvTGVhZmxldC5hd2Vzb21lLW1hcmtlcnMvMi4wLjIvbGVhZmxldC5hd2Vzb21lLW1hcmtlcnMuanMiPjwvc2NyaXB0PgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL2Nkbi5qc2RlbGl2ci5uZXQvbnBtL2xlYWZsZXRAMS42LjAvZGlzdC9sZWFmbGV0LmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL21heGNkbi5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC8zLjIuMC9jc3MvYm9vdHN0cmFwLm1pbi5jc3MiLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9tYXhjZG4uYm9vdHN0cmFwY2RuLmNvbS9ib290c3RyYXAvMy4yLjAvY3NzL2Jvb3RzdHJhcC10aGVtZS5taW4uY3NzIi8+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vbWF4Y2RuLmJvb3RzdHJhcGNkbi5jb20vZm9udC1hd2Vzb21lLzQuNi4zL2Nzcy9mb250LWF3ZXNvbWUubWluLmNzcyIvPgogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL2NkbmpzLmNsb3VkZmxhcmUuY29tL2FqYXgvbGlicy9MZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy8yLjAuMi9sZWFmbGV0LmF3ZXNvbWUtbWFya2Vycy5jc3MiLz4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iaHR0cHM6Ly9jZG4uanNkZWxpdnIubmV0L2doL3B5dGhvbi12aXN1YWxpemF0aW9uL2ZvbGl1bS9mb2xpdW0vdGVtcGxhdGVzL2xlYWZsZXQuYXdlc29tZS5yb3RhdGUubWluLmNzcyIvPgogICAgCiAgICAgICAgICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsCiAgICAgICAgICAgICAgICBpbml0aWFsLXNjYWxlPTEuMCwgbWF4aW11bS1zY2FsZT0xLjAsIHVzZXItc2NhbGFibGU9bm8iIC8+CiAgICAgICAgICAgIDxzdHlsZT4KICAgICAgICAgICAgICAgICNtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUgewogICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICAgICAgICAgICAgICAgICB3aWR0aDogMTAwLjAlOwogICAgICAgICAgICAgICAgICAgIGhlaWdodDogMTAwLjAlOwogICAgICAgICAgICAgICAgICAgIGxlZnQ6IDAuMCU7CiAgICAgICAgICAgICAgICAgICAgdG9wOiAwLjAlOwogICAgICAgICAgICAgICAgfQogICAgICAgICAgICA8L3N0eWxlPgogICAgICAgIAo8L2hlYWQ+Cjxib2R5PiAgICAKICAgIAogICAgICAgICAgICA8ZGl2IGNsYXNzPSJmb2xpdW0tbWFwIiBpZD0ibWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlIiA+PC9kaXY+CiAgICAgICAgCjwvYm9keT4KPHNjcmlwdD4gICAgCiAgICAKICAgICAgICAgICAgdmFyIG1hcF8wYTZmNzQ5ZWI4YWY0N2VjOGJmODJiMDBkOGZlYWViZSA9IEwubWFwKAogICAgICAgICAgICAgICAgIm1hcF8wYTZmNzQ5ZWI4YWY0N2VjOGJmODJiMDBkOGZlYWViZSIsCiAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgY2VudGVyOiBbLTYuOCwgMzkuMjg1XSwKICAgICAgICAgICAgICAgICAgICBjcnM6IEwuQ1JTLkVQU0czODU3LAogICAgICAgICAgICAgICAgICAgIHpvb206IDExLAogICAgICAgICAgICAgICAgICAgIHpvb21Db250cm9sOiB0cnVlLAogICAgICAgICAgICAgICAgICAgIHByZWZlckNhbnZhczogZmFsc2UsCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICk7CgogICAgICAgICAgICAKCiAgICAgICAgCiAgICAKICAgICAgICAgICAgdmFyIHRpbGVfbGF5ZXJfZmMxNWRmNGI2NjdkNDY1MmFhODkxYmQxZGI5NzlhMzggPSBMLnRpbGVMYXllcigKICAgICAgICAgICAgICAgICJodHRwOi8vbXQxLmdvb2dsZS5jb20vdnQvbHlycz15XHUwMDI2ej17en1cdTAwMjZ4PXt4fVx1MDAyNnk9e3l9IiwKICAgICAgICAgICAgICAgIHsiYXR0cmlidXRpb24iOiAiR29vZ2xlIiwgImRldGVjdFJldGluYSI6IGZhbHNlLCAibWF4TmF0aXZlWm9vbSI6IDE4LCAibWF4Wm9vbSI6IDE4LCAibWluWm9vbSI6IDAsICJub1dyYXAiOiBmYWxzZSwgIm9wYWNpdHkiOiAxLCAic3ViZG9tYWlucyI6ICJhYmMiLCAidG1zIjogZmFsc2V9CiAgICAgICAgICAgICkuYWRkVG8obWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlKTsKICAgICAgICAKICAgIAogICAgICAgICAgICB2YXIgcG9seV9saW5lXzk3ODIwZDhkZTk2YzRiNThiYTEzMjE2YjNhOWNjYmFlID0gTC5wb2x5bGluZSgKICAgICAgICAgICAgICAgIFtbLTYuOSwgMzkuMl0sIFstNi45LCAzOS4zN10sIFstNi43LCAzOS4zN10sIFstNi43LCAzOS4yXSwgWy02LjksIDM5LjJdXSwKICAgICAgICAgICAgICAgIHsiYnViYmxpbmdNb3VzZUV2ZW50cyI6IHRydWUsICJjb2xvciI6ICJyZWQiLCAiZGFzaEFycmF5IjogbnVsbCwgImRhc2hPZmZzZXQiOiBudWxsLCAiZmlsbCI6IGZhbHNlLCAiZmlsbENvbG9yIjogInJlZCIsICJmaWxsT3BhY2l0eSI6IDAuMiwgImZpbGxSdWxlIjogImV2ZW5vZGQiLCAibGluZUNhcCI6ICJyb3VuZCIsICJsaW5lSm9pbiI6ICJyb3VuZCIsICJub0NsaXAiOiBmYWxzZSwgIm9wYWNpdHkiOiAwLjgsICJzbW9vdGhGYWN0b3IiOiAxLjAsICJzdHJva2UiOiB0cnVlLCAid2VpZ2h0IjogM30KICAgICAgICAgICAgKS5hZGRUbyhtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUpOwogICAgICAgIAogICAgCiAgICAgICAgICAgICAgICB2YXIgbGF0X2xuZ19wb3B1cF83YzNjYjM3ZTFhZDY0MDVkOTY5ZmU0YTQ1NDJhMDhhYiA9IEwucG9wdXAoKTsKICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGxhdExuZ1BvcChlKSB7CiAgICAgICAgICAgICAgICAgICAgbGF0X2xuZ19wb3B1cF83YzNjYjM3ZTFhZDY0MDVkOTY5ZmU0YTQ1NDJhMDhhYgogICAgICAgICAgICAgICAgICAgICAgICAuc2V0TGF0TG5nKGUubGF0bG5nKQogICAgICAgICAgICAgICAgICAgICAgICAuc2V0Q29udGVudCgiTGF0aXR1ZGU6ICIgKyBlLmxhdGxuZy5sYXQudG9GaXhlZCg0KSArCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8YnI+TG9uZ2l0dWRlOiAiICsgZS5sYXRsbmcubG5nLnRvRml4ZWQoNCkpCiAgICAgICAgICAgICAgICAgICAgICAgIC5vcGVuT24obWFwXzBhNmY3NDllYjhhZjQ3ZWM4YmY4MmIwMGQ4ZmVhZWJlKTsKICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICBtYXBfMGE2Zjc0OWViOGFmNDdlYzhiZjgyYjAwZDhmZWFlYmUub24oJ2NsaWNrJywgbGF0TG5nUG9wKTsKICAgICAgICAgICAgCjwvc2NyaXB0Pg==\" style=\"position:absolute;width:100%;height:100%;left:0;top:0;border:none !important;\" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe></div></div>"
],
"text/plain": [
"<folium.folium.Map at 0x7f78c69a1d30>"
]
},
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"x = (39.20, 39.37)\n",
"y = (-6.90, -6.70)\n",
Expand All @@ -86,12 +118,12 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
"landsat_ds = dc.load(\n",
" product=\"ls8_c2l2\",\n",
" product=\"ls8_sr\",\n",
" x=(39.20, 39.37),\n",
" y=(-6.90, -6.70),\n",
" time=(\"2018-01-01\", \"2018-12-31\"),\n",
Expand Down Expand Up @@ -190,6 +222,13 @@
"source": [
"rgb(sentinel_2_ds, bands=[\"red\", \"green\", \"blue\"], index=9, size=10)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
Binary file added docs/_static/session_2/explorer_11august2018.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_2/explorer_2018.PNG
Binary file not shown.
Binary file added docs/_static/session_2/explorer_2018.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/session_2/explorer_august.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_2/explorer_ls8.PNG
Binary file not shown.
Binary file added docs/_static/session_2/explorer_ls8.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_2/explorer_tanzania.PNG
Binary file not shown.
Binary file added docs/_static/session_2/explorer_tanzania.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_2/explorer_ui1.PNG
Binary file not shown.
Binary file added docs/_static/session_2/explorer_ui1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/session_2/explorer_zoom.PNG
Binary file not shown.
Binary file added docs/_static/session_2/explorer_zoom.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d9a6ede

Please sign in to comment.