Merge branch 'master' into android-latest

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.40.{build}
+version: 13.42.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.40
+VERSION = 13.42
 
 QT += core \
     gui \

gpxsee.qrc

@@ -43,6 +43,7 @@
 		<file alias="casino-11.svg">icons/map/POI/casino-11.svg</file>
 		<file alias="castle-11.svg">icons/map/POI/castle-11.svg</file>
 		<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
+		<file alias="charging-station-11.svg">icons/map/POI/charging-station-11.svg</file>
 		<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
 		<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
 		<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
@@ -138,7 +139,101 @@
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
+		<file alias="buoy-white.png">icons/map/marine/buoy-white.png</file>
+		<file alias="buoy-white-black.png">icons/map/marine/buoy-white-black.png</file>
+		<file alias="buoy-white-green.png">icons/map/marine/buoy-white-green.png</file>
+		<file alias="buoy-white-red.png">icons/map/marine/buoy-white-red.png</file>
+		<file alias="buoy-white-yellow.png">icons/map/marine/buoy-white-yellow.png</file>
+		<file alias="buoy-white-yellow-white.png">icons/map/marine/buoy-white-yellow-white.png</file>
+		<file alias="buoy-green.png">icons/map/marine/buoy-green.png</file>
+		<file alias="buoy-green-white.png">icons/map/marine/buoy-green-white.png</file>
+		<file alias="buoy-green-white-green-white.png">icons/map/marine/buoy-green-white-green-white.png</file>
+		<file alias="buoy-green-black.png">icons/map/marine/buoy-green-black.png</file>
+		<file alias="buoy-green-red.png">icons/map/marine/buoy-green-red.png</file>
+		<file alias="buoy-green-red-green.png">icons/map/marine/buoy-green-red-green.png</file>
+		<file alias="buoy-green-red-green-red.png">icons/map/marine/buoy-green-red-green-red.png</file>
+		<file alias="buoy-red.png">icons/map/marine/buoy-red.png</file>
+		<file alias="buoy-red-white.png">icons/map/marine/buoy-red-white.png</file>
+		<file alias="buoy-red-white-red-white.png">icons/map/marine/buoy-red-white-red-white.png</file>
+		<file alias="buoy-red-black.png">icons/map/marine/buoy-red-black.png</file>
+		<file alias="buoy-red-green.png">icons/map/marine/buoy-red-green.png</file>
+		<file alias="buoy-red-yellow.png">icons/map/marine/buoy-red-yellow.png</file>
+		<file alias="buoy-red-green-red.png">icons/map/marine/buoy-red-green-red.png</file>
+		<file alias="buoy-red-green-red-green.png">icons/map/marine/buoy-red-green-red-green.png</file>
+		<file alias="buoy-yellow.png">icons/map/marine/buoy-yellow.png</file>
+		<file alias="buoy-yellow-white.png">icons/map/marine/buoy-yellow-white.png</file>
+		<file alias="buoy-yellow-white-yellow.png">icons/map/marine/buoy-yellow-white-yellow.png</file>
+		<file alias="buoy-yellow-black.png">icons/map/marine/buoy-yellow-black.png</file>
+		<file alias="buoy-yellow-black-yellow.png">icons/map/marine/buoy-yellow-black-yellow.png</file>
+		<file alias="buoy-yellow-red-yellow.png">icons/map/marine/buoy-yellow-red-yellow.png</file>
+		<file alias="buoy-black-white.png">icons/map/marine/buoy-black-white.png</file>
+		<file alias="buoy-black-red.png">icons/map/marine/buoy-black-red.png</file>
+		<file alias="buoy-black-white-black.png">icons/map/marine/buoy-black-white-black.png</file>
+		<file alias="buoy-black-red-black.png">icons/map/marine/buoy-black-red-black.png</file>
+		<file alias="buoy-black-green.png">icons/map/marine/buoy-black-green.png</file>
+		<file alias="buoy-black-yellow.png">icons/map/marine/buoy-black-yellow.png</file>
+		<file alias="buoy-black-yellow-black.png">icons/map/marine/buoy-black-yellow-black.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
+		<file alias="beacon-white.png">icons/map/marine/beacon-white.png</file>
+		<file alias="beacon-white-black.png">icons/map/marine/beacon-white-black.png</file>
+		<file alias="beacon-white-green.png">icons/map/marine/beacon-white-green.png</file>
+		<file alias="beacon-white-red.png">icons/map/marine/beacon-white-red.png</file>
+		<file alias="beacon-white-yellow.png">icons/map/marine/beacon-white-yellow.png</file>
+		<file alias="beacon-white-yellow-white.png">icons/map/marine/beacon-white-yellow-white.png</file>
+		<file alias="beacon-green.png">icons/map/marine/beacon-green.png</file>
+		<file alias="beacon-green-white.png">icons/map/marine/beacon-green-white.png</file>
+		<file alias="beacon-green-white-green-white.png">icons/map/marine/beacon-green-white-green-white.png</file>
+		<file alias="beacon-green-black.png">icons/map/marine/beacon-green-black.png</file>
+		<file alias="beacon-green-red.png">icons/map/marine/beacon-green-red.png</file>
+		<file alias="beacon-green-red-green.png">icons/map/marine/beacon-green-red-green.png</file>
+		<file alias="beacon-green-red-green-red.png">icons/map/marine/beacon-green-red-green-red.png</file>
+		<file alias="beacon-red.png">icons/map/marine/beacon-red.png</file>
+		<file alias="beacon-red-white.png">icons/map/marine/beacon-red-white.png</file>
+		<file alias="beacon-red-white-red-white.png">icons/map/marine/beacon-red-white-red-white.png</file>
+		<file alias="beacon-red-black.png">icons/map/marine/beacon-red-black.png</file>
+		<file alias="beacon-red-green.png">icons/map/marine/beacon-red-green.png</file>
+		<file alias="beacon-red-yellow.png">icons/map/marine/beacon-red-yellow.png</file>
+		<file alias="beacon-red-green-red.png">icons/map/marine/beacon-red-green-red.png</file>
+		<file alias="beacon-red-green-red-green.png">icons/map/marine/beacon-red-green-red-green.png</file>
+		<file alias="beacon-yellow.png">icons/map/marine/beacon-yellow.png</file>
+		<file alias="beacon-yellow-white.png">icons/map/marine/beacon-yellow-white.png</file>
+		<file alias="beacon-yellow-white-yellow.png">icons/map/marine/beacon-yellow-white-yellow.png</file>
+		<file alias="beacon-yellow-black.png">icons/map/marine/beacon-yellow-black.png</file>
+		<file alias="beacon-yellow-black-yellow.png">icons/map/marine/beacon-yellow-black-yellow.png</file>
+		<file alias="beacon-yellow-red-yellow.png">icons/map/marine/beacon-yellow-red-yellow.png</file>
+		<file alias="beacon-black-white.png">icons/map/marine/beacon-black-white.png</file>
+		<file alias="beacon-black-white-black.png">icons/map/marine/beacon-black-white-black.png</file>
+		<file alias="beacon-black-red.png">icons/map/marine/beacon-black-red.png</file>
+		<file alias="beacon-black-red-black.png">icons/map/marine/beacon-black-red-black.png</file>
+		<file alias="beacon-black-green.png">icons/map/marine/beacon-black-green.png</file>
+		<file alias="beacon-black-yellow.png">icons/map/marine/beacon-black-yellow.png</file>
+		<file alias="beacon-black-yellow-black.png">icons/map/marine/beacon-black-yellow-black.png</file>
+		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
+		<file alias="spar-buoy-red.png">icons/map/marine/spar-buoy-red.png</file>
+		<file alias="spar-buoy-green.png">icons/map/marine/spar-buoy-green.png</file>
+		<file alias="spar-buoy-yellow.png">icons/map/marine/spar-buoy-yellow.png</file>
+		<file alias="spar-buoy-white.png">icons/map/marine/spar-buoy-white.png</file>
+		<file alias="spar-buoy-black-yellow.png">icons/map/marine/spar-buoy-black-yellow.png</file>
+		<file alias="spar-buoy-white-red.png">icons/map/marine/spar-buoy-white-red.png</file>
+		<file alias="spar-buoy-black-red.png">icons/map/marine/spar-buoy-black-red.png</file>
+		<file alias="spar-buoy-white-green.png">icons/map/marine/spar-buoy-white-green.png</file>
+		<file alias="spar-buoy-red-yellow.png">icons/map/marine/spar-buoy-red-yellow.png</file>
+		<file alias="spar-buoy-red-green.png">icons/map/marine/spar-buoy-red-green.png</file>
+		<file alias="spar-buoy-black-yellow-black.png">icons/map/marine/spar-buoy-black-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black.png">icons/map/marine/spar-buoy-yellow-black.png</file>
+		<file alias="spar-buoy-yellow-black-yellow.png">icons/map/marine/spar-buoy-yellow-black-yellow.png</file>
+		<file alias="spar-buoy-red-white.png">icons/map/marine/spar-buoy-red-white.png</file>
+		<file alias="spar-buoy-green-red-green.png">icons/map/marine/spar-buoy-green-red-green.png</file>
+		<file alias="spar-buoy-red-green-red.png">icons/map/marine/spar-buoy-red-green-red.png</file>
+		<file alias="spar-buoy-black-red-black.png">icons/map/marine/spar-buoy-black-red-black.png</file>
+		<file alias="spar-buoy-yellow-red-yellow.png">icons/map/marine/spar-buoy-yellow-red-yellow.png</file>
+		<file alias="spar-buoy-green-red.png">icons/map/marine/spar-buoy-green-red.png</file>
+		<file alias="spar-buoy-black-white.png">icons/map/marine/spar-buoy-black-white.png</file>
+		<file alias="spar-buoy-white-yellow.png">icons/map/marine/spar-buoy-white-yellow.png</file>
+		<file alias="spar-buoy-yellow-white.png">icons/map/marine/spar-buoy-yellow-white.png</file>
+		<file alias="spar-buoy-green-white.png">icons/map/marine/spar-buoy-green-white.png</file>
+		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
+		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
 		<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
 		<file alias="wreck.png">icons/map/marine/wreck.png</file>
@@ -158,11 +253,8 @@
 		<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
 		<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
 		<file alias="pile.png">icons/map/marine/pile.png</file>
-		<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
-		<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
 		<file alias="tower.png">icons/map/marine/tower.png</file>
 		<file alias="chimney.png">icons/map/marine/chimney.png</file>
-		<file alias="platform.png">icons/map/marine/platform.png</file>
 		<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
 		<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
 		<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
@@ -217,6 +309,8 @@
 		<file alias="nature-reserve-line.png">icons/map/marine/nature-reserve-line.png</file>
 		<file alias="sanctuary-line.png">icons/map/marine/sanctuary-line.png</file>
 		<file alias="fishing-farm.png">icons/map/marine/fishing-farm.png</file>
+		<file alias="shellfish-farm-line.png">icons/map/marine/shellfish-farm-line.png</file>
+		<file alias="degaussing-line.png">icons/map/marine/degaussing-line.png</file>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->

icons/map/POI/charging-station-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="charging-station-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.5,3H9V1.5C9,1.2239,8.7761,1,8.5,1S8,1.2239,8,1.5V3c0,0.5523,0.4477,1,1,1v4.25C9,8.3881,8.8881,8.5,8.75,8.5&#xA;&#x9;S8.5,8.3881,8.5,8.25V6.5C8.5,5.6716,7.8284,5,7,5V2c0-0.5523-0.4477-1-1-1H2C1.4477,1,1,1.4477,1,2v7c0,0.5523,0.4477,1,1,1h4&#xA;&#x9;c0.5523,0,1-0.4477,1-1V6c0.2761,0,0.5,0.2239,0.5,0.5v1.75c0,0.6904,0.5596,1.25,1.25,1.25S10,8.9404,10,8.25V3.5&#xA;&#x9;C10,3.2239,9.7761,3,9.5,3z M3.5,8.75H3L4,6H1.75L4.5,2.25H5L4,5h2.25L3.5,8.75z"/>
+</svg>