Merge branch 'release-0.6.8' into release-0.6-maintenance

Closes #838. Not meant to be merged to release.

Author: dg0yt

CMakeLists.txt

@@ -1,6 +1,6 @@
 #
 #    Copyright 2012, 2013, 2014 Thomas Schöps
-#    Copyright 2012-2016 Kai Pastor
+#    Copyright 2012-2017 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -31,15 +31,15 @@ include(FeatureSummary)
 
 project(Mapper)
 
-set(Mapper_COPYRIGHT "(C) 2012-2016 OpenOrienteering developers")
+set(Mapper_COPYRIGHT "(C) 2012-2017 The 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 7)
+	set(Mapper_VERSION_PATCH 8)
 endif()
 
 set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")
@@ -316,7 +316,7 @@ else()
 	add_subdirectory("test")
 endif()
 
-foreach(qt5_module Core Gui Network PrintSupport Test Widgets Xml)
+foreach(qt5_module Core Gui Network PrintSupport Test Widgets)
 	if (TARGET Qt5::${qt5_module} AND TARGET Qt5)
 		add_dependencies(Qt5::${qt5_module} Qt5)
 	endif()

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.7" android:versionCode="607" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.8" android:versionCode="608" 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/faq.md

@@ -45,9 +45,10 @@ The .omap format is OpenOrienteering Mapper's native format. It is XML-based, wh
 
 ### What is the difference between .xmap and .omap format?
 The .xmap format is nearly identical but more verbose, even suitable for direct manual editing. The .omap format is tuned towards minimum size and fast processing.
+If you want to keep you data in a line-based version control system such as git, you must use the .xmap format.
 
 ### Can Mapper read and write .ocd files?
-Yes, Mapper reads .ocd files from different version (8 .. 11). But currently only version 8 .ocd files can be written. Beware that some details are neither loaded from nor saved to .ocd files, and some additional inaccuracies might occur.
+Yes, Mapper reads .ocd files from different version (8 .. 12). But currently only version 8 .ocd files can be written. Beware that some details are neither loaded from nor saved to .ocd files, and some additional inaccuracies might occur.
 
 
 ## Mobile devices

doc/manual/pages/images/tag_selector.png

@@ -1,6 +1,6 @@
 ---
 title: User Manual
-edited: 26 November 2015
+edited: 4 January 2017
 redirect_from:
   - /
   - /Home
@@ -40,6 +40,9 @@ Organizing objects in maps
 [Tag Editor](tag_editor.md){: .subpage} <br/>
 Attaching arbitrary key-value pairs to objects
 
+[Tag Selector](tag_selector.md){: .subpage} <br/>
+Selecting objects based on their tags
+
 [Settings](settings.md){: .subpage} <br/>
 Adjusting the program to your preferences.
 

doc/manual/pages/index.md

@@ -4,11 +4,13 @@ authors:
   - Thomas Schoeps
   - Fraser Mills
 keywords: Tagging
-edited: 12 December 2015
+edited: 4 January 2017
 ---
 
+[Tag Selector]: tag_selector.md
+
 Add arbitrary key-value pairs to objects, just like in OpenStreetMap. This way, additional information can be stored, for example the height of certain features (for control descriptions). 
 
 Tags will be imported from OSM and DXF files.
 
-An object selection method based on tags is planned for future versions.
+Objects can be selected based on their tags using the [Tag Selector].

doc/manual/pages/tag_editor.md

@@ -0,0 +1,61 @@
+---
+title: Tag Selector
+authors:
+  - Mitchell Krome
+keywords: Tagging
+edited: 6 January 2017
+---
+
+The tag selector is opened from the View menu.
+It allows the selection of objects based on their tags.
+
+![ ](images/tag_selector.png)
+
+# Editor Layout
+
+Each row in the editor represents a single condition in the query and its relation to the other conditions.
+
+## Relation
+
+The relation column specifies a logical operator describing how this row is related to the row above.
+Therefore the first row has no relation.
+
+There are two possible relations: **and** or **or**.
+**and** relations take precedence over **or** relations. Within the editor the **and** relation is indented slightly to show this precedence.
+
+Taking the precedence into account, the query in the screenshot above would be interpreted as:
+
+```
+("highway" is "residential" and "source" contains "bing") or ("highway" is "primary" and "source" contains "bing")
+```
+
+## Key
+
+The key is the name of the tag which this condition applies to.
+This field cannot be left empty.
+
+## Value
+
+This field specifies a value that the actual tag's value is compared to.
+It can be left empty.
+
+## Comparison
+
+The comparison defines how the actual value of the tag is compared to the value that was specified in the editor.
+
+| Comparison | Description |
+| ---------- | ----------- |
+| is         | The tag specified must exist for the object, and that tag's value must exactly match the specified value. |
+| is not     | If the tag specified exists for the object, then its value must not much the specified value. If the tag doesn't exist, the condition is true. |
+| contains   | The tag specified must exist for the object, and its value must contain the specified value. If an empty value is specified, any value of the tag will match. This can be used to test for the existence of a particular tag. |
+
+## Buttons
+
+The ![ ](../mapper-images/plus.png) and ![ ](../mapper-images/minus.png) buttons are used to add or delete a row.
+Added rows appear below the currently selected row.
+
+The ![ ](../mapper-images/arrow-up.png) and ![ ](../mapper-images/arrow-down.png) buttons move the selected row up or down.
+
+The Select button evaluates the query on all objects in the current part, and selects those which match.
+The status information displays how many objects were selected.
+If any conditions contain an empty key, the query is invalid and no objects are selected.

doc/manual/pages/tag_selector.md

@@ -13,14 +13,19 @@ todo:
 
 <!-- Note: Each item needs an ID. This ID is used to open the context-sensitive help. -->
 
+ * [Toolbar positions and visibility](#toolbar-visibility)
  * [General toolbar](#general-toolbar)
  * [View toolbar](#view-toolbar)
  * [Map parts toolbar](#map-parts-toolbar)
  * [Drawing toolbar](#drawing-toolbar)
  * [Editing toolbar](#editing-toolbar)
  * [Advanced drawing](#advanced-drawing-toolbar)
 
-*Note:* Toolbars may be moved to a more convenient position.  To detach and move, pick the handle (the vertical line of dots) at the left end and drag the toolbar to your preferred position.  The resulting order of your tools may thus be different from this page.
+## Toolbar positions and visibility
+
+Toolbars may be moved to a more convenient position. To detach and move, pick the handle at the left end and drag the toolbar to your preferred position. The resulting order of your toolbars may thus be different from this page.
+
+You may hide toolbars you don't use. To close or open a toolbar right click on any open toolbar or docked window. This will open a small window where you can disable or enable toolbars and docked windows.
 
 
 ## General toolbar {#general-toolbar}

doc/manual/pages/toolbars.md

@@ -45,6 +45,9 @@ Note that key F6 starts panning immediately.</td></tr>
 <tr><td></td><td><a name="fullscreen"><h4>Toggle fullscreen mode</h4></a></td><td><h4>F11</h4></td><td>
 <p>This toggle switches the display to full-screen mode and back.</p></td></tr>
 
+<tr><td><img class="small" src="../mapper-images/tag-selector.png" width="32" height="32" border="0" alt="" /></td><td><h4>Tag selector</h4></td><td><h4>Ctrl+Shift+5</h4></td><td>
+<p>This toggle shows or hides the <a href="tag_selector.md">tag selector</a>.</p></td></tr>
+
 <tr><td><img class="small" src="../mapper-images/window-new.png" width="32" height="32" border="0" alt="" /></td><td><h4>Tag editor</h4></td><td><h4>Ctrl+Shift+6</h4></td><td>
 <p>This toggle shows or hides the <a href="tag_editor.md">tag editor</a>.</p></td></tr>
 

doc/manual/pages/view_menu.md

@@ -1,4 +1,4 @@
 # Generated in CMakeLists.txt, do not edit here.
 Mapper_VERSION_MAJOR = 0
 Mapper_VERSION_MINOR = 6
-Mapper_VERSION_PATCH = 7
+Mapper_VERSION_PATCH = 8