Skip to content

Commit 19e37ea

Browse files
authored
Merge branch 'master' into beanzmo-getstarted-enhancement
2 parents 1bc6f0a + d8f601c commit 19e37ea

20 files changed

+76
-50
lines changed
Loading
42.7 KB
Loading
Binary file not shown.

documentation/get-started/concepts.en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ Before heading out to the field though, preliminary steps such as layer styling,
2525
Since QField is a mobile optimized version of the QGIS desktop app, your project will appear and feel identical both in QGIS and QField.
2626
The rendering engine in QField is the same as the one used in desktop QGIS, ensuring that projects will appear virtually identical in both environments.
2727

28-
Configurations options prepared in QGIS beforehand don't need to be recreated, which is why QField uses the same edit widgets as QGIS desktop does.
28+
Configuration options prepared in QGIS beforehand don't need to be recreated, which is why QField uses the same edit widgets as QGIS desktop does.
2929
As a result, projects configured on the desktop should work seamlessly on the mobile app.
3030

3131
These principles have so far informed our development and design of QField, and will continue to do so in the future.
32-
In the last few years, QField proved to be the fieldworker's best friend and continues to evolve with new features handling an even broader range of needs.
32+
In the last few years, QField has proved to be the fieldworker's best friend and continues to evolve with new features handling an even broader range of needs.
3333

3434
## Mode based
3535

3636
QField is built around different *modes*, similar to the *map tools* in the QGIS desktop version.
3737
The mode defines the nature of the task.
38-
In QField, users are either *browsing* through data or *digitizing* new stuff.
38+
In QField, users are either *browsing* through data or *digitizing* new data.

documentation/get-started/contribute.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ QField is an open source project. It is free to share, use and modify and it wil
1818

1919
# Development
2020

21-
if you want to get involved in QField development, please refer to the following doumentations:
21+
If you want to get involved in QField development, please refer to the following documentation:
2222
- [QField repository](https://github.com/opengisch/QField/blob/master/doc/dev.md) <!-- markdown-link-check-disable-line -->
2323
- [QFieldCloud repository](https://github.com/opengisch/qfieldcloud) <!-- markdown-link-check-disable-line -->
2424
- [QFieldSync repository](https://github.com/opengisch/QFieldSync) <!-- markdown-link-check-disable-line -->
2525

2626
# Credits
2727

28-
QField, QFieldCloud and QFieldSync are developped by [OPENGIS.ch](https://www.opengis.ch/) <!-- markdown-link-check-disable-line -->. OPENGIS.ch does [consulting](https://www.opengis.ch/training-consulting/) <!-- markdown-link-check-disable-line -->,
28+
QField, QFieldCloud and QFieldSync are developed by [OPENGIS.ch](https://www.opengis.ch/) <!-- markdown-link-check-disable-line -->. OPENGIS.ch does [consulting](https://www.opengis.ch/training-consulting/) <!-- markdown-link-check-disable-line -->,
2929
[development](https://www.opengis.ch/custom-development/) <!-- markdown-link-check-disable-line -->, [training](https://www.opengis.ch/qfield-training/) <!-- markdown-link-check-disable-line --> and [support](https://www.opengis.ch/qgis-support/) <!-- markdown-link-check-disable-line --> for open source software including QField and
3030
QGIS.
3131

documentation/get-started/faq.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ tx_slug: documentation_get-started_faq
88
??? help "How many versions of a file are stored on QFieldCloud?"
99

1010
## How many versions of a file are stored on QFieldCloud?
11-
The number of stored file versions are depending on the account type. 3 versions are stored for COMMUNITY account, and 10 for other account types.
11+
The number of stored file versions depends on the account type. 3 versions are stored for COMMUNITY account, and 10 for other account types.
1212

1313
??? help "How can I delete old file versions?"
1414

1515
## How can I delete old file versions?
16-
You can delete old versions of a file, except for the latest version, from QFieldSync or the QfieldCloud web interface. When you remove a version all previous versions are also removed.
16+
You can delete old versions of a file, except for the latest version, from QFieldSync or the QFieldCloud web interface. When you remove a version, all previous versions are also removed.
1717

1818
??? help "Which browsers are supported by QFieldCloud?"
1919

documentation/get-started/how-to-contribute-translation.en.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Translations for the QField app are managed through the **Transifex** platform.
1616

1717
1. Select a project you want to contribute to.
1818
2. Select the language you want to contribute to.
19-
3. Look for languages requiring translation. For these languages, you'll see a "Translate" button. Click on it.
19+
3. Look for languages that need translation. These will have a "Translate" button next to them. Click on it.
2020

2121
!![](../assets/images/transifex_translation_01.png,850px)
2222

@@ -31,7 +31,7 @@ You'll see a "Join Team" link. Click it and wait for approval (you'll receive an
3131

3232
!![](../assets/images/transifex_translation_02.png,850px)
3333

34-
- Then choose **No**.
34+
- Then choose **No** to show only untranslated strings.
3535

3636
!![](../assets/images/transifex_translation_03.png,850px)
3737

@@ -61,9 +61,9 @@ You'll see a "Join Team" link. Click it and wait for approval (you'll receive an
6161

6262
## 6. Synchronization and Testing
6363

64-
- Translations are typically synchronized with the QField apps master codebase each day.
64+
- Translations are typically synchronized with the QField app's master codebase each day.
6565
- To see your translation reflected in the app:
66-
- Join the [QField Beta Program](https://play.google.com/apps/testing/ch.opengis.qfield_dev) for early access to new releases with this translations.
66+
- Join the [QField Beta Program](https://play.google.com/apps/testing/ch.opengis.qfield_dev)<!-- markdown-link-check-disable-line --> for early access to new releases with these translations.
6767

6868
If your language is not yet available, we will happily add it for you.
69-
Just open an issue on GitHub repository and tell us which language you would like to translate it to.
69+
Just open an issue on the GitHub repository and specify which language you would like to translate to.

documentation/get-started/index.en.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ The following pages will provide the possible options in detail, which can be ad
4747
Download the latest <a href="https://qfield.org/get_latest/?platform=macos" target="_blank">MacOS
4848
version</a> (Universal).
4949

50+
5051
QField is available for Android and iOS devices and can also be accessed on the Desktop (Windows, macOS and Linux).
5152
Use QField for optimised data collection outside in any place on earth.
5253
Its optimized user interface exposes through a an easy-to-use front-end that gets out of the way the full power of [QGIS](https://qgis.org) under the hood.
@@ -56,6 +57,7 @@ Its optimized user interface exposes through a an easy-to-use front-end that get
5657
[QFieldCloud](https://qfield.cloud) allows you to seamlessly integrate your team's field work.
5758
It is a cloud-based service and with its unique technology it will allow your team to focus on what's important, making sure you efficiently get the best field data possible.
5859

60+
5961
Thanks to the tight integration with QField, your team will be able to start surveying and digitising data in no time.
6062

6163
[Register Now :material-cloud-outline:](https://app.qfield.cloud/accounts/signup/){ .md-button }

documentation/get-started/license.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tx_slug: documentation_get-started_license
88
QField is released under the GNU Public License (GPL) Version 2 or
99
above. Developing QField under this license means that you can inspect
1010
and modify the source code and guarantees that you will always have
11-
access to a QGIS based field data collection app that is free of cost
11+
access to a QGIS-based field data collection app that is free of cost
1212
and can be freely modified.
1313

1414
You can find the source code on [github](https://github.com/opengisch/QField)

documentation/get-started/settings.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ When switched on, user's saved and currently opened project bookmarks will be di
7070
## Use native camera
7171

7272
If disabled, QField will use a minimalist internal camera instead of the camera app on the device.
73-
Tip: Enable this option and install the open camera app to create geo tagged photos.
73+
Tip: Disable this option to have geo tagged photos and have access to the [EXIF](../reference/exif.md) variables.
7474

7575
## Fast editing mode
7676

documentation/get-started/tutorials/advanced-setup-qfc.en.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ tx_slug: documentation_get-started_tutorials_advanced-setup-qfc
55

66
# Advanced setup guide
77

8-
!!! note
9-
We have a [community discussion platform](https://github.com/opengisch/qfield/discussions) to discuss your questions, doubts and ideas. Do not hesitate to check it out.
10-
11-
128
## Supported vector providers
139

1410
Currently, QFieldCloud supports GeoPackage and PostGIS layers for collaborative editing. Other formats supported by QGIS should also work but are not officially supported.
@@ -23,7 +19,7 @@ If you would like to set up relations, it is recommended to add a UUID field on
2319

2420
1. Setup on QGIS desktop:
2521
1. Create a new project.
26-
2. Create a GeoPackage layers, save it in the same folder than the QGIS project.
22+
2. Create GeoPackage layers, save it in the same folder than the QGIS project.
2723
3. Set the GeoPackage to "Offline editing" in the QFieldSync plugin.
2824
4. Upload the project to QFieldCloud.
2925
2. Collect data on the device with QField:
@@ -33,14 +29,14 @@ If you would like to set up relations, it is recommended to add a UUID field on
3329
1. In QFieldSync, download the updated files (the GeoPackage file should have changed).
3430

3531
!!! warning
36-
This workflow does not support changing the GeoPackage on the desktop, as being file base, the whole GeoPackage will be replaced. This means that data can only be digitized using QFieldCloud.
32+
This workflow does not support changing the GeoPackage on the desktop, as being file-based, the whole GeoPackage will be replaced. This means that data can only be digitized using QFieldCloud.
3733

3834

3935
## PostGIS
4036

4137
Using PostGIS layers is a good choice if you want data from your QField users to be updated directly in your database by QFieldCloud when they sync their work without any further steps.
4238

43-
It requires your database to be publicly accessible and credentials must be saved unencrypted in the QGIS project. Please be aware of the security implications of such requirements, and remember to have backups.
39+
It requires your database to be publicly accessible, and credentials must be saved unencrypted in the QGIS project. Please be aware of the security implications of such requirements, and remember to have backups.
4440

4541
### Example workflow (PostGIS)
4642

@@ -183,7 +179,7 @@ You will receive notifications for events in which you are not the actor. These
183179

184180
## Enhance your project with the "Optimized Packager"
185181

186-
We recommend to use the new "Optimized Packager" over the deprecated "QGIS Core Offline Editing" for all your projects. Set the packager under "Packaging Offliner" in the "Settings" tab of your project.
182+
We recommend using the new "Optimized Packager" over the deprecated "QGIS Core Offline Editing" for all your projects. Set the packager under "Packaging Offliner" in the "Settings" tab of your project.
187183

188184
The "Optimized Packager" supports consolidating filtered layers of same datasource into a single offline layer, respecting distinct symbology but also using less storage. Here is an example to illustrate this feature:
189185

@@ -226,9 +222,9 @@ You can modify the default QFieldCloud server QField and QFieldSync connect to:
226222
4. Enter the details of the desired server in the provided field.
227223
(Leaving the field empty will connect to the default QFieldCloud server at app.qfield.cloud.)
228224

229-
!![Reveling server in QField Sync](../../assets/images/changing_default_qfieldcloud_server_qfield_sync.png,250px)
225+
!![Revealing server in QField Sync](../../assets/images/changing_default_qfieldcloud_server_qfield_sync.png,250px)
230226

231-
!![Reveling server in QField](../../assets/images/changing_default_qfieldcloud_server_qfield.png,250px)
227+
!![Revealing server in QField](../../assets/images/changing_default_qfieldcloud_server_qfield.png,250px)
232228

233229
!!! note
234230
It's important to note that QFieldSync does not support the same cloud project in multiple QGIS profiles. As a recommendation use a single QGIS profile for your QFieldCloud projects to avoid synchronization issues.

documentation/get-started/tutorials/get-started-qfc.en.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ tx_slug: documentation_get-started_tutorials_get-started-qfc
55
---
66
# Getting started guide
77

8-
!!! note
9-
We have a [community discussion platform](https://github.com/opengisch/qfield/discussions) to discuss your questions, doubts and ideas. Do not hesitate to check it out.
10-
118
## Get a free [QFieldCloud account](https://app.qfield.cloud/accounts/signup/)
129

1310
:material-monitor: Desktop preparation
@@ -147,10 +144,10 @@ Select a project to download on your device:
147144

148145
!![Download](../../assets/images/getting_started_download_project.png,250px)
149146

150-
### Synchronise your changes
147+
### Synchronize your changes
151148

152149
Make a change to your data. Either create a new feature, delete a feature, or modify the geometry or attributes.
153-
Open the blue cloud button on the top left of the screen:
150+
Click the blue cloud button on the top left of the screen:
154151

155152
!![Cloud button](../../assets/images/getting_started_blue_button.png,250px)
156153

documentation/get-started/tutorials/get-started-qfs.en.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Properties
8585

8686
2. Set up the attachment default naming, please refer to the [Configurable picture path](../../how-to/pictures.md#configurable-attachment-path)
8787

88-
3. Set up the maximum number of items shown in the relation editor widget
88+
3. Set up the maximum number of items shown in the relation editor widget.
8989

9090
!![QFieldSync Layer Properties](../../assets/images/qfield-sync-properties.png)
9191

@@ -178,7 +178,7 @@ Simply activate the checkbox labeled "Show the packaging options in the toolbar.
178178
Copy the folder on your device. Open QField, open the project and start
179179
collecting data.
180180

181-
Make also sure to save the QGIS project using the regular Save As of
181+
Also make sure to save the QGIS project using the regular Save As of
182182
QGIS as you'll have to re-open it later when you want to synchronize
183183
the changes.
184184

@@ -200,7 +200,7 @@ Use iTunes' File Sharing function to import into the QField root folder.
200200
When you want to synchronize what you have collected, re-open the
201201
project in QGIS (the one you saved with a regular Save As).
202202

203-
Copy the project folder from your device to your computer and use the
203+
Copy the project folder from your device to your computer, and use the
204204
**Synchronize from QField** menu to synchronize your changes from the
205205
protable project to the main project.
206206

documentation/how-to/geofencing.en.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
title: Geofencing
3+
tx_slug: documentation_how-to_geofencing
4+
---
5+
6+
# Geofencing
7+
8+
QField has a built-in geofencing functinality that can alert or inform users when the position provided by their GNSS device enters and/or leaves areas defined through polygon features. Digitizing of new features can also be prohibited when a geofencing alarm is turned on.
9+
10+
## Defining geofenced areas
11+
:material-monitor: Desktop preparation
12+
13+
Defining geofenced areas on QGIS happens with the help of the QFieldSync plugin. Simply open the project properties dialog and go to the QField panel, where you will find a checkbox to activate geofencing and a number of widgets to configure its behavior.
14+
15+
!![](../assets/images/geofencing-settings.png)
16+
17+
The geofencing areas layer combobox allows you to pick a polygon vector layer from your project file. You can rely on any data provider, including online sources such as postgis databases.
18+
19+
Once a layer is chosen, you can choose between three geofencing behavior:
20+
- alert users when inside an area, where the polygons from the vector layer act as no-go areas
21+
- alert users when outside all areas, where the polygons from the vector layer act as safe areas
22+
- inform users when entering and leaving areas, where polygons from the vector layer act as areas of informed or warned about
23+
24+
Finally, a checkbox allows you to prohibit the digitizing of new features when in geofencing's alert mode is activated by the first two behaviors above. When checked, users will not be able to digitize new features into the currently opened project.
25+
26+
## Geofencing feedback
27+
28+
When QField turns its geofencing alert on, a glowing read circle will appear at the bottom right corner of your device's screen. The visual queue will remain on the screen until the alert is turned off based on your selected behavior. In addition, on devices that supports vibration, a tactile alert will occur alongside a message informing users of which areas has been trespassed into.
29+
30+
![type:video](../assets/videos/geofencing-alert.webm)
31+
32+
If you enabled the digitizing prevention checkbox, you will notice that QField's digitizing toolbar will disappear while in alert mode to clearly inform users of the ongoing prohibition and avoid accidental data entry.

documentation/how-to/index.en.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@ tx_slug: documentation_how-to_index
55

66
# How-to guides
77

8-
QField leverages the power of QGIS to comfortably configure your
9-
projects. After setting up everything, you can eventually synchronise your
10-
project and any additional files to your device and immediately get
11-
down to work.
8+
QField leverages the power of QGIS to comfortably configure your projects.
9+
After setting up everything on your desktop, you can eventually synchronise your project and any additional files to your device and immediately get down to work.
1210

13-
Synchronising your projects to your teams' devices, can be done in
14-
various way. The QFieldSync plugin helps preparing and packaging QGIS
15-
projects for QField and distributing it to your devices. For a
16-
seamless integration experience and for managing teams we highly
17-
suggest using QFieldCloud.
11+
Synchronising your projects to your teams' devices, can be done in various ways.
12+
The QFieldSync plugin helps preparing and packaging QGIS projects for QField and distributing it to your devices.
13+
For a seamless integration experience and for managing teams we highly suggest using QFieldCloud.
1814

19-
QField is built to be very user friendly and intuitive. We suggest
20-
starting it and opening a demo project to get used to the powerful
21-
interaction possibilities.
15+
QField is built to be very user friendly and intuitive.
16+
We suggest starting it and opening a demo project to get used to the powerful interaction possibilities.
2217

23-
Here you'll find plenty of resources on how to configure and interact
24-
with QField.
18+
Here you'll find plenty of resources on how to configure and interact with QField.

documentation/how-to/pg-service.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Before beginning, ensure that your PostgreSQL database allows connections from Q
3030

3131
### Setup `pg_service.conf` File
3232

33-
We first need to set up a configuration file. There are many options to organize this, [read more in the PostgreSQL documentation](https://www.postgresql.org/docs/current/libpq-pgservice.html) or follow the description below.
33+
We first need to set up a configuration file. There are many options to organize this, [read more in the PostgreSQL documentation](https://www.postgresql.org/docs/current/libpq-pgservice.html)<!-- markdown-link-check-disable-line --> or follow the description below.
3434

3535
1. **Create a Configuration File**:
3636

documentation/how-to/pictures.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Information about location and direction of the pictures will therefore be baked
9292

9393
!!! note
9494
While with older Android versions it was possible to use other apps like the amazing OpenCamera app for taking pictures and preserving EXIF information from there, this is no longer with recent Android versions.
95-
If you enable *Use native Camera* in the *settings* you will not be able to preserve EXIF information.
95+
Is recommended to disable *Use native Camera* in the *settings* to preserve [EXIF](../reference/exif.md) information.
9696

9797
## Fetching Geotags (EXIF) from the image file into the attribute table
9898
:material-monitor: Desktop preparation

documentation/reference/qfieldcloud/architecture.en.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ The data is stored on 4 **[`minio_data`]** volumes, as replication is enforced b
123123

124124
Should be replaced by a proper S3-like Object Storage SaaS provider.
125125

126+
If `minio` is running, please make sure the host's firewall allows port `8009`, required by the `minio` service (or the port configured with the `MINIO_API_PORT` environment variable).
127+
126128

127129
#### [`createbuckets`] Create Minio Buckets
128130

@@ -155,7 +157,7 @@ Stores dynamically created user PostGIS databases.
155157

156158
#### [`minio_data`]
157159

158-
Stores data for **[`geodb`] GeoDB PostgreSQL**.
160+
Stores data for the **[`minio`] S3 service**.
159161

160162

161163
#### [`postgres_data`]

0 commit comments

Comments
 (0)