Skip to content

Commit a6c8403

Browse files
authored
Merge branch 'main' into iss_701-describing-providers
2 parents d09947f + 371c37b commit a6c8403

115 files changed

Lines changed: 652 additions & 146 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ git-output.txt
2020
.vscode
2121
*-snippet.txt
2222
redirect_test.txt
23-
23+
CLAUDE.md
2424
src/.vitepress/cache
25-
src/.vitepress/dist
25+
src/.vitepress/dist

scripts/broken-link-exceptions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--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/* --exclude=.*x.com/* --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/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/community/join --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://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/* --exclude=https://pro.arcgis.com/* --exclude=https://www.esri.com/* --exclude=https://api.merginmaps.com/logs --exclude=https://en.wikipedia.org/wiki/* --exclude=https://www.reddit.com/* --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L572 --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L641 --exclude=https://merginmaps.com/ngo-form --exclude=https://merginmaps.com/academia-form --exclude=https://merginmaps.com/eudr-geolocation-data-collection
1+
--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/* --exclude=.*x.com/* --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/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/community/join --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://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/* --exclude=https://pro.arcgis.com/* --exclude=https://www.esri.com/* --exclude=https://api.merginmaps.com/logs --exclude=https://en.wikipedia.org/wiki/* --exclude=https://www.reddit.com/* --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L572 --exclude=https://github.com/MerginMaps/python-api-client/blob/634237890afd9f28f03953e5a01376b56f5abf5c/mergin/client.py#L641 --exclude=https://merginmaps.com/ngo-form --exclude=https://merginmaps.com/academia-form --exclude=https://merginmaps.com/eudr-geolocation-data-collection --exclude=https://exiftool.sourceforge.net/TagNames/EXIF.html

scripts/markdown_style.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ for i in \
2323
do
2424
echo "Checking for $i"
2525
# exclude HTML tags inside QGIS expressions in documentation
26-
A1=`grep --line-number -r -e "$i" $SCRIPT_DIR/../src/ --include \*.md | grep -v 'expression.evaluate'`
26+
A1=`grep --line-number -r -e "$i" $SCRIPT_DIR/../src/ --include \*.md | grep -v 'expression.evaluate' | grep -v 'app.merginmaps.com/maps/'` | grep -v 'app.merginmaps.com/app/ogc'
2727
if [ ! -z "$A1" ]
2828
then
2929
echo $A1

scripts/unreferenced_images.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USED_XCF=0
77
NOT_USED_XCF=0
88
NOT_USED_PICS=0
99

10-
PICS=`find src/ | grep -e png -e jpg -e svg -e PNG -e JPG -e SVG -e jpeg -e JPEG`
10+
PICS=`find src/ | grep -e png -e jpg -e svg -e PNG -e JPG -e SVG -e jpeg -e JPEG -e webp -e WEBP`
1111
stringarray=($PICS)
1212

1313
for i in "${stringarray[@]}"
@@ -49,4 +49,4 @@ echo "number of not used pictures: $NOT_USED_PICS"
4949
echo "number of not used XCF: $NOT_USED_XCF"
5050

5151
echo "number of errors: $ERRORS"
52-
exit $ERRORS
52+
exit $ERRORS

scripts/wordlist.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,22 @@ MVT
9595
Mercedes
9696
Mergin
9797
Multiline
98+
MultiLine
99+
MultiPoint
100+
MultiPolygon
98101
NDK
99102
NMEA
100103
NTRIP
104+
OGC
105+
OGR
106+
Ok
101107
OneDrive
102108
OSGB
103109
OSM
104110
OSTN
105111
OGR
106112
Ok
113+
OpenLayers
107114
OpenMapTiles
108115
OpenStreetMap
109116
onboarding
@@ -208,6 +215,7 @@ hotline
208215
html
209216
http
210217
https
218+
iframe
211219
interoperable
212220
integration
213221
integrations
@@ -293,6 +301,8 @@ vCPUS
293301
xcf
294302
xyz
295303
yml
304+
webmap
305+
WebMap
296306
webmaps
297307
WebMaps
298308
webp
@@ -313,3 +323,8 @@ pre
313323
env
314324
IDP
315325
enum
326+
OGC
327+
DOM
328+
CDN
329+
submodules
330+
JavaScript

src/.vitepress/sidebar/en.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,20 @@ export default {
3131
{ text: 'Member Roles and Permissions', link: '/manage/permissions/' },
3232
{ text: 'Synchronisation', link: '/manage/synchronisation/' },
3333
{ text: 'Mergin Maps Project', link: '/manage/project/' },
34+
{ text: 'Webmaps',
35+
items: [
36+
{ text: 'Overview', link: '/manage/dashboard-maps/' },
37+
{ text: 'Sharing and Embedding', link: '/manage/webmaps-sharing/' },
38+
{ text: 'Custom Applications (with AI) 🧪', link: '/manage/webmaps-applications/' },
39+
{ text: 'Troubleshooting', link: '/manage/webmaps-troubleshooting/' }
40+
] },
3441
{ text: 'How to Create a New Project', link: '/manage/create-project/' },
3542
{ text: 'How to Share, Transfer or Delete Projects', link: '/manage/project-advanced/' },
3643
{ text: 'How to Delete Files', link: '/manage/delete-files/' },
3744
{ text: 'How to Deploy Revised Projects', link: '/manage/deploy-new-project/' },
3845
{ text: 'How to Recover Missing Data', link: '/manage/missing-data/' },
3946
{ text: 'Mergin Maps QGIS Plugin Overview', link: '/manage/plugin/' },
4047
{ text: 'Mergin Maps Dashboard', link: '/manage/dashboard/' },
41-
{ text: 'Webmaps', link: '/manage/dashboard-maps/' },
4248
{ text: 'Project History and Versions', link: '/manage/project-history/' },
4349
{ text: 'Selective Synchronisation', link: '/manage/selective_sync/' }
4450
] },
@@ -54,6 +60,7 @@ export default {
5460
{ text: 'How to Enable Digitising', link: '/gis/enable_digitising/' },
5561
{ text: 'How to Set Up Snapping for Mergin Maps Mobile App', link: '/gis/snapping/' },
5662
{ text: 'How to Avoid Polygons Overlap', link: '/gis/avoid-overlap/' },
63+
{ text: 'Publishing Projects via OGC API (WMS/WMTS, WFS)', link: '/gis/ogc-api/' },
5764
{ text: 'Custom Projections', link: '/gis/proj/' },
5865
{ text: 'Elevations', link: '/gis/elevations/' },
5966
{ text: 'Supported Formats', link: '/gis/supported_formats/' }
@@ -95,17 +102,18 @@ export default {
95102
collapsed: true,
96103
items: [
97104
{ text: 'Use Cases Overview', link: '/layer/use-cases/' },
98-
{ text: 'How to Open a File', link: '/layer/open-file/' },
99-
{ text: 'How to Use Hyperlinks', link: '/layer/external-link/' },
105+
{ text: 'How to Open a File', link: '/layer/open-file/' },
106+
{ text: 'How to Use Hyperlinks', link: '/layer/external-link/' },
100107
{ text: 'How to Open a Link to a Navigation App', link: '/layer/link-to-navigation/' },
101108
{ text: 'How to Use a Phone Call Link', link: '/layer/phone-call-link/' },
102109
{ text: 'How to Link Multiple Records to One Feature (1-N Relations)', link: '/layer/one-to-n-relations/' },
103110
{ text: 'How to Embed an Image', link: '/layer/embed-image/' },
104111
{ text: 'How to Use Image Guides in the Form', link: '/layer/image-guide/' },
112+
{ text: 'How to Display Photo Location and Direction', link: '/layer/photo-direction/' },
105113
] },
106114
] },
107115
{
108-
text: 'Fieldwork Tips', // required
116+
text: 'Fieldwork', // required
109117
collapsed: true,
110118
items: [
111119
{ text: 'Mergin Maps Mobile App Interface', link: '/field/mobile-app-ui/' },
-84.2 KB
Binary file not shown.
-838 KB
Binary file not shown.

0 commit comments

Comments
 (0)