-
Notifications
You must be signed in to change notification settings - Fork 20
#644 update ios screenshot for data transfer #655
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -2,7 +2,8 @@ | |||||
|
||||||
[[toc]] | ||||||
|
||||||
Let's say you synchronise surveyed data from multiple devices (individual surveyors) and when you examine them, you find out there is something missing - new features that were captured in the field or changes made by one or more of your team members. | ||||||
Let's say you synchronise surveyed data from multiple devices (individual surveyors) and when you examine them, you find out there is something missing - new features that were captured in the field or changes made by one or more of your team members. | ||||||
|
||||||
The reasons why you didn't get all the data can vary. For instance, the data could not be synchronised correctly because of multiple surveyors editing the same feature or synchronisation of projects with different data schema. You can read more about this topic in [Behind Data Synchronisation](../synchronisation/). | ||||||
|
||||||
Here we will try to guide you through common techniques that can help you to retrieve your data. | ||||||
|
@@ -20,7 +21,7 @@ If you cannot synchronise changes, make sure you are connected to the internet a | |||||
Depending on your data format, you can get something like `survey_polygon (edit conflict, sarah v4).json`, which is a conflict file for data from a user called `sarah`, project version 4. | ||||||
|
||||||
## There are conflict files in the folder | ||||||
Conflict files can appear in your project when Mergin could not synchronise changes automatically and they indicate there may be some issues that should be fixed. | ||||||
Conflict files can appear in your project when <MainPlatformName /> could not synchronise changes automatically and they indicate there may be some issues that should be fixed. | ||||||
|
||||||
You can add conflict files to your QGIS project and check whether they contain the data you are missing. Then you can resolve them manually or semi-automatically, depending on the scope of your issue. | ||||||
|
||||||
|
@@ -51,15 +52,13 @@ You can access your data by following these steps: | |||||
|
||||||
2. Open `Finder` file browser | ||||||
|
||||||
3. Go to Locations and select your `<device_name>` | ||||||
 | ||||||
|
||||||
4. Click on the tab named `files` | ||||||
3. Go to **Locations**, select your `<device_name>` and click on the **Files** tab. | ||||||
|
||||||
5. Select `Input` app from a list to see a data folder | ||||||
Select **<MainPlatformName />** from a list to see a data folder `INPUT` | ||||||
|
||||||
 | ||||||
|
||||||
6. Drag-and-drop the `INPUT` folder to another location to see the content | ||||||
4. Drag-and-drop the `INPUT` folder to another location to see the content | ||||||
|
||||||
### Manual data transfer (between iOS and Windows) | ||||||
Here are the steps to transfer the data from iPhone/iPad to a Windows PC. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can't put the review on the first point, but wouldn't linking to microsoft store itunes be better? |
||||||
|
@@ -71,16 +70,16 @@ Here are the steps to transfer the data from iPhone/iPad to a Windows PC. | |||||
3. [Connect your iOS device to the PC](https://support.apple.com/en-gb/guide/iphone/iph42d9b3178/15.0/ios/15.0) and unlock the screen | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
The link can be update too |
||||||
|
||||||
4. In iTunes, click on the phone icon in the toolbar | ||||||
 | ||||||
 | ||||||
|
||||||
5. From the left panel, select **File Sharing** | ||||||
|
||||||
6. Select **Input** in Apps tab | ||||||
6. Select **<MainPlatformName />** in Apps tab | ||||||
|
||||||
7. Under Input Documents, select **INPUT** folder | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
8. Press **Save...** | ||||||
 | ||||||
 | ||||||
|
||||||
9. Select a path to save the folder on your computer. | ||||||
|
||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here and also in the first sentence of the section is mentioned
iTunes
, however as far as I know there is no iTunes on mac.