Skip to content

Commit 767d819

Browse files
dg0ytdg0yt
committed
Merge v0.6.5 into release
2 parents 1a275e9 + 9b191f9 commit 767d819

Some content is hidden

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

50 files changed

+13100
-13626
lines changed

‎.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
*.omap binary diff=xmllint
44
*.ocd binary
55
*.ts binary diff=xmllint
6+
3rd-party/* linguist-vendored
7+
doc/* linguist-documentation
8+
help/* linguist-documentation

‎.github/ISSUE_TEMPLATE.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Steps to reproduce
2+
1.
3+
2.
4+
3.
5+
6+
### Actual behaviour
7+
Tell us what happens
8+
9+
### Expected behaviour
10+
Tell us what should happen instead
11+
12+
### Configuration
13+
Mapper Version:
14+
Operating System:

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(Mapper_VERSION_MAJOR 0)
3939
set(Mapper_VERSION_MINOR 6)
4040
if(NOT Mapper_VERSION_PATCH)
4141
# This can be configured when running cmake
42-
set(Mapper_VERSION_PATCH 4)
42+
set(Mapper_VERSION_PATCH 5)
4343
endif()
4444

4545
set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")

‎android/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.4" android:versionCode="4" package="org.openorienteering.mapper" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.5" android:versionCode="5" package="org.openorienteering.mapper" android:installLocation="auto">
33
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
44
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
55
android:name="org.openorienteering.mapper.MapperActivity"

‎doc/manual/pages/android-app.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords: Android
55

66
[Toolbars]: toolbars.md
77

8-
On startup, the app shows a list of available map files. In case there are no map files, you probably misspelled the map folder name (see previous section). To start editing a map, touch its filename.
8+
On startup, the app shows a list of map files available from the [supported storage locations](android-storage.md). To start editing a map, touch its filename.
99

1010
This will show a map editor screen which is similar to the desktop version. In the following, only the functionality which differs from the desktop version will be explained. To find out about the other symbols, see [Toolbars] in the desktop application's manual.
1111

‎doc/manual/pages/android-index.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ Contents
2121

2222
[Preparing a map on the PC](android-pc.md){: .subpage}
2323

24-
[Transferring the map to the Android device](android-pc.md#android-transfer-to-device){: .subpage}
24+
[Storing Maps and Templates on Android Devices](android-storage.md){: .subpage}
2525

2626
[Using the Mapper app](android-app.md){: .subpage}
2727

28-
[Transferring the map back to the PC](android-pc.md#android-transfer-to-pc){: .subpage}

‎doc/manual/pages/android-pc.md

-22
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,3 @@ artifacts when saving the file and loading it again.
9494
Note that to view the scribbles on a PC after creating them on a mobile device,
9595
you need to transfer not only the map file, but also the affected image template
9696
file(s) back to the PC, as the scribbles are saved directly in the image files.
97-
98-
99-
100-
Transferring the map to the Android device {#android-transfer-to-device}
101-
==========================================
102-
103-
Create a folder named "OOMapper" (spelled exactly like this) either in the
104-
device's internal storage root or in its SD card root folder. Then copy the
105-
map(s) to use together with all of their template files into this folder.
106-
107-
Be aware that some devices use an uncommon protocol for direct file transfer via
108-
cable, which might not be well supported by your PC. This might corrupt files
109-
during transfer such that they cannot be opened on the target device. This can
110-
be worked around by choosing another method for file transfer.
111-
112-
113-
114-
Transferring the map back to the PC {#android-transfer-to-pc}
115-
===================================
116-
117-
Simply copy the map files and any templates you drew on with the
118-
paint-on-template functionality from the "OOMapper" folder back to your PC.

‎doc/manual/pages/android-requirements.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords: Android
66
Android version
77
---------------
88

9-
The minimum version for running the app is 2.3.
9+
The minimum version for running the app is 2.3. Write access to SD cards may require Android 4.4 (cf. [Storage locations](android-storage.md))
1010

1111

1212
Water-proofing

‎doc/manual/pages/android-storage.md

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
title: Storing Maps and Templates on Android Devices
3+
keywords: Android
4+
---
5+
6+
Storage locations
7+
-----------------
8+
9+
Android organizes storage and permissions different than PCs.
10+
Especially on SD cards, write access for apps is restricted.
11+
12+
You can choose the following locations for storing data which you want to edit and to display in OpenOrienteering Mapper:
13+
14+
- Folder "OOMapper" at the top level of the primary storage volume. On most devices, the primary storage volume is a part of the built-in storage.
15+
Files in this area are stored permanently, until you decide to remove them.
16+
Unfortunately, there is usually only limited capacity available - this memory is expensive when buying the device.
17+
18+
- Path "Android/data/org.openorienteering.mapper/files" on arbitrary storage volumes such as SD cards (since Mapper 0.6.5).
19+
This is the only convenient way to store map data on cheap extra memory cards.
20+
However, you need to be aware of the fact that these folders are removed by Android when you uninstall the Mapper app.
21+
So please carefully save your changes to a PC.
22+
23+
OpenOrienteering Mapper for Android will create these folders when they are missing, and scan them for map files.
24+
It will display warnings when you open maps from the non-permanent app-specific folders or from read-only locations. (Top-level "OOMapper" folders on secondary storage volumes are scanned, but cannot be written to.)
25+
26+
27+
File transfer
28+
-------------
29+
30+
You can transfer files from and to a PC via a USB cable. Android supports multiple file transfer protocols.
31+
32+
- MTP is the preferred method now. There is hardly any interference for apps while the device is connected to the PC.
33+
Via MTP, Android will only show files which are known to its Media Scanner. If you cannot find a file such a recorded GPX track, a reboot of the device could trigger a rescan.
34+
35+
- Mass Storage makes the storage unavailable for apps for the duration of the connection with the PC.
36+
(Android also needs to terminate apps which are stored on the volume which is provided as mass storage.)
37+
Unlike MTP, mass storage does not depend on the media scanner, so all files are always visible.
38+
39+
In some cases, users suffered from files being damaged during transfer. This can be worked around by choosing another method for file transfer. Remember to keep backups and to verify transferred files.

‎doc/manual/postprocess-qhp.cmake.in

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ string(MD5 file_md5 "${output}")
2222

2323
string(REGEX REPLACE " *<file>tabs.css.*sync_off.png</file>" "" output "${output}")
2424
string(REGEX REPLACE " *<file>ftv2.*ftv2[^.]*[.]png</file>" "" output "${output}")
25+
string(REGEX REPLACE " *<file>openorienteering.png</file>" "" output "${output}")
26+
string(REGEX REPLACE "( *)(<file>index.html</file>)" "\\1\\2\n\\1<file>openorienteering.png</file>" output "${output}")
2527
string(MD5 output_md5 "${output}")
2628
if(NOT "${output_md5}" STREQUAL "${file_md5}")
2729
message(STATUS "Updating ${index_qhp}")

‎examples/autosave-example.qrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<RCC>
22
<qresource prefix="/examples">
3-
<file alias="autosave-test.omap.autosave">sprint sample.omap</file>
3+
<file alias="autosave-test.omap.autosave">complete map.omap</file>
44
<file alias="autosave-test.omap">overprinting.omap</file>
55
</qresource>
66
</RCC>

‎help/tip-of-the-day/tips_fr.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ Toutes les largeurs de lignes et les tailles des symboles doivent conserver leur
1111
Pour les lignes en pointillés : au moins deux pointillés doivent apparaître
1212
Pour les lignes en tirets : au moins deux tirets doivent apparaître
1313
Les surfaces délimitées par des lignes tirets doivent avoir un diamètre au moins égal à 1,5 mm et être composées d'au moins 5 tirets
14-
Les surfaces de couleurs doivent avoir un diamètre mininum :<br/>Bleu, vert, gris ou jaune en plein : 0,5 mm²; <br/>Pointillés noirs : 0,5 mm²; <br/>Bleu, marron, vert ou jaune en pointillés : 1,0 mm²
14+
Les surfaces de couleurs doivent avoir un diamètre minimum :<br/>Bleu, vert, gris ou jaune en plein : 0,5 mm²; <br/>Pointillés noirs : 0,5 mm²; <br/>Bleu, marron, vert ou jaune en pointillés : 1,0 mm²
1515
Tous les objets plus petits que les dimensions minimums doivent être exagérées (agrandies sur la carte) ou ne pas apparaître, en fonction de leur utilité ou non pour les orienteurs.
1616
La taille d'une carte de sprint ne doit pas dépasser le format A4.

‎oo-mapper-version.pri

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Generated in CMakeLists.txt, do not edit here.
22
Mapper_VERSION_MAJOR = 0
33
Mapper_VERSION_MINOR = 6
4-
Mapper_VERSION_PATCH = 4
4+
Mapper_VERSION_PATCH = 5

‎src/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ set(Mapper_Common_SRCS
4747
core/map_printer.cpp
4848
core/map_view.cpp
4949
core/path_coord.cpp
50+
core/storage_location.cpp
5051
core/virtual_path.cpp
5152
core/virtual_coord_vector.cpp
5253

0 commit comments

Comments
 (0)