Merge v0.6.4 into release

Author: dg0yt

.gitattributes

@@ -2,3 +2,4 @@
 .gitattributes       export-ignore
 *.omap               binary diff=xmllint
 *.ocd                binary
+*.ts                 binary diff=xmllint

3rd-party/clipper/CMakeLists.txt

@@ -93,10 +93,12 @@ include(ExternalProject)
 ExternalProject_Add(
   Clipper
   ${CLIPPER_SOURCE}
-  # Check that the license hasn't changed.
-  UPDATE_COMMAND ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/License.txt "${CLIPPER_LICENSE_FILE}"
-  # Force source file timestamp update.
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/cpp/clipper.cpp "${CMAKE_CURRENT_BINARY_DIR}/clipper.cpp"
+  CONFIGURE_COMMAND
+    # Check that the license hasn't changed.
+    ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/License.txt "${CLIPPER_LICENSE_FILE}"
+  COMMAND
+    # Force source file timestamp update.
+    ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/cpp/clipper.cpp "${CMAKE_CURRENT_BINARY_DIR}/clipper.cpp"
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
 )

3rd-party/doxygen/CMakeLists.txt

@@ -76,8 +76,11 @@ ExternalProject_Add(
   ${DOXYGEN_SOURCE}
   # Check that the license hasn't changed.
   PATCH_COMMAND sed -e "/This version of Mac OS X is unsupported/d" -i.orig qtools/qglobal.h
-  UPDATE_COMMAND ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE "${DOXYGEN_LICENSE_FILE}"
-  CONFIGURE_COMMAND "<SOURCE_DIR>/configure" "--release" "--prefix" "<INSTALL_DIR>"
+  CONFIGURE_COMMAND
+    # Check that the license hasn't changed.
+    ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE "${DOXYGEN_LICENSE_FILE}"
+  COMMAND
+    "<SOURCE_DIR>/configure" "--release" "--prefix" "<INSTALL_DIR>"
   BUILD_IN_SOURCE 1
 )
 ExternalProject_Get_Property(doxygen-project INSTALL_DIR)

3rd-party/gdal/CMakeLists.txt

@@ -127,14 +127,14 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/download
   URL ${GDAL_URL}
   URL_MD5 ${GDAL_MD5}
-  # Check that the license hasn't changed.
-  UPDATE_COMMAND
-    ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE.TXT "${GDAL_LICENSE_FILE}"
   PATCH_COMMAND
     cp ${PROJECT_SOURCE_DIR}/patches/config.sub ${PROJECT_SOURCE_DIR}/patches/config.guess <SOURCE_DIR>/
   COMMAND
     find ${PROJECT_SOURCE_DIR}/patches -name gdal-${GDAL_MAJOR_MINOR_REVISION}*.patch -exec patch -p0 -N -i {} +
   CONFIGURE_COMMAND
+    # Check that the license hasn't changed.
+    ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/LICENSE.TXT "${GDAL_LICENSE_FILE}"
+  COMMAND
     "<SOURCE_DIR>/configure"
     "--prefix=<INSTALL_DIR>"
     --disable-static

3rd-party/proj/CMakeLists.txt

@@ -88,10 +88,12 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/download
   URL "http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz"
   URL_MD5 ${PROJ_MD5}
-  # Check that the license hasn't changed.
-  UPDATE_COMMAND ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/COPYING "${PROJ_LICENSE_FILE}"
   PATCH_COMMAND "${SH_PROGRAM}" -l -e ${CMAKE_CURRENT_BINARY_DIR}/proj-patch
-  CONFIGURE_COMMAND "${SH_PROGRAM}" -l -e ${CMAKE_CURRENT_BINARY_DIR}/proj-config
+  CONFIGURE_COMMAND
+    # Check that the license hasn't changed.
+    ${CMAKE_COMMAND} -E compare_files <SOURCE_DIR>/COPYING "${PROJ_LICENSE_FILE}"
+  COMMAND
+    "${SH_PROGRAM}" -l -e ${CMAKE_CURRENT_BINARY_DIR}/proj-config
   BUILD_COMMAND ${PROJ_MAKE_COMMAND}
   INSTALL_COMMAND ${PROJ_MAKE_COMMAND} -j1 install
                && "${SH_PROGRAM}" -l -e ${CMAKE_CURRENT_BINARY_DIR}/proj-postinstall

CMakeLists.txt

@@ -19,6 +19,10 @@
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 cmake_policy(SET CMP0020 OLD)
+if(CMAKE_VERSION VERSION_GREATER 2.9)
+cmake_policy(SET CMP0026 OLD)
+cmake_policy(SET CMP0048 OLD)
+endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(FeatureSummary)
@@ -27,15 +31,15 @@ include(FeatureSummary)
 
 project(Mapper)
 
-set(Mapper_COPYRIGHT "(C) 2012-2015 OpenOrienteering developers")
+set(Mapper_COPYRIGHT "(C) 2012-2016 OpenOrienteering developers")
 
 # All version components must be integers.
 # We use Mapper_VERSION_PATCH >= 99 to mark development builds.
 set(Mapper_VERSION_MAJOR 0)
 set(Mapper_VERSION_MINOR 6)
 if(NOT Mapper_VERSION_PATCH)
 	# This can be configured when running cmake
-	set(Mapper_VERSION_PATCH 3)
+	set(Mapper_VERSION_PATCH 4)
 endif()
 
 set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")
@@ -255,7 +259,7 @@ if(Mapper_DEVELOPMENT_BUILD)
 	add_definitions(-DMAPPER_DEVELOPMENT_BUILD)
 	include(EnableSanitize)
 	enable_sanitize(address undefined)
-	configure_file(suppress.txt.in suppress.txt COPY_ONLY)
+	configure_file(suppress.txt.in suppress.txt COPYONLY)
 else()
 	add_definitions(-DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DNDEBUG)
 endif()

README.md

@@ -26,16 +26,7 @@ Pull requests are very welcome.
 
 ### Translating
 
-The translations for Mapper are stored in `translations/OpenOrienteering_{LANGUAGE}.ts`.
-The best way to edit those files is by using [Qt Linguist for translation](http://doc.qt.io/qt-5/linguist-translators.html).
-The translations can also be edited with any XML editor.
-
-Adding a new translation is done by making a new copy of `OpenOrienteering_template.ts`
-and replacing `template` in the file name with the matching language code.
-The new file also has to be added to `translations/CMakeLists.txt`.
-
-Some strings such as basic buttons and colors get their translation from the
-Qt Framework. For translating those see [Qt Localization](https://wiki.qt.io/Qt_Localization).
+Translations can be edited online on [Weblate](https://hosted.weblate.org/projects/openorienteering/mapper/). You can register/login with your Github account. Find out more about translation in our [wiki](https://github.com/OpenOrienteering/mapper/wiki/Translation).
 
 
 ### Writing Documentation

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.3" android:versionCode="3" package="org.openorienteering.mapper" android:installLocation="auto">
+<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">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

doc/manual/pages/android-requirements.md

@@ -42,8 +42,10 @@ Sensors
 
 OpenOrienteering Mapper can use integrated GPS receivers. However, their
 accuracy may be low, so it may be advantageous to connect to an external GPS
-receiver. This can be done on the level of the Android Operating System (i.e.
-not directly in the Mapper app), and instructions can be found on the internet.
+receiver. There is no direct support for external devices in Mapper, but
+some third party apps bridge the gap. For example the [Bluetooth GPS app](https://play.google.com/store/apps/details?id=googoo.android.btgps&rdid=googoo.android.btgps)
+provides a "mock" location provider which can be used when Android is put in
+developer mode.
 
 The app can use a magnetometer and accelerometer as a compass. Almost all modern
 devices should contain these sensors. If a gyroscope is also available, it will

doc/manual/pages/course_design.md

@@ -0,0 +1,81 @@
+---
+title: Using the Course Design Symbol Set
+keywords: Courses, Symbol sets
+---
+
+[Templates]: templates.md
+[IOF Homepage]: http://orienteering.org
+
+OpenOrienteering Mapper doesn't have a sophisticated course planning feature.
+The Course Design symbol set provides basic support for designing maps with
+courses and control desriptions. It contains the overprinting symbols from the
+ISOM 2000 and the control descriptions from IOF's "International Specification
+for Control Descriptions - 2004". See the [IOF Homepage] for details.
+
+![ ](images/course_design.png)
+
+
+Loading a base map
+------------------
+
+Open the base map as a template in the background. See [Templates] for details.
+
+
+Drawing the course
+------------------
+
+For simple courses which consist only of start, controls, finish and free
+navigation you may use symbol 799 Simple Orienteering Course. For more complex
+courses use the individual overprinting symbols. The labels for the controls
+have to be created explicitly.
+
+
+Creating the control description sheet
+--------------------------------------
+
+The Course Design symbol set contains the individual pictograms as well as
+symbols for the different sections which together form the control description
+sheet. The pictograms' names indicate the column of the control description sheet where
+they are to be used.
+
+The control description symbols are meant to be used with a grid of horizontal
+and vertical lines spaced 3.0 millimeters. By pressing the Shift key while
+creating a new element, you may easily align all the parts of the description.
+
+
+About the control description sheet
+-----------------------------------
+
+The control description sheet starts with a heading which consists of blocks for
+the event title, classes (optional), and (in a single row) course code, course
+length and and height climb. The course length is given in kilometres rounded to
+the nearest 0.1 km. The height climb is given in metres rounded to the nearest
+5 m.
+
+The heading is followed by lines describing the start location, the individual
+controls, and special routes. The description of start and individual controls
+uses eight colums which are refered to as A...H.
+
+| Column | Description |
+| ------ | ----------- |
+| A      | Control number. Numbering of controls is in the sequence they are to be visited, unless the description is for a Score competition. |
+| B      | Control code. The control code should be a number greater than 30. |
+| C      | Which of any similar feature. This column is used when there is more than one similar feature within the control circle; e.g. south eastern. |
+| D      | Control feature. The feature, as shown on the map, at the centre of the circle deÞ ning the control site; e.g. clearing; boulder. The description of each control is based on the International Specification for Orienteering Maps (ISOM 2000). |
+| E      | Appearance. Further information on the nature of the feature if it is required; e.g. overgrown; ruined. In certain circumstances also used for a second control feature where the description requires this. |
+ | F      | Dimensions / Combinations. Dimensions of the feature should be given where the size of the control feature on the map is symbolic rather than to scale. Also used for the two combination symbols (crossing; junction). |
+| G       | Location of the control flag. Position of the control flag with respect to the feature; e.g. west corner (outside); south foot. |
+| H       | Other information. Other information that may be of importance to the competitor; e.g. radio control; refreshments. |
+
+
+Specifications for Trail Orienteering
+-------------------------------------
+
+There are two variations in the use of the columns when using IOF Control Descriptions for Trail Orienteering.
+
+| Column | Description |
+| ------ | ----------- |
+| B      | Number of control flags. This column is used to denote the number of control flags visible at this control; e.g. A-C equals three control flags to choose from; A-D equals four control flags to choose from. |
+| H      | Direction of observation. This column is used to denote the direction in which to view a feature. For example an arrow pointing north indicates that the competitor should be on a path/track to the south of the control circle. |
+
+