Skip to content

Commit 6916564

Browse files
dg0ytdg0yt
committed
Merge branch 'master' into release
2 parents 6ecda78 + fc41d29 commit 6916564

File tree

75 files changed

+31658
-19002
lines changed

Some content is hidden

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

75 files changed

+31658
-19002
lines changed

‎CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2323

2424
include(FeatureSummary)
2525

26+
if(CCACHE_PROGRAM)
27+
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
28+
endif()
29+
2630
# Project declaration
2731

28-
project(Mapper VERSION 0.8.1.2 LANGUAGES CXX C)
32+
project(Mapper VERSION 0.8.2 LANGUAGES CXX C)
2933

3034
if(Mapper_VERSION_DISPLAY)
3135
message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")

‎INSTALL.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ components. Direct dependencies are:
1919
- Clipper library (aka libpolyclipping) >= 6.1.3.a
2020
http://www.angusj.com/delphi/clipper.php
2121
- PROJ.4 Cartographic Projections Library >= 4.8
22-
http://proj4.org/
22+
https://proj4.org/
2323
- GDAL Geospatial Data Abstraction Library
24-
http://www.gdal.org/
24+
https://www.gdal.org/
2525
- ZLib Compression Library
26-
http://zlib.net/
26+
https://zlib.net/
2727

2828
When building for Linux, you may use the distributions' packages.
2929
However, openSUSE is known to lack the Clipper library.
@@ -109,7 +109,7 @@ it needs.
109109

110110
For setting up Kits, see the Qt Creator documentation:
111111

112-
http://doc.qt.io/qtcreator/creator-targets.html
112+
https://doc.qt.io/qtcreator/creator-targets.html
113113

114114
Starting with Qt Creator 4.3, it might become possible to simply open the
115115
superbuild's openorienteering-mapper build directory as a regular project

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# OpenOrienteering Mapper
22

3-
![Mapper Screenshot](http://openorienteering.github.io/mapper-manual/pages/images/main_window.png)
3+
![Mapper Screenshot](https://www.openorienteering.org/mapper-manual/pages/images/main_window.png)
44

55
OpenOrienteering Mapper is an orienteering mapmaking program and provides
66
a free and open source alternative to existing commercial software.
77
OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
88

9-
- [Mapper Homepage](http://www.openorienteering.org/apps/mapper/)
10-
- [Manual](http://www.openorienteering.org/mapper-manual/)
9+
- [Mapper Homepage](https://www.openorienteering.org/apps/mapper/)
10+
- [Manual](https://www.openorienteering.org/mapper-manual/)
1111
- [Downloads](https://github.com/OpenOrienteering/mapper/releases)
12-
- [OpenOrienteering Blog](http://www.openorienteering.org/)
12+
- [OpenOrienteering Blog](https://www.openorienteering.org/)
1313

1414

1515
## Reporting Issues and Asking for Help
@@ -37,7 +37,7 @@ For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrient
3737
Pull requests are very welcome.
3838

3939
- [Issue tracker](https://github.com/OpenOrienteering/mapper/issues)
40-
- [API documentation](http://www.openorienteering.org/api-docs/mapper/)
40+
- [API documentation](https://www.openorienteering.org/api-docs/mapper/)
4141
- [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
4242

4343

‎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.8.1" android:versionCode="801" package="org.openorienteering.mapper" android:installLocation="auto">
2+
<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">
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/licensing/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ endforeach()
3434

3535
# Select default provider
3636
if(ANDROID OR APPLE OR WIN32)
37-
set(default_provider superbuild)
37+
set(default_provider OFF)
3838
elseif(UNIX)
3939
execute_process(
4040
COMMAND sh -c ". /etc/os-release; echo $ID"

‎doc/licensing/licensing.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h2 id="openorienteering-mapper">
3131
</h2>
3232
<p>
3333
OpenOrienteering Mapper is a free software for drawing orienteering maps.<br />
34-
<a href="http://www.openorienteering.org/apps/mapper/">http://www.openorienteering.org/apps/mapper/</a>
34+
<a href="https://www.openorienteering.org/apps/mapper/">https://www.openorienteering.org/apps/mapper/</a>
3535
</p>
3636
<p>
3737
@Mapper_COPYRIGHT@

‎doc/licensing/opensuse-leap-licensing.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")

‎doc/licensing/opensuse-licensing.cmake

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2017 Kai Pastor
2+
# Copyright 2017, 2018 Kai Pastor
33
#
44
# This file is part of OpenOrienteering.
55
#
@@ -21,10 +21,16 @@
2121

2222
include("linux-distribution.cmake")
2323

24+
find_file (GDAL_LICENSE_TXT
25+
NAMES LICENSE.TXT
26+
PATHS /usr/share/licenses/gdal-devel
27+
/usr/share/doc/packages/gdal-devel
28+
NO_DEFAULT_PATH
29+
)
2430
set(explicit_copyright_gdal
2531
# Copy! Package libgdal* does not include this file.
2632
"gdal.txt"
27-
"/usr/share/doc/packages/gdal-devel/LICENSE.TXT"
33+
"${GDAL_LICENSE_TXT}"
2834
"3rd-party"
2935
)
3036

‎doc/licensing/opensuse-tumbleweed-licensing.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/opensuse-licensing.cmake")

‎doc/licensing/src/licensing.qdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
\section1 OpenOrienteering Mapper
2727

2828
\e {OpenOrienteering Mapper is a free software for drawing orienteering maps.} \break
29-
\l http://openorienteering.org
29+
\l https://www.openorienteering.org
3030

3131
Copyright (C) 2012-2015 Kai Pastor, Thomas Schöps
3232

‎doc/man/Mapper.1

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Report bugs in the OpenOrienteering ticket system:
8383
.SH COPYRIGHT
8484
Copyright \(co 2017 The OpenOrienteering developers
8585
.br
86-
License GPLv3: GNU GPL version 3 <http://gnu.org/licenses/gpl.html>.
86+
License GPLv3: GNU GPL version 3 <https://www.gnu.org/licenses/gpl.html>.
8787
.br
8888
This is free software: you are free to change and redistribute it.
8989
There is NO WARRANTY, to the extent permitted by law.
@@ -93,4 +93,4 @@ Extended documentation for
9393
.B Mapper
9494
is available from the program's help menu and also online at:
9595
.br
96-
<http://www.openorienteering.org/mapper-manual/>
96+
<https://www.openorienteering.org/mapper-manual/>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ the desktop version, so please read this first for important instructions.
2323
[Storing Maps and Templates on Android Devices](android-storage.md){: .subpage}
2424

2525
{% if doxygen %}
26-
**Note:** The [online version](http://www.openorienteering.org/mapper-manual/android/) of this documentation may contain additions and corrections.
26+
**Note:** The [online version](https://www.openorienteering.org/mapper-manual/android/) of this documentation may contain additions and corrections.
2727
{% endif %}
2828

2929

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If you want to use live GPS display, the map must be georeferenced. There are se
99

1010
## Georeferencing when you create a new map
1111

12-
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.
12+
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.
1313

1414
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.
1515

‎doc/manual/pages/course_design.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ keywords: Courses, Symbol sets
44
---
55

66
[Templates]: templates.md
7-
[IOF Homepage]: http://orienteering.org
7+
[IOF Homepage]: https://orienteering.org
88

99
OpenOrienteering Mapper doesn't have a sophisticated course planning feature.
1010
The Course Design symbol set provides basic support for designing maps with

‎doc/manual/pages/file_menu.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This shows the dialog to create a [new map](new_map.md).
1919
#### ![ ](../mapper-images/open.png) Open...
2020
**Ctrl+O**
2121

22-
Shows the dialog to open an existing map file. Currently supported formats are .omap, .xmap or .ocd (versions 6 to 11).
22+
Shows the dialog to open an existing map file. Currently supported formats are .omap, .xmap or .ocd (versions 6 to 12).
2323

2424

2525
#### Open recent

‎doc/manual/pages/georeferencing.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ edited: 25 February 2013
1616

1717
#### Introduction
1818

19-
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).
19+
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).
2020

2121
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.
2222

@@ -27,7 +27,7 @@ Georeferencing properties are set in a dialog which is available from the menu *
2727
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:
2828

2929
- **Gauss-Kr&uuml;ger**: this is similar to UTM and widely used in Germany, but is being superseded by UTM.
30-
- **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.
30+
- **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.
3131
- **Local**: this enables you to use local projected coordinates without a mapping to global geographic coordinates.
3232

3333
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
6868

6969
#### Further reading
7070

71-
- Wikipedia: [Geographic coordinate systems](http://en.wikipedia.org/wiki/Geographic_coordinate_system)
72-
- Richard Knippers (2009): [Geometric Aspects of Mapping](http://kartoweb.itc.nl/geometrics/)
71+
- Wikipedia: [Geographic coordinate systems](https://en.wikipedia.org/wiki/Geographic_coordinate_system)
72+
- Richard Knippers (2009): [Geometric Aspects of Mapping](https://kartoweb.itc.nl/geometrics/)
7373
- Larry Simons (2005): [Magnetic Declination &amp; Grid Convergence](http://www.threelittlemaids.co.uk/magdec/explain.html)

‎doc/manual/pages/index.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: User Manual
3-
edited: 24 January 2018
3+
edited: 3 June 2018
44
redirect_from:
55
- /
66
- /Home
77
---
88

99
{% if doxygen %}
10-
**Note:** The [online version](http://www.openorienteering.org/mapper-manual/) of this documentation may contain additions and corrections.
10+
**Note:** The [online version](https://www.openorienteering.org/mapper-manual/) of this documentation may contain additions and corrections.
1111
{% endif %}
1212

1313
## Contents
@@ -22,7 +22,7 @@ Toolbar and menu items, including explanations for [all drawing tools](toolbars.
2222
First steps.
2323

2424
[Georeferencing](georeferencing.md){: .subpage}
25-
Defining the relationship between map paper coordinates and real world coordinates system.
25+
Defining the relationship between map paper coordinates and real world coordinates.
2626

2727
[Map grid](grid.md){: .subpage}
2828
Showing a helper grid in the map view.
@@ -31,7 +31,7 @@ Showing a helper grid in the map view.
3131
Working with templates.
3232

3333
[Colors and symbols](colors_symbols.md){: .subpage}
34-
Modifying map colors and symbols,
34+
Modifying map colors and symbols.
3535

3636
[Map parts](map_parts.md){: .subpage}
3737
Organizing objects in maps.
@@ -60,7 +60,7 @@ Frequently asked questions.
6060

6161
## Online resources
6262

63-
[Blog](http://www.openorienteering.org/)
63+
[Blog](https://www.openorienteering.org/)
6464
The latest news from OpenOrienteering.
6565

6666
[Issues list](https://github.com/OpenOrienteering/mapper/issues)

0 commit comments

Comments
 (0)