Properly print the tag name on big-edian systems

Currently translated at 100.0% (492 of 492 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.28.{build}
+version: 13.39.{build}
 
 configuration:
   - Release
@@ -8,24 +8,24 @@ image:
 
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
+  JOMDIR: C:\Qt\Tools\QtCreator\bin\jom
   matrix:
   - QTDIR: C:\Qt\5.15\msvc2019_64
     OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
     NSISDEF: /DOPENSSL /DANGLE
-  - QTDIR: C:\Qt\6.7\msvc2019_64
-    OPENSSLDIR: C:\OpenSSL-v33-Win64\bin
-    NSISDEF: /DQT6 /DOPENSSL
+  - QTDIR: C:\Qt\6.8\msvc2022_64
+    NSISDEF: /DQT6
 
 install:
 - cmd: |-
-    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
+    set PATH=%QTDIR%\bin;%NSISDIR%;%JOMDIR%;%PATH%
     call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
 
 build_script:
 - cmd: |-
     lrelease gpxsee.pro
     qmake gpxsee.pro
-    nmake release
+    jom release
 
     md installer
     copy release\GPXSee.exe installer
@@ -36,8 +36,8 @@ build_script:
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i
     copy licence.txt installer
-    copy %OPENSSLDIR%\libcrypto-*-x64.dll installer
-    copy %OPENSSLDIR%\libssl-*-x64.dll installer
+    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer)
+    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer)
 
     makensis.exe %NSISDEF% installer\gpxsee64.nsi
 

.github/workflows/android.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Configure build
         run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
       - name: Build project
-        run:  make -j2 apk
+        run:  make -j4 apk
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/linux.yml

@@ -8,7 +8,10 @@ on:
 jobs:
   build:
     name: GPXSee
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        config: ['release', 'debug']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -19,6 +22,6 @@ jobs:
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build
-        run: qmake gpxsee.pro
+        run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
       - name: Build project
-        run: make -j2
+        run: make -j4

.github/workflows/osx.yml

@@ -6,32 +6,8 @@ on:
       - master
 
 jobs:
-  qt5:
-    name: GPXSee Qt5 build
-    runs-on: macos-12
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
-        with:
-          version: '5.15.2'
-      - name: Create localization
-        run: lrelease gpxsee.pro
-      - name: Configure build
-        run: qmake gpxsee.pro
-      - name: Build project
-        run: make -j3
-      - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg -appstore-compliant
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: GPXSee-qt5.dmg
-          path: GPXSee.dmg
-
-  qt6:
-    name: GPXSee Qt6 build
+  build:
+    name: GPXSee
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -39,7 +15,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: '6.7.2'
+          version: '6.8.2'
           modules: qtpositioning qtserialport qtimageformats
       - name: Create localization
         run: lrelease gpxsee.pro
@@ -52,5 +28,5 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: GPXSee-qt6.dmg
           path: GPXSee.dmg
+          name: GPXSee.dmg

README.md

@@ -5,7 +5,9 @@ GPS log file formats.
 ## Features
 * Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON,
   OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN, ONmove OMD/GHP,
-  TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG files.
+  TwoNav (TRK, RTE, WPT), GPSDump WPT, Velocitek VTK, Vakaros VKX, 70mai GPS logs
+  and geotagged JPEG files.
+* Opens geo URIs (RFC 5870).
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS,
   QuadTiles).
 * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
@@ -28,8 +30,8 @@ GPS log file formats.
 
 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt6 >= 6.2 (Android builds require Qt6)
-* C++11 or newer compiler (tested: msvc2019, gcc 7.5.0, clang/Apple LLVM version
+* Qt5 >= 5.15 or Qt6 >= 6.2 (Android builds require Qt6)
+* C++11 or newer compiler (tested: msvc2022, gcc 11, clang/Apple LLVM version
   10.0.0)
 
 Build steps:

data/style/style.xml

@@ -21,9 +21,9 @@
     </rule>
 
     <rule e="way" closed="yes" k="natural" v="rock|stone|bare_rock|bedrock" zoom-min="14">
-        <area fill="#60000000"/>
+        <area fill="#96968f"/>
     </rule>
-    <rule e="way" closed="yes" k="natural" v="glacier" zoom-min="12">
+    <rule e="way" closed="yes" k="natural" v="glacier" zoom-min="10">
         <area fill="#ddf1fd"/>
     </rule>
 
@@ -32,7 +32,7 @@
         <area fill="#e4efcf"/>
     </rule>
 
-    <rule e="way" closed="yes" k="landuse" v="construction|quarry|landfill|industrial|farm|farmyard" zoom-min="10">
+    <rule e="way" closed="yes" k="landuse" v="construction|quarry|landfill|industrial|farm|farmyard|railway" zoom-min="10">
         <area fill="#d6d4ce"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="allotments" zoom-min="10">
@@ -49,10 +49,10 @@
         <area fill="#e4efcf"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="orchard" zoom-min="10">
-        <area src=":/patterns/orchard.svg" symbol-width="28"/>
+        <area src=":/patterns/orchard.svg" symbol-width="7"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="vineyard" zoom-min="10">
-        <area src=":/patterns/vineyard.svg" symbol-width="28" symbol-height="32"/>
+        <area src=":/patterns/vineyard.svg" symbol-width="7" symbol-height="8"/>
     </rule>
 
     <!-- Hillshading -->
@@ -82,34 +82,39 @@
     <!-- Water -->
     <rule e="way" closed="yes" k="natural" v="water">
         <area fill="#9fc4e1"/>
-        <rule e="way" k="*" v="*" zoom-min="11" zoom-max="13">
-            <caption fill="#9fc4e1" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+        <rule e="way" k="bBoxWeight" v="~|mid|large|xlarge|xxlarge|xxxlarge" zoom-min="14" zoom-max="15">
+            <caption fill="#ffffff" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
         </rule>
-        <rule e="way" k="*" v="*" zoom-min="14" zoom-max="19">
-            <caption fill="#9fc4e1" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+        <rule e="way" k="bBoxWeight" v="~|xsmall|small|mid|large|xlarge|xxlarge|xxxlarge" zoom-min="16" zoom-max="16">
+            <caption fill="#ffffff" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
+        </rule>
+        <rule e="way" k="*" v="*" zoom-min="17">
+            <caption fill="#ffffff" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
         </rule>
     </rule>
-    <rule e="way" closed="yes" k="natural" v="marsh|wetland|mud" zoom-min="13">
-        <area src=":/patterns/wetland.svg" symbol-height="32"/>
+    <rule e="way" closed="yes" k="natural" v="marsh|wetland|mud" zoom-min="12">
+        <area src=":/patterns/wetland.svg" symbol-height="4"/>
     </rule>
 
     <rule e="way" k="waterway" v="river" zoom-min="8">
         <line stroke="#9fc4e1" stroke-width="1.2"/>
-        <pathText fill="#9fc4e1" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
-        <rule e="way" k="*" v="*" zoom-min="12">
+        <rule e="way" k="*" v="*" zoom-min="10" zoom-max="13">
+            <pathText fill="#ffffff" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
+        </rule>
+        <rule e="way" k="*" v="*" zoom-min="14">
             <lineSymbol src=":/symbols/flow.svg" symbol-width="16" symbol-height="8"/>
+            <pathText fill="#ffffff" font-size="14" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
         </rule>
     </rule>
-    <rule e="way" k="waterway" v="stream|drain|ditch">
+    <rule e="way" k="waterway" v="stream|drain|ditch" zoom-min="10">
         <rule e="way" k="intermittent" v="~|no">
-            <rule e="way" k="*" v="*" zoom-min="10" zoom-max="13">
+            <rule e="way" k="*" v="*" zoom-max="13">
                 <line stroke="#9fc4e1" stroke-width="1"/>
-                <pathText fill="#9fc4e1" font-size="11" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
             </rule>
             <rule e="way" k="*" v="*" zoom-min="14">
                 <line stroke="#9fc4e1" stroke-width="0.6"/>
-                <pathText fill="#9fc4e1" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
-                <rule e="way" k="name" v="*">
+                <pathText fill="#ffffff" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#9fc4e1" stroke-width="2"/>
+                <rule e="way" k="name" v="*" zoom-min="16">
                     <lineSymbol src=":/symbols/flow.svg" symbol-width="16" symbol-height="8"/>
                 </rule>
             </rule>
@@ -127,9 +132,12 @@
     <rule e="way" closed="yes" k="waterway" v="dam" zoom-min="10">
         <area fill="#bbbbbb"/>
     </rule>
+    <rule e="way" k="waterway" v="lock_gate" zoom-min="10">
+        <line stroke="#000000" stroke-width="0.1"/>
+    </rule>
     <rule e="way" k="waterway" v="weir" zoom-min="10">
         <lineSymbol src=":/symbols/cliff.svg" repeat="true" display="always" repeat-gap="0" repeat-start="0" symbol-width="4" symbol-height="5"/>
-        <pathText fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+        <pathText fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
     </rule>
     <rule e="way" k="man_made" v="pier" zoom-min="10">
         <line stroke="#ededed" stroke-width="0.5" stroke-linecap="butt"/>
@@ -152,64 +160,74 @@
 
     <!-- City areas -->
     <rule e="way" closed="yes" k="landuse" v="cemetery">
-        <area src=":/patterns/cemetery.svg" symbol-width="30" symbol-height="28"/>
+        <area src=":/patterns/cemetery.svg" symbol-width="6" symbol-height="7"/>
         <rule e="way" k="*" v="*" zoom-min="15">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
         </rule>
     </rule>
     <rule e="way" closed="yes" k="amenity" v="grave_yard">
-        <area src=":/patterns/cemetery.svg" symbol-width="30" symbol-height="28"/>
+        <area src=":/patterns/cemetery.svg" symbol-width="6" symbol-height="7"/>
     </rule>
     <rule e="way" closed="yes" k="bridge" v="yes|true|viaduct|aqueduct|suspension|culvert|swing" zoom-min="10">
         <area fill="#ffffff"/>
     </rule>
     <rule e="way" closed="yes" k="amenity" v="parking" zoom-min="10">
         <area fill="#ffffff" stroke="#d5cdc0" stroke-width="0.1"/>
-        <rule e="way" k="*" v="*" zoom-min="16">
+        <rule e="way" k="parking" v="~|surface|street_side|lane" zoom-min="17">
             <symbol id="parking" src=":/POI/parking-11.svg" symbol-width="11"/>
         </rule>
+        <rule e="way" k="parking" v="underground|multi-storey" zoom-min="17">
+            <symbol id="garage" src=":/POI/parking-garage-11.svg" symbol-width="11"/>
+        </rule>
     </rule>
     <rule e="way" closed="yes" k="highway" v="pedestrian" zoom-min="10">
         <area fill="#ffffff"/>
     </rule>
-    <rule e="way" closed="yes" k="leisure" v="pitch|playground|track" zoom-min="10">
+    <rule e="way" closed="yes" k="leisure" v="pitch|playground|track|ls_track" zoom-min="10">
         <area fill="#e3edc6" stroke="#c9d3a5" stroke-width="1" scale="none"/>
     </rule>
-    <rule e="way" closed="yes" k="leisure" v="swimming_pool" zoom-min="10">
+    <rule e="way" closed="no" k="leisure" v="track|ls_track" zoom-min="10">
+        <line stroke="#c9d3a5" stroke-width="0.3"/>
+        <line stroke="#e3edc6" stroke-width="0.2"/>
+    </rule>
+    <rule e="way" closed="yes" k="leisure" v="swimming_pool" zoom-min="12">
         <area fill="#9fc4e1" stroke="#4398d9" stroke-width="1" scale="none"/>
     </rule>
-    <rule e="way" k="leisure" v="track" zoom-min="10">
-        <line stroke="#e3edc6" stroke-width="1"/>
+    <rule e="way" closed="yes" k="amenity" v="fountain" zoom-min="12">
+        <area fill="#9fc4e1"/>
     </rule>
 
     <!-- Area overlays -->
     <rule e="way" k="landuse" v="military" zoom-min="10">
-        <area src=":/patterns/military-area.svg" symbol-height="32"/>
-        <caption fill="#ff4040" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="1"/>
+        <area src=":/patterns/military-area.svg" symbol-height="4"/>
+        <rule e="way" k="*" v="*" zoom-min="16">
+            <caption fill="#ff4040" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="2"/>
+        </rule>
     </rule>
     <rule e="way" k="boundary" v="protected_area|national_park" zoom-min="10" zoom-max="14">
         <rule e="way" k="protect_class" v="pr_2">
-            <area src=":/patterns/nature-reserve.svg" symbol-height="32"/>
-            <rule e="way" k="*" v="*" zoom-max="12">
-                <caption fill="#9ac269" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="1"/>
+            <area src=":/patterns/nature-reserve.svg" symbol-height="4"/>
+            <rule e="way" k="*" v="*" zoom-max="11">
+                <caption fill="#9ac269" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="2"/>
             </rule>
         </rule>
     </rule>
 
     <!-- Buildings -->
-    <rule e="way" k="building" v="*">
+    <rule e="way" k="building" v="-|civic|office|cathedral|church|basilica">
         <area fill="#dbd0b6" stroke="#cdccc4" stroke-width="0.1"/>
     </rule>
-    <rule e="way" k="building" v="civic">
+
+    <rule e="way" k="building" v="civic|office">
         <area fill="#cfc4b3" stroke="#cdccc4" stroke-width="0.1"/>
         <rule e="way" k="*" v="*" zoom-min="16">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" priority="-10"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" priority="-10"/>
         </rule>
     </rule>
     <rule e="way" k="building" v="cathedral|church|basilica">
         <area fill="#a19d96" stroke="#cdccc4" stroke-width="0.1"/>
         <rule e="way" k="*" v="*" zoom-min="16">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
         </rule>
     </rule>
 
@@ -346,7 +364,7 @@
             <line stroke="#ffffff" stroke-width="0.4"/>
         </rule>
     </rule>
-    <rule e="way" k="highway" v="tertiary|tertiary_link|residential|living_street">
+    <rule e="way" k="highway" v="tertiary|tertiary_link|residential|living_street|raceway">
         <rule e="way" k="*" v="*" zoom-min="13" zoom-max="13">
             <line stroke="#d5cdc0" stroke-width="1.5"/>
             <line stroke="#ffffff" stroke-width="0.75"/>
@@ -356,7 +374,7 @@
             <line stroke="#ffffff" stroke-width="0.75"/>
         </rule>
         <rule e="way" k="*" v="*" zoom-min="15">
-            <pathText fill="#000000" font-size="10" k="name" priority="-7" stroke="#FFFFFF" stroke-width="1"/>
+            <pathText fill="#000000" font-size="10" k="name" priority="-7" stroke="#FFFFFF" stroke-width="2"/>
             <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
                 <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
             </rule>
@@ -384,9 +402,9 @@
             </rule>
         </rule>
         <rule e="way" k="*" v="*" zoom-min="14">
-            <pathText fill="#000000" font-size="10" k="name" priority="-5" stroke="#FFFFFF" stroke-width="1"/>
+            <pathText fill="#000000" font-size="10" k="name" priority="-5" stroke="#FFFFFF" stroke-width="2"/>
             <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
-                <lineSymbol priority="-50" src=":/symbols/arrow.svg" symbol-width="16" symbol-height="8"/>
+                <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
             </rule>
         </rule>
     </rule>
@@ -411,6 +429,12 @@
                 <line stroke="#f7d9a6" stroke-width="1" stroke-linecap="butt"/>
             </rule>
         </rule>
+        <rule e="way" k="*" v="*" zoom-min="14">
+            <pathText fill="#000000" font-size="10" k="name" priority="-3" stroke="#FFFFFF" stroke-width="2"/>
+            <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
+                <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
+            </rule>
+        </rule>
     </rule>
     <rule e="way" k="highway" v="motorway|motorway_link">
         <rule e="way" k="tunnel" v="~|false|no">
@@ -436,16 +460,16 @@
     </rule>
 
     <rule e="way" k="highway" v="motorway" zoom-min="14">
-        <pathText fill="#FFFFFF" font-size="10" k="ref" stroke="#dd3e3e" stroke-width="1" text-orientation="auto_down"/>
+        <pathText fill="#FFFFFF" font-size="10" k="ref" stroke="#dd3e3e" stroke-width="2" text-orientation="auto_down"/>
     </rule>
     <rule e="node" k="highway" v="motorway_junction" zoom-min="16">
         <symbol id="exit" src=":/symbols/exit.svg" symbol-width="15" symbol-height="11" priority="100"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="exit"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="exit"/>
     </rule>
 
     <!-- Railways -->
     <rule e="way" k="tunnel" v="~|false|no">
-        <rule e="way" k="railway" v="rail">
+        <rule e="way" k="railway" v="rail|preserved|disused">
             <rule e="way" k="*" v="*" zoom-min="10" zoom-max="12">
                <line stroke="#717171" stroke-width="1" stroke-linecap="butt"/>
             </rule>
@@ -462,12 +486,15 @@
                 <line stroke="#ffffff" stroke-width="0.4608" stroke-dasharray="2,2" stroke-linecap="butt" scale="all"/>
             </rule>
         </rule>
+        <rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="14">
+            <line stroke="#414141" stroke-width="0.2" stroke-linecap="butt"/>
+        </rule>
         <rule e="way" k="railway" v="tram" zoom-min="15">
             <line stroke="#717171" stroke-width="0.2" stroke-linecap="butt"/>
         </rule>
     </rule>
     <rule e="way" k="tunnel" v="yes|true">
-        <rule e="way" k="railway" v="rail">
+        <rule e="way" k="railway" v="rail|preserved|disused">
             <rule e="way" k="*" v="*" zoom-min="10" zoom-max="12">
                <line stroke="#717171" stroke-width="1" stroke-linecap="butt" stroke-dasharray="10,8"/>
             </rule>
@@ -481,6 +508,9 @@
                 <line stroke="#878787" stroke-width="0.4144" stroke-linecap="butt" stroke-dasharray="2,1" scale="all"/>
             </rule>
         </rule>
+        <rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="14">
+            <line stroke="#414141" stroke-width="0.2" stroke-linecap="butt" stroke-dasharray="12,4"/>
+        </rule>
         <rule e="way" k="railway" v="tram" zoom-min="15">
             <line stroke="#717171" stroke-width="0.2" stroke-linecap="butt" stroke-dasharray="12,4"/>
         </rule>
@@ -507,7 +537,7 @@
     <rule e="way" closed="no" k="aerialway" v="*">
         <line stroke="#202020" stroke-linecap="butt" stroke-width="0.3"/>
         <rule e="any" k="*" v="*" zoom-min="15">
-            <pathText fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
+            <pathText fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
         </rule>
     </rule>
 
@@ -523,63 +553,123 @@
         </rule>
     </rule>
 
-    <!-- Town & vilage names -->
-    <rule e="node" k="place" v="locality" zoom-min="14">
-        <caption fill="#000000" font-size="10" k="name" priority="10" stroke="#FFFFFF" stroke-width="1"/>
+    <!-- Town & village names -->
+    <rule e="node" k="place" v="locality|isolated_dwelling|farm" zoom-min="14">
+        <caption fill="#000000" font-size="10" k="name" priority="10" stroke="#FFFFFF" stroke-width="2"/>
     </rule>
     <rule e="node" k="place" v="hamlet" zoom-min="12">
-        <caption fill="#000000" font-size="12" k="name" priority="20" stroke="#FFFFFF" stroke-width="1"/>
+        <caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
     </rule>
     <rule e="node" k="place" v="village" zoom-min="11">
-        <caption fill="#000000" font-size="12" k="name" priority="20" stroke="#FFFFFF" stroke-width="1"/>
+        <caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
     </rule>
-    <rule e="node" k="place" v="town" zoom-min="9">
-        <caption fill="#000000" font-size="14" k="name" priority="30" stroke="#FFFFFF" stroke-width="1"/>
+    <rule e="node" k="place" v="town" zoom-min="9" zoom-max="14">
+        <rule e="node" k="*" v="*" zoom-max="10">
+            <caption fill="#000000" font-size="14" k="name" priority="30" stroke="#FFFFFF" stroke-width="2"/>
+        </rule>
+        <rule e="node" k="*" v="*" zoom-min="11">
+            <caption fill="#000000" font-size="16" k="name" font-style="bold" priority="30" stroke="#FFFFFF" stroke-width="2"/>
+        </rule>
     </rule>
     <rule e="node" k="place" v="city">
-        <rule e="node" k="capital" v="yes|1|2">
-            <caption fill="#000000" font-size="16" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="1" text-transform="uppercase"/>
+        <rule e="node" k="*" v="*" zoom-max="10">
+            <rule e="node" k="capital" v="2">
+                <caption fill="#000000" font-size="18" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="2" text-transform="uppercase"/>
+            </rule>
+            <rule e="node" k="capital" v="4|~">
+                <caption fill="#000000" font-size="18" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="2"/>
+            </rule>
         </rule>
-        <rule e="node" k="capital" v="no|~">
-            <caption fill="#000000" font-size="16" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="1"/>
+        <rule e="node" k="*" v="*" zoom-min="11" zoom-max="14">
+            <rule e="node" k="capital" v="2">
+                <caption fill="#000000" font-size="22" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="2" text-transform="uppercase"/>
+            </rule>
+            <rule e="node" k="capital" v="4|~">
+                <caption fill="#000000" font-size="22" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="2"/>
+            </rule>
         </rule>
     </rule>
+    <rule e="node" k="place" v="suburb">
+        <rule e="node" k="*" v="*" zoom-min="12" zoom-max="13">
+            <caption fill="#000000" font-size="14" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
+        </rule>
+        <rule e="node" k="*" v="*" zoom-min="14" zoom-max="17">
+            <caption fill="#000000" font-size="16" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
+        </rule>
+    </rule>
+    <rule e="node" k="place" v="quarter" zoom-min="14" zoom-max="17">
+        <caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
+    </rule>
+    <rule e="node" k="place" v="neighbourhood" zoom-min="15" zoom-max="17">
+        <caption fill="#000000" font-size="12" k="name" priority="15" stroke="#FFFFFF" stroke-width="2"/>
+    </rule>
 
     <!-- Nature POIs -->
     <rule e="node" k="natural" v="peak" zoom-min="13">
+        <rule e="node" k="ele" v="*">
+            <rule e="node" k="name" v="*">
+                <symbol id="peak" src=":/POI/triangle-11.svg" symbol-width="11" priority="10"/>
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="peak"/>
+                <rule e="node" k="*" v="*" zoom-min="14">
+                    <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" stroke="#FFFFFF" stroke-width="2" symbol-id="peak" priority="-1"/>
+                </rule>
+            </rule>
+        </rule>
+        <rule e="node" k="ele" v="~" zoom-min="15">
+            <rule e="node" k="name" v="*">
+                <symbol id="peak-minor" src=":/POI/triangle-stroked-11.svg" symbol-width="11" priority="5"/>
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="peak-minor"/>
+            </rule>
+        </rule>
+    </rule>
+    <rule e="node" k="natural" v="saddle" zoom-min="13">
         <rule e="node" k="name" v="*">
-            <symbol id="peak" src=":/POI/mountain-11.svg" symbol-width="11"/>
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="peak"/>
-            <rule e="any" k="*" v="*" zoom-min="17">
-                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="1" symbol-id="peak"/>
+            <symbol id="saddle" src=":/symbols/saddle.svg" symbol-width="9" symbol-height="11" priority="9"/>
+            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="saddle"/>
+            <rule e="node" k="*" v="*" zoom-min="14">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" stroke="#FFFFFF" stroke-width="2" symbol-id="saddle" priority="-1"/>
             </rule>
         </rule>
     </rule>
     <rule e="node" k="natural" v="volcano" zoom-min="13">
-        <symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="volcano"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" priority="9" stroke="#FFFFFF" stroke-width="1" symbol-id="volcano"/>
+        <rule e="node" k="name" v="*">
+            <symbol id="volcano" src=":/POI/volcano-11.svg" symbol-width="11" priority="10"/>
+            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano"/>
+            <rule e="node" k="*" v="*" zoom-min="14">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="ele" stroke="#FFFFFF" stroke-width="2" symbol-id="volcano" priority="-1"/>
+            </rule>
         </rule>
     </rule>
     <rule e="node" k="waterway" v="waterfall" zoom-min="15">
-        <symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11"/>
-        <rule e="any" k="*" v="*" zoom-min="16">
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="waterfall"/>
+        <rule e="any" k="name" v="*">
+            <symbol id="waterfall" src=":/POI/waterfall-11.svg" symbol-width="11" priority="8"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="waterfall"/>
+            </rule>
         </rule>
     </rule>
     <rule e="node" k="natural" v="spring" zoom-min="15">
         <rule e="any" k="name" v="*">
-            <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11"/>
+            <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11" priority="7"/>
             <rule e="any" k="*" v="*" zoom-min="16">
-                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" priority="10" stroke="#FFFFFF" stroke-width="1" symbol-id="spring"/>
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="spring"/>
+            </rule>
+        </rule>
+    </rule>
+    <rule e="node" k="natural" v="hot_spring|geyser" zoom-min="15">
+        <rule e="any" k="name" v="*">
+            <symbol id="hot-spring" src=":/POI/hot-spring.svg" symbol-width="11" priority="7"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hot-spring"/>
             </rule>
         </rule>
     </rule>
     <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
         <rule e="node" k="name" v="*">
             <symbol id="viewpoint" src=":/POI/viewpoint-11.svg" symbol-width="11"/>
-            <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="viewpoint"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="viewpoint"/>
+            </rule>
         </rule>
     </rule>
 
@@ -588,156 +678,192 @@
         <rule e="any" k="name" v="*">
             <symbol id="hospital" src=":/POI/hospital-11.svg" symbol-width="11" priority="20"/>
             <rule e="any" k="*" v="*" zoom-min="16">
-                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hospital"/>
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hospital"/>
             </rule>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="doctors" zoom-min="16">
         <symbol id="doctor" src=":/POI/doctor-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="doctor"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="doctor"/>
     </rule>
     <rule e="any" k="amenity|building" v="police" zoom-min="15">
         <symbol id="police" src=":/POI/police-11.svg" symbol-width="11" priority="19"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="police"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="police"/>
         </rule>
     </rule>
     <rule e="any" k="amenity|building" v="fire_station" zoom-min="15">
         <symbol id="fire-station" src=":/POI/fire-station-11.svg" symbol-width="11" priority="18"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fire-station"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="fire-station"/>
         </rule>
     </rule>
     <rule e="any" k="barrier" v="border_control|checkpoint" zoom-min="15">
         <symbol id="checkpoint" src=":/POI/entrance-alt1-11.svg" symbol-width="11" priority="20"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="checkpoint"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="checkpoint"/>
     </rule>
 
     <rule e="any" k="aeroway" v="helipad" zoom-min="14">
         <symbol id="heliport" src=":/POI/heliport-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="16">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="heliport"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="heliport"/>
         </rule>
     </rule>
     <rule e="any" k="aeroway" v="aerodrome" zoom-min="12">
         <symbol id="airport" src=":/POI/airport-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="airport"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="airport"/>
     </rule>
 
     <rule e="any" k="railway" v="station|halt">
         <rule e="any" k="station" v="~" zoom-min="14">
             <symbol id="train-station" src=":/POI/rail-11.svg" symbol-width="13" priority="20"/>
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="train-station"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="train-station"/>
         </rule>
         <rule e="any" k="station" v="subway" zoom-min="15">
             <symbol id="metro-station" src=":/POI/rail-metro-11.svg" symbol-width="11" priority="20"/>
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="metro-station"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="metro-station"/>
         </rule>
         <rule e="any" k="station" v="light_rail" zoom-min="15">
             <symbol id="light-rail-station" src=":/POI/rail-light-11.svg" symbol-width="11" priority="20"/>
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="light-rail-station"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="light-rail-station"/>
         </rule>
     </rule>
     <rule e="node" k="railway" v="tram_stop" zoom-min="16">
         <symbol id="tram-stop" src=":/POI/rail-light-11.svg" symbol-width="11" priority="10"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="tram-stop"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="tram-stop"/>
         </rule>
     </rule>
 
     <rule e="any" k="amenity" v="bus_station" zoom-min="16">
         <symbol id="bus-station" src=":/POI/bus-11.svg" symbol-width="11" priority="10"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bus-station"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bus-station"/>
     </rule>
     <rule e="any" k="highway" v="bus_stop" zoom-min="16">
         <symbol id="bus-stop" src=":/POI/bus-11.svg" symbol-width="11" priority="5"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bus-stop"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bus-stop"/>
         </rule>
     </rule>
 
     <rule e="any" k="amenity" v="ferry_terminal" zoom-min="16">
         <symbol id="ferry" src=":/POI/ferry-11.svg" symbol-width="11" priority="10"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="ferry"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="ferry"/>
         </rule>
     </rule>
 
     <rule e="any" k="amenity" v="fuel" zoom-min="15">
         <symbol id="fuel" src=":/POI/fuel-11.svg" symbol-width="11" priority="15"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fuel"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="fuel"/>
         </rule>
     </rule>
 
     <rule e="any" k="amenity" v="shelter" zoom-min="16">
         <symbol id="shelter" src=":/POI/shelter-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="shelter"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="shelter"/>
         </rule>
     </rule>
-    <rule e="any" k="tourism|building" v="alpine_hut|hotel|hostel|guest_house|chalet|motel" zoom-min="16">
+    <rule e="any" k="tourism|building" v="alpine_hut" zoom-min="15">
+        <symbol id="alpine_hut" src=":/POI/home-11.svg" symbol-width="11" priority="5"/>
+        <rule e="any" k="*" v="*" zoom-min="16">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="alpine_hut"/>
+        </rule>
+    </rule>
+    <rule e="any" k="tourism|building" v="hotel|hostel|guest_house|chalet|motel" zoom-min="17">
         <symbol id="lodging" src=":/POI/lodging-11.svg" symbol-width="11"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lodging"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lodging"/>
         </rule>
     </rule>
     <rule e="any" k="tourism|accommodation" v="camp_site|caravan_site" zoom-min="16">
         <symbol id="camp" src=":/POI/campsite-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="camp"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="camp"/>
         </rule>
     </rule>
 
-    <rule e="any" k="man_made" v="lighthouse" zoom-min="16">
+    <rule e="any" k="man_made" v="lighthouse" zoom-min="15">
         <symbol id="lighthouse" src=":/POI/lighthouse-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="lighthouse"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lighthouse"/>
         </rule>
     </rule>
     <rule e="any" k="tower" v="communication" zoom-min="16">
         <symbol id="com-tower" src=":/POI/communications-tower-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="com-tower"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="com-tower"/>
+        </rule>
+    </rule>
+    <rule e="any" k="tower" v="observation" zoom-min="16">
+        <symbol id="obs-tower" src=":/POI/observation-tower.svg" symbol-width="11" priority="5"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="obs-tower"/>
+        </rule>
+    </rule>
+    <rule e="any" k="power" v="generator" zoom-min="16">
+        <rule e="any" k="generator:source" v="wind">
+            <symbol id="wind-turbine" src=":/POI/cross-11.svg" symbol-width="11" priority="5"/>
+            <rule e="any" k="*" v="*" zoom-min="17">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="wind-turbine"/>
+            </rule>
+        </rule>
+    </rule>
+    <rule e="any" k="man_made" v="watermill" zoom-min="16">
+        <symbol id="watermill" src=":/POI/watermill-11.svg" symbol-width="11" priority="5"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="watermill"/>
+        </rule>
+    </rule>
+    <rule e="any" k="man_made|tower" v="windmill" zoom-min="16">
+        <symbol id="windmill" src=":/POI/windmill-11.svg" symbol-width="11" priority="5"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="windmill"/>
         </rule>
     </rule>
 
     <rule e="any" k="amenity" v="theatre" zoom-min="16">
         <symbol id="theatre" src=":/POI/theatre-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="theatre"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="theatre"/>
+        </rule>
     </rule>
     <rule e="any" k="amenity" v="cinema" zoom-min="16">
         <symbol id="cinema" src=":/POI/cinema-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="cinema"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cinema"/>
+        </rule>
     </rule>
     <rule e="any" k="tourism" v="museum" zoom-min="16">
         <symbol id="museum" src=":/POI/museum-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="museum"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="museum"/>
         </rule>
     </rule>
     <rule e="any" k="amenity|building" v="library" zoom-min="16">
         <symbol id="library" src=":/POI/library-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="library"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="library"/>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="post_office" zoom-min="16">
         <symbol id="post" src=":/POI/post-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="post"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="post"/>
         </rule>
     </rule>
-    <rule e="any" k="historic" v="memorial" zoom-min="17">
+    <rule e="any" k="historic" v="memorial|monument" zoom-min="17">
         <symbol id="memorial" src=":/POI/monument-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="18">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="memorial"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="memorial"/>
         </rule>
     </rule>
-    <rule e="any" k="amenity" v="bank" zoom-min="16">
+    <rule e="any" k="amenity" v="bank" zoom-min="17">
         <symbol id="bank" src=":/POI/bank-11.svg" symbol-width="11"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bank"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bank"/>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="toilets" zoom-min="16">
@@ -746,139 +872,266 @@
     <rule e="any" k="information" v="visitor_centre|office" zoom-min="16">
         <symbol id="information" src=":/POI/information-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="information"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="information"/>
         </rule>
     </rule>
     <rule e="any" k="historic" v="castle" zoom-min="16">
         <symbol id="castle" src=":/POI/castle-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="castle"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="castle"/>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="townhall" zoom-min="16">
         <symbol id="townhall" src=":/POI/town-hall-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="townhall"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="townhall"/>
         </rule>
     </rule>
-    <rule e="any" k="amenity" v="school|university" zoom-min="16">
+    <rule e="any" k="amenity" v="university|college" zoom-min="16">
+        <symbol id="university" src=":/POI/college-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="university"/>
+        </rule>
+    </rule>
+    <rule e="any" k="amenity" v="school" zoom-min="16">
         <symbol id="school" src=":/POI/school-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="school"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="school"/>
+        </rule>
+    </rule>
+    <rule e="any" k="amenity|building" v="embassy" zoom-min="16">
+        <symbol id="embassy" src=":/POI/embassy-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="embassy"/>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="stadium" zoom-min="16">
+        <symbol id="stadium" src=":/POI/stadium-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="stadium"/>
+        </rule>
+    </rule>
+    <rule e="any" k="tourism" v="zoo" zoom-min="16">
+        <symbol id="zoo" src=":/POI/zoo-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="zoo"/>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="park" zoom-min="16">
+        <rule e="any" k="name" v="*">
+            <symbol id="park" src=":/POI/park-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="17">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="park"/>
+            </rule>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="garden" zoom-min="16">
+        <rule e="any" k="name" v="*">
+            <symbol id="garden" src=":/POI/garden-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="17">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="garden"/>
+            </rule>
         </rule>
     </rule>
 
     <rule e="any" k="sport" v="swimming" zoom-min="16">
         <symbol id="swimming" src=":/POI/swimming-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="swimming"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="swimming"/>
         </rule>
     </rule>
-    <rule e="any" k="sport" v="golf" zoom-min="16">
+    <rule e="any" k="sport|leisure" v="golf|golf_course" zoom-min="17">
         <symbol id="golf" src=":/POI/golf-11.svg" symbol-width="11"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="golf"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="golf"/>
     </rule>
-    <rule e="any" k="sport" v="soccer" zoom-min="16">
+    <rule e="any" k="sport" v="soccer" zoom-min="17">
         <symbol id="soccer" src=":/POI/soccer-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="18">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="soccer"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="soccer"/>
         </rule>
     </rule>
-    <rule e="any" k="sport" v="tennis" zoom-min="16">
+    <rule e="any" k="sport" v="tennis" zoom-min="17">
         <symbol id="tennis" src=":/POI/tennis-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="18">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="tennis"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="tennis"/>
         </rule>
     </rule>
-    <rule e="any" k="sport" v="skateboard" zoom-min="16">
+    <rule e="any" k="sport" v="skateboard" zoom-min="17">
         <symbol id="skateboard" src=":/POI/skateboard-11.svg" symbol-width="11"/>
         <rule e="any" k="*" v="*" zoom-min="18">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="skateboard"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="skateboard"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="baseball" zoom-min="17">
+        <symbol id="baseball" src=":/POI/baseball-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="baseball"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="basketball" zoom-min="17">
+        <symbol id="basketball" src=":/POI/basketball-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="basketball"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="volleyball" zoom-min="17">
+        <symbol id="volleyball" src=":/POI/volleyball-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="volleyball"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="equestrian" zoom-min="17">
+        <symbol id="equestrian" src=":/POI/horse-riding-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="equestrian"/>
+        </rule>
+    </rule>
+    <rule e="any" k="sport" v="cricket" zoom-min="17">
+        <symbol id="cricket" src=":/POI/cricket-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cricket"/>
         </rule>
     </rule>
 
-    <rule e="any" k="amenity" v="restaurant" zoom-min="16">
+    <rule e="any" k="amenity" v="restaurant" zoom-min="17">
         <symbol id="restaurant" src=":/POI/restaurant-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="restaurant"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="restaurant"/>
         </rule>
     </rule>
-    <rule e="any" k="amenity" v="fast_food" zoom-min="16">
+    <rule e="any" k="amenity" v="fast_food" zoom-min="17">
         <symbol id="fast-food" src=":/POI/fast-food-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="fast-food"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="fast-food"/>
         </rule>
     </rule>
-    <rule e="any" k="amenity" v="cafe" zoom-min="16">
+    <rule e="any" k="amenity" v="cafe" zoom-min="17">
         <symbol id="cafe" src=":/POI/cafe-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="cafe"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cafe"/>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="bar" zoom-min="17">
         <symbol id="bar" src=":/POI/bar-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bar"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bar"/>
         </rule>
     </rule>
-    <rule e="any" k="amenity" v="pub" zoom-min="16">
+    <rule e="any" k="amenity" v="pub|biergarten" zoom-min="17">
         <symbol id="pub" src=":/POI/beer-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pub"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="pub"/>
+        </rule>
+    </rule>
+    <rule e="any" k="amenity" v="ice_cream" zoom-min="17">
+        <symbol id="ice-cream" src=":/POI/ice-cream-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="ice-cream"/>
         </rule>
     </rule>
 
     <rule e="any" k="shop" v="car|car_repair|car_parts" zoom-min="16">
         <symbol id="car-repair" src=":/POI/car-repair-11.svg" symbol-width="11" priority="-5"/>
-        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="car-repair"/>
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="car-repair"/>
     </rule>
     <rule e="any" k="shop" v="supermarket" zoom-min="16">
         <symbol id="supermarket" src=":/POI/grocery-11.svg" symbol-width="11" priority="-5"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="supermarket"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="supermarket"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="convenience" zoom-min="16">
+    <rule e="any" k="shop" v="convenience" zoom-min="17">
         <symbol id="convenience" src=":/POI/shop-11.svg" symbol-width="11" priority="-5"/>
         <rule e="any" k="*" v="*" zoom-min="18">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="convenience"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="convenience"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="doityourself|hardware" zoom-min="16">
+    <rule e="any" k="shop" v="doityourself|hardware" zoom-min="17">
         <symbol id="hardware" src=":/POI/hardware-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hardware"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hardware"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="bakery" zoom-min="16">
+    <rule e="any" k="shop" v="bakery" zoom-min="17">
         <symbol id="bakery" src=":/POI/bakery-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bakery"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bakery"/>
         </rule>
     </rule>
     <rule e="any" k="amenity" v="pharmacy" zoom-min="16">
         <symbol id="pharmacy" src=":/POI/pharmacy-11.svg" symbol-width="11" priority="-5"/>
         <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="pharmacy"/>
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="pharmacy"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="bicycle" zoom-min="16">
+    <rule e="any" k="shop" v="bicycle" zoom-min="17">
         <symbol id="bikeshop" src=":/POI/bicycle-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="bikeshop"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bikeshop"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="hairdresser" zoom-min="16">
+    <rule e="any" k="shop" v="hairdresser" zoom-min="17">
         <symbol id="hairdresser" src=":/POI/hairdresser-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="hairdresser"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hairdresser"/>
         </rule>
     </rule>
-    <rule e="any" k="shop" v="beverages|alcohol" zoom-min="16">
+    <rule e="any" k="shop" v="beverages|alcohol" zoom-min="17">
         <symbol id="alcohol" src=":/POI/alcohol-shop-11.svg" symbol-width="11" priority="-5"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1" symbol-id="alcohol"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="alcohol"/>
+        </rule>
+    </rule>
+    <rule e="any" k="shop" v="travel_agency" zoom-min="17">
+        <symbol id="travel-agency" src=":/POI/beach-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="travel-agency"/>
+        </rule>
+    </rule>
+    <rule e="any" k="shop" v="laundry" zoom-min="17">
+        <symbol id="laundry" src=":/POI/laundry-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="laundry"/>
+        </rule>
+    </rule>
+    <rule e="any" k="shop" v="butcher" zoom-min="17">
+        <symbol id="butcher" src=":/POI/slaughterhouse-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="butcher"/>
         </rule>
     </rule>
 
+    <rule e="any" k="military" v="bunker|bunker_disused" zoom-min="17">
+        <symbol id="bunker" src=":/symbols/bunker.svg" symbol-width="11" symbol-height="9"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bunker"/>
+        </rule>
+    </rule>
+    <rule e="any" k="historic" v="wayside_cross|wayside_shrine" zoom-min="17">
+        <symbol id="wayside-cross" src=":/symbols/cross.svg" symbol-width="6" symbol-height="8"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="wayside-cross"/>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="slipway" zoom-min="16">
+        <symbol id="slipway" src=":/POI/slipway-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="slipway"/>
+        </rule>
+    </rule>
+
+    <rule e="any" k="power" v="plant" zoom-min="15">
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" priority="1"/>
+    </rule>
+    <rule e="any" k="landuse" v="quarry" zoom-min="14">
+        <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
+    </rule>
+
+    <rule e="any" k="emergency" v="phone" zoom-min="16">
+        <symbol id="phone" src=":/POI/telephone-11.svg" symbol-width="11"/>
+    </rule>
+    <rule e="any" k="emergency" v="defibrillator" zoom-min="16">
+        <symbol id="defibrillator" src=":/POI/defibrillator-11.svg" symbol-width="11"/>
+    </rule>
+
 </rendertheme>

gpxsee.pro

@@ -3,8 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.28
-
+VERSION = 13.39
 
 QT += core \
     gui \
@@ -118,6 +117,11 @@ HEADERS += src/common/config.h \
     src/data/gpsdumpparser.h \
     src/data/style.h \
     src/data/twonavparser.h \
+    src/data/txtparser.h \
+    src/data/vkxparser.h \
+    src/data/vtkparser.h \
+    src/map/ENC/data.h \
+    src/map/IMG/light.h \
     src/map/downloader.h \
     src/map/demloader.h \
     src/map/ENC/attributes.h \
@@ -343,6 +347,9 @@ SOURCES += src/main.cpp \
     src/GUI/pngexportdialog.cpp \
     src/GUI/projectioncombobox.cpp \
     src/GUI/passwordedit.cpp \
+    src/data/txtparser.cpp \
+    src/data/vkxparser.cpp \
+    src/data/vtkparser.cpp \
     src/map/downloader.cpp \
     src/map/demloader.cpp \
     src/map/ENC/atlasdata.cpp \
@@ -523,7 +530,7 @@ win32 {
     RESOURCES += theme-color.qrc
 
     QMAKE_TARGET_DESCRIPTION = GPXSee
-    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2024 Martin Tuma
+    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2025 Martin Tuma
     RC_ICONS = icons/app/gpxsee.ico \
         icons/formats/gpx.ico \
         icons/formats/tcx.ico \
@@ -558,7 +565,9 @@ win32 {
         icons/formats/trk.ico \
         icons/formats/gemf.ico \
         icons/formats/000.ico \
-        icons/formats/031.ico
+        icons/formats/031.ico \
+        icons/formats/vtk.ico \
+        icons/formats/vkx.ico
     DEFINES += _USE_MATH_DEFINES \
         NOGDI
 }

gpxsee.qrc

@@ -6,10 +6,13 @@
 
 	<!-- Common map stuff -->
 	<qresource prefix="/symbols">
+		<file alias="bunker.svg">icons/map/symbols/bunker.svg</file>
 		<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
+		<file alias="cross.svg">icons/map/symbols/cross.svg</file>
 		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
 		<file alias="flow.svg">icons/map/symbols/flow.svg</file>
 		<file alias="oneway.svg">icons/map/symbols/oneway.svg</file>
+		<file alias="saddle.svg">icons/map/symbols/saddle.svg</file>
 	</qresource>
 
 	<!-- POIs (IMG, Mapsforge & ENC style) -->
@@ -22,6 +25,8 @@
 		<file alias="bank-11.svg">icons/map/POI/bank-11.svg</file>
 		<file alias="bar-11.svg">icons/map/POI/bar-11.svg</file>
 		<file alias="barrier-11.svg">icons/map/POI/barrier-11.svg</file>
+		<file alias="baseball-11.svg">icons/map/POI/baseball-11.svg</file>
+		<file alias="basketball-11.svg">icons/map/POI/basketball-11.svg</file>
 		<file alias="bbq-11.svg">icons/map/POI/bbq-11.svg</file>
 		<file alias="beach-11.svg">icons/map/POI/beach-11.svg</file>
 		<file alias="beer-11.svg">icons/map/POI/beer-11.svg</file>
@@ -40,13 +45,18 @@
 		<file alias="cemetery-11.svg">icons/map/POI/cemetery-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>
 		<file alias="communications-tower-11.svg">icons/map/POI/communications-tower-11.svg</file>
 		<file alias="convenience-11.svg">icons/map/POI/convenience-11.svg</file>
+		<file alias="cricket-11.svg">icons/map/POI/cricket-11.svg</file>
+		<file alias="cross-11.svg">icons/map/POI/cross-11.svg</file>
 		<file alias="dam-11.svg">icons/map/POI/dam-11.svg</file>
 		<file alias="danger-11.svg">icons/map/POI/danger-11.svg</file>
+		<file alias="defibrillator-11.svg">icons/map/POI/defibrillator-11.svg</file>
 		<file alias="doctor-11.svg">icons/map/POI/doctor-11.svg</file>
 		<file alias="drinking-water-11.svg">icons/map/POI/drinking-water-11.svg</file>
 		<file alias="fast-food-11.svg">icons/map/POI/fast-food-11.svg</file>
+		<file alias="embassy-11.svg">icons/map/POI/embassy-11.svg</file>
 		<file alias="entrance-alt1-11.svg">icons/map/POI/entrance-alt1-11.svg</file>
 		<file alias="ferry-11.svg">icons/map/POI/ferry-11.svg</file>
 		<file alias="fire-station-11.svg">icons/map/POI/fire-station-11.svg</file>
@@ -61,17 +71,24 @@
 		<file alias="harbor-11.svg">icons/map/POI/harbor-11.svg</file>
 		<file alias="hardware-11.svg">icons/map/POI/hardware-11.svg</file>
 		<file alias="heliport-11.svg">icons/map/POI/heliport-11.svg</file>
+		<file alias="home-11.svg">icons/map/POI/home-11.svg</file>
+		<file alias="horse-riding-11.svg">icons/map/POI/horse-riding-11.svg</file>
 		<file alias="hospital-11.svg">icons/map/POI/hospital-11.svg</file>
+		<file alias="hot-spring.svg">icons/map/POI/hot-spring.svg</file>
+		<file alias="ice-cream-11.svg">icons/map/POI/ice-cream-11.svg</file>
 		<file alias="information-11.svg">icons/map/POI/information-11.svg</file>
 		<file alias="landmark-11.svg">icons/map/POI/landmark-11.svg</file>
+		<file alias="laundry-11.svg">icons/map/POI/laundry-11.svg</file>
 		<file alias="library-11.svg">icons/map/POI/library-11.svg</file>
 		<file alias="lighthouse-11.svg">icons/map/POI/lighthouse-11.svg</file>
 		<file alias="lodging-11.svg">icons/map/POI/lodging-11.svg</file>
 		<file alias="monument-11.svg">icons/map/POI/monument-11.svg</file>
 		<file alias="mountain-11.svg">icons/map/POI/mountain-11.svg</file>
 		<file alias="museum-11.svg">icons/map/POI/museum-11.svg</file>
+		<file alias="observation-tower.svg">icons/map/POI/observation-tower.svg</file>
 		<file alias="park-11.svg">icons/map/POI/park-11.svg</file>
 		<file alias="parking-11.svg">icons/map/POI/parking-11.svg</file>
+		<file alias="parking-garage-11.svg">icons/map/POI/parking-garage-11.svg</file>
 		<file alias="pharmacy-11.svg">icons/map/POI/pharmacy-11.svg</file>
 		<file alias="picnic-site-11.svg">icons/map/POI/picnic-site-11.svg</file>
 		<file alias="place-of-worship-11.svg">icons/map/POI/place-of-worship-11.svg</file>
@@ -93,19 +110,27 @@
 		<file alias="shop-11.svg">icons/map/POI/shop-11.svg</file>
 		<file alias="skateboard-11.svg">icons/map/POI/skateboard-11.svg</file>
 		<file alias="skiing-11.svg">icons/map/POI/skiing-11.svg</file>
+		<file alias="slaughterhouse-11.svg">icons/map/POI/slaughterhouse-11.svg</file>
+		<file alias="slipway-11.svg">icons/map/POI/slipway-11.svg</file>
 		<file alias="soccer-11.svg">icons/map/POI/soccer-11.svg</file>
+		<file alias="stadium-11.svg">icons/map/POI/stadium-11.svg</file>
 		<file alias="swimming-11.svg">icons/map/POI/swimming-11.svg</file>
 		<file alias="telephone-11.svg">icons/map/POI/telephone-11.svg</file>
 		<file alias="tennis-11.svg">icons/map/POI/tennis-11.svg</file>
 		<file alias="theatre-11.svg">icons/map/POI/theatre-11.svg</file>
 		<file alias="toilet-11.svg">icons/map/POI/toilet-11.svg</file>
 		<file alias="town-hall-11.svg">icons/map/POI/town-hall-11.svg</file>
+		<file alias="triangle-11.svg">icons/map/POI/triangle-11.svg</file>
+		<file alias="triangle-stroked-11.svg">icons/map/POI/triangle-stroked-11.svg</file>
 		<file alias="viewpoint-11.svg">icons/map/POI/viewpoint-11.svg</file>
 		<file alias="village-11.svg">icons/map/POI/village-11.svg</file>
 		<file alias="volcano-11.svg">icons/map/POI/volcano-11.svg</file>
+		<file alias="volleyball-11.svg">icons/map/POI/volleyball-11.svg</file>
 		<file alias="water-11.svg">icons/map/POI/water-11.svg</file>
 		<file alias="waterfall-11.svg">icons/map/POI/waterfall-11.svg</file>
+		<file alias="watermill-11.svg">icons/map/POI/watermill-11.svg</file>
 		<file alias="wetland-11.svg">icons/map/POI/wetland-11.svg</file>
+		<file alias="windmill-11.svg">icons/map/POI/windmill-11.svg</file>
 		<file alias="zoo-11.svg">icons/map/POI/zoo-11.svg</file>
 	</qresource>
 
@@ -168,6 +193,10 @@
 		<file alias="overfalls.png">icons/map/marine/overfalls.png</file>
 		<file alias="boarding-place.png">icons/map/marine/boarding-place.png</file>
 		<file alias="light.png">icons/map/marine/light.png</file>
+		<file alias="light-red.png">icons/map/marine/light-red.png</file>
+		<file alias="light-green.png">icons/map/marine/light-green.png</file>
+		<file alias="light-yellow.png">icons/map/marine/light-yellow.png</file>
+		<file alias="light-white.png">icons/map/marine/light-white.png</file>
 		<file alias="building.png">icons/map/marine/building.png</file>
 		<file alias="fog-signal.png">icons/map/marine/fog-signal.png</file>
 		<file alias="construction.png">icons/map/marine/construction.png</file>
@@ -181,6 +210,13 @@
 		<file alias="kelp.png">icons/map/marine/kelp.png</file>
 		<file alias="eddies.png">icons/map/marine/eddies.png</file>
 		<file alias="dome.png">icons/map/marine/dome.png</file>
+		<file alias="radar-reflector.png">icons/map/marine/radar-reflector.png</file>
+		<file alias="24h-anchorage.png">icons/map/marine/24h-anchorage.png</file>
+		<file alias="dw-anchorage.png">icons/map/marine/dw-anchorage.png</file>
+		<file alias="tanker-anchorage.png">icons/map/marine/tanker-anchorage.png</file>
+		<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>
 	</qresource>
 
 	<!-- Patterns (Mapsforge) -->

icons/formats/scripts/extensions

@@ -32,3 +32,5 @@ trk:#cccccc
 gemf:#147085
 000:#000000
 031:#000000
+vtk:#632433
+vkx:#00ccff

icons/map/POI/baseball-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="baseball-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M7,3c0,0.5523-0.4477,1-1,1S5,3.5523,5,3s0.4477-1,1-1S7,2.4477,7,3z M9.85,10.24L9.85,10.24l-3-4.85&#xA;&#x9;C6.7391,5.2011,6.5603,5.0616,6.35,5H2.5C2.2239,5,2,5.2239,2,5.5S2.2239,6,2.5,6H5l0.92,1.09l-2.73,3l0,0&#xA;&#x9;C3.0637,10.1876,2.9928,10.3405,3,10.5C3,10.7761,3.2239,11,3.5,11c0.1224-0.0006,0.2401-0.047,0.33-0.13l0,0l3-2.71L9,10.81l0,0&#xA;&#x9;c0.0912,0.1178,0.231,0.1877,0.38,0.19c0.2761,0,0.5-0.2239,0.5-0.5C9.8938,10.4122,9.8834,10.3223,9.85,10.24z M4,0.28&#xA;&#x9;C4,0.1254,3.8746,0,3.72,0C3.6221,0.0262,3.5348,0.0821,3.47,0.16L2,4.59C1.9941,4.6331,1.9941,4.6769,2,4.72&#xA;&#x9;C2,4.8746,2.1254,5,2.28,5c0.1015-0.0243,0.1926-0.0803,0.26-0.16L4,0.41C4.006,0.3669,4.006,0.3231,4,0.28z"/>
+</svg>

icons/map/POI/basketball-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="basketball-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path id="icon_concepts:_sports_leisure" d="M2.63,3.51a5.1555,5.1555,0,0,1,.34,1.48H2.04A3.2586,3.2586,0,0,1,2.63,3.51Zm.55-.63a6.2022,6.2022,0,0,1,.55,2.11H5.12V2.01A3.4256,3.4256,0,0,0,3.18,2.88Zm2.7-.87V4.99H7.27a6.2022,6.2022,0,0,1,.55-2.11A3.4256,3.4256,0,0,0,5.88,2.01Zm2.49,1.5a5.1555,5.1555,0,0,0-.34,1.48h.93A3.2586,3.2586,0,0,0,8.37,3.51ZM9.9,6.5a.4952.4952,0,0,1-.49.5H8.44L7.91,8.05v1.7a.2176.2176,0,0,1-.14.2.236.236,0,0,1-.08.02.1987.1987,0,0,1-.16-.07l-.75-.74-1.16.77a.2107.2107,0,0,1-.24,0L4.22,9.16l-.75.74a.2222.2222,0,0,1-.38-.15V8.05L2.57,7H1.6a.5.5,0,1,1,0-1H9.4a.4951.4951,0,0,1,.5.49ZM3.53,8V9.22l.5-.5c.01,0,.01-.01.02-.01L5.1,7H3.06l.45.9A.3561.3561,0,0,1,3.53,8Zm2.97.82-1-1.63-1,1.63,1,.67ZM7.94,7H5.9L6.95,8.71c.01,0,.01.01.02.01l.5.5V8a.3561.3561,0,0,1,.02-.1Z"/>
+</svg>

icons/map/POI/college-11.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="college-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <g>
+    <path d="M2,7.3c0.3-0.2,0.5-0.5,0.5-0.8c0-0.4-0.2-0.7-0.6-0.9V4.4L5.5,6L11,3.5L5.5,1L0,3.5L1.2,4v1.6&#xA;  C0.8,5.8,0.6,6.1,0.6,6.5c0,0.3,0.2,0.6,0.5,0.8L0.6,9c-0.3,1,0.5,1,0.5,1h1c0,0,0.8,0,0.5-1L2,7.3z"/>
+    <path d="M3.5,6.2c0,0.1,0,0.2,0,0.3c0,0.4-0.2,0.8-0.4,1.1C3.3,8,3.5,8.4,3.5,9v0.6C4,9.8,4.7,10,5.5,10&#xA;  C8,10,9,8.5,9,8.5v-3L5.5,7.1L3.5,6.2z"/>
+  </g>
+</svg>

icons/map/POI/cricket-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cricket-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M6,1c0,0.5523-0.4477,1-1,1S4,1.5523,4,1s0.4477-1,1-1S6,0.4477,6,1z M8.88,5.18l-1-2l0,0l0,0&#xA;&#x9;C7.7859,3.0671,7.647,3.0012,7.5,3H2.77C2.3827,2.9815,2.0467,3.2651,2,3.65l0,0l-1,6.71l0,0c-0.0068,0.0464-0.0068,0.0936,0,0.14&#xA;&#x9;C1,10.7761,1.2239,11,1.5,11c0.2307,0.0129,0.4391-0.1371,0.5-0.36l0,0l1.22-3.89l0,0l0.21-0.83l0.4,0.44l0,0L5,7.6v2.9&#xA;&#x9;C5,10.7761,5.2239,11,5.5,11S6,10.7761,6,10.5v-3l0,0l0,0C5.9971,7.3984,5.9621,7.3004,5.9,7.22l0,0L4.45,5.5L5.5,4h1.71l0.92,1.84&#xA;&#x9;l0,0C8.2247,5.9439,8.3594,6.0022,8.5,6C8.7723,6.0001,8.9946,5.7822,9,5.51C8.9826,5.3931,8.9418,5.2808,8.88,5.18z M10.5,8&#xA;&#x9;C10.2239,8,10,8.2239,10,8.5S10.2239,9,10.5,9S11,8.7761,11,8.5S10.7761,8,10.5,8z M8.69,8V7.25C8.69,7.1119,8.5781,7,8.44,7&#xA;&#x9;S8.19,7.1119,8.19,7.25V8C8.0378,8.0855,7.9426,8.2455,7.94,8.42v2.08c0,0.2761,0.2239,0.5,0.5,0.5s0.5-0.2239,0.5-0.5V8.41&#xA;&#x9;C8.9339,8.2391,8.8392,8.0837,8.69,8z"/>
+</svg>

icons/map/POI/cross-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cross-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M2.2,1.19l3.3,3.3L8.8,1.2C8.9314,1.0663,9.1127,0.9938,9.3,1C9.6761,1.0243,9.9757,1.3239,10,1.7&#xA;&#x9;c0.0018,0.1806-0.0705,0.3541-0.2,0.48L6.49,5.5L9.8,8.82C9.9295,8.9459,10.0018,9.1194,10,9.3C9.9757,9.6761,9.6761,9.9757,9.3,10&#xA;&#x9;c-0.1873,0.0062-0.3686-0.0663-0.5-0.2L5.5,6.51L2.21,9.8c-0.1314,0.1337-0.3127,0.2062-0.5,0.2C1.3265,9.98,1.02,9.6735,1,9.29&#xA;&#x9;C0.9982,9.1094,1.0705,8.9359,1.2,8.81L4.51,5.5L1.19,2.18C1.0641,2.0524,0.9955,1.8792,1,1.7C1.0243,1.3239,1.3239,1.0243,1.7,1&#xA;&#x9;C1.8858,0.9912,2.0669,1.06,2.2,1.19z"/>
+</svg>

icons/map/POI/defibrillator-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11" id="defibrillator-11">
+  <path d="M1.42,4.7955C-0.2131,1.5291,3.9327-.6514,5.512,2.6149,7.0914-.6514,11.2371,1.5291,9.6039,4.7955c-0.0225.0377-.0483,0.0732-0.071,0.1108H8.3867L7.5586,3.252a0.65,0.65,0,0,0-1.1172,0L5,6.1338,4.5586,5.252A0.6243,0.6243,0,0,0,4,4.9063H1.4913C1.4685,4.8687,1.4427,4.8332,1.42,4.7955ZM8,6.1563a0.6243,0.6243,0,0,1-.5586-0.3457L7,4.9287,5.5586,7.8105a0.6241,0.6241,0,0,1-1.1172,0L3.6133,6.1563H2.3006a24.2269,24.2269,0,0,0,2.8973,3.449L5.2134,9.6208A0.44,0.44,0,0,0,5.835,9.6053a24.2289,24.2289,0,0,0,2.8905-3.449H8Z"/>
+</svg>

icons/map/POI/embassy-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="embassy-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M5.5,2C4.6014,2.0766,3.7537,2.4494,3.09,3.06C3.0316,3.1262,2.9995,3.2117,3,3.3v3.32&#xA;&#x9;C2.9889,6.8074,3.1318,6.9684,3.3193,6.9796C3.4115,6.985,3.5021,6.9527,3.57,6.89C4.1239,6.4637,4.8011,6.2286,5.5,6.22&#xA;&#x9;C6.61,6.22,6.85,7,8,7c0.6869-0.0671,1.3313-0.3629,1.83-0.84C9.9401,6.0917,10.0051,5.9695,10,5.84V2.37&#xA;&#x9;c0.0309-0.1908-0.0987-0.3705-0.2896-0.4014C9.6387,1.9569,9.5652,1.9679,9.5,2C9.0686,2.3529,8.5507,2.5842,8,2.67&#xA;&#x9;C6.85,2.67,6.65,2,5.5,2z M1.5,1.5c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1S0.9477,1.5,1.5,1.5z M2,4.5v6&#xA;&#x9;C2,10.7761,1.7761,11,1.5,11S1,10.7761,1,10.5v-6C1,4.2239,1.2239,4,1.5,4S2,4.2239,2,4.5z"/>
+</svg>

icons/map/POI/home-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11" id="home-11">
+  <path d="M10.0015,4.7507c0,0.13807-0.11193,0.25-0.25,0.25H1.25c-0.13807,0-0.25-0.11193-0.25-0.25&#xA;&#x9;c-0.00054-0.07163,0.02839-0.14033,0.08-0.19l4.2378-3.4545l0.016-0.016c0.10112-0.09209,0.2577-0.08493,0.35,0.016l2.3174,1.8892&#xA;&#x9;V1.5c0-0.27614,0.22386-0.5,0.5-0.5s0.5,0.22386,0.5,0.5v2.31l0.92,0.75C9.9731,4.60979,10.00215,4.67878,10.0015,4.7507z M2,9.7514&#xA;&#x9;c-0.00111,0.13696,0.10902,0.24889,0.24598,0.25c0.00001,0,0.00001,0,0.00002,0h2.7547v-2h1v2h2.7526&#xA;&#x9;c0.13697,0,0.248-0.11103,0.248-0.248l0,0l0,0V6.0009H2V9.7514z"/>
+</svg>

icons/map/POI/horse-riding-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="horse-riding-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M4,1A1,1,0,1,1,5,2,1,1,0,0,1,4,1Zm6.88,3.5L9,3V2.5L7,5H6L7,6V7.014a.5.5,0,1,1-1,0V6.5L4,5H3a1,1,0,0,0-.8.446A1.189,1.189,0,0,0,1.247,5,1.076,1.076,0,0,0,0,5.988C0,7.3.635,7.471.635,7.471a.33.33,0,0,0,.115.023A.253.253,0,0,0,1,7.25V6a.49.49,0,0,1,.48-.5H1.5A.5.5,0,0,1,2,6V8.014l-.3.6a1.609,1.609,0,0,0-.2.6v1.542A.244.244,0,0,0,1.744,11,.255.255,0,0,0,2,10.756V9.514a.367.367,0,0,1,.1-.3l.9-1.2V9l.467,1.816A.256.256,0,0,0,3.709,11a.25.25,0,0,0,.25-.25v-.016l-.242-1.61a.6.6,0,0,1,.025-.236L3.8,8.714,4,8H6V9l.466,1.816A.256.256,0,0,0,6.709,11a.25.25,0,0,0,.25-.25L6.718,9.124a.6.6,0,0,1,.025-.236L7,8a.877.877,0,0,0,.934-.661L8.5,4.5a.6.6,0,0,0,.71.454.562.562,0,0,0,.143-.07l.9.116a.721.721,0,0,0,.392.1A.331.331,0,0,0,11,4.784.406.406,0,0,0,10.88,4.5ZM6,3.5A.51.51,0,0,0,5.5,3h-1a.482.482,0,0,0-.5.5V5H6Z"/>
+</svg>

icons/map/POI/hot-spring.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="hot-spring" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.682,5.759c-.505-.725-.781-1.121-.63-2.376,.139-1.156,.678-1.616,1.198-2.059,.404-.345,.797-.68,.981-1.324,.301,.722-.036,1.47-.349,2.164-.311,.691-.599,1.329-.211,1.836,.971,1.271,1.963,2.88,.971,4.586-.214,.393-.539,.681-.861,.968-.422,.375-.841,.747-1.004,1.348-.269-.677,.008-1.366,.285-2.052,.306-.759,.61-1.516,.172-2.251-.203-.34-.389-.607-.551-.84Zm3.371-1.174c-.098-.632,.034-1.281,.368-1.809,.367-.45,.701-.642,.991-.81,.345-.199,.627-.362,.83-.877,.289,.684,0,1.188-.304,1.718-.119,.207-.24,.418-.329,.645-.191,.61,.101,.893,.467,1.247,.358,.346,.786,.76,.899,1.617,.083,.635-.036,1.156-.372,1.684-.356,.436-.681,.655-.965,.846-.356,.24-.648,.437-.856,.965-.292-.688,.031-1.259,.353-1.828,.123-.217,.246-.434,.334-.658,.073-.558-.234-.867-.581-1.217-.357-.36-.757-.763-.834-1.523Zm-8.018,0c-.098-.632,.005-1.3,.368-1.809,.376-.528,.729-.717,1.035-.881,.323-.173,.594-.318,.786-.806,.289,.683-.014,1.208-.325,1.749-.122,.212-.246,.427-.336,.655-.152,.385,.131,1.014,.501,1.242,1.002,.801,1.227,2.286,.547,3.353-.366,.448-.704,.648-.999,.823-.353,.209-.645,.382-.849,.898-.278-.656,.008-1.18,.3-1.714,.131-.24,.263-.481,.345-.737,.179-.557-.134-.884-.51-1.277-.349-.365-.752-.785-.863-1.498Zm10.965,4.414c.7,2.616-3.474,3-5.5,3s-6.2-.484-5.5-3c-.633,.316-1,.961-1,1.5,0,1.519,2.91,2.9,6.5,2.9s6.5-1.381,6.5-2.9c0-.539-.367-1.184-1-1.5Z"/>
+</svg>

icons/map/POI/ice-cream-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="ice-cream-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M4,6c0.541,0.0007,1.0676-0.1748,1.5-0.5C5.9324,5.8252,6.459,6.0007,7,6l-1,4.69c-0.1082,0.2541-0.4019,0.3723-0.656,0.264&#xA;&#x9;c-0.1188-0.0506-0.2134-0.1452-0.264-0.264L4,6z M7,2H6.91c0.2826-0.7787-0.1195-1.6391-0.8982-1.9218S4.3726,0.1978,4.09,0.9765&#xA;&#x9;C3.97,1.3071,3.97,1.6694,4.09,2H4C3.1716,2,2.5,2.6716,2.5,3.5S3.1716,5,4,5s1.5-0.6716,1.5-1.5l0,0l0,0l0,0&#xA;&#x9;C5.5,4.3284,6.1716,5,7,5s1.5-0.6716,1.5-1.5S7.8284,2,7,2z"/>
+</svg>

icons/map/POI/laundry-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="laundry-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path3291" d="M5,0L4,2H2c0,0-1,0-1,1v7c0,0,0,1,1,1h7c1,0,1-1,1-1V1c0-1-1-1-1-1H5z M6,1h3v1H6V1z M5.5,4&#xA;&#x9;C6.8807,4,8,5.1193,8,6.5S6.8807,9,5.5,9S3,7.8807,3,6.5S4.1193,4,5.5,4z"/>
+</svg>

icons/map/POI/observation-tower.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="observation-tower">
+  <path d="M12 12.5H11.5L10 9V7C10.9951 7 10.9951 6.25 10.9951 6.25L11.5 3C11.5 3 11.5 2.5 11 2.5H10C10 2.5 10 2 9.5 2H8.5V1.5C8.5 1.5 8.5 0.5 7.5 0.5C6.5 0.5 6.5 1.5 6.5 1.5V2H5.5C5 2 5 2.5 5 2.5H4C3.5 2.5 3.5 3 3.5 3L4.0049 6.25C4.0049 6.25 4.0049 7 5 7V9L3.5 12.5H3C3 12.5 2 12.5 2 13.25C2 14 3 14 3 14H12C12 14 13 14 13 13.25C13 12.5 12 12.5 12 12.5ZM10.25 3.5L10 5H5L4.75 3.4971L10.25 3.5ZM8.5 7V8H6.5V7H8.5ZM6.5006 9.4971H8.4994L9.5 12.5H5.5L6.5006 9.4971Z"/>
+</svg>

icons/map/POI/parking-garage-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="parking-garage-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M7.25,7.44C6.8067,7.7602,6.2657,7.9158,5.72,7.88H4.45V10H3.19V4H5.8c0.5201-0.0279,1.0324,0.1358,1.44,0.46&#xA;&#x9;c0.3847,0.372,0.5828,0.8966,0.54,1.43C7.8557,6.4611,7.6596,7.0348,7.25,7.44z M6.25,5.28c-0.1946-0.1475-0.4365-0.2186-0.68-0.2&#xA;&#x9;H4.45v1.76H5.6c0.246,0.0129,0.4882-0.0654,0.68-0.22c0.1746-0.1813,0.2621-0.4293,0.24-0.68c0.023-0.2449-0.0651-0.4871-0.24-0.66&#xA;&#x9;L6.25,5.28z M10.41,3.28c0.1349-0.2403,0.0499-0.5444-0.19-0.68l-4.5-2.5c-0.1521-0.0855-0.3379-0.0855-0.49,0l-4.5,2.5&#xA;&#x9;C0.4972,2.7485,0.4288,3.0576,0.5773,3.2904C0.7144,3.5054,0.9913,3.5828,1.22,3.47l4.28-2.4l4.26,2.37&#xA;&#x9;c0.2421,0.1328,0.546,0.0442,0.6789-0.1979C10.4392,3.2414,10.4396,3.2407,10.44,3.24L10.41,3.28z"/>
+</svg>

icons/map/POI/slaughterhouse-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="slaughterhouse-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M11,5.75v.241C11,7,10,6.5,10,6.5H8A3.081,3.081,0,0,1,7,8a2.848,2.848,0,0,1-.416.9.26.26,0,0,0-.05.242l.458,1.55A.227.227,0,0,1,7,10.75a.25.25,0,0,1-.25.25.259.259,0,0,1-.244-.173L6,9V8.5H2.75l-.21.42a.25.25,0,0,0-.02.168L3,10.75a.25.25,0,0,1-.25.25.26.26,0,0,1-.237-.172L2,9V8.5a4.013,4.013,0,0,1-.843-.139,1.383,1.383,0,0,1-.5,1.045.242.242,0,0,0-.094.282l.414.99a.213.213,0,0,1,.011.072.25.25,0,0,1-.25.25.253.253,0,0,1-.228-.148L0,9.5a6.031,6.031,0,0,0,0-2v-2A1.486,1.486,0,0,1,2,4.1s.768.132,1.1.154A2.457,2.457,0,0,0,4,4.087,1.666,1.666,0,0,1,4.5,4a1.648,1.648,0,0,1,.844.257,3.166,3.166,0,0,0,.9.23L7,4.5s.966-.484,1-.5V3.5l.5.5A1.474,1.474,0,0,1,10,3.5.914.914,0,0,0,9,4l1,1,.68.529a.425.425,0,0,1,.07-.029A.238.238,0,0,1,11,5.75Z"/>
+</svg>

icons/map/POI/slipway-11.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="slipway-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <g id="slipway-final">
+    <path d="M1.0417,8l8,1.3794V10h-8Zm8-4-1,1v.625L3.7345,4.01l.0777-.2852.86-.8447H5.5a.35.35,0,0,0,0-.6992H4.529a.3478.3478,0,0,0-.2451.1L3.2546,3.291a.3566.3566,0,0,0-.0928.1582l-.0856.3137L1.0417,3C1.0948,4,1,5.5094,3,5.8844,3.9829,6.0687,8.0948,7,8.0948,7l1.9469-2Z"/>
+  </g>
+</svg>

icons/map/POI/stadium-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="stadium-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path4177" d="M5,0v3v0.0117&#xA;&#x9;C2.7922,3.1089,1.0876,3.8182,1,4.6816c0,0,0,2.4594,0,3.6816C0.9995,9.2672,3.0143,10,5.5,10s4.5005-0.7328,4.5-1.6367V4.6816&#xA;&#x9;C9.9122,3.8177,8.2093,3.1082,6,3.0117V2.5723L8.5,1.5L5,0z M1.8184,5.752C2.1366,5.9302,2.5373,6.0838,3,6.2051v2.459&#xA;&#x9;C2.2493,8.4283,1.8213,8.0972,1.8184,7.75V5.752z M9.1816,5.7559V7.75C9.1803,8.0979,8.7521,8.4298,8,8.666V6.2031&#xA;&#x9;C8.4614,6.0836,8.862,5.932,9.1816,5.7559z M4,6.3984C4.4815,6.4652,4.9888,6.4995,5.5,6.5C6.0112,6.4995,6.5185,6.4652,7,6.3984&#xA;&#x9;v2.4922C6.5282,8.9624,6.0171,8.9997,5.5,9C4.9829,8.9997,4.4718,8.9624,4,8.8906V6.3984z"/>
+</svg>

icons/map/POI/triangle-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="triangle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="rect3338" d="M5.5174,1.2315&#xA;&#x9;C5.3163,1.2253,5.1276,1.328,5.024,1.5l-4,6.6598C0.8013,8.5293,1.0679,8.9999,1.5,9h8c0.4321-0.0001,0.6987-0.4707,0.476-0.8402&#xA;&#x9;l-4-6.6598C5.8787,1.3386,5.706,1.2375,5.5174,1.2315z"/>
+</svg>

icons/map/POI/triangle-stroked-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="triangle-stroked-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="rect3338" d="M5.5174,1.2315&#xA;&#x9;C5.3163,1.2253,5.1276,1.328,5.024,1.5l-4,6.6598C0.8013,8.5293,1.0679,8.9999,1.5,9h8c0.4321-0.0001,0.6987-0.4707,0.476-0.8402&#xA;&#x9;l-4-6.6598C5.8787,1.3386,5.706,1.2375,5.5174,1.2315z M5.5,2.8627l3.0191,5.0286H2.4809L5.5,2.8627z"/>
+</svg>

icons/map/POI/volleyball-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="volleyball-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M9.99,5.73a3.6572,3.6572,0,0,1-.1.74A6.3224,6.3224,0,0,0,7.44,5.05a5.9537,5.9537,0,0,0-1.32-.27c-.03,0-.07-.01-.11-.01A4.6052,4.6052,0,0,1,5.5,3.64a1.0563,1.0563,0,0,1-.06-.24h.12a4.8784,4.8784,0,0,1,1.01.11,5.0388,5.0388,0,0,1,1.14.36,4.8341,4.8341,0,0,1,.94.53A5.1356,5.1356,0,0,1,9.99,5.73ZM9.33,7.31a5.1964,5.1964,0,0,0-1.36-.97c-.05.1-.11.19-.17.29a5.8645,5.8645,0,0,1-.59.82,7.1807,7.1807,0,0,1-.78.78,6.72,6.72,0,0,1-.93.65,6.3643,6.3643,0,0,1-1.86.72,4.524,4.524,0,0,0,3.72,0,4.1584,4.1584,0,0,0,1.25-.86,3.1983,3.1983,0,0,0,.43-.47,3.7473,3.7473,0,0,0,.48-.76A1.1915,1.1915,0,0,0,9.33,7.31ZM8.68,2.32a4.5077,4.5077,0,0,0-1.24-.88,3.979,3.979,0,0,0-.75-.28,4.3423,4.3423,0,0,0-1.03-.15,1.2787,1.2787,0,0,0-.32,0A5.3628,5.3628,0,0,0,5.25,2c0,.14.01.28.02.41a1.6165,1.6165,0,0,1,.22-.01,1.9237,1.9237,0,0,1,.24.01,6.6508,6.6508,0,0,1,1,.11,5.6947,5.6947,0,0,1,1,.28,6.7814,6.7814,0,0,1,1.02.47,6.6645,6.6645,0,0,1,.98.69A4.5655,4.5655,0,0,0,8.68,2.32ZM3.03,6.34a5.808,5.808,0,0,1-.4-.92,5.7849,5.7849,0,0,1-.28-1.03,6.86,6.86,0,0,1-.1-1.12V3.25a5.656,5.656,0,0,1,.07-.93A4.3939,4.3939,0,0,0,1.27,3.97,4.3206,4.3206,0,0,0,1,5.5a1.7671,1.7671,0,0,0,.01.23,4.4161,4.4161,0,0,0,.09.73,4.0749,4.0749,0,0,0,.31.91,1.0685,1.0685,0,0,0,.27-.07A5.0679,5.0679,0,0,0,3.2,6.63C3.14,6.53,3.08,6.44,3.03,6.34Zm3.88-.4a5.4992,5.4992,0,0,0-1.35-.19c-.02.03-.04.05-.06.08a6.2466,6.2466,0,0,1-.91,1.01,5.8334,5.8334,0,0,1-.8.61,6.5727,6.5727,0,0,1-1.83.82,3.1983,3.1983,0,0,0,.43.47,5.1724,5.1724,0,0,0,2.18-.51,5.4146,5.4146,0,0,0,.93-.55,5.5958,5.5958,0,0,0,.91-.84A4.8049,4.8049,0,0,0,7,6.01a.0517.0517,0,0,0,.02-.04A.2283.2283,0,0,0,6.91,5.94ZM4.88,4.78a5.6391,5.6391,0,0,1-.45-1.27,6.3861,6.3861,0,0,1-.16-.99c-.01-.17-.02-.35-.02-.52a5.83,5.83,0,0,1,.06-.84,3.9815,3.9815,0,0,0-.75.28A5.5806,5.5806,0,0,0,3.27,2.8c-.01.15-.02.3-.02.45a4.2153,4.2153,0,0,0,.04.62,4.7107,4.7107,0,0,0,.27,1.18,5.0984,5.0984,0,0,0,.42.92A.0517.0517,0,0,0,4,6.01a.1778.1778,0,0,0,.08-.07h.01a5.6817,5.6817,0,0,0,.84-1.06A.3131.3131,0,0,1,4.88,4.78Z"/>
+</svg>

icons/map/POI/watermill-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="watermill-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.9874,4.375C9.9216,2.5436,8.4563,1.0784,6.625,1.0126V1h-0.25v0.0126C5.274,1.0521,4.3123,1.6034,3.7004,2.4301L2.5059,1&#xA;&#x9;L0,4h1v4l1.8-1l1.8,1l1.1202-0.6218C5.2513,7.2512,4.825,7.021,4.4765,6.7003L6.252,4.9247c0.0385,0.0226,0.0788,0.0383,0.123,0.05&#xA;&#x9;v2.0399L6.4014,7L6.625,7.1243V4.9747c0.0442-0.0117,0.0845-0.0274,0.123-0.05l1.7755,1.7755&#xA;&#x9;C8.1429,7.0505,7.6736,7.3016,7.1526,7.4177l0.5937,0.3301C9.0195,7.2596,9.9359,6.0602,9.9874,4.625H10v-0.25H9.9874z&#xA;&#x9; M4.2997,6.5235C3.8347,6.0182,3.5435,5.3568,3.5126,4.625h2.5126c0.0117,0.0442,0.0274,0.0845,0.05,0.123L4.2997,6.5235z&#xA;&#x9; M6.0253,4.375H3.5126c0.0308-0.7318,0.3221-1.3932,0.7871-1.8985L6.0753,4.252C6.0527,4.2905,6.037,4.3308,6.0253,4.375z&#xA;&#x9; M6.375,4.0253c-0.0442,0.0117-0.0845,0.0274-0.123,0.05L4.4765,2.2997c0.5053-0.465,1.1667-0.7563,1.8985-0.7871V4.0253z&#xA;&#x9; M6.625,4.0253V1.5126c0.7318,0.0308,1.3932,0.3221,1.8985,0.7871L6.748,4.0753C6.7095,4.0527,6.6692,4.037,6.625,4.0253z&#xA;&#x9; M8.7003,6.5235L6.9247,4.748c0.0226-0.0385,0.0383-0.0788,0.05-0.123h2.5126C9.4565,5.3568,9.1653,6.0182,8.7003,6.5235z&#xA;&#x9; M6.9747,4.375c-0.0117-0.0442-0.0274-0.0845-0.05-0.123l1.7755-1.7755c0.465,0.5053,0.7563,1.1667,0.7871,1.8985H6.9747z M6.4014,8&#xA;&#x9;L4.6,9L3.808,8.56l0,0L2.8,8L1.792,8.56l0,0L1,9v1l1.8-1l1.8,1l1.8014-1L8.2,10L10,9V8L8.2,9L6.4014,8z"/>
+</svg>

icons/map/POI/windmill-11.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="windmill-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M6.375,3.9375L5.9375,3.5L6.375,3.0625h0.4375L9,0.875L8.125,0L5.9375,2.1875V2.625L5.5,3.0625L5.0625,2.625V2.1875L2.875,0&#xA;&#x9;L2,0.875l2.1875,2.1875H4.625L5.0625,3.5L4.625,3.9375H4.1875L2,6.125L2.875,7l2.1875-2.1875V4.375L5.5,3.9375L5.9375,4.375v0.4375&#xA;&#x9;L8.125,7L9,6.125L6.8125,3.9375H6.375z M8.5,10H8L7,7.5L5.5,6L4,7.5L3,10H2.5C2.2239,10,2,10.2238,2,10.5&#xA;&#x9;C2,10.7761,2.2239,11,2.5,11h6C8.7761,11,9,10.7761,9,10.5C9,10.2238,8.7761,10,8.5,10z M6,9.9717C6,9.9873,5.9874,10,5.9717,10&#xA;&#x9;H5.0283C5.0126,10,5,9.9873,5,9.9717v-0.972C5,8.7238,5.2238,8.5,5.4998,8.5C5.7761,8.5,6,8.7239,6,9.0002V9.9717z"/>
+</svg>

icons/map/patterns/cemetery.svg

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30" height="28" version="1.1" viewBox="0 0 30 28">
-	<defs>
-		<pattern id="crosses" patternUnits="userSpaceOnUse" width="6" height="7">
-			<path d="M 1.5,0.5 L 1.5,3.5" stroke="#444444" stroke-width="1"/>
-			<path d="M 0.5,1.5 L 2.5,1.5" stroke="#444444" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#crosses)"/>
+<svg width="6" height="7" version="1.1" viewBox="0 0 6 7">
+	<path d="M 1.5,0.5 L 1.5,3.5 M 0.5,1.5 L 2.5,1.5" stroke="#444444" stroke-width="1"/>
 </svg>

icons/map/patterns/military-area.svg

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="red" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="red" stroke-width="1"/>
 </svg>

icons/map/patterns/nature-reserve.svg

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9ac269" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9ac269" stroke-width="1"/>
 </svg>

icons/map/patterns/orchard.svg

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28" height="28" version="1.1" viewBox="0 0 28 28">
-	<defs>
-		<pattern id="circles" patternUnits="userSpaceOnUse" width="7" height="7">
-			<circle cx="3" cy="3" r="1.5" stroke="#c9d69c" stroke-width="1" fill="none"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="#dee9bc"/>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#circles)"/>
+<svg width="7" height="7" version="1.1" viewBox="0 0 7 7">
+	<rect x="0" y="0" width="7" height="7" fill="#dee9bc"/>
+	<circle cx="3" cy="3" r="1.5" stroke="#c9d69c" stroke-width="1" fill="none"/>
 </svg>

icons/map/patterns/vineyard.svg

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28" height="32" version="1.1" viewBox="0 0 28 32">
-	<defs>
-		<pattern id="circles" patternUnits="userSpaceOnUse" width="7" height="8">
-			<path d="M 3,2 L 3,6" stroke="#c9d69c" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="#dee9bc"/>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#circles)"/>
+<svg width="7" height="8" version="1.1" viewBox="0 0 7 8">
+	<rect x="0" y="0" width="7" height="8" fill="#dee9bc"/>
+	<path d="M 3,2 L 3,6" stroke="#c9d69c" stroke-width="1"/>
 </svg>

icons/map/patterns/wetland.svg

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9fc4e1" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9fc4e1" stroke-width="1"/>
 </svg>

icons/map/symbols/bunker.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 11 9" height="9" width="11" version="1.1">
+	<g stroke-width="1.5" stroke="#000000" fill="none">
+		<rect x="2" y="2" width="7" height="5"/>
+		<line x1="0" y1="0" x2="2" y2="2"/>
+		<line x1="11" y1="0" x2="9" y2="2"/>
+		<line x1="0" y1="9" x2="2" y2="7"/>
+		<line x1="11" y1="9" x2="9" y2="7"/>
+	</g>
+</svg>

icons/map/symbols/cliff.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 4 5" height="5" width="4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-  <g>
-    <path d="M 0.5,0 V 5" stroke-width="1.0" stroke="#666666"/>
-    <path d="M 0,0.5 H 4" stroke-width="1.0" stroke="#666666"/>
-  </g>
+<svg viewBox="0 0 4 5" height="5" width="4" version="1.1">
+	<g stroke-width="1.0" stroke="#666666">
+		<path d="M 0.5,0 V 5"/>
+		<path d="M 0,0.5 H 4"/>
+	</g>
 </svg>

icons/map/symbols/cross.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="6" height="8" version="1.1" viewBox="0 0 6 8">
+	<path d="M 0.5,3 L 5.5,3 M 3,0.5 L 3,7.5" stroke="#000000" stroke-width="1"/>
+</svg>

icons/map/symbols/exit.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15" height="11" viewBox="0 0 15 11" version="1.1">
-  <g>
-    <path style="stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 15.007812 0.132812 C 15.007812 0.230469 15.007812 0.324219 15.007812 0.421875 C 14.570312 1.402344 14.0625 2.710938 13.589844 3.875 C 13.480469 4.140625 13.316406 4.886719 12.96875 4.859375 C 12.683594 4.835938 12.535156 4.089844 12.445312 3.8125 C 12.292969 3.339844 12.210938 3.003906 12.074219 2.605469 C 10.507812 3.261719 9.367188 4.308594 9.421875 6.476562 C 9.460938 8.195312 10.074219 9.632812 10.441406 11.007812 C 8.917969 11.007812 7.394531 11.007812 5.871094 11.007812 C 5.730469 7.347656 5.59375 3.683594 5.46875 0.0078125 C 5.996094 0.0078125 6.519531 0.0078125 7.042969 0.0078125 C 7.40625 1.230469 7.800781 2.421875 8.15625 3.652344 C 8.941406 2.871094 10.023438 2.042969 11.335938 1.65625 C 11.128906 1.378906 10.828125 1.179688 10.5625 0.957031 C 10.320312 0.757812 9.9375 0.570312 9.945312 0.132812 C 10.007812 0.113281 10.015625 0.0390625 10.070312 0.0078125 C 11.675781 0.0078125 13.28125 0.0078125 14.882812 0.0078125 C 14.898438 0.046875 14.921875 0.0742188 14.976562 0.0703125 C 14.972656 0.109375 14.984375 0.128906 15.007812 0.132812 Z M 15.007812 0.132812 "/>
-    <path style="stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 3.433594 0.0078125 C 3.957031 0.0078125 4.484375 0.0078125 5.007812 0.0078125 C 4.867188 3.667969 4.730469 7.332031 4.605469 11.007812 C 3.074219 11.007812 1.539062 11.007812 0.0078125 11.007812 C 0.0078125 10.976562 0.0078125 10.945312 0.0078125 10.914062 C 1.171875 7.300781 2.277344 3.628906 3.433594 0.0078125 Z M 3.433594 0.0078125 "/>
-  </g>
+<svg width="15" height="11" viewBox="0 0 15 11" version="1.1">
+	<g stroke="none" fill="#000000">
+		<path d="M 15.007812 0.132812 C 15.007812 0.230469 15.007812 0.324219 15.007812 0.421875 C 14.570312 1.402344 14.0625 2.710938 13.589844 3.875 C 13.480469 4.140625 13.316406 4.886719 12.96875 4.859375 C 12.683594 4.835938 12.535156 4.089844 12.445312 3.8125 C 12.292969 3.339844 12.210938 3.003906 12.074219 2.605469 C 10.507812 3.261719 9.367188 4.308594 9.421875 6.476562 C 9.460938 8.195312 10.074219 9.632812 10.441406 11.007812 C 8.917969 11.007812 7.394531 11.007812 5.871094 11.007812 C 5.730469 7.347656 5.59375 3.683594 5.46875 0.0078125 C 5.996094 0.0078125 6.519531 0.0078125 7.042969 0.0078125 C 7.40625 1.230469 7.800781 2.421875 8.15625 3.652344 C 8.941406 2.871094 10.023438 2.042969 11.335938 1.65625 C 11.128906 1.378906 10.828125 1.179688 10.5625 0.957031 C 10.320312 0.757812 9.9375 0.570312 9.945312 0.132812 C 10.007812 0.113281 10.015625 0.0390625 10.070312 0.0078125 C 11.675781 0.0078125 13.28125 0.0078125 14.882812 0.0078125 C 14.898438 0.046875 14.921875 0.0742188 14.976562 0.0703125 C 14.972656 0.109375 14.984375 0.128906 15.007812 0.132812 Z M 15.007812 0.132812"/>
+		<path d="M 3.433594 0.0078125 C 3.957031 0.0078125 4.484375 0.0078125 5.007812 0.0078125 C 4.867188 3.667969 4.730469 7.332031 4.605469 11.007812 C 3.074219 11.007812 1.539062 11.007812 0.0078125 11.007812 C 0.0078125 10.976562 0.0078125 10.945312 0.0078125 10.914062 C 1.171875 7.300781 2.277344 3.628906 3.433594 0.0078125 Z M 3.433594 0.0078125"/>
+	</g>
 </svg>

icons/map/symbols/saddle.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 9 11" height="11" width="9" version="1.1">
+	<g stroke-width="1" stroke="#000000" fill="none">
+		<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5"/>
+		<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5"/>
+	</g>
+</svg>

pkg/android/AndroidManifest.xml

@@ -21,6 +21,12 @@
                 <data android:scheme="content" android:mimeType="image/jpeg"/>
                 <data android:scheme="content" android:mimeType="image/tiff"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="geo"/>
+            </intent-filter>
 
             <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
             <meta-data android:name="android.app.arguments" android:value="-- %%INSERT_APP_ARGUMENTS%% --"/>

pkg/linux/gpxsee.appdata.xml

@@ -15,8 +15,9 @@
 			<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SIGMA SLF, Suunto SML, LOC,
 				OziExplorer (PLT, WPT, RTE), GeoJSON, SeeYou CUP,
 				Garmin GPI &amp; CSV, TomTom OV2 &amp; ITN, ONmove OMD/GHP,
-				TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG
-				files.</li>
+				TwoNav (TRK, RTE, WPT), GPSDump WPT, Velocitek VTK,
+				Vakaros VKX, 70mai GPS logs and geotagged JPEG files.</li>
+			<li>Opens geo URIs (RFC 5870).</li>
 			<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
 				WMS, TMS, QuadTiles).</li>
 			<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
@@ -112,5 +113,9 @@
 		<mimetype>application/vnd.iho.s57-catalogue</mimetype>
 		<mimetype>application/vnd.gpsdump.wpt</mimetype>
 		<mimetype>application/vnd.gpstuner.gmi</mimetype>
+		<mimetype>application/vnd.70mai.txt</mimetype>
+		<mimetype>application/vnd.velocitek.vtk</mimetype>
+		<mimetype>application/vnd.vakaros.vkx</mimetype>
+		<mimetype>x-scheme-handler/geo</mimetype>
 	</mimetypes>
 </component>

pkg/linux/gpxsee.desktop

@@ -11,9 +11,9 @@ Comment[ru]=Программа для просмотра и анализа GPS
 Comment[sv]=GPS-loggfilsläsare och analysator
 Comment[tr]=GPS günlük dosyası görüntüleyici ve analizcisi
 Comment[uk]=Переглядач та аналізатор GPS логів
-Exec=gpxsee %F
+Exec=gpxsee %U
 Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
-MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt;application/vnd.gpstuner.gmi
+MimeType=x-scheme-handler/geo;application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt;application/vnd.gpstuner.gmi;application/vnd.70mai.txt;application/vnd.velocitek.vtk;application/vnd.vakaros.vkx

pkg/linux/gpxsee.xml

@@ -188,6 +188,33 @@
 		<glob pattern="*.wpt"/>
 	</mime-type>
 
+	<mime-type type="application/vnd.70mai.txt">
+		<comment>70mai GPS Log File</comment>
+		<sub-class-of type="text/plain"/>
+		<generic-icon name="text/plain"/>
+		<magic>
+			<match type="string" offset="0" value="$V02"/>
+		</magic>
+		<glob pattern="*.txt"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.velocitek.vtk">
+		<comment>Velocitek VTK File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.vtk"/>
+	</mime-type>
+
+	<mime-type type="application/vnd.vakaros.vkx">
+		<comment>Vakaros VKX File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<magic>
+			<match type="byte" offset="0" value="0xFF"/>
+		</magic>
+		<glob pattern="*.vkx"/>
+	</mime-type>
+
 	<!-- Maps -->
 
 	<mime-type type="application/vnd.garmin.img">

pkg/mac/Info.plist

@@ -736,6 +736,66 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>txt</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.70mai.txt</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>70mai GPS Log File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>vtk</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.velocitek.vtk</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/vtk.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Velocitek VTK File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>vkx</string>
+			</array>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/vnd.vakaros.vkx</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>icons/vkx.icns</string>
+			<key>CFBundleTypeName</key>
+			<string>Vakaros VKX File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>geo</string>
+			</array>
+			<key>CFBundleURLName</key>
+			<string>org.geouri.geo</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 
 	<key>UTImportedTypeDeclarations</key>
@@ -1669,6 +1729,8 @@
 			<string>https://iho.int/uploads/user/pubs/standards/s-57/31Main.pdf</string>
 			<key>UTTypeDescription</key>
 			<string>IHO S-57 Electronic Navigation Chart</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/000.icns</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -1690,6 +1752,8 @@
 			<string>https://iho.int/uploads/user/pubs/standards/s-57/20ApB1.pdf</string>
 			<key>UTTypeDescription</key>
 			<string>IHO S-57 Electronic Navigation Catalogue</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/031.icns</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -1704,6 +1768,73 @@
 				<string>application/vnd.iho.s57-catalogue</string>
 			</dict>
 		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.70mai.txt</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://forum.mapillary.com/t/using-the-70mai-a810-dashcam-for-mapillary/9130/7?u=boris</string>
+			<key>UTTypeDescription</key>
+			<string>70mai GPS Log File</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>txt</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.70mai.txt</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.velocitek.vtk</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/velocitek/vtk_protocol</string>
+			<key>UTTypeDescription</key>
+			<string>Velocitek VTK File</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/vtk.icns</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>vtk</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.velocitek.vtk</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeIdentifier</key>
+			<string>com.vakaros.vkx</string>
+			<key>UTTypeReferenceURL</key>
+			<string>https://github.com/vakaros/vkx</string>
+			<key>UTTypeDescription</key>
+			<string>Vakaros VKX File</string>
+			<key>UTTypeIconFile</key>
+			<string>icons/vkx.icns</string>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>vkx</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/vnd.vakaros.vkx</string>
+			</dict>
+		</dict>
 	</array>
 
 	<key>UTExportedTypeDeclarations</key>