diff --git a/src/manage/missing-data/index.md b/src/manage/missing-data/index.md index 65efe1a4..6e203540 100644 --- a/src/manage/missing-data/index.md +++ b/src/manage/missing-data/index.md @@ -1,17 +1,20 @@ --- description: There are some common techniques to retrieve your data. Resolve conflict files in Mergin Maps folder or retrieve the data from mobile devices manually. + +outline: deep --- # How to Recover Missing Data [[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. -::: warning +::: warning Check internet connection and storage limit If you cannot synchronise changes, make sure you are connected to the internet and that you have not exceeded your storage limit. ::: @@ -24,7 +27,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 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. @@ -37,7 +40,7 @@ Change the schema of the table in the conflict file to match the new schema and ![QGIS Processing toolbox Detect dataset changes](./qgis-detect-dataset-changes.jpg "QGIS Processing toolbox Detect dataset changes") ## There are no conflict files in the folder -If you don't see any conflict files in your folder, try to download them manually from the mobile device. Surveyed data are stored in the device that was to collect them. So, if you have access to this device, you can download data manually and process them in your computer. +If you don't see any conflict files in your folder, try to download them manually from the mobile device. Surveyed data are stored in the device that was used to collect them. So, if you have access to this device, you can download data manually and process them on your computer. ### Manual data transfer (Android) Manual data transfer from an Android device can be done by connecting your device to a computer and copying data files to/from the device. Once your Android phone or tablet is recognised by the operating system after connecting it using USB cable, you can use file browser to copy files. @@ -46,47 +49,38 @@ You can find the path to your project folder in the [Diagno This folder is accessible only from a computer, so you might not see it in your mobile device. -### Manual data transfer (between iOS and Mac) +### Manual data transfer (iOS) The supports iTunes file sharing. Note that iTunes doesn't allow you to browse or edit data from the app data folder, only allows you to delete or copy the data folder to another location. -You can access your data by following these steps: +Manual data transfer from an iOS device can be done by [connecting your iOS device](https://support.apple.com/en-gb/guide/iphone/iph42d9b3178/18.0/ios/18.0) to a Mac or a Windows computer. On Windows, data can be copied using [iTunes](#using-itunes-macos-windows). On Macs, you can use [iTunes](#using-itunes-macos-windows) or [Finder](#using-finder-macos), depending on your macOS version. -1. Plug iOS device to a computer - -2. Open `Finder` file browser +#### Using iTunes (MacOS, Windows) +Detailed steps for general data transfer using `iTunes` can be found on [Apple Support](https://support.apple.com/en-us/120403). -3. Go to Locations and select your `` - ![Plugged iOS device Locations iTunes](./itunes.jpg "iTunes iOS device plugged to a computer") - -4. Click on the tab named `files` - -5. Select `Input` app from a list to see a data folder - ![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes") +1. Connect the iOS device to your computer via USB cable +2. Open iTunes and click on the smartphone icon in the toolbar + ![iTunes phone icon](./ios_itunes.jpg "iTunes phone icon") -6. Drag-and-drop the `INPUT` folder to another location to see the content +3. Navigate to **File Sharing** in the left panel. As the supports file sharing, it will be listed here. -### Manual data transfer (between iOS and Windows) -Here are the steps to transfer the data from iPhone/iPad to a Windows PC. +4. In **Apps**, select ****. In Documents, there will be a folder named `INPUT` that contains data from the . -1. Make sure you have installed [iTunes](https://support.apple.com/en-us/HT210384) +8. Press **Save...** or drag-and-drop the `INPUT` folder to a location on your computer to copy the data. + ![iTunes save Mergin Maps mobile app files](./ios_itunes_merginmaps.jpg "iTunes save Mergin Maps mobile app files") -2. Sign into iTunes +#### Using Finder (MacOS) +Detailed steps for general data transfer using `Finder` can be found on [Apple Support](https://support.apple.com/en-us/119585). -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 +You can access your data using `Finder`: -4. In iTunes, click on the phone icon in the toolbar - ![iTunes phone icon](./ios_win_itunes.jpg "iTunes phone icon") - -5. From the left panel, select **File Sharing** - -6. Select **Input** in Apps tab - -7. Under Input Documents, select **INPUT** folder - -8. Press **Save...** - ![iTunes save Mergin Maps mobile app files](./ios_win_itunes_input.jpg "iTunes save Mergin Maps mobile app files") +1. Connect the iOS device to your computer via USB cable +2. Open `Finder` file browser +3. In **Locations**, select your device and click on the **Files** tab. As the supports file sharing, it will be listed here. +4. Select **** from the list. There will be a folder named `INPUT` that contains data from the . -9. Select a path to save the folder on your computer. + Drag-and-drop the `INPUT` folder to a location on your computer to copy the data. + + ![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes") ## Next steps If you were not able to solve your problem, you can contact the [support](../../misc/troubleshoot/#support) or get [diagnostic logs](../../misc/troubleshoot/#diagnostic-logs) to inspect the issues thoroughly. diff --git a/src/manage/missing-data/ios_itunes.jpg b/src/manage/missing-data/ios_itunes.jpg new file mode 100644 index 00000000..f8551f2d Binary files /dev/null and b/src/manage/missing-data/ios_itunes.jpg differ diff --git a/src/manage/missing-data/ios_win_itunes.xcf b/src/manage/missing-data/ios_itunes.xcf similarity index 100% rename from src/manage/missing-data/ios_win_itunes.xcf rename to src/manage/missing-data/ios_itunes.xcf diff --git a/src/manage/missing-data/ios_itunes_merginmaps.jpg b/src/manage/missing-data/ios_itunes_merginmaps.jpg new file mode 100644 index 00000000..515bb93a Binary files /dev/null and b/src/manage/missing-data/ios_itunes_merginmaps.jpg differ diff --git a/src/manage/missing-data/ios_itunes_merginmaps.xcf b/src/manage/missing-data/ios_itunes_merginmaps.xcf new file mode 100644 index 00000000..fea9e267 Binary files /dev/null and b/src/manage/missing-data/ios_itunes_merginmaps.xcf differ diff --git a/src/manage/missing-data/ios_win_itunes.jpg b/src/manage/missing-data/ios_win_itunes.jpg deleted file mode 100644 index a6403906..00000000 Binary files a/src/manage/missing-data/ios_win_itunes.jpg and /dev/null differ diff --git a/src/manage/missing-data/ios_win_itunes_input.jpg b/src/manage/missing-data/ios_win_itunes_input.jpg deleted file mode 100644 index e5f55de2..00000000 Binary files a/src/manage/missing-data/ios_win_itunes_input.jpg and /dev/null differ diff --git a/src/manage/missing-data/ios_win_itunes_input.xcf b/src/manage/missing-data/ios_win_itunes_input.xcf deleted file mode 100644 index 2aca98a1..00000000 Binary files a/src/manage/missing-data/ios_win_itunes_input.xcf and /dev/null differ diff --git a/src/manage/missing-data/itunes.jpg b/src/manage/missing-data/itunes.jpg deleted file mode 100644 index 3a38b1d7..00000000 Binary files a/src/manage/missing-data/itunes.jpg and /dev/null differ diff --git a/src/manage/missing-data/itunes.xcf b/src/manage/missing-data/itunes.xcf deleted file mode 100644 index e3ea6e37..00000000 Binary files a/src/manage/missing-data/itunes.xcf and /dev/null differ diff --git a/src/manage/missing-data/itunes2.jpg b/src/manage/missing-data/itunes2.jpg index 253c76ea..4bae9efe 100644 Binary files a/src/manage/missing-data/itunes2.jpg and b/src/manage/missing-data/itunes2.jpg differ diff --git a/src/manage/missing-data/itunes2.xcf b/src/manage/missing-data/itunes2.xcf index 4ee24002..02d2e38a 100644 Binary files a/src/manage/missing-data/itunes2.xcf and b/src/manage/missing-data/itunes2.xcf differ