Skip to content

Commit

Permalink
Merge pull request #133 from GIScience/dev
Browse files Browse the repository at this point in the history
small improvements across the platform
  • Loading branch information
enauj authored Nov 8, 2024
2 parents 9997122 + fa2d782 commit cd9bdb4
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 20 deletions.
1 change: 1 addition & 0 deletions _toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ parts:
sections:
- file: content/Modul_4/en_qgis_map_design_I.md
- file: content/Modul_4/en_qgis_map_design_2.md
- file: content/Modul_4/en_qgis_symbology_raster.md
- file: content/Modul_4/en_qgis_map_examples.md
- file: content/Modul_4/en_qgis_modul_4_exercises.md
- caption: Module 5
Expand Down
4 changes: 2 additions & 2 deletions content/Modul_1/en_qgis_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ different operating systems.
There are many versions of QGIS. It is recommended to use the __Long Term
Release__ versions because it is the most stable and contains the fewest bugs.
The current __Long Term Release__ is __QGIS 3.28.11 Firenze__
The current __Long Term Release__ is __[QGIS 3.34.12 'Prizren'](https://qgis.org/download/)__
```

### QGIS Download

1. Go to the [__QGIS download page__](https://www.qgis.org/en/site/forusers/download.html).
2. Select `Download for Windows`, `Download for macOS` or `Download for Linux`,
depending on your operating system.
3. Click on `Looking for the most stable version? Get QGIS 3.28 LTR`
3. Click on `Looking for the most stable version? Get QGIS 3.34 LTR`

```{figure} /fig/QGIS_download_LTR_version.png
---
Expand Down
17 changes: 14 additions & 3 deletions content/Modul_1/en_qgis_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,24 @@ An example of a warning icon while adjusting the parameters of a processing tool
If you have more questions before or after the training or require assistance, do not hesitate to reach out to us by writing an email to `[email protected]`.
```

There is a big and vibrant QGIS community online. If you are struggling with a specific function, or have questions on how to achieve GIS operations that are not covered on this platform, you can find help on dedicated QGIS forums:
:::{card}
:class-card: sd-text-justify sd-rounded-3 sd-border-2
:link:
https://giscience.github.io/gis-training-resource-center/content/Wiki/en_qgis_common_errors_and_Issues.html
We have collected a list of __[Common errors and issues](https://giscience.github.io/gis-training-resource-center/content/Wiki/en_qgis_common_errors_and_Issues.html)__. If you ever find yourself at your wits end (which can happen a lot when working with QGIS!), try finding the solution to your problem here.

:::


There is also a big and vibrant QGIS community online. If you are struggling with a specific function, or have questions on how to achieve GIS operations that are not covered on this platform, you can find help on dedicated QGIS forums:

- QGIS user forum on stackexchange: https://gis.stackexchange.com/?tags=qgis
- QGIS user groups: https://www.qgis.org/en/site/forusers/usergroups.html#qgis-usergroups
- QGIS telegram channel: https://t.me/joinchat/Aq2V5RPoxYYhXqUPoxRWPQ

Additionally, there is a large amount of youtube Tutorials and learning Material available online. Amongst others, the [QGIS documentation](https://docs.qgis.org/3.34/en/docs/index.html) also offers Exercises and Training Material, as well as a [Gentle Introduction to QGIS](https://docs.qgis.org/3.34/en/docs/gentle_gis_introduction/index.html).
Additionally, there is a large amount of youtube tutorials, online guides and learning material for specific
GIS-operations, so it is always a good idea to do a quick google search. Amongst others, the [QGIS documentation]
(https://docs.qgis.org/3.34/en/docs/index.html) also offers Exercises and Training Material, as well as a [Gentle Introduction to QGIS](https://docs.qgis.org/3.34/en/docs/gentle_gis_introduction/index.html).


You can also reach out to us by writing us an email to [email protected].

10 changes: 6 additions & 4 deletions content/Modul_2/en_qgis_attribute_table.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ name: Vector Data overview
Vector Data overview. Source: HeiGIT
```

:::{dropdown} Trainer's corner
:::{admonition} Now it's your turn!
:class: note

You can complement this chapter by doing the steps with a vector layer of your choice.
You can also do exercise 2 from this module.
You can complement this chapter by doing the steps with a vector layer of your choice. When working with geodata, you
will always have to understand the information stored in the datasets, both the geometries as well as the attribute
data.

:::

Expand Down Expand Up @@ -70,7 +72,7 @@ You can also use the shortcut `F6` (in some cases `Fn` + `F6`) to open the attri
```
::::

:::{dropdown} Buttons of Attribute Table
:::{dropdown} Buttons of the attribute table
|Icon|Description|Purpose|Shortcut|
|---|---|-----|---|
| ![](/fig/mActionToggleEditing.png)|__Toggle editing mode__ | Enable editing functionalities|`Ctrl+E`|
Expand Down
5 changes: 3 additions & 2 deletions content/Modul_2/en_qgis_geodata_concept.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ Databases such as Geodatabase (`.gdb`) or

----

{numref}`The main geographical data formats` summarizes the different data formats for raster and vector data commonly used in GIS.
{numref}`main_geodata_formats` summarizes the different data formats for raster and vector data commonly used in GIS.

```{figure} /fig/en_data_formats.png
---
width: 700px
align: center
name: The main geographical data formats
name: main_geodata_formats
---
The main geographical data formats. Source: [CartONG](https://cartong.pages.gitlab.cartong.org/learning-corner/en/4_data_geo/4_1_formats)
```
Expand Down Expand Up @@ -258,6 +258,7 @@ Layers in a GIS. Source: [CartONG](https://cartong.pages.gitlab.cartong.org/lear
Practical experience is key to mastering GIS. Now is a good moment to apply what we've learned in the first exercise of module 2.

:::{card}
:class-card: sd-text-justify sd-rounded-3 sd-border-2
:link: https://giscience.github.io/gis-training-resource-center/content/Modul_2/en_qgis_geodata_concept_ex1.html

__Module 2 Exercise 1: Understanding Geodata__
Expand Down
16 changes: 16 additions & 0 deletions content/Modul_3/en_qgis_data_queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ Three general types of selection/queries in QGIS that will cover the majority of

**3. Layer based spatial Selection:** Selecting features in one layer based on specified geometric relationships with features in another layer.


::::{admonition} Now it's your turn!

Querying data is essential to understand and manipulating your datasets. You can follow the steps outlined below by downloading [this dataset](https://datacatalog.worldbank.org/search/dataset/0038272/World-Bank-Official-Boundaries).

:::{card}
:class-card: sd-text-justify sd-rounded-3 sd-border-2
:link: https://nexus.heigit.org/repository/gis-training-resource-center/Module_3/Module_3_world_bank_official_boundaries.zip

__Download World Bank Official Boundaries__

:::

::::

## Manual Selection
Manual selection is done mostly using one of the click-based selection tools available under in your project toolbar (alternative: `Edit` > `Select`). These include `Select Feature(s)`, `Select Feature by Polygon`, `Select Feature by Freehand` and `Select Feature by Radius`.
\
Expand Down Expand Up @@ -134,5 +149,6 @@ Selected features are again highlighted in bright yellow in your geospatial inte
| Are within | Features from the target layer are selected if they are completely within features in the source layer. | Selecting building polygons that are entirely within a polygon of a city boundary. |
| Cross | Features from the target layer are selected if they cross features in the source layer. | Selecting rivers that cross a road. |

<!--ADD examples relevant to IM? -->

[def]: /fig/mActionSelectRectangle.png
2 changes: 1 addition & 1 deletion content/Modul_5/en_qgis_modul_5_exercises.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ These exercises touch on all the content of module 5.
| __[Exercise 2: Disaster impact in different regions of Senegal](/content/Modul_5/en_qgis_non_spatial_tools_ex1.md)__ | Become familiar with different types of non-spatial analysis and geoprocessing tools. Understand the process of discovering relationships and connections between features in spatial data. | Data analysis | 3 hours |
| __[Exercise 3: Trigger & Intervention Map for Forecast-based-Action](/content/Modul_5/en_qgis_modul_5_ex2.md)__ | This exercise is based on the monitoring and triggering process used by the Somalia Red Cresent Society (SRCS) in the framework of a drought Early Action Protocol (EAP). In this exercise, you will build a simplified version of the monitoring and trigger mechanism for the FEWSNET projection pillar. | Data analysis, Early Action Protocol, Monitoring & Triggering | 6 hours |
| __[Exercise 4: Security Peshawar](/content/Modul_5/en_qgis_modul_5_ex3.md)__ | | Data analysis | 3 hours |
| __[Exercise 5: Assess G2P Disbursement](/content/Modul_5/en_qgis_module_5_ex4.md)__ | The exercise teaches how to aggregate data on administrative levels and subsequently join the aggregated data with a polygon dataset. | Data analysis and creating reports | 60 minutes |
| __[Exercise 5: Exercise 5: Aggregate and Assess G2P Money Transfers in Pakistan](/content/Modul_5/en_qgis_module_5_ex4.md)__ | The exercise teaches how to aggregate data on administrative levels and subsequently join the aggregated data with a polygon dataset. | Data analysis and creating reports | 60 minutes |



Expand Down
17 changes: 9 additions & 8 deletions content/Modul_5/en_qgis_module_5_ex4.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Exercise 5: Aggregate and Assess the Cash Programs in Pakistan
# Exercise 5: Aggregate and Assess G2P Money Transfers in Pakistan

## Characteristics of the exercise

Expand Down Expand Up @@ -30,9 +30,10 @@ __These skills are relevant for__

::::{grid} 2
:::{grid-item-card}

__Estimated time demand for the exercise__
^^^
60 minutes
~ 60 minutes

:::

Expand Down Expand Up @@ -79,9 +80,7 @@ __Wrap up:__

:::

## Instructions

### Step-by-step instructions
## Step-by-step instructions

:::{card}
:class-card: sd-text-justify sd-rounded-3 sd-border-2
Expand All @@ -96,7 +95,7 @@ __Available Data:__
^^^

- `G2P_disbursement_report_cleaned.csv` - Datatable with cash transactions. This dataset has been cleaned and all information has been removed.
- `pak_admbnda_adm2_wfp_20220909` - Administrative boundaries on adm2 level (districts).
- `pak_admbnda_adm2_wfp_20220909.shp` - Administrative boundaries on adm2 level (districts).
:::

::::{margin}
Expand All @@ -105,6 +104,8 @@ To load the CSV-file, navigate to `Layer` > `Add Layer` > `Add delimited text la
```
::::

### Preparing the data

1. Unzip the exercise data and create a new QGIS-project.
2. Load the data into your QGIS-project.
3. Let's familiarise ourselves with the data. Open the attribute table of each layer and see what kind of information is stored in the datasets.
Expand All @@ -120,7 +121,7 @@ By comparing the values in the column `admin2_EN` from the `pak_admbnda_adm2_wfp
```

#### Step 1: Aggregating the amount of transferred money on admin2
### Step 1: Aggregating the amount of transferred money on admin2

3. In the processing toolbox, search for the tool `Aggregate` under `Vector Geometry`. <kbd>Double-Click</kbd> on it. A new window will open (see {numref}`aggregate_tool`).

Expand Down Expand Up @@ -166,7 +167,7 @@ The Aggregate-tool in QGIS 3.36
```
#### Step 2: Joining the aggregated data with administrative boundaries
### Step 2: Joining the aggregated data with administrative boundaries
In this step, we want to add the aggregated information we gained from the CSV file to the administrative boundaries. We need to join the aggregated table with the `pak_admbnda_adm2_wfp_20220909`-layer.
Expand Down

0 comments on commit cd9bdb4

Please sign in to comment.