Merge branch 'master' into release

OpenOrienteering · Aug 11, 2018 · 6916564 · 6916564
2 parents 6ecda78 + fc41d29
commit 6916564
Show file tree

Hide file tree

Showing 75 changed files with 31,658 additions and 19,002 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,9 +23,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(FeatureSummary)
 
+if(CCACHE_PROGRAM)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+endif()
+
 # Project declaration
 
-project(Mapper VERSION 0.8.1.2 LANGUAGES CXX C)
+project(Mapper VERSION 0.8.2 LANGUAGES CXX C)
 
 if(Mapper_VERSION_DISPLAY)
 	message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")

diff --git a/INSTALL.md b/INSTALL.md
@@ -19,11 +19,11 @@ components. Direct dependencies are:
  - Clipper library (aka libpolyclipping) >= 6.1.3.a
    http://www.angusj.com/delphi/clipper.php
  - PROJ.4 Cartographic Projections Library >= 4.8
-   http://proj4.org/
+   https://proj4.org/
  - GDAL Geospatial Data Abstraction Library
-   http://www.gdal.org/
+   https://www.gdal.org/
  - ZLib Compression Library
-   http://zlib.net/
+   https://zlib.net/
 
 When building for Linux, you may use the distributions' packages. 
 However, openSUSE is known to lack the Clipper library.
@@ -109,7 +109,7 @@ it needs.
 
 For setting up Kits, see the Qt Creator documentation:
 
-http://doc.qt.io/qtcreator/creator-targets.html
+https://doc.qt.io/qtcreator/creator-targets.html
 
 Starting with Qt Creator 4.3, it might become possible to simply open the
 superbuild's openorienteering-mapper build directory as a regular project

diff --git a/README.md b/README.md
@@ -1,15 +1,15 @@
 # OpenOrienteering Mapper
 
-![Mapper Screenshot](http://openorienteering.github.io/mapper-manual/pages/images/main_window.png)
+![Mapper Screenshot](https://www.openorienteering.org/mapper-manual/pages/images/main_window.png)
 
 OpenOrienteering Mapper is an orienteering mapmaking program and provides
 a free and open source alternative to existing commercial software.
 OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
 
- - [Mapper Homepage](http://www.openorienteering.org/apps/mapper/)
- - [Manual](http://www.openorienteering.org/mapper-manual/)
+ - [Mapper Homepage](https://www.openorienteering.org/apps/mapper/)
+ - [Manual](https://www.openorienteering.org/mapper-manual/)
  - [Downloads](https://github.com/OpenOrienteering/mapper/releases)
- - [OpenOrienteering Blog](http://www.openorienteering.org/)
+ - [OpenOrienteering Blog](https://www.openorienteering.org/)
 
 
 ## Reporting Issues and Asking for Help
@@ -37,7 +37,7 @@ For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrient
 Pull requests are very welcome.
 
  - [Issue tracker](https://github.com/OpenOrienteering/mapper/issues)
- - [API documentation](http://www.openorienteering.org/api-docs/mapper/)
+ - [API documentation](https://www.openorienteering.org/api-docs/mapper/)
  - [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
 
 

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.1" android:versionCode="801" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.8.2" android:versionCode="802" 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"

diff --git a/doc/licensing/CMakeLists.txt b/doc/licensing/CMakeLists.txt
@@ -34,7 +34,7 @@ endforeach()
 
 # Select default provider
 if(ANDROID OR APPLE OR WIN32)
-	set(default_provider superbuild)
+	set(default_provider OFF)
 elseif(UNIX)
 	execute_process(
 	  COMMAND sh -c ". /etc/os-release; echo $ID"

diff --git a/doc/licensing/licensing.html b/doc/licensing/licensing.html
@@ -31,7 +31,7 @@ <h2 id="openorienteering-mapper">
 </h2>
 <p>
   OpenOrienteering Mapper is a free software for drawing orienteering maps.<br />
-  <a href="http://www.openorienteering.org/apps/mapper/">http://www.openorienteering.org/apps/mapper/</a>
+  <a href="https://www.openorienteering.org/apps/mapper/">https://www.openorienteering.org/apps/mapper/</a>
 </p>
 <p>
   @Mapper_COPYRIGHT@

diff --git a/doc/licensing/opensuse-leap-licensing.cmake b/doc/licensing/opensuse-leap-licensing.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")
diff --git a/doc/licensing/opensuse-licensing.cmake b/doc/licensing/opensuse-licensing.cmake
@@ -1,5 +1,5 @@
 #
-#    Copyright 2017 Kai Pastor
+#    Copyright 2017, 2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -21,10 +21,16 @@
 
 include("linux-distribution.cmake")
 
+find_file (GDAL_LICENSE_TXT
+  NAMES LICENSE.TXT
+  PATHS /usr/share/licenses/gdal-devel
+        /usr/share/doc/packages/gdal-devel
+  NO_DEFAULT_PATH
+)
 set(explicit_copyright_gdal
   # Copy! Package libgdal* does not include this file.
   "gdal.txt"
-  "/usr/share/doc/packages/gdal-devel/LICENSE.TXT"
+  "${GDAL_LICENSE_TXT}"
   "3rd-party"
 )
 

diff --git a/doc/licensing/opensuse-tumbleweed-licensing.cmake b/doc/licensing/opensuse-tumbleweed-licensing.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")
diff --git a/doc/licensing/src/licensing.qdoc b/doc/licensing/src/licensing.qdoc
@@ -26,7 +26,7 @@
 \section1 OpenOrienteering Mapper
 
 \e {OpenOrienteering Mapper is a free software for drawing orienteering maps.} \break
-\l http://openorienteering.org
+\l https://www.openorienteering.org
 
 Copyright (C) 2012-2015 Kai Pastor, Thomas Schöps
 

diff --git a/doc/man/Mapper.1 b/doc/man/Mapper.1
@@ -83,7 +83,7 @@ Report bugs in the OpenOrienteering ticket system:
 .SH COPYRIGHT
 Copyright \(co 2017 The OpenOrienteering developers
 .br
-License GPLv3: GNU GPL version 3 <http://gnu.org/licenses/gpl.html>.
+License GPLv3: GNU GPL version 3 <https://www.gnu.org/licenses/gpl.html>.
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
@@ -93,4 +93,4 @@ Extended documentation for
 .B Mapper
 is available from the program's help menu and also online at:
 .br
-<http://www.openorienteering.org/mapper-manual/>
+<https://www.openorienteering.org/mapper-manual/>
diff --git a/doc/manual/pages/android-app.md b/doc/manual/pages/android-app.md
@@ -23,7 +23,7 @@ the desktop version, so please read this first for important instructions.
 [Storing Maps and Templates on Android Devices](android-storage.md){: .subpage}
 
 {% if doxygen %}
-**Note:** The [online version](http://www.openorienteering.org/mapper-manual/android/) of this documentation may contain additions and corrections.
+**Note:** The [online version](https://www.openorienteering.org/mapper-manual/android/) of this documentation may contain additions and corrections.
 {% endif %}
 
 

diff --git a/doc/manual/pages/android-pc.md b/doc/manual/pages/android-pc.md
@@ -9,7 +9,7 @@ If you want to use live GPS display, the map must be georeferenced. There are se
 
 ## Georeferencing when you create a new map
 
-The first thing to do after creating a new map should be to load a georeferenced template. If you do not have one, you may use for example an OpenStreetMap export in case there is sufficient data at the map's location. To do so, go to http://www.openstreetmap.org, locate the map region, and click 'Export'. Then select an area which covers all of your templates and save the export as .osm file. This file can then be loaded into Mapper as a georeferenced template.
+The first thing to do after creating a new map should be to load a georeferenced template. If you do not have one, you may use for example an OpenStreetMap export in case there is sufficient data at the map's location. To do so, go to https://www.openstreetmap.org, locate the map region, and click 'Export'. Then select an area which covers all of your templates and save the export as .osm file. This file can then be loaded into Mapper as a georeferenced template.
 
 On loading the first georeferenced template, Mapper will show the georeferencing dialog. This may look a bit intimidating at first, but when loading a template, usually little needs to be changed there. First, the projection type should be checked. If you do not know which projection to use, just select UTM. Second, the magnetic declination should be entered to align the map with magnetic north. You may simply use the lookup button to look it up on the internet for the place of the template you loaded. However, be aware that the lookup only uses a model which may deviate from the real declination. It may be advantageous to check this in the terrain. All remaining values in the georeferencing dialog are already initialized using the newly loaded template, so you can then finish the dialog.
 

diff --git a/doc/manual/pages/course_design.md b/doc/manual/pages/course_design.md
@@ -4,7 +4,7 @@ keywords: Courses, Symbol sets
 ---
 
 [Templates]: templates.md
-[IOF Homepage]: http://orienteering.org
+[IOF Homepage]: https://orienteering.org
 
 OpenOrienteering Mapper doesn't have a sophisticated course planning feature.
 The Course Design symbol set provides basic support for designing maps with

diff --git a/doc/manual/pages/file_menu.md b/doc/manual/pages/file_menu.md
@@ -19,7 +19,7 @@ This shows the dialog to create a [new map](new_map.md).
 #### ![ ](../mapper-images/open.png) Open...
 **Ctrl+O**
 
-Shows the dialog to open an existing map file. Currently supported formats are .omap, .xmap or .ocd (versions 6 to 11).
+Shows the dialog to open an existing map file. Currently supported formats are .omap, .xmap or .ocd (versions 6 to 12).
 
 
 #### Open recent

diff --git a/doc/manual/pages/georeferencing.md b/doc/manual/pages/georeferencing.md
@@ -16,7 +16,7 @@ edited: 25 February 2013
 
 #### Introduction
 
-Georeferencing of a map is the best way for aligning templates (such as base maps or aerial imagery) and GPS tracks. In short, to georeference a map means to establish a known relationship between the paper coordinates of the map and the coordinates of a geographic coordinate reference system. This way, data which is known in a geographic coordinate reference system (such as GPS coordinates) can be transformed to map coordinates and thus displayed on the map, and vice versa the map can be transformed to geographic coordinates and e.g. be displayed on a world map. More information is available on [Wikipedia](http://en.wikipedia.org/wiki/Georeferencing).
+Georeferencing of a map is the best way for aligning templates (such as base maps or aerial imagery) and GPS tracks. In short, to georeference a map means to establish a known relationship between the paper coordinates of the map and the coordinates of a geographic coordinate reference system. This way, data which is known in a geographic coordinate reference system (such as GPS coordinates) can be transformed to map coordinates and thus displayed on the map, and vice versa the map can be transformed to geographic coordinates and e.g. be displayed on a world map. More information is available on [Wikipedia](https://en.wikipedia.org/wiki/Georeferencing).
 
 Georeferencing properties are set in a dialog which is available from the menu **Map &gt; Georeferencing...**. The dialog is divided in three sections: Map coordinate reference system, Reference point and Map north.
 
@@ -27,7 +27,7 @@ Georeferencing properties are set in a dialog which is available from the menu *
 This section defines in which kind of projected coordinates (real-world metric cartesian coordinates) the reference point relating map and geographic coordinates is defined. Projected coordinates are transformed to map coordinates by scaling and rotation. You should thus choose the coordinate reference system in which you know the real-world coordinates of a point on the map. In case you just want to load some GPS tracks, you can also just safely use UTM, which is widely used world-wide. Other choices are:
 
  - **Gauss-Kr&uuml;ger**: this is similar to UTM and widely used in Germany, but is being superseded by UTM.
- - **From Proj.4 specification**: projections are internally handled by the [PROJ.4 Cartographic Projections library](http://proj4.org/), so coordinate reference systems can also be given in its internal specification format. Examples may be found at [http://www.remotesensing.org/geotiff/proj_list/ (Internet Archive)](https://web.archive.org/web/20160802172057/http://www.remotesensing.org/geotiff/proj_list/) and [http://spatialreference.org/](http://spatialreference.org/). When selecting this option, the specification field will be pre-filled with the specification of the previously selected coordinate reference system.
+ - **From Proj.4 specification**: projections are internally handled by the [PROJ.4 Cartographic Projections library](https://proj4.org/), so coordinate reference systems can also be given in its internal specification format. Examples may be found at [http://www.remotesensing.org/geotiff/proj_list/ (Internet Archive)](https://web.archive.org/web/20160802172057/http://www.remotesensing.org/geotiff/proj_list/) and [http://spatialreference.org/](http://spatialreference.org/). When selecting this option, the specification field will be pre-filled with the specification of the previously selected coordinate reference system.
  - **Local**: this enables you to use local projected coordinates without a mapping to global geographic coordinates.
 
 Depending on the selected coordinate reference system more settings may show up. For example, for UTM the zone number must be given in addition.
@@ -68,6 +68,6 @@ The (mouse) cursor position of the map editor can be displayed in map coordinate
 
 #### Further reading
 
- - Wikipedia: [Geographic coordinate systems](http://en.wikipedia.org/wiki/Geographic_coordinate_system)
- - Richard Knippers (2009): [Geometric Aspects of Mapping](http://kartoweb.itc.nl/geometrics/)
+ - Wikipedia: [Geographic coordinate systems](https://en.wikipedia.org/wiki/Geographic_coordinate_system)
+ - Richard Knippers (2009): [Geometric Aspects of Mapping](https://kartoweb.itc.nl/geometrics/)
  - Larry Simons (2005): [Magnetic Declination &amp; Grid Convergence](http://www.threelittlemaids.co.uk/magdec/explain.html)
diff --git a/doc/manual/pages/index.md b/doc/manual/pages/index.md
@@ -1,13 +1,13 @@
 ---
 title: User Manual
-edited: 24 January 2018
+edited: 3 June 2018
 redirect_from:
   - /
   - /Home
 ---
 
 {% if doxygen %}
-**Note:** The [online version](http://www.openorienteering.org/mapper-manual/) of this documentation may contain additions and corrections.
+**Note:** The [online version](https://www.openorienteering.org/mapper-manual/) of this documentation may contain additions and corrections.
 {% endif %}
 
 ## Contents
@@ -22,7 +22,7 @@ Toolbar and menu items, including explanations for [all drawing tools](toolbars.
 First steps.
 
 [Georeferencing](georeferencing.md){: .subpage}
-Defining the relationship between map paper coordinates and real world coordinates system.
+Defining the relationship between map paper coordinates and real world coordinates.
 
 [Map grid](grid.md){: .subpage}
 Showing a helper grid in the map view.
@@ -31,7 +31,7 @@ Showing a helper grid in the map view.
 Working with templates.
 
 [Colors and symbols](colors_symbols.md){: .subpage}
-Modifying map colors and symbols,
+Modifying map colors and symbols.
 
 [Map parts](map_parts.md){: .subpage}
 Organizing objects in maps.
@@ -60,7 +60,7 @@ Frequently asked questions.
 
 ## Online resources
 
-[Blog](http://www.openorienteering.org/)
+[Blog](https://www.openorienteering.org/)
 The latest news from OpenOrienteering.
 
 [Issues list](https://github.com/OpenOrienteering/mapper/issues)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")