Skip to content

Commit d5b79ad

Browse files
authored
fix #87 text formatting (#88)
fix #87
1 parent b057bc7 commit d5b79ad

13 files changed

+66
-150
lines changed

src/howto/contribute.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
How to contribute to the project?
44

5-
We are happy to help to promote work or co-author and place on our websites or give
6-
special offer for Mergin Maps Cloud for project contributors.
5+
We are happy to help to promote work or co-author and place on our websites or give special offer for Mergin Maps Cloud for project contributors.
76

87
<CommunityJoin />
98

@@ -43,8 +42,7 @@ or for other subprojects
4342

4443
## Develop
4544

46-
Software developer? Code and prepare a pull request. We will help you with setup of the development
47-
environment and answer your questions.
45+
Software developer? Code and prepare a pull request. We will help you with setup of the development environment and answer your questions.
4846

4947
- <GitHubRepo id="lutraconsulting/input" desc="Mergin Maps Input" />
5048
- <GitHubRepo id="lutraconsulting/mergin" desc="Mergin Maps Cloud" />

src/howto/customapp.md

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,12 @@
22

33
<PublicImage src="input.svg" />
44

5-
The [Input app](https://inputapp.io/) is a great companion to Mergin as it
6-
provides seamless synchronisation of data between your phone/tablet and
7-
Mergin service. We know that sometimes people want a mobile app optimised
8-
for a specific use case rather than just using a general purpose app like Input.
5+
The [Input app](https://inputapp.io/) is a great companion to Mergin as it provides seamless synchronisation of data between your phone/tablet and Mergin service. We know that sometimes people want a mobile app optimised for a specific use case rather than just using a general purpose app like Input.
96

10-
The good news is that Input is licensed as open source software and therefore
11-
it is possible to build custom apps off it. Maybe you just want to change the
12-
branding or disable some functionality - or maybe you want a bigger overhaul
13-
of the user interface - anything is possible with a bit of development.
7+
The good news is that Input is licensed as open source software and therefore it is possible to build custom apps off it. Maybe you just want to change the branding or disable some functionality - or maybe you want a bigger overhaul of the user interface - anything is possible with a bit of development.
148

159
## GitHub
1610

17-
If you are interested in building a custom app, you can start by going to
18-
<GitHubRepo id="lutraconsulting/input" desc="Input App repository" /> on GitHub and
19-
building it for your platform.
20-
The <GitHubRepo id="lutraconsulting/input-sdk" desc="Input SDK repository" />
21-
provides all the dependencies for various platforms (Android, iOS, macOS, Windows).
11+
If you are interested in building a custom app, you can start by going to <GitHubRepo id="lutraconsulting/input" desc="Input App repository" /> on GitHub and building it for your platform. The <GitHubRepo id="lutraconsulting/input-sdk" desc="Input SDK repository" /> provides all the dependencies for various platforms (Android, iOS, macOS, Windows).
2212

23-
For the Input source code and developers' documentation, you can visit
24-
<GitHubRepo id="lutraconsulting/input" />.
13+
For the Input source code and developers' documentation, you can visit <GitHubRepo id="lutraconsulting/input" />.

src/howto/dbsync.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
# PostgreSQL DB Sync
22

3-
Integrating with other databases is an important feature provided by the DB sync tool,
4-
hosted in <GitHubRepo id="lutraconsulting/mergin-db-sync" />
5-
repository. It takes care of synchronisation of changes between a Mergin project and a PostgreSQL
6-
database. The synchronisation works both ways: it pushes changes from PostgreSQL to Mergin and
7-
it also pulls changes from Mergin to PostgreSQL. Please see the project page for more details.
8-
3+
Integrating with other databases is an important feature provided by the DB sync tool, hosted in <GitHubRepo id="lutraconsulting/mergin-db-sync" /> repository. It takes care of synchronisation of changes between a Mergin project and a PostgreSQL database. The synchronisation works both ways: it pushes changes from PostgreSQL to Mergin and it also pulls changes from Mergin to PostgreSQL. Please see the project page for more details.

src/howto/exif_metadata.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Exif Metadata
2+
[[toc]]
23

34
Input comes with predefined default value expression functions which can be used to read an image EXIF metadata.
45

5-
## Functions
6+
## Supported functions
67

78
Following functions are supported:
89

@@ -15,25 +16,23 @@ Following functions are supported:
1516
- `read_exif_longitude('<ABSOLUTE_PATH_TO_IMAGE>')`
1617
- returning decimal number
1718

19+
## Allowing location tags
1820
Note that **location tags have to be allowed** in a camera settings. You can find the option as following:
1921

20-
## Android
22+
### Android
2123
Open Camera app -> Camera settings -> Location tags.
2224
![photos](./android_geo_tags.jpg)
2325

24-
## iOS
26+
### iOS
2527
Open Settings -> Privacy -> Location Services -> Camera (app).
2628
![photos](./ios_geo_tags.png)
2729

2830
## Use it with Photo widget
29-
The parameter `<ABSOLUTE_PATH_TO_IMAGE>` can be set with an expression using value of another field.
30-
Therefore you can use a value from a text field of an attachment type as a parameter for Input's EXIF functions as following:
31+
The parameter `<ABSOLUTE_PATH_TO_IMAGE>` can be set with an expression using value of another field. Therefore you can use a value from a text field of an attachment type as a parameter for Input's EXIF functions as following:
3132

3233
`read_exif(@project_home + '/' + "photo", 'GPSImgDirection')`
3334

34-
You can use both `Take a photo` or `From gallery` actions of the attachment widget. While capturing a photo with a camera,
35-
GPS EXIF data are added to the photo metadata. Make sure that location permissions are allowed in Input and also
36-
for your camera app.
35+
You can use both `Take a photo` or `From gallery` actions of the attachment widget. While capturing a photo with a camera, GPS EXIF data are added to the photo metadata. Make sure that location permissions are allowed in Input and also for your camera app.
3736

3837
For further examples you can check fields definitions of project <MerginMapsProject id="lutraconsulting/test_exif" /> accessible on Mergin.
3938

src/howto/input_features.md

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,29 @@ To be able to transfer your data to your mobile/tablet device, share your projec
1515
- You can sign in to your Mergin account
1616

1717
## Accessing projects
18-
You can install Input from Google Play Store. Once you open the
19-
application for the first time, it will take you to **Home** screen.
20-
This screen displays all the projects stored locally (under
21-
/sdcard/INPUT folder).
18+
You can install Input from Google Play Store. Once you open the application for the first time, it will take you to **Home** screen. This screen displays all the projects stored locally (under /sdcard/INPUT folder).
2219

2320
![MY PROJECTS screen in Input](./input_projects_home.png)
2421

25-
To access your projects or those shared with you through Mergin, select
26-
**My projects** or **Shared with me** tabs respectively. You will need your log in details to sign in to
27-
Mergin:
22+
To access your projects or those shared with you through Mergin, select **My projects** or **Shared with me** tabs respectively. You will need your log in details to sign in to Mergin:
2823

2924
![Mergin sign in screen in Input](./input_mergin_signin.png)
3025

31-
Once logged in, you can download your project to work on it locally by
32-
pressing download button to the right of the project:
26+
Once logged in, you can download your project to work on it locally by pressing download button to the right of the project:
3327

3428
![My projects screen in Input](./input_projects_my_projects.png)
3529

36-
The project will be available for loading in Input after you download it locally.
37-
Select **Home** and you should be able to see your downloaded
38-
project:
30+
The project will be available for loading in Input after you download it locally. Select **Home** and you should be able to see your downloaded project:
3931

4032
![Home screen in Input](./input_projects_home_updated.png)
4133

4234
Selecting a project under **Home** will open it in INPUT.
4335

4436
## Adding/editing features
4537

46-
To add a feature, select the record button from the lower panel. When you tap on the record button, it will list all the
47-
layers, you can edit. In Input, you have two modes to capture feature:
38+
To add a feature, select the record button from the lower panel. When you tap on the record button, it will list all the layers, you can edit. In Input, you have two modes to capture feature:
4839

4940
- GPS location or streaming (if you are capturing lines/areas)
50-
5141
- Free hand: by adding points or nodes to lines or areas
5242

5343
### Capturing points
@@ -65,27 +55,20 @@ If your survey layer is a line or area, the panel at the bottom changes to a fig
6555
You can:
6656

6757
- Use **Add point** to define the shape of your line or area manually by navigating through the map
68-
6958
- If you want to **stream** the GPS to shape your line or area, press and hold **GPS** button on the bottom left corner.
7059

7160
Once finished, press **Done**. If your feature is an area, it will join the last point to the first point to close the shape.
7261

7362
## Viewing/deleting existing data
74-
You can view the existing data by tapping on them on the map. It will
75-
open a preview panel (according to Display settings in QGIS - see
76-
project preparation section). To edit the form related to an existing
77-
feature, you can press the pencil within the preview panel.
63+
You can view the existing data by tapping on them on the map. It will open a preview panel (according to Display settings in QGIS - see project preparation section). To edit the form related to an existing feature, you can press the pencil within the preview panel.
7864

7965
For point layers, you can also change the location (geometry) of your layer, by pressing **Edit geometry**. Similar to capturing a new point, a map will appear with a cross-hair at your GPS location. You can adjust the location of the cross-hair by panning the map and press **Confirm**.
8066

81-
If you want to delete the item, you can press the recycle bin from the lower panel
82-
in the form edit.
67+
If you want to delete the item, you can press the recycle bin from the lower panel in the form edit.
8368

8469
## Synchronisation of data/ projects
8570
You can upload your changes through the Mergin service, once you have network connectivity. Select Project from the lower panel and then tap on **My projects** (or **Shared with me** if you have write access to the shared project). Input should automatically flag changed projects with a synchronise icon.
8671

8772
![My projects screen with updated local project](./input_my_projects_upload.png)
8873

89-
Pressing sync button to the right of the project will send the updated
90-
data to the Mergin service. Similarly, if a project and its data has been updated
91-
through the Mergin service, you will be notified to synchronise the changes to your local copy.
74+
Pressing sync button to the right of the project will send the updated data to the Mergin service. Similarly, if a project and its data has been updated through the Mergin service, you will be notified to synchronise the changes to your local copy.

src/howto/input_ui.md

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,24 @@ You can **Search** for projects using the search bar on the top. To access your
1717
![Projects screen](./input_screen.jpg)
1818

1919
## GPS
20-
By default, the map centred around the project extent. Pressing
21-
and holding GPS icon, will turn on the GPS auto-centre mode.
20+
By default, the map centred around the project extent. Pressing and holding GPS icon, will turn on the GPS auto-centre mode.
2221

23-
GPS signal colour on the map denotes the accuracy threshold set by user
24-
within the Input settings (See Settings section).
22+
GPS signal colour on the map denotes the accuracy threshold set by user within the Input settings (See Settings section).
2523

2624
## Record
27-
This option will allow user to capture the position of the GPS and save it
28-
as point or line vertices. Pressing the **Record** button will
29-
list all the survey layers (point and line layers within the project not
30-
marked as read-only in the QGIS project properties). User can then
31-
select a layer.
25+
This option will allow user to capture the position of the GPS and save it as point or line vertices. Pressing the **Record** button will list all the survey layers (point and line layers within the project not marked as read-only in the QGIS project properties). User can then select a layer.
3226

33-
If a point layer is selected, a point geometry will be recorded at the
34-
location of the GPS. A form (attribute table) for the point will appear
35-
for user to fill in.
27+
If a point layer is selected, a point geometry will be recorded at the location of the GPS. A form (attribute table) for the point will appear for user to fill in.
3628

37-
If a line layer is selected, a path will be generated from the GPS track
38-
until the record button is pressed again. The form for the recorded line
39-
will appear accordingly.
29+
If a line layer is selected, a path will be generated from the GPS track until the record button is pressed again. The form for the recorded line will appear accordingly.
4030

4131
Pressing and holding **Record** button will allow you to set the default survey layer. This option is also available under the **Settings** section.
4232

4333
## Zoom to project
4434
This is a shortcut to zoom the extent of all visible layers within the project.
4535

4636
## Map themes
47-
Themes generated from QGIS project will be listed here. User can switch
48-
between different map themes using this option.
37+
Themes generated from QGIS project will be listed here. User can switch between different map themes using this option.
4938

5039
## Settings
5140
Input specific configuration can be accessed through settings.
@@ -54,17 +43,12 @@ Input specific configuration can be accessed through settings.
5443

5544
### Mergin
5645

57-
Displays the current user signed in to Mergin. To clear the log in,
58-
users can tap on their name.
46+
Displays the current user signed in to Mergin. To clear the log in, users can tap on their name.
5947

6048
### GPS
6149

62-
**Follow GPS with map** will pan the map so the GPS point can be seen on the
63-
map.
50+
**Follow GPS with map** will pan the map so the GPS point can be seen on the map.
6451

65-
**GPS accuracy** colours show the current strength of the signal based on the
66-
Accuracy threshold. If the signal falls within the the threshold, the
67-
colour will be green. If it is outside, it will be orange. The indicator
68-
will be red in case there is no GPS position fix available.
52+
**GPS accuracy** colours show the current strength of the signal based on the Accuracy threshold. If the signal falls within the the threshold, the colour will be green. If it is outside, it will be orange. The indicator will be red in case there is no GPS position fix available.
6953

70-
**Line rec. interval** when streaming GPS position for capturing lines, you can set the intervals at which the GPS location will be used as vertices of the line.
54+
**Line rec. interval** when streaming GPS position for capturing lines, you can set the intervals at which the GPS location will be used as vertices of the line.

src/howto/integration.md

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
# Integrate Mergin
22

3-
Mergin is an open platform that aims to be developer friendly,
4-
and it has been designed to allow easy integration with other software.
3+
Mergin is an open platform that aims to be developer friendly, and it has been designed to allow easy integration with other software.
54

65
## Python Client
76

87
### Installation
98

10-
The easiest way to use Mergin programmatically is to use the Python
11-
client module. It is available in the PyPI repository and so it can
12-
be installed with `pip`:
9+
The easiest way to use Mergin programmatically is to use the Python client module. It is available in the PyPI repository and so it can be installed with `pip`:
1310

1411
```
1512
pip3 install mergin-client
@@ -26,35 +23,28 @@ mc = MerginClient(login='john', password='pass')
2623
mc.download_project('john/project1', '/home/john/mergin/project1')
2724
```
2825

29-
You can of course also get project status, push/pull changes, create/delete projects
30-
and more.
26+
You can of course also get project status, push/pull changes, create/delete projects and more.
3127

3228
The source code of the Python client is available on GitHub in <GitHubRepo id="lutraconsulting/mergin-py-client" /> repository.
3329

3430
### Command Line Interface
3531

36-
For those who prefer using terminal, there is `mergin` command line tool
37-
shipped with the Python client.
38-
With several built-in commands, it is possible to download Mergin projects,
39-
push/pull changes, create or delete projects and more.
32+
For those who prefer using terminal, there is `mergin` command line tool shipped with the Python client. With several built-in commands, it is possible to download Mergin projects, push/pull changes, create or delete projects and more.
4033

4134
For example, to download a Mergin project to a local directory:
4235
```
4336
mergin download john/project1 ~/mergin/project1
4437
```
4538

46-
Please see <GitHubRepo id="lutraconsulting/mergin-py-client" /> repository for
47-
more information on the usage.
39+
Please see <GitHubRepo id="lutraconsulting/mergin-py-client" /> repository for more information on the usage.
4840

4941
## C++ Standalone Client
5042

51-
C++ Client has advantage over Python that is is completely
52-
without any dependencies.
43+
C++ Client has advantage over Python that is is completely without any dependencies.
5344

5445
### Installation
5546

56-
Just <GitHubRepo id="lutraconsulting/mergin-cpp-client/releases" desc="download"/> binary for your platform and
57-
use it from command line.
47+
Just <GitHubRepo id="lutraconsulting/mergin-cpp-client/releases" desc="download"/> binary for your platform and use it from command line.
5848

5949
### Usage
6050
```bash
@@ -75,10 +65,8 @@ Commands:
7565
remove Remove project from server.
7666
```
7767

78-
Please see <GitHubRepo id="lutraconsulting/mergin-cpp-client" /> repository
79-
for more information on the usage.
68+
Please see <GitHubRepo id="lutraconsulting/mergin-cpp-client" /> repository for more information on the usage.
8069

8170
### C++ Mergin API Core Library
8271

83-
Client is based on the Qt-based <GitHubRepo id="lutraconsulting/input/tree/master/core" desc="mergin api core library" />
84-
used by the [Input App](https://inputapp.io) to sync the projects in the mobile application
72+
Client is based on the Qt-based <GitHubRepo id="lutraconsulting/input/tree/master/core" desc="mergin api core library" /> used by the [Input App](https://inputapp.io) to sync the projects in the mobile application.

src/howto/mergince.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22

33
<PublicImage src="Mergin.svg" />
44

5-
The [Mergin](https://public.cloudmergin.com) is a great companion to Input as it
6-
provides seamless synchronisation of data between your phone/tablet,
7-
Mergin service and QGIS Desktop.
5+
The [Mergin](https://public.cloudmergin.com) is a great companion to Input as it provides seamless synchronisation of data between your phone/tablet, Mergin service and QGIS Desktop.
86

9-
The good news is that Mergin CE is licensed as open source software and therefore
10-
it is possible to do your custom deployments.
7+
The good news is that Mergin CE is licensed as open source software and therefore it is possible to do your custom deployments.
118

129
## GitHub
1310

14-
If you are interested in deploying Mergin CE, you can start by going to
15-
<GitHubRepo id="lutraconsulting/mergin" /> on GitHub and
16-
read instructions how to deploy it for your platform.
11+
If you are interested in deploying Mergin CE, you can start by going to <GitHubRepo id="lutraconsulting/mergin" /> on GitHub and read instructions how to deploy it for your platform.

0 commit comments

Comments
 (0)