Skip to content

Commit

Permalink
Merge branch 'master' into get-started-storage
Browse files Browse the repository at this point in the history
  • Loading branch information
earlgray1979 authored Jul 18, 2024
2 parents 28dbe7c + 7e9b5ee commit d130e62
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ Pipfile.lock
.transifexrc
/.python-version
.cache
.vscode
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ feel free to use it accordingly and to contribute back your updates via a
[pull request](https://github.com/opengisch/QField-docs/pulls).


[cc-by-sa]: http://creativecommons.org/licenses/by-sa/4.0/
[cc-by-sa]: http://creativecommons.org/licenses/by-sa/4.0/ <!-- markdown-link-check-disable-line -->
[cc-by-sa-shield]: https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg

[![CC BY-SA 4.0][cc-by-sa-shield]][cc-by-sa]
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
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.
Binary file not shown.
Binary file removed documentation/assets/projects/simple-bee-farming.zip
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions documentation/get-started/concepts.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ tx_slug: documentation_get-started_concepts

QField is designed with a few key principles in mind.


## Keeping it simple

The requirements in the field are not the same as on a desktop.
Expand All @@ -20,12 +21,14 @@ Before heading out to the field though, preliminary steps such as layer styling,

## Compatibility with QGIS


Since QField is a mobile optimized version of the QGIS desktop app, your project will appear and feel identical both in QGIS and QField.
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.

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.
As a result, projects configured on the desktop should work seamlessly on the mobile app.

These principles have so far informed our development and design of QField, and will continue to do so in the future.
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.

## Mode based
Expand Down
9 changes: 4 additions & 5 deletions documentation/get-started/sample-projects.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ tx_slug: documentation_get-started_sample-projects

# Sample projects

QField ships with three sample (demo) projects by default. You can use these projects to explore some of the QField configuration details in QGIS+QFieldSync.
QField ships with sample projects by default. You can use these projects to explore some of the QField configuration details in QGIS and QFieldSync.

The links below will download an archive with each project.
The links below will download an archive of sample projects.

[Simple Bee :material-bee:](../assets/projects/simple-bee-farming.zip){ .md-button }
[Advanced Bee :material-bee-flower:](../assets/projects/advanced-bee-farming.zip){ .md-button }
[QField Users :material-map-marker:](../assets/projects/qfield-users-survey.zip){ .md-button }
[Bee Farming Sample Project :material-bee:](../assets/projects/bee_farming_project.zip){ .md-button }
[Wasterwater Management Sample Project :material-bee-flower:](../assets/projects/wasterwater_management_project.zip){ .md-button }

You can also explore the sample projects directly in the [QField GitHub repository](https://github.com/opengisch/QField/tree/master/resources/sample_projects).
2 changes: 1 addition & 1 deletion documentation/get-started/third-part-tutorials.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ tx_slug: documentation_get-started_third-part-tutorials

Here you can find some great tutorials created by our community:

- [QField tutorials](https://livelihoods-and-landscapes.github.io/qgis_qfield_tutorials/training_overview.html) from Climate-Smart Landscapes for Promoting Sustainability of Pacific Island Agricultural Systems <!-- markdown-link-check-disable-line -->
- [QField tutorials](https://livelihoods-and-landscapes.com/docs/tutorials.html) from Climate-Smart Landscapes for Promoting Sustainability of Pacific Island Agricultural Systems <!-- markdown-link-check-disable-line -->
- [QField Quickstart Udemy course](https://www.udemy.com/course/qfield-quickstart/) by Michael Miller <!-- markdown-link-check-disable-line -->
4 changes: 2 additions & 2 deletions documentation/get-started/tutorials/get-started-qfs.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ title: Get Started
tx_slug: documentation_get-started_tutorials_get-started-qfs
---

# QFieldSync plugin
# QFieldSync

The QFieldSync plugin helps preparing and packaging QGIS projects for
The [QFieldSync plugin for QGIS](https://plugins.qgis.org/plugins/qfieldsync/) helps preparing and packaging QGIS projects for
QField.

QFieldSync supports your project preparation with automating the
Expand Down
8 changes: 5 additions & 3 deletions documentation/how-to/gnss.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ The formats currently supported are:

For example:
For the transformation from ETRS89 (reference ellipsoid GPS) to NAP (Dutch) users can download
the file [nlgeo2018.gtx from NSGI](https://www.nsgi.nl/rdnaptrans) and put it in the directory.
the file [nlgeo2018.gtx from NSGI](https://www.nsgi.nl/rdnaptrans) and put it in the directory.<!-- markdown-link-check-disable-line -->

To obtain precise altitude data for Cadastral Surveying in Switzerland, users can access the file correction of the vertical grid shift through [Geoid OGD from Swisstopo](https://cms.geo.admin.ch/ogd/geodesy/Geoid_OGD.zip).
To obtain precise altitude data for Cadastral Surveying in Switzerland, users can access the file correction of the vertical grid shift through [Geoid OGD from Swisstopo](https://cms.geo.admin.ch/ogd/geodesy/Geoid_OGD.zip).<!-- markdown-link-check-disable-line -->
Following the download, users are advised to perform a conversion of the file labeled `chgeo04_htrans_lv95.agr` to `chgeo04_htrans_lv95.gtx`.
The QGIS processing algorithm `gdal:translate` (convert format) can be used for that.

Expand Down Expand Up @@ -191,7 +191,7 @@ You can get access to positioning information through additional
expression variables accessible in the attribute form. These will
only be available when positioning is enabled.

These variables are commonly used as part of [default values expressions](https://docs.qgis.org/latest/en/docs/user_manual/working_with_vector/vector_properties.html#default-values)
These variables are commonly used as part of [default values expressions](https://docs.qgis.org/latest/en/docs/user_manual/working_with_vector/vector_properties.html#default-values)<!-- markdown-link-check-disable-line -->
for fields to keep track of the quality of individual measured points.

All `@position_*` variables have a corresponding `@gnss_*` variable.
Expand All @@ -218,6 +218,8 @@ The gnss variables always report the gnss sensor values, even when the crosshair
- `@position_direction` - The direction of movement in degrees from true north as reported
by the sensor. It is only available when the crosshair is
snapped to the sensor. - IE
- `@position_orientation` - Orientation of the device itself, regardless of its movement.
It changes as the device is rotated relative to true north (from 0° to 359°).
- `@position_ground_speed` - Groundspeed (in m/s) as reported by the sensor. It is only
available when the crosshair is snapped to the sensor. - IE
- `@position_magnetic_variation` - The angle between the horizontal component of the magnetic field
Expand Down
2 changes: 1 addition & 1 deletion documentation/how-to/plugins.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Plugins
tx_slug: documentation_how-to_plugins
---

# Plugins
# QField Plugins

QField has a QML/Javascript plugin framework through which additional functionalities and
features can be scripted.
Expand Down
6 changes: 3 additions & 3 deletions documentation/reference/qfieldcloud/sdk.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import requests
from qfieldcloud_sdk import sdk

client = sdk.Client(
url="https://app.qfield.cloud/api/v1/",
username="user1",
password="pass1",
url="https://app.qfield.cloud/api/v1/"
)
client.login(username='me', password='mysecret')

try:
projects = client.list_projects()
print(projects)
except requests.exceptions.RequestException:
print("Oops!")
```
Expand Down
12 changes: 6 additions & 6 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ nav:
- QFieldCloud:
- get-started/tutorials/get-started-qfc.md
- get-started/tutorials/advanced-setup-qfc.md
- get-started/storage-qfc.en.md
- get-started/storage-qfc.md
- QFieldSync:
- get-started/tutorials/get-started-qfs.md
- get-started/faq.md
Expand Down Expand Up @@ -282,25 +282,25 @@ plugins:
QFieldエコシステムのドキュメントへようこそ。QFieldエコシステムは、フィールドワークをシームレスかつ効率的にするために設計された製品群です。このページでは、QField
のすべての製品について、包括的でわかりやすいドキュメントを提供しています。初めてお使いになる方でも、経験豊富なプロの方でも、QFieldとその関連ツールの使用に関して知っておくべきことが全て網羅されています。
nav_translations:
Home: Home
Home: ホーム
Get started: スタート・ガイド
Tutorials: Tutorials
Tutorials: チュートリアル
QFieldCloud: QFieldCloud
QFieldSync: QFieldSync
How-to guides: ハウツー・ガイド
Technical reference: 技術参考情報
Success stories: Success stories
Success stories: ケーススタディ
palette:
- scheme: default
primary: light green
toggle:
icon: octicons/moon-24
name: Switch to dark mode
name: ダークモードにする
- scheme: slate
primary: blue
toggle:
icon: octicons/sun-24
name: Switch to light mode
name: ライトモードにする

# Page tree
- locale: pt
Expand Down
2 changes: 1 addition & 1 deletion utils/push_to_zoho.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def push_article(
req = requests.post(url, json=payload, headers=headers)
print("creating: ", permalink, ": ", req.status_code)

if req.status_code == 401:
if req.status_code >= 400:
raise RuntimeError(req.text)


Expand Down

0 comments on commit d130e62

Please sign in to comment.