Skip to content

Commit

Permalink
Merge branch 'main' into iss_338_reuse-deleted-prj-name
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-cit committed Jul 24, 2023
2 parents 91c0765 + 189ad96 commit b67c31a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion scripts/broken-link-exceptions.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--exclude=.*twitter.com/lutraconsulting --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com*
--exclude=https://de.merginmaps.com/* --exclude=https://es.merginmaps.com/* --exclude=https://fr.merginmaps.com/* --exclude=https://it.merginmaps.com/* --exclude=https://pt.merginmaps.com/* --exclude=.*twitter.com/lutraconsulting --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com*
2 changes: 1 addition & 1 deletion src/.vuepress/components/SinceBadge.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<span>
<span class="sincebadge" v-if="type === 'App'" >since Input App {{ version }}</span>
<span class="sincebadge" v-if="type === 'App'" >since Mobile {{ version }}</span>
<span class="sincebadge" v-else-if="type === 'Plugin'">since Plugin {{ version }}</span>
<span class="sincebadge" v-else-if="type === 'Server'">since Server {{ version }}</span>
</span>
Expand Down
2 changes: 2 additions & 0 deletions src/field/external_gps.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ External GPS receivers can be connected to your mobile device via Bluetooth and

There are several [extra position variables](../layer/position_variables/) that can be useful to record when doing the survey with external GPS, such as the GPS antenna height, GPS device name as well as metrics like horizontal, vertical or position dilution of precision (HDOP, VDOP, PDOP).

Note that external GPS devices usually return orthometric heights (ellipsoid with the geoid separation applied).

**Before you start**:
- Set up your device according to the instructions of its manufacturer. You should continue only when you are sure that the device is working and sending data.
- Make sure that your mobile device offers the functionality to pair with an external GPS device and that it communicates through a standard interface.
Expand Down
2 changes: 1 addition & 1 deletion src/field/gps_accuracy.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ When doing the survey, it is essential to be aware of the limitations of your GP
A warning will appear, if your accuracy is outside the GPS accuracy threshold. To get rid of this warning, you can increase your **Accuracy threshold** or turn off these warnings in [Settings](./input_ui.md#gps-settings).
![Low GPS position accuracy warning](./input-gps-warning.jpg "Low GPS position accuracy warning")

Tapping the GPS accuracy tab opens the GPS info panel, which contains information about the horizontal and vertical accuracy, as well as number of satellites in use.
Tapping the GPS accuracy tab opens the [GPS info panel](./input_ui/#gps), which contains information about the horizontal and vertical accuracy, as well as number of satellites in use.
![GPS info panel](./input-gps-info.jpg "GPS info panel")

If you'd like to have higher accuracy, you can wait for your device to acquire a better GPS signal. For precise measurements, you may need to connect your device to an [external GPS](./external_gps.md).
Expand Down
6 changes: 1 addition & 5 deletions src/field/input_ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,11 @@ Tapping the GPS accuracy tab opens the GPS info panel:
- **Longitude, Latitude**: current position
- **X, Y**: current position in project's coordinate reference system
- **Horizontal** and **Vertical accuracy** of the GPS position
- **Altitude**: ellipsoidal height
- **Altitude**: ellipsoidal height if internal GPS is used. [External GPS](./external_gps/) devices usually return orthometric heights (ellipsoid with the geoid separation applied).
- **Satellites (in use/view)**: number of satellites
- **Speed**
- **Last fix**: time of the last received GPS position

::: tip
External GNSS devices return orthometric heights (ellipsoid with the geoid separation applied)
:::

![GPS info panel](./input-gps-info.jpg "GPS info panel")

## Record
Expand Down
11 changes: 10 additions & 1 deletion src/setup/sign-up-to-mergin-maps/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,18 @@ You can also sign up from <MobileAppName />.
You can get up-to-speed quickly by following [<MobileAppName />'s tour projects](../install-input/#mergin-maps-input-s-tour-projects) and our [Quick Start tutorials](../../tutorials/capturing-first-data/index.md).

## Forgotten password
If you forget your password, you can reset it through <AppDomainNameLink /> by clicking **Forgot password?**
If you forget your password, you can reset it through <AppDomainNameLink /> by clicking **Forgot password**. Email with password reset link will be sent to your email address.
![Mergin Maps web forgot password](./forgot-password.jpg "Mergin Maps web forgot password")

The same can be done on the login page in <MobileAppName />
![Mergin Maps Input forgot password](./merginmaps-mobile-forgot-password.jpg "Mergin Maps Input forgot password")

::: tip
Check your spam folder if the email with password reset link does not appear in your inbox after a few minutes.

If that's not the case, please contact <MerginMapsEmail id="support" /> to resolve this issue.
:::




0 comments on commit b67c31a

Please sign in to comment.