Merge pull request #36 from digitalearthafrica/week-2-in-progress

Week 2 to production
digitalearthafrica · Sep 3, 2020 · e3613df · e3613df
2 parents b0b4c59 + 83a6a9a
commit e3613df
Show file tree

Hide file tree

Showing 62 changed files with 1,288 additions and 2 deletions.
diff --git a/docs/Maps_help.ipynb b/docs/Maps_help.ipynb
@@ -0,0 +1,185 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Map portal user guide"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "This guide provides detailed instructions on how to use the different features of the Digital Earth Africa Map portal at https://maps.digitalearth.africa/."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "raw_mimetype": "text/restructuredtext"
+   },
+   "source": [
+    "## Get Started\n",
+    "\n",
+    "To launch the DE Africa Map and display some basic data follow these steps.\n",
+    "\n",
+    "\n",
+    "* Launch the DE Africa Map at [maps.digitalearth.africa](https://maps.digitalearth.africa/).\n",
+    "* In the left panel click the **Add Data** button to open the data catalogue (see image below).\n",
+    "* Find a dataset of interest such as water.\n",
+    "* Select the dataset to see a preview of that data and description.\n",
+    "* To view your selected dataset on the map, click the **Add to the map** button.\n",
+    "\n",
+    "\n",
+    "<img align=\"middle\" src=\"./_static/other_information/DataCatalogue.jpg\" alt=\"DE Africa maps image\" width=\"800\">\n",
+    "\n",
+    "Visualise and analyse your dataset:\n",
+    "\n",
+    "* The spatial data will be displayed in the map view, and a visual legend will appear in the Data workbench, on the left side of the page.\n",
+    "\n",
+    "* It may not be immediately obvious where your selected spatial data has loaded on the map if it does not cover a large part of Africa. To locate loaded data on the map, go to the workbench, and select **Zoom to extent**.\n",
+    "\n",
+    "* The dataset should now be visible in the map view.\n",
+    "\n",
+    "* To add additional datasets to the map, repeat the above steps.\n",
+    "\n",
+    "* Zoom manually by moving your mouse pointer over the map and using your mouse wheel to zoom in or out further.\n",
+    "\n",
+    "* Click and drag the map to further show the region in which you are interested.\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Explore the workbench\n",
+    "\n",
+    "<img align=\"middle\" src=\"./_static/other_information/Workbench.jpg\" alt=\"DE Africa maps image\" width=\"800\">\n",
+    "\n",
+    "\n",
+    "When a dataset is added to the map via the data catalogue, a legend for that dataset will appear in the workbench. From the workbench you can:\n",
+    "\n",
+    "* Set the order data is shown on the map. To do this, click the title of a dataset and drag it to a new position in your workbench.\n",
+    "* Toggle the visibility of added datasets by selecting the checkbox opposite your prefered dataset title\n",
+    "* Zoom to the geographical extent of an added data set\n",
+    "* Set the opacity of individual data sets\n",
+    "* Remove data sets from the map. Note: they can be re-added via the data catalogue."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Navigate the Map\n",
+    "\n",
+    "<img align=\"middle\" src=\"./_static/other_information/Navigate.jpg\" alt=\"DE Africa maps image\" width=\"800\">\n",
+    "\n",
+    "There are multiple ways to navigate DE Africa Map's map view:\n",
+    "\n",
+    "### Zooming\n",
+    "\n",
+    "Move your mouse pointer over the map and use the scroll wheel to zoom in or out. The location at the centre of the map display is the centre of the zooming. Right-click and drag upwards or downwards over the map to zoom about the centre point. Select the zoom control to zoom in or out quickly by a set amount.\n",
+    "\n",
+    "### Panning\n",
+    "\n",
+    "Click anywhere on the map and drag it to the required location.\n",
+    "\n",
+    "### Rotate the map\n",
+    "\n",
+    "Use the compass control to rotate the map so North is no longer at the top. Select the “gyroscope” in the centre of the compass control and drag slowly to the left or right to rotate the map clockwise or anti-clockwise respectively. The further you drag, the faster it rotates. Release the mouse button when you reach the desired rotation.\n",
+    "\n",
+    "Select the North Point or outer ring of the Compass Control and drag it around to set the desired rotation directly.\n",
+    "\n",
+    "Control + left-click and drag left or right over the map to rotate the view about the centre.\n",
+    "\n",
+    "### Perspective view\n",
+    "\n",
+    "Select the “gyroscope” in the centre of the compass control and drag slowly upwards to tilt the view into a perspective view. Drag downwards to tilt the view back to vertical. The further you drag, the faster it tilts. Release the mouse button when you reach the desired view.\n",
+    "\n",
+    "Control + left-click and drag upwards or downwards over the map to enter or adjust the perspective view.\n",
+    "\n",
+    "When you are in perspective view, control + left-click and drag left or right over the map to “orbit” around the centre of the view. You can also click and drag left or right over the “gyroscope” at the centre of the Compass Control to orbit about the centre of the view.\n",
+    "\n",
+    "Double-click the “gyroscope” in the centre of the Compass Control to return the view quickly to a vertical view with North to the top at the current location and scale.\n",
+    "\n",
+    "Dragging to pan and using the mouse wheel to zoom still work while showing a perspective view.\n",
+    "\n",
+    "### Use the splitter functionality\n",
+    "\n",
+    "The splitter functionality allows you to compare a dataset for different time periods. To use it:\n",
+    "\n",
+    "* Select an area/location\n",
+    "* Select a dataset from the catalogue to add it to the workbench\n",
+    "* Select the **Split** link in the workbench to create a copy of the data already selected. Note that you can use the splitter with two different datasets, not just with copies of the same data\n",
+    "* Select different times (using the date picker) for the “left” and “right” sections of the screen\n",
+    "* Use the back and forward arrows to explore imagery and select cloud-free views\n",
+    "* Drag the splitter on the screen to observe the differences"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "This video shows an example of the splitter used over a map of Australia, but the functionality is the same."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "[![Split functionality video](http://img.youtube.com/vi/H3htpdYAE7w/0.jpg)](http://www.youtube.com/watch?v=H3htpdYAE7w \"Split functionality\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Upload Data to the Map\n",
+    "\n",
+    "There are two ways to load your data:\n",
+    "\n",
+    "1. Drag your data file onto the DE Africa Map map view. The format of the data file will be auto-detected.\n",
+    "1. Select **Add Data** in the left panel. This will launch the data catalogue. Select the **My Data** tab at the top of the modal window and follow the provided instructions.\n",
+    "\n",
+    "As for DE Africa Map data sets, you can select regions or points to see the data available for that location. If the file is a CSV file, the data from all columns will be shown in the feature information dialogue.\n",
+    "\n",
+    "You can also use all of the features of the workbench on the data you have loaded as well.\n",
+    "\n",
+    "To share a view of your data with others, you must first publish it to the web somewhere with a URL, and then load it from there.\n",
+    "\n",
+    "DE Africa Map can display two kinds of spreadsheets:\n",
+    "\n",
+    "1. Spreadsheets with a point location (latitude and longitude) for each row, expressed as two columns: lat and lon. These will be displayed as points (circles).\n",
+    "2. Spreadsheets where each row refers to a region such as a local government area (council), state, postcode, or ABS statistical unit such as an SA2 or CED (Commonwealth Electoral Division). Columns must be named according to the CSV-geo-au standard. These will be displayed as regions, highlighting the actual shape of each area.\n",
+    "\n",
+    "Spreadsheets must be saved as CSV (comma-separated values).\n",
+    "\n",
+    "Other standard spatial data types such as GeoJSON and KML are also supported.\n",
+    "\n",
+    "[![Upload Location](http://img.youtube.com/vi/XKP90TcBq6A/0.jpg)](http://www.youtube.com/watch?v=XKP90TcBq6A \"Upload Location\")"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.9"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}
diff --git a/docs/_static/other_information/Basemaps.jpg b/docs/_static/other_information/Basemaps.jpg
diff --git a/docs/_static/other_information/DataCatalogue.jpg b/docs/_static/other_information/DataCatalogue.jpg
diff --git a/docs/_static/other_information/Navigate.jpg b/docs/_static/other_information/Navigate.jpg
diff --git a/docs/_static/other_information/Workbench.jpg b/docs/_static/other_information/Workbench.jpg
diff --git a/docs/_static/session_2/01_products_intro_wofs_example.png b/docs/_static/session_2/01_products_intro_wofs_example.png
diff --git a/...sion_2/03_working_with_jupyter_notebooks_01_creating_notebook_open_launcher.png b/...sion_2/03_working_with_jupyter_notebooks_01_creating_notebook_open_launcher.png
diff --git a/...on_2/03_working_with_jupyter_notebooks_02_creating_notebook_launcher_button.png b/...on_2/03_working_with_jupyter_notebooks_02_creating_notebook_launcher_button.png
diff --git a/...c/session_2/03_working_with_jupyter_notebooks_03_creating_notebook_rename_1.png b/...c/session_2/03_working_with_jupyter_notebooks_03_creating_notebook_rename_1.png
diff --git a/...c/session_2/03_working_with_jupyter_notebooks_04_creating_notebook_rename_2.png b/...c/session_2/03_working_with_jupyter_notebooks_04_creating_notebook_rename_2.png
diff --git a/...c/session_2/03_working_with_jupyter_notebooks_05_creating_notebook_rename_3.png b/...c/session_2/03_working_with_jupyter_notebooks_05_creating_notebook_rename_3.png
diff --git a/...atic/session_2/03_working_with_jupyter_notebooks_06_ribbon_change_cell_type.png b/...atic/session_2/03_working_with_jupyter_notebooks_06_ribbon_change_cell_type.png
diff --git a/docs/_static/session_2/03_working_with_jupyter_notebooks_07_markdown_reference.png b/docs/_static/session_2/03_working_with_jupyter_notebooks_07_markdown_reference.png
diff --git a/docs/_static/session_2/03_working_with_jupyter_notebooks_08_run_cell_ribbon_1.png b/docs/_static/session_2/03_working_with_jupyter_notebooks_08_run_cell_ribbon_1.png
diff --git a/docs/_static/session_2/03_working_with_jupyter_notebooks_09_run_cell_ribbon_2.png b/docs/_static/session_2/03_working_with_jupyter_notebooks_09_run_cell_ribbon_2.png
diff --git a/..._static/session_2/03_working_with_jupyter_notebooks_10_create_cell_ribbon_1.png b/..._static/session_2/03_working_with_jupyter_notebooks_10_create_cell_ribbon_1.png
diff --git a/..._static/session_2/03_working_with_jupyter_notebooks_11_create_cell_ribbon_2.png b/..._static/session_2/03_working_with_jupyter_notebooks_11_create_cell_ribbon_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_01_navigate_to_Training_dir.png b/docs/_static/session_2/04_load_data_exercise_01_navigate_to_Training_dir.png
diff --git a/.../_static/session_2/04_load_data_exercise_02_creating_notebook_open_launcher.png b/.../_static/session_2/04_load_data_exercise_02_creating_notebook_open_launcher.png
diff --git a/...static/session_2/04_load_data_exercise_03_creating_notebook_launcher_button.png b/...static/session_2/04_load_data_exercise_03_creating_notebook_launcher_button.png
diff --git a/docs/_static/session_2/04_load_data_exercise_04_creating_notebook_rename_1.png b/docs/_static/session_2/04_load_data_exercise_04_creating_notebook_rename_1.png
diff --git a/docs/_static/session_2/04_load_data_exercise_05_creating_notebook_rename_2.png b/docs/_static/session_2/04_load_data_exercise_05_creating_notebook_rename_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_06_creating_notebook_rename_3.png b/docs/_static/session_2/04_load_data_exercise_06_creating_notebook_rename_3.png
diff --git a/docs/_static/session_2/04_load_data_exercise_07_imports.png b/docs/_static/session_2/04_load_data_exercise_07_imports.png
diff --git a/docs/_static/session_2/04_load_data_exercise_08++_display_map_2.png b/docs/_static/session_2/04_load_data_exercise_08++_display_map_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_08+_display_map_1.png b/docs/_static/session_2/04_load_data_exercise_08+_display_map_1.png
diff --git a/docs/_static/session_2/04_load_data_exercise_08_connect_to_the_datacube.png b/docs/_static/session_2/04_load_data_exercise_08_connect_to_the_datacube.png
diff --git a/docs/_static/session_2/04_load_data_exercise_09_load_data.png b/docs/_static/session_2/04_load_data_exercise_09_load_data.png
diff --git a/docs/_static/session_2/04_load_data_exercise_10_examine_data_1.png b/docs/_static/session_2/04_load_data_exercise_10_examine_data_1.png
diff --git a/docs/_static/session_2/04_load_data_exercise_11_examine_data_2.png b/docs/_static/session_2/04_load_data_exercise_11_examine_data_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_12_rgb_1.png b/docs/_static/session_2/04_load_data_exercise_12_rgb_1.png
diff --git a/docs/_static/session_2/04_load_data_exercise_13_rgb_2.png b/docs/_static/session_2/04_load_data_exercise_13_rgb_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_14_load_data_sentinel2.png b/docs/_static/session_2/04_load_data_exercise_14_load_data_sentinel2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_15_rgb_1.png b/docs/_static/session_2/04_load_data_exercise_15_rgb_1.png
diff --git a/docs/_static/session_2/04_load_data_exercise_16_rgb_2.png b/docs/_static/session_2/04_load_data_exercise_16_rgb_2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_nameerror.PNG b/docs/_static/session_2/04_load_data_exercise_nameerror.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_productsentinel2.png b/docs/_static/session_2/04_load_data_exercise_productsentinel2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_resolutionsentinel2.png b/docs/_static/session_2/04_load_data_exercise_resolutionsentinel2.png
diff --git a/docs/_static/session_2/04_load_data_exercise_sent2query.PNG b/docs/_static/session_2/04_load_data_exercise_sent2query.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_sentinel2ds.PNG b/docs/_static/session_2/04_load_data_exercise_sentinel2ds.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_syntaxerror.PNG b/docs/_static/session_2/04_load_data_exercise_syntaxerror.PNG
diff --git a/docs/_static/session_2/04_load_data_exercise_typo.PNG b/docs/_static/session_2/04_load_data_exercise_typo.PNG
diff --git a/docs/_static/session_2/07_plotting_01_deafrica_maps_1.png b/docs/_static/session_2/07_plotting_01_deafrica_maps_1.png
diff --git a/docs/_static/session_2/explorer_2018.PNG b/docs/_static/session_2/explorer_2018.PNG
diff --git a/docs/_static/session_2/explorer_ls8.PNG b/docs/_static/session_2/explorer_ls8.PNG
diff --git a/docs/_static/session_2/explorer_tanzania.PNG b/docs/_static/session_2/explorer_tanzania.PNG
diff --git a/docs/_static/session_2/explorer_ui1.PNG b/docs/_static/session_2/explorer_ui1.PNG
diff --git a/docs/_static/session_2/explorer_zoom.PNG b/docs/_static/session_2/explorer_zoom.PNG
diff --git a/docs/_static/session_2/maps_datacatalogue_l8_boxed.PNG b/docs/_static/session_2/maps_datacatalogue_l8_boxed.PNG
diff --git a/docs/_static/session_2/maps_float_boxed.PNG b/docs/_static/session_2/maps_float_boxed.PNG
diff --git a/docs/_static/session_2/maps_lonlat.PNG b/docs/_static/session_2/maps_lonlat.PNG
diff --git a/docs/_static/session_2/maps_shaded.PNG b/docs/_static/session_2/maps_shaded.PNG
diff --git a/docs/_static/session_2/maps_time.PNG b/docs/_static/session_2/maps_time.PNG
diff --git a/docs/_static/session_2/maps_ui1.PNG b/docs/_static/session_2/maps_ui1.PNG
diff --git a/docs/_static/session_2/maps_workbench1.PNG b/docs/_static/session_2/maps_workbench1.PNG
diff --git a/docs/_static/session_2/maps_zoomed.PNG b/docs/_static/session_2/maps_zoomed.PNG
diff --git a/docs/index.rst b/docs/index.rst
@@ -10,7 +10,7 @@ Welcome to the Digital Earth Africa training course!
 
 This is a 6-week, self-paced online course. It should take around 2 hours per week to complete. Participants who successfully complete the course will receive a Certification of Completion at the end of training.
 
-To get started, watch the short introductory video below. Then click **Session 1: Introduction** to begin.
+To get started, watch the short introductory video below. Then click **Session 1: Introduction** to begin. Other sessions will be added as the course progresses.
 
 Should you require help, see the :doc:`Frequently_asked_questions` and :doc:`Contact_us` pages.
 
@@ -28,8 +28,9 @@ Should you require help, see the :doc:`Frequently_asked_questions` and :doc:`Con
    :caption: Lessons
 
    session_1/index
+   session_2/index
 
-Sessions 2 -- 6 will be added shortly.
+Sessions 3 -- 6 will be added shortly.
 
 .. toctree::
    :maxdepth: 1
@@ -38,4 +39,5 @@ Sessions 2 -- 6 will be added shortly.
    Contact_us
    Frequently_asked_questions
    help_documentation
+   Maps_help
    License