2025-04-20 20:29:10 +02:00
727 changed files with 16196 additions and 22315 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 13.39.{build}
+version: 13.13.{build}
 configuration:
  - Release
@ -8,24 +8,25 @@ 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
+    OPENSSLVERSION: 1_1
-  - QTDIR: C:\Qt\6.8\msvc2022_64
+  - QTDIR: C:\Qt\6.5\msvc2019_64
    OPENSSLDIR: C:\OpenSSL-v30-Win64\bin
    OPENSSLVERSION: 3
    NSISDEF: /DQT6
 install:
 - cmd: |-
-    set PATH=%QTDIR%\bin;%NSISDIR%;%JOMDIR%;%PATH%
+    set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
    call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
 build_script:
 - cmd: |-
    lrelease gpxsee.pro
    qmake gpxsee.pro
-    jom release
+    nmake release
    md installer
    copy release\GPXSee.exe installer
@ -36,8 +37,8 @@ build_script:
    xcopy lang\*.qm installer\translations\ /sy
    xcopy icons\symbols installer\symbols /i
    copy licence.txt installer
-    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libcrypto-*-x64.dll installer)
+    copy %OPENSSLDIR%\libcrypto-%OPENSSLVERSION%-x64.dll installer
-    IF DEFINED OPENSSLDIR (copy %OPENSSLDIR%\libssl-*-x64.dll installer)
+    copy %OPENSSLDIR%\libssl-%OPENSSLVERSION%-x64.dll installer
    makensis.exe %NSISDEF% installer\gpxsee64.nsi
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -8,30 +8,32 @@ on:
 jobs:
  build:
    name: GPXSee
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
-          distribution: 'temurin'
+          distribution: 'zulu'
          java-version: '11'
      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v2
-        with:
+      - name: Run sdkmanager update
-          cmdline-tools-version: 9862592
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
-      - name: Install android platform, build-tools and ndk
+      - name: Install android platform, platform-tools, build-tools and ndk
-        run:  ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
      - name: Setup NDK path
        run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
      - name: Install Qt (Desktop)
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
        with:
          aqtversion: '==3.1.*'
          version: '6.4.0'
      - name: Install Qt (Android)
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
        with:
          aqtversion: '==3.1.*'
          version: '6.4.0'
          target: 'android'
          arch: 'android_arm64_v8a'
@ -43,9 +45,9 @@ jobs:
      - name: Configure build
        run:  qmake gpxsee.pro OPENSSL_PATH=android_openssl 
      - name: Build project
-        run:  make -j4 apk
+        run:  make -j2 apk
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: GPXSee-arm64_v8a.apk
          path: android-build/build/outputs/apk/debug/android-build-debug.apk
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -18,7 +18,7 @@ jobs:
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
    - name: Install dependencies
      run: |
@ -26,7 +26,7 @@ jobs:
          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@ -37,9 +37,9 @@ jobs:
        # queries: security-extended,security-and-quality
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2
      with:
        category: "/language:${{matrix.language}}"
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -8,13 +8,10 @@ on:
 jobs:
  build:
    name: GPXSee
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    strategy:
      matrix:
        config: ['release', 'debug']
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Install dependencies
        run: |
          sudo apt-get update
@ -22,6 +19,6 @@ jobs:
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
-        run: qmake CONFIG+=${{ matrix.config }} gpxsee.pro
+        run: qmake gpxsee.pro
      - name: Build project
-        run: make -j4
+        run: make -j2
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -6,17 +6,41 @@ on:
      - master
 jobs:
-  build:
+  qt5:
-    name: GPXSee
+    name: GPXSee Qt5 build
    runs-on: macos-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Install Qt
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
        with:
-          version: '6.8.2'
+          version: '5.15.2'
-          modules: qtpositioning qtserialport qtimageformats
+      - 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@v3
        with:
          name: GPXSee-qt5.dmg
          path: GPXSee.dmg
  qt6:
    name: GPXSee Qt6 build
    runs-on: macos-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v3
      - name: Install Qt
        uses: jurplel/install-qt-action@v3
        with:
          version: '6.5.1'
          modules: qtpositioning qt5compat qtserialport
      - name: Create localization
        run: lrelease gpxsee.pro
      - name: Configure build
@ -26,7 +50,7 @@ jobs:
      - name: Create DMG
        run: macdeployqt GPXSee.app -dmg -appstore-compliant
      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: GPXSee-qt6.dmg
          path: GPXSee.dmg
          name: GPXSee.dmg
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,4 @@
-__Only localization contributions are accepted at the moment, code pull requests will be rejected.__
+Only localization contributions are accepted at the moment, code pull requests will be rejected.
 The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
 stores under a non-GPL licence open. In the future, code pull requests under a
--- a/README.md
+++ b/README.md
@ -5,9 +5,7 @@ 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, Velocitek VTK, Vakaros VKX, 70mai GPS logs
+  TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG files.
  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,
@ -30,8 +28,8 @@ GPS log file formats.
 ## Build
 Build requirements:
-* Qt5 >= 5.15 or Qt6 >= 6.2 (Android builds require Qt6)
+* Qt5 >= 5.11 or Qt6 >= 6.2 (Android builds require Qt6)
-* C++11 or newer compiler (tested: msvc2022, gcc 11, clang/Apple LLVM version
+* C++11 or newer compiler (tested: msvc2019, gcc 7.5.0, clang/Apple LLVM version
  10.0.0)
 Build steps:
@ -75,3 +73,5 @@ different, GPL compatible, licenses:
  [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
  Source Code Disclaimer
 * [Projection parameters CSV files](data/CRS) - BSD/EPSG/Public domain
 * [Mapsforge render theme](data/mapsforge/default.xml) and its
  [icons](icons/map/mapsforge) - LGPLv3
--- a/data/CRS/pcs.csv
+++ b/data/CRS/pcs.csv
@ -2116,6 +2116,7 @@ UCS-2000 / Ukraine TM zone 12,6386,5561,6379
 UCS-2000 / Ukraine TM zone 13,6387,5561,6380
 Cayman Islands National Grid 2011,6391,6135,6390
 NAD83(2011) / Alaska Albers,6393,6318,15021
 NAD83(2011) / Alaska zone 1,6394,6318,15031
 NAD83(2011) / Alaska zone 2,6395,6318,15032
 NAD83(2011) / Alaska zone 3,6396,6318,15033
 NAD83(2011) / Alaska zone 4,6397,6318,15034
@ -2218,6 +2219,7 @@ NAD83(2011) / Michigan Central,6493,6318,12142
 NAD83(2011) / Michigan Central (ft),6494,6318,15334
 NAD83(2011) / Michigan North,6495,6318,12141
 NAD83(2011) / Michigan North (ft),6496,6318,15333
 NAD83(2011) / Michigan Oblique Mercator,6497,6318,12150
 NAD83(2011) / Michigan South,6498,6318,12143
 NAD83(2011) / Michigan South (ft),6499,6318,15335
 NAD83(2011) / Minnesota Central,6500,6318,12232
@ -2376,6 +2378,8 @@ NAD83(2011) / Oregon Canyonville-Grants Pass zone (m),6802,6318,6749
 NAD83(2011) / Oregon Canyonville-Grants Pass zone (ft),6803,6318,6750
 NAD83(2011) / Oregon Columbia River East zone (m),6806,6318,6751
 NAD83(2011) / Oregon Columbia River East zone (ft),6807,6318,6752
 NAD83(2011) / Oregon Columbia River West zone (m),6810,6318,6753
 NAD83(2011) / Oregon Columbia River West zone (ft),6811,6318,6754
 NAD83(2011) / Oregon Cottage Grove-Canyonville zone (m),6814,6318,6755
 NAD83(2011) / Oregon Cottage Grove-Canyonville zone (ft),6815,6318,6756
 NAD83(2011) / Oregon Dufur-Madras zone (m),6818,6318,6757
@ -2390,6 +2394,8 @@ NAD83(2011) / Oregon La Grande zone (m),6834,6318,6765
 NAD83(2011) / Oregon La Grande zone (ft),6835,6318,6766
 NAD83(2011) / Oregon Ontario zone (m),6838,6318,6767
 NAD83(2011) / Oregon Ontario zone (ft),6839,6318,6768
 NAD83(2011) / Oregon Coast zone (m),6842,6318,6769
 NAD83(2011) / Oregon Coast zone (ft),6843,6318,6770
 NAD83(2011) / Oregon Pendleton zone (m),6846,6318,6771
 NAD83(2011) / Oregon Pendleton zone (ft),6847,6318,6772
 NAD83(2011) / Oregon Pendleton-La Grande zone (m),6850,6318,6773
@ -2748,6 +2754,7 @@ NAD27 / MTM zone 10,7991,4267,17710
 Malongo 1987 / UTM zone 33S,7992,4259,16133
 WGS 84 / TM Zone 20N (ftUS),8035,4326,8033
 WGS 84 / TM Zone 21N (ftUS),8036,4326,8034
 NAD83(2011) / PCCS zone 1 (ft),8065,6318,8061
 NAD83(2011) / PCCS zone 2 (ft),8066,6318,8062
 NAD83(2011) / PCCS zone 3 (ft),8067,6318,8063
 NAD83(2011) / PCCS zone 4 (ft),8068,6318,8064
@ -2956,6 +2963,7 @@ Pulkovo 1995 / Gauss-Kruger zone 29,20029,4200,16229
 Pulkovo 1995 / Gauss-Kruger zone 30,20030,4200,16230
 Pulkovo 1995 / Gauss-Kruger zone 31,20031,4200,16231
 Pulkovo 1995 / Gauss-Kruger zone 32,20032,4200,16232
 NAD83(2011) / Amtrak NECCS21 (ft),20050,6318,10148
 Pulkovo 1995 / Gauss-Kruger 4N,20064,4200,16304
 Pulkovo 1995 / Gauss-Kruger 5N,20065,4200,16305
 Pulkovo 1995 / Gauss-Kruger 6N,20066,4200,16306
--- a/data/CRS/projections.csv
+++ b/data/CRS/projections.csv
@ -283,42 +283,6 @@ Map Grid of Australia zone 44,6728,9001,9807,4400,8801,0,9102,8802,81,9102,8805,
 Map Grid of Australia zone 46,6729,9001,9807,4400,8801,0,9102,8802,93,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 Map Grid of Australia zone 47,6730,9001,9807,4400,8801,0,9102,8802,99,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 Map Grid of Australia zone 59,6731,9001,9807,4400,8801,0,9102,8802,171,9102,8805,0.9996,9201,8806,500000,9001,8807,10000000,9001,,,,,,
 Oregon Baker zone (meter),6741,9001,9807,4499,8801,44.3,9110,8802,-117.5,9110,8805,1.00016,9201,8806,40000.0,9001,8807,0.0,9001,,,,,,
 Oregon Baker zone (international foot),6742,9002,9807,4495,8801,44.3,9110,8802,-117.5,9110,8805,1.00016,9201,8806,131233.5958,9002,8807,0.0,9002,,,,,,
 Oregon Bend-Klamath Falls zone (meter),6743,9001,9807,4499,8801,41.45,9110,8802,-121.45,9110,8805,1.0002,9201,8806,80000.0,9001,8807,0.0,9001,,,,,,
 Oregon Bend-Klamath Falls zone (international foot),6744,9002,9807,4495,8801,41.45,9110,8802,-121.45,9110,8805,1.0002,9201,8806,262467.1916,9002,8807,0.0,9002,,,,,,
 Oregon Bend-Redmond-Prineville zone (meter),6745,9001,9801,4499,8801,44.4,9110,8802,-121.15,9110,8805,1.00012,9201,8806,80000.0,9001,8807,130000.0,9001,,,,,,
 Oregon Bend-Redmond-Prineville zone (international foot),6746,9002,9801,4495,8801,44.4,9110,8802,-121.15,9110,8805,1.00012,9201,8806,262467.1916,9002,8807,426509.1864,9002,,,,,,
 Oregon Bend-Burns zone (meter),6747,9001,9801,4499,8801,43.4,9110,8802,-119.45,9110,8805,1.0002,9201,8806,120000.0,9001,8807,60000.0,9001,,,,,,
 Oregon Bend-Burns zone (international foot),6748,9002,9801,4495,8801,43.4,9110,8802,-119.45,9110,8805,1.0002,9201,8806,393700.7874,9002,8807,196850.3937,9002,,,,,,
 Oregon Canyonville-Grants Pass zone (meter),6749,9001,9807,4499,8801,42.3,9110,8802,-123.2,9110,8805,1.00007,9201,8806,40000.0,9001,8807,0.0,9001,,,,,,
 Oregon Canyonville-Grants Pass zone (international foot),6750,9002,9807,4495,8801,42.3,9110,8802,-123.2,9110,8805,1.00007,9201,8806,131233.5958,9002,8807,0.0,9002,,,,,,
 Oregon Columbia River East zone (meter),6751,9001,9801,4499,8801,45.4,9110,8802,-120.3,9110,8805,1.000008,9201,8806,150000.0,9001,8807,30000.0,9001,,,,,,
 Oregon Columbia River East zone (international foot),6752,9002,9801,4495,8801,45.4,9110,8802,-120.3,9110,8805,1.000008,9201,8806,492125.9843,9002,8807,98425.1969,9002,,,,,,
 Oregon Cottage Grove-Canyonville zone (meter),6755,9001,9807,4499,8801,42.5,9110,8802,-123.2,9110,8805,1.000023,9201,8806,50000.0,9001,8807,0.0,9001,,,,,,
 Oregon Cottage Grove-Canyonville zone (international foot),6756,9002,9807,4495,8801,42.5,9110,8802,-123.2,9110,8805,1.000023,9201,8806,164041.9948,9002,8807,0.0,9002,,,,,,
 Oregon Dufur-Madras zone (meter),6757,9001,9807,4499,8801,44.3,9110,8802,-121.0,9110,8805,1.00011,9201,8806,80000.0,9001,8807,0.0,9001,,,,,,
 Oregon Dufur-Madras zone (international foot),6758,9002,9807,4495,8801,44.3,9110,8802,-121.0,9110,8805,1.00011,9201,8806,262467.1916,9002,8807,0.0,9002,,,,,,
 Oregon Eugene zone (meter),6759,9001,9807,4499,8801,43.45,9110,8802,-123.1,9110,8805,1.000015,9201,8806,50000.0,9001,8807,0.0,9001,,,,,,
 Oregon Eugene zone (international foot),6760,9002,9807,4495,8801,43.45,9110,8802,-123.1,9110,8805,1.000015,9201,8806,164041.9948,9002,8807,0.0,9002,,,,,,
 Oregon Grants Pass-Ashland zone (meter),6761,9001,9807,4499,8801,41.45,9110,8802,-123.2,9110,8805,1.000043,9201,8806,50000.0,9001,8807,0.0,9001,,,,,,
 Oregon Grants Pass-Ashland zone (international foot),6762,9002,9807,4495,8801,41.45,9110,8802,-123.2,9110,8805,1.000043,9201,8806,164041.9948,9002,8807,0.0,9002,,,,,,
 Oregon Gresham-Warm Springs zone (meter),6763,9001,9807,4499,8801,45.0,9110,8802,-122.2,9110,8805,1.00005,9201,8806,10000.0,9001,8807,0.0,9001,,,,,,
 Oregon Gresham-Warm Springs zone (international foot),6764,9002,9807,4495,8801,45.0,9110,8802,-122.2,9110,8805,1.00005,9201,8806,32808.399,9002,8807,0.0,9002,,,,,,
 Oregon La Grande zone (meter),6765,9001,9807,4499,8801,45.0,9102,8802,-118.0,9102,8805,1.00013,9201,8806,40000.0,9001,8807,0.0,9001,,,,,,
 Oregon La Grande zone (international foot),6766,9002,9807,4495,8801,45.0,9102,8802,-118.0,9102,8805,1.00013,9201,8806,131233.5958,9002,8807,0.0,9002,,,,,,
 Oregon Ontario zone (meter),6767,9001,9807,4499,8801,43.15,9110,8802,-117.0,9110,8805,1.0001,9201,8806,80000.0,9001,8807,0.0,9001,,,,,,
 Oregon Ontario zone (international foot),6768,9002,9807,4495,8801,43.15,9110,8802,-117.0,9110,8805,1.0001,9201,8806,262467.1916,9002,8807,0.0,9002,,,,,,
 Oregon Pendleton zone (meter),6771,9001,9807,4499,8801,45.15,9110,8802,-119.1,9110,8805,1.000045,9201,8806,60000.0,9001,8807,0.0,9001,,,,,,
 Oregon Pendleton zone (international foot),6772,9001,9807,4495,8801,45.15,9110,8802,-119.1,9110,8805,1.000045,9201,8806,196850.3937,9002,8807,0.0,9002,,,,,,
 Oregon Pendleton-La Grande zone (meter),6773,9001,9807,4499,8801,45.05,9110,8802,-118.2,9110,8805,1.000175,9201,8806,30000.0,9001,8807,0.0,9001,,,,,,
 Oregon Pendleton-La Grande zone (international foot),6774,9002,9807,4495,8801,45.05,9110,8802,-118.2,9110,8805,1.000175,9201,8806,98425.1969,9002,8807,0.0,9002,,,,,,
 Oregon Portland zone (meter),6775,9001,9801,4499,8801,45.3,9110,8802,-122.45,9110,8805,1.000002,9201,8806,100000.0,9001,8807,50000.0,9001,,,,,,
 Oregon Portland zone (international foot),6776,9002,9801,4495,8801,45.3,9110,8802,-122.45,9110,8805,1.000002,9201,8806,328083.9895,9002,8807,164041.9948,9002,,,,,,
 Oregon Salem zone (meter),6777,9001,9807,4499,8801,44.2,9110,8802,-123.05,9110,8805,1.00001,9201,8806,50000.0,9001,8807,0.0,9001,,,,,,
 Oregon Salem zone (international foot),6778,9002,9807,4495,8801,44.2,9110,8802,-123.05,9110,8805,1.00001,9201,8806,164041.9948,9002,8807,0.0,9002,,,,,,
 Oregon Santiam Pass zone (meter),6779,9001,9807,4499,8801,44.05,9110,8802,-122.3,9110,8805,1.000155,9201,8806,0.0,9001,8807,0.0,9001,,,,,,
 Oregon Santiam Pass zone (international foot),6780,9002,9807,4495,8801,44.05,9110,8802,-122.3,9110,8805,1.000155,9201,8806,0.0,9002,8807,0.0,9002,,,,,,
 Albania TM 2010,6869,9001,9807,4530,8801,0,9102,8802,20,9102,8805,1,9201,8806,500000,9001,8807,0,9001,,,,,,
 Italy zone,6877,9001,9807,4500,8801,0,9102,8802,12,9102,8805,0.9985,9201,8806,7000000,9001,8807,0,9001,,,,,,
 Italy zone 12,6878,9001,9807,4500,8801,0,9102,8802,12,9102,8805,1,9201,8806,3000000,9001,8807,0,9001,,,,,,
@ -331,159 +295,7 @@ Vietnam TM-3 zone 482,6953,9001,9807,4400,8801,0,9102,8802,105,9102,8805,0.9999,
 Vietnam TM-3 zone 491,6954,9001,9807,4400,8801,0,9102,8802,108,9102,8805,0.9999,9201,8806,0,9001,8807,500000,9001,,,,,,
 Vietnam TM-3 Da Nang zone,6955,9001,9807,4400,8801,0,9110,8802,107.45,9110,8805,0.9999,9201,8806,0,9001,8807,500000,9001,,,,,,
 Albania LCC 2010,6961,9001,9802,4530,8821,41,9102,8822,20,9102,8823,39,9102,8824,43,9102,8826,0,9001,8827,0,9001,,,
 City and County of San Francisco CS13 (meters),6994,9001,9807,4499,8801,37.75,9102,8802,-122.45,9102,8805,1.000007,9202,8806,48000.0,9001,8807,24000.0,9001,,,,,,
 City and County of San Francisco CS13 (US Survey feet),6995,9003,9807,4497,8801,37.75,9102,8802,-122.45,9102,8805,1.000007,9202,8806,157480.0,9003,8807,78740.0,9003,,,,,,
 Iowa regional zone 1 Spencer,7043,9003,9801,4497,8801,43.12,9110,8802,-95.15,9110,8805,1.000052,9201,8806,11500000.0,9003,8807,9600000.0,9003,,,,,,
 Iowa regional zone 2 Mason City,7044,9003,9801,4497,8801,43.1,9110,8802,-92.45,9110,8805,1.000043,9201,8806,12500000.0,9003,8807,9800000.0,9003,,,,,,
 Iowa regional zone 3 Elkader,7045,9003,9807,4497,8801,40.15,9110,8802,-91.12,9110,8805,1.000035,9201,8806,13500000.0,9003,8807,8300000.0,9003,,,,,,
 Iowa regional zone 4 Sioux City-Iowa Falls,7046,9003,9801,4497,8801,42.32,9110,8802,-94.5,9110,8805,1.000045,9201,8806,14500000.0,9003,8807,8600000.0,9003,,,,,,
 Iowa regional zone 5 Waterloo,7047,9003,9801,4497,8801,42.39,9110,8802,-92.15,9110,8805,1.000032,9201,8806,15500000.0,9003,8807,8900000.0,9003,,,,,,
 Iowa regional zone 6 Council Bluffs,7048,9003,9807,4497,8801,40.15,9110,8802,-95.44,9110,8805,1.000039,9201,8806,16500000.0,9003,8807,6600000.0,9003,,,,,,
 Iowa regional zone 7 Carroll-Atlantic,7049,9003,9807,4497,8801,40.15,9110,8802,-94.38,9110,8805,1.000045,9201,8806,17500000.0,9003,8807,6800000.0,9003,,,,,,
 Iowa regional zone 8 Ames-Des Moines,7050,9003,9807,4497,8801,40.15,9110,8802,-93.43,9110,8805,1.000033,9201,8806,18500000.0,9003,8807,7000000.0,9003,,,,,,
 Iowa regional zone 9 Newton,7051,9003,9807,4497,8801,40.15,9110,8802,-92.49,9110,8805,1.000027,9201,8806,19500000.0,9003,8807,7200000.0,9003,,,,,,
 Iowa regional zone 10 Cedar Rapids,7052,9003,9801,4497,8801,41.5,9110,8802,-91.4,9110,8805,1.00002,9201,8806,20500000.0,9003,8807,8000000.0,9003,,,,,,
 Iowa regional zone 11 Dubuque-Davenport,7053,9003,9807,4497,8801,40.15,9110,8802,-90.32,9110,8805,1.000027,9201,8806,21500000.0,9003,8807,7600000.0,9003,,,,,,
 Iowa regional zone 12 Red Oak-Ottumwa,7054,9003,9801,4497,8801,40.55,9110,8802,-93.45,9110,8805,1.000037,9201,8806,22500000.0,9003,8807,6200000.0,9003,,,,,,
 Iowa regional zone 13 Fairfield,7055,9003,9807,4497,8801,40.15,9110,8802,-91.55,9110,8805,1.00002,9201,8806,23500000.0,9003,8807,6400000.0,9003,,,,,,
 Iowa regional zone 14 Burlington,7056,9003,9807,4497,8801,40.15,9110,8802,-91.15,9110,8805,1.000018,9201,8806,24500000.0,9003,8807,6200000.0,9003,,,,,,
 Montana Blackfeet St Mary Valley (meter),7089,9001,9807,4499,8801,48.3,9110,8802,-112.3,9110,8805,1.00016,9201,8806,150000.0,9001,8807,0.0,9001,,,,,,
 Montana Blackfeet St Mary Valley (international foot),7090,9002,9807,4495,8801,48.3,9110,8802,-112.3,9110,8805,1.00016,9201,8806,492125.9843,9002,8807,0.0,9002,,,,,,
 Montana Blackfeet (meter),7091,9001,9807,4499,8801,48.0,9110,8802,-112.3,9110,8805,1.00019,9201,8806,100000.0,9001,8807,0.0,9001,,,,,,
 Montana Blackfeet (international foot),7092,9002,9807,4495,8801,48.0,9110,8802,-112.3,9110,8805,1.00019,9201,8806,328083.9895,9002,8807,0.0,9002,,,,,,
 Montana Milk River (meter),7093,9001,9801,4499,8801,48.3,9110,8802,-111.0,9110,8805,1.000145,9201,8806,150000.0,9001,8807,200000.0,9001,,,,,,
 Montana Milk River (international foot),7094,9002,9801,4495,8801,48.3,9110,8802,-111.0,9110,8805,1.000145,9201,8806,492125.9843,9002,8807,656167.979,9002,,,,,,
 Montana Fort Belknap (meter),7095,9001,9801,4499,8801,48.3,9110,8802,-108.3,9110,8805,1.00012,9201,8806,200000.0,9001,8807,150000.0,9001,,,,,,
 Montana Fort Belknap (international foot),7096,9002,9801,4495,8801,48.3,9110,8802,-108.3,9110,8805,1.00012,9201,8806,656167.979,9002,8807,492125.9843,9002,,,,,,
 Montana Fort Peck Assiniboine (meter),7097,9001,9801,4499,8801,48.2,9110,8802,-105.3,9110,8805,1.00012,9201,8806,200000.0,9001,8807,100000.0,9001,,,,,,
 Montana Fort Peck Assiniboine (international foot),7098,9002,9801,4495,8801,48.2,9110,8802,-105.3,9110,8805,1.00012,9201,8806,656167.979,9002,8807,328083.9895,9002,,,,,,
 Montana Fort Peck Sioux (meter),7099,9001,9801,4499,8801,48.2,9110,8802,-105.3,9110,8805,1.00009,9201,8806,100000.0,9001,8807,50000.0,9001,,,,,,
 Montana Fort Peck Sioux (international foot),7100,9002,9801,4495,8801,48.2,9110,8802,-105.3,9110,8805,1.00009,9201,8806,328083.9895,9002,8807,164041.9938,9002,,,,,,
 Montana Crow (meter),7101,9001,9807,4499,8801,44.45,9110,8802,-107.45,9110,8805,1.000148,9201,8806,200000.0,9001,8807,0.0,9001,,,,,,
 Montana Crow (international foot),7102,9002,9807,4495,8801,44.45,9110,8802,-107.45,9110,8805,1.000148,9201,8806,656167.979,9002,8807,0.0,9002,,,,,,
 Montana Bobcat (meter),7103,9001,9801,4499,8801,46.15,9110,8802,-111.15,9110,8805,1.000185,9201,8806,100000.0,9001,8807,100000.0,9001,,,,,,
 Montana Bobcat (international foot),7104,9002,9801,4495,8801,46.15,9110,8802,-111.15,9110,8805,1.000185,9201,8806,328083.9895,9002,8807,328083.9895,9002,,,,,,
 Montana Billings (meter),7105,9001,9801,4499,8801,45.47,9110,8802,-108.25,9110,8805,1.0001515,9201,8806,200000.0,9001,8807,50000.0,9001,,,,,,
 Montana Billings (international foot),7106,9002,9801,4495,8801,45.47,9110,8802,-108.25,9110,8805,1.0001515,9201,8806,656167.979,9002,8807,164041.9948,9002,,,,,,
 Wyoming Wind River (meter),7107,9001,9807,4499,8801,42.4,9110,8802,-108.2,9110,8805,1.00024,9201,8806,100000.0,9001,8807,0.0,9001,,,,,,
 Wyoming Wind River (US survey foot),7108,9003,9807,4497,8801,42.4,9110,8802,-108.2,9110,8805,1.00024,9201,8806,328083.3333,9003,8807,0.0,9003,,,,,,
 City and County of San Francisco CS13 (meter),7129,9001,9807,4499,8801,37.75,9102,8802,-122.45,9102,8805,1.000007,9201,8806,48000.0,9001,8807,24000.0,9001,,,,,,
 City and County of San Francisco CS13 (US survey foot),7130,9003,9807,4497,8801,37.75,9102,8802,-122.45,9102,8805,1.000007,9201,8806,157480.0,9003,8807,78740.0,9003,,,,,,
 Palestine Grid modified,7141,9001,9807,4400,8801,31.4402749,9110,8802,35.124349,9110,8805,1,9201,8806,170251.555,9001,8807,126867.909,9001,,,,,,
 InGCS Adams (m),7143,9001,9807,4499,8801,40.33,9110,8802,-84.57,9110,8805,1.000034,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Adams (ftUS),7144,9003,9807,4497,8801,40.33,9110,8802,-84.57,9110,8805,1.000034,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Allen (m),7145,9001,9807,4499,8801,40.54,9110,8802,-85.03,9110,8805,1.000031,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Allen (ftUS),7146,9003,9807,4497,8801,40.54,9110,8802,-85.03,9110,8805,1.000031,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Bartholomew (m),7147,9001,9807,4499,8801,39.0,9110,8802,-85.51,9110,8805,1.000026,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Bartholomew (ftUS),7148,9003,9807,4497,8801,39.0,9110,8802,-85.51,9110,8805,1.000026,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Benton (m),7149,9001,9807,4499,8801,40.27,9110,8802,-87.18,9110,8805,1.000029,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Benton (ftUS),7150,9003,9807,4497,8801,40.27,9110,8802,-87.18,9110,8805,1.000029,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Blackford-Delaware (m),7151,9001,9807,4499,8801,40.03,9110,8802,-85.24,9110,8805,1.000038,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Blackford-Delaware (ftUS),7152,9003,9807,4497,8801,40.03,9110,8802,-85.24,9110,8805,1.000038,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Boone-Hendricks (m),7153,9001,9807,4499,8801,39.36,9110,8802,-86.3,9110,8805,1.000036,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Boone-Hendricks (ftUS),7154,9003,9807,4497,8801,39.36,9110,8802,-86.3,9110,8805,1.000036,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Brown (m),7155,9001,9807,4499,8801,39.0,9110,8802,-86.18,9110,8805,1.00003,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Brown (ftUS),7156,9003,9807,4497,8801,39.0,9110,8802,-86.18,9110,8805,1.00003,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Carroll (m),7157,9001,9807,4499,8801,40.24,9110,8802,-86.39,9110,8805,1.000026,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Carroll (ftUS),7158,9003,9807,4497,8801,40.24,9110,8802,-86.39,9110,8805,1.000026,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Cass (m),7159,9001,9807,4499,8801,40.33,9110,8802,-86.24,9110,8805,1.000028,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Cass (ftUS),7160,9003,9807,4497,8801,40.33,9110,8802,-86.24,9110,8805,1.000028,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Clark-Floyd-Scott (m),7161,9001,9807,4499,8801,38.09,9110,8802,-85.36,9110,8805,1.000021,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Clark-Floyd-Scott (ftUS),7162,9003,9807,4497,8801,38.09,9110,8802,-85.36,9110,8805,1.000021,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Clay (m),7163,9001,9807,4499,8801,39.09,9110,8802,-87.09,9110,8805,1.000024,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Clay (ftUS),7164,9003,9807,4497,8801,39.09,9110,8802,-87.09,9110,8805,1.000024,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Clinton (m),7165,9001,9807,4499,8801,40.09,9110,8802,-86.36,9110,8805,1.000032,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Clinton (ftUS),7166,9003,9807,4497,8801,40.09,9110,8802,-86.36,9110,8805,1.000032,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Crawford-Lawrence-Orange (m),7167,9001,9807,4499,8801,38.06,9110,8802,-86.3,9110,8805,1.000025,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Crawford-Lawrence-Orange (ftUS),7168,9003,9807,4497,8801,38.06,9110,8802,-86.3,9110,8805,1.000025,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Daviess-Greene (m),7169,9001,9807,4499,8801,38.27,9110,8802,-87.06,9110,8805,1.000018,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Daviess-Greene (ftUS),7170,9003,9807,4497,8801,38.27,9110,8802,-87.06,9110,8805,1.000018,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Dearborn-Ohio-Switzerland (m),7171,9001,9807,4499,8801,38.39,9110,8802,-84.54,9110,8805,1.000029,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Dearborn-Ohio-Switzerland (ftUS),7172,9003,9807,4497,8801,38.39,9110,8802,-84.54,9110,8805,1.000029,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Decatur-Rush (m),7173,9001,9807,4499,8801,39.06,9110,8802,-85.39,9110,8805,1.000036,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Decatur-Rush (ftUS),7174,9003,9807,4497,8801,39.06,9110,8802,-85.39,9110,8805,1.000036,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS DeKalb (m),7175,9001,9807,4499,8801,41.15,9110,8802,-84.57,9110,8805,1.000036,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS DeKalb (ftUS),7176,9003,9807,4497,8801,41.15,9110,8802,-84.57,9110,8805,1.000036,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Dubois-Martin (m),7177,9001,9807,4499,8801,38.12,9110,8802,-86.57,9110,8805,1.00002,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Dubois-Martin (ftUS),7178,9003,9807,4497,8801,38.12,9110,8802,-86.57,9110,8805,1.00002,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Elkhart-Kosciusko-Wabash (m),7179,9001,9807,4499,8801,40.39,9110,8802,-85.51,9110,8805,1.000033,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Elkhart-Kosciusko-Wabash (ftUS),7180,9003,9807,4497,8801,40.39,9110,8802,-85.51,9110,8805,1.000033,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Fayette-Franklin-Union (m),7181,9001,9807,4499,8801,39.15,9110,8802,-85.03,9110,8805,1.000038,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Fayette-Franklin-Union (ftUS),7182,9003,9807,4497,8801,39.15,9110,8802,-85.03,9110,8805,1.000038,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Fountain-Warren (m),7183,9001,9807,4499,8801,39.57,9110,8802,-87.18,9110,8805,1.000025,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Fountain-Warren (ftUS),7184,9003,9807,4497,8801,39.57,9110,8802,-87.18,9110,8805,1.000025,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Fulton-Marshall-St. Joseph (m),7185,9001,9807,4499,8801,40.54,9110,8802,-86.18,9110,8805,1.000031,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Fulton-Marshall-St. Joseph (ftUS),7186,9003,9807,4497,8801,40.54,9110,8802,-86.18,9110,8805,1.000031,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Gibson (m),7187,9001,9807,4499,8801,38.09,9110,8802,-87.39,9110,8805,1.000013,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Gibson (ftUS),7188,9003,9807,4497,8801,38.09,9110,8802,-87.39,9110,8805,1.000013,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Grant (m),7189,9001,9807,4499,8801,40.21,9110,8802,-85.42,9110,8805,1.000034,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Grant (ftUS),7190,9003,9807,4497,8801,40.21,9110,8802,-85.42,9110,8805,1.000034,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Hamilton-Tipton (m),7191,9001,9807,4499,8801,39.54,9110,8802,-86.0,9110,8805,1.000034,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Hamilton-Tipton (ftUS),7192,9003,9807,4497,8801,39.54,9110,8802,-86.0,9110,8805,1.000034,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Hancock-Madison (m),7193,9001,9807,4499,8801,39.39,9110,8802,-85.48,9110,8805,1.000036,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Hancock-Madison (ftUS),7194,9003,9807,4497,8801,39.39,9110,8802,-85.48,9110,8805,1.000036,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Harrison-Washington (m),7195,9001,9807,4499,8801,37.57,9110,8802,-86.09,9110,8805,1.000027,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Harrison-Washington (ftUS),7196,9003,9807,4497,8801,37.57,9110,8802,-86.09,9110,8805,1.000027,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Henry (m),7197,9001,9807,4499,8801,39.45,9110,8802,-85.27,9110,8805,1.000043,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Henry (ftUS),7198,9003,9807,4497,8801,39.45,9110,8802,-85.27,9110,8805,1.000043,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Howard-Miami (m),7199,9001,9807,4499,8801,40.21,9110,8802,-86.09,9110,8805,1.000031,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Howard-Miami (ftUS),7200,9003,9807,4497,8801,40.21,9110,8802,-86.09,9110,8805,1.000031,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Huntington-Whitley (m),7201,9001,9807,4499,8801,40.39,9110,8802,-85.3,9110,8805,1.000034,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Huntington-Whitley (ftUS),7202,9003,9807,4497,8801,40.39,9110,8802,-85.3,9110,8805,1.000034,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Jackson (m),7203,9001,9807,4499,8801,38.42,9110,8802,-85.57,9110,8805,1.000022,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Jackson (ftUS),7204,9003,9807,4497,8801,38.42,9110,8802,-85.57,9110,8805,1.000022,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Jasper-Porter (m),7205,9001,9807,4499,8801,40.42,9110,8802,-87.06,9110,8805,1.000027,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Jasper-Porter (ftUS),7206,9003,9807,4497,8801,40.42,9110,8802,-87.06,9110,8805,1.000027,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Jay (m),7207,9001,9807,4499,8801,40.18,9110,8802,-85.0,9110,8805,1.000038,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Jay (ftUS),7208,9003,9807,4497,8801,40.18,9110,8802,-85.0,9110,8805,1.000038,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Jefferson (m),7209,9001,9807,4499,8801,38.33,9110,8802,-85.21,9110,8805,1.000028,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Jefferson (ftUS),7210,9003,9807,4497,8801,38.33,9110,8802,-85.21,9110,8805,1.000028,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Jennings (m),7211,9001,9807,4499,8801,38.48,9110,8802,-85.48,9110,8805,1.000025,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Jennings (ftUS),7212,9003,9807,4497,8801,38.48,9110,8802,-85.48,9110,8805,1.000025,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Johnson-Marion (m),7213,9001,9807,4499,8801,39.18,9110,8802,-86.09,9110,8805,1.000031,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Johnson-Marion (ftUS),7214,9003,9807,4497,8801,39.18,9110,8802,-86.09,9110,8805,1.000031,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Knox (m),7215,9001,9807,4499,8801,38.24,9110,8802,-87.27,9110,8805,1.000015,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Knox (ftUS),7216,9003,9807,4497,8801,38.24,9110,8802,-87.27,9110,8805,1.000015,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS LaGrange-Noble (m),7217,9001,9807,4499,8801,41.15,9110,8802,-85.27,9110,8805,1.000037,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS LaGrange-Noble (ftUS),7218,9003,9807,4497,8801,41.15,9110,8802,-85.27,9110,8805,1.000037,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Lake-Newton (m),7219,9001,9807,4499,8801,40.42,9110,8802,-87.24,9110,8805,1.000026,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Lake-Newton (ftUS),7220,9003,9807,4497,8801,40.42,9110,8802,-87.24,9110,8805,1.000026,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS LaPorte-Pulaski-Starke (m),7221,9001,9807,4499,8801,40.54,9110,8802,-86.45,9110,8805,1.000027,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS LaPorte-Pulaski-Starke (ftUS),7222,9003,9807,4497,8801,40.54,9110,8802,-86.45,9110,8805,1.000027,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Monroe-Morgan (m),7223,9001,9807,4499,8801,38.57,9110,8802,-86.3,9110,8805,1.000028,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Monroe-Morgan (ftUS),7224,9003,9807,4497,8801,38.57,9110,8802,-86.3,9110,8805,1.000028,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Montgomery-Putnam (m),7225,9001,9807,4499,8801,39.27,9110,8802,-86.57,9110,8805,1.000031,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Montgomery-Putnam (ftUS),7226,9003,9807,4497,8801,39.27,9110,8802,-86.57,9110,8805,1.000031,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Owen (m),7227,9001,9807,4499,8801,39.09,9110,8802,-86.54,9110,8805,1.000026,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Owen (ftUS),7228,9003,9807,4497,8801,39.09,9110,8802,-86.54,9110,8805,1.000026,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Parke-Vermillion (m),7229,9001,9807,4499,8801,39.36,9110,8802,-87.21,9110,8805,1.000022,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Parke-Vermillion (ftUS),7230,9003,9807,4497,8801,39.36,9110,8802,-87.21,9110,8805,1.000022,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Perry (m),7231,9001,9807,4499,8801,37.48,9110,8802,-86.42,9110,8805,1.00002,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Perry (ftUS),7232,9003,9807,4497,8801,37.48,9110,8802,-86.42,9110,8805,1.00002,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Pike-Warrick (m),7233,9001,9807,4499,8801,37.51,9110,8802,-87.18,9110,8805,1.000015,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Pike-Warrick (ftUS),7234,9003,9807,4497,8801,37.51,9110,8802,-87.18,9110,8805,1.000015,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Posey (m),7235,9001,9807,4499,8801,37.45,9110,8802,-87.57,9110,8805,1.000013,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Posey (ftUS),7236,9003,9807,4497,8801,37.45,9110,8802,-87.57,9110,8805,1.000013,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Randolph-Wayne (m),7237,9001,9807,4499,8801,39.42,9110,8802,-85.03,9110,8805,1.000044,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Randolph-Wayne (ftUS),7238,9003,9807,4497,8801,39.42,9110,8802,-85.03,9110,8805,1.000044,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Ripley (m),7239,9001,9807,4499,8801,38.54,9110,8802,-85.18,9110,8805,1.000038,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Ripley (ftUS),7240,9003,9807,4497,8801,38.54,9110,8802,-85.18,9110,8805,1.000038,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Shelby (m),7241,9001,9807,4499,8801,39.18,9110,8802,-85.54,9110,8805,1.00003,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Shelby (ftUS),7242,9003,9807,4497,8801,39.18,9110,8802,-85.54,9110,8805,1.00003,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Spencer (m),7243,9001,9807,4499,8801,37.45,9110,8802,-87.03,9110,8805,1.000014,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Spencer (ftUS),7244,9003,9807,4497,8801,37.45,9110,8802,-87.03,9110,8805,1.000014,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Steuben (m),7245,9001,9807,4499,8801,41.3,9110,8802,-85.0,9110,8805,1.000041,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Steuben (ftUS),7246,9003,9807,4497,8801,41.3,9110,8802,-85.0,9110,8805,1.000041,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Sullivan (m),7247,9001,9807,4499,8801,38.54,9110,8802,-87.3,9110,8805,1.000017,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Sullivan (ftUS),7248,9003,9807,4497,8801,38.54,9110,8802,-87.3,9110,8805,1.000017,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Tippecanoe-White (m),7249,9001,9807,4499,8801,40.12,9110,8802,-86.54,9110,8805,1.000026,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Tippecanoe-White (ftUS),7250,9003,9807,4497,8801,40.12,9110,8802,-86.54,9110,8805,1.000026,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Vanderburgh (m),7251,9001,9807,4499,8801,37.48,9110,8802,-87.33,9110,8805,1.000015,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Vanderburgh (ftUS),7252,9003,9807,4497,8801,37.48,9110,8802,-87.33,9110,8805,1.000015,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Vigo (m),7253,9001,9807,4499,8801,39.15,9110,8802,-87.27,9110,8805,1.00002,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Vigo (ftUS),7254,9003,9807,4497,8801,39.15,9110,8802,-87.27,9110,8805,1.00002,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 InGCS Wells (m),7255,9001,9807,4499,8801,40.33,9110,8802,-85.15,9110,8805,1.000034,9201,8806,240000.0,9001,8807,36000.0,9001,,,,,,
 InGCS Wells (ftUS),7256,9003,9807,4497,8801,40.33,9110,8802,-85.15,9110,8805,1.000034,9201,8806,787400.0,9003,8807,118110.0,9003,,,,,,
 WISCRS Ashland County (m),7378,9001,9807,4499,8801,45.4222,9110,8802,-90.372,9110,8805,1.0000495683,9201,8806,172821.9461,9001,8807,0.0017,9001,,,,,,
 WISCRS Ashland County (ftUS),7379,9003,9807,4497,8801,45.4222,9110,8802,-90.372,9110,8805,1.0000495683,9201,8806,567000.001,9003,8807,0.006,9003,,,,,,
 WISCRS Bayfield County (m),7380,9001,9801,4499,8801,46.4010734158,9110,8802,-91.091,9110,8805,1.0000331195,9201,8806,228600.4575,9001,8807,148551.4837,9001,,,,,,
@ -560,8 +372,6 @@ WISCRS Wood County (m),7482,9001,9801,4499,8801,44.214534369,9110,8802,-90,9110,
 WISCRS Wood County (ftUS),7483,9003,9801,4497,8801,44.214534369,9110,8802,-90,9110,8805,1.0000421209,9201,8806,684000.001,9003,8807,441566.551,9003,,,,,,
 WISCRS Adams and Juneau Counties (m),7484,9001,9807,4499,8801,43.22,9110,8802,-90,9110,8805,1.0000365285,9201,8806,147218.6942,9001,8807,0.0037,9001,,,,,,
 WISCRS Adams and Juneau Counties (ftUS),7485,9003,9807,4497,8801,43.22,9110,8802,-90,9110,8805,1.0000365285,9201,8806,482999.999,9003,8807,0.012,9003,,,,,,
 "WISCRS Calumet, Fond du Lac, Outagamie and Winnebago Counties (m)",7486,9001,9807,4499,8801,42.431,9110,8802,-88.3,9110,8805,1.0000286569,9201,8806,244754.8893,9001,8807,0.0049,9001,,,,,,
 "WISCRS Calumet, Fond du Lac, Outagamie and Winnebago Counties (ftUS)",7487,9003,9807,4497,8801,42.431,9110,8802,-88.3,9110,8805,1.0000286569,9201,8806,802999.999,9003,8807,0.016,9003,,,,,,
 WISCRS Columbia County (m),7488,9001,9801,4499,8801,43.2745167925,9110,8802,-89.234,9110,8805,1.00003498,9201,8806,169164.3381,9001,8807,111569.6134,9001,,,,,,
 WISCRS Columbia County (ftUS),7489,9003,9801,4497,8801,43.2745167925,9110,8802,-89.234,9110,8805,1.00003498,9201,8806,554999.999,9003,8807,366041.307,9003,,,,,,
 WISCRS Crawford County (m),7490,9001,9801,4499,8801,43.1200200178,9110,8802,-90.562,9110,8805,1.0000349151,9201,8806,113690.6274,9001,8807,53703.1201,9001,,,,,,
@ -578,10 +388,6 @@ WISCRS Green Lake and Marquette Counties (m),7500,9001,9801,4499,8801,43.4825200
 WISCRS Green Lake and Marquette Counties (ftUS),7501,9003,9801,4497,8801,43.4825200424,9110,8802,-89.143,9110,8805,1.0000344057,9201,8806,495000,9003,8807,259746.132,9003,,,,,,
 WISCRS Iowa County (m),7502,9001,9807,4499,8801,42.322,9110,8802,-90.094,9110,8805,1.0000394961,9201,8806,113081.0261,9001,8807,0.0045,9001,,,,,,
 WISCRS Iowa County (ftUS),7503,9003,9807,4497,8801,42.322,9110,8802,-90.094,9110,8805,1.0000394961,9201,8806,371000,9003,8807,0.015,9003,,,,,,
 "WISCRS Kenosha, Milwaukee, Ozaukee and Racine Counties (m)",7504,9001,9807,4499,8801,42.13,9110,8802,-87.534,9110,8805,1.0000260649,9201,8806,185928.3728,9001,8807,0.0009,9001,,,,,,
 "WISCRS Kenosha, Milwaukee, Ozaukee and Racine Counties (ftUS)",7505,9003,9807,4497,8801,42.13,9110,8802,-87.534,9110,8805,1.0000260649,9201,8806,610000.003,9003,8807,0.003,9003,,,,,,
 "WISCRS Kewaunee, Manitowoc and Sheboygan Counties (m)",7506,9001,9807,4499,8801,43.16,9110,8802,-87.33,9110,8805,1.0000233704,9201,8806,79857.7614,9001,8807,0.0012,9001,,,,,,
 "WISCRS Kewaunee, Manitowoc and Sheboygan Counties (ftUS)",7507,9003,9807,4497,8801,43.16,9110,8802,-87.33,9110,8805,1.0000233704,9201,8806,262000.006,9003,8807,0.004,9003,,,,,,
 WISCRS La Crosse County (m),7508,9001,9807,4499,8801,43.2704,9110,8802,-91.19,9110,8805,1.0000319985,9201,8806,130454.6598,9001,8807,0.0033,9001,,,,,,
 WISCRS La Crosse County (ftUS),7509,9003,9807,4497,8801,43.2704,9110,8802,-91.19,9110,8805,1.0000319985,9201,8806,427999.996,9003,8807,0.011,9003,,,,,,
 WISCRS Monroe County (m),7510,9001,9801,4499,8801,44.0000266143,9110,8802,-90.383,9110,8805,1.0000434122,9201,8806,204521.209,9001,8807,121923.9861,9001,,,,,,
@ -646,73 +452,6 @@ St. Helena Local Grid 1971,7875,9001,9807,4400,8801,-15.58,9110,8802,-5.43,9110,
 St. Helena Local Grid (Tritan),7876,9001,9807,4400,8801,-15.58,9110,8802,-5.43,9110,8805,1,9201,8806,299483.737,9001,8807,2000527.879,9001,,,,,,
 TM Zone 20N (US survey feet),8033,9003,9807,4497,8801,0,9102,8802,-63,9102,8805,0.9996,9201,8806,1640416.667,9003,8807,0,9003,,,,,,
 TM Zone 21N (US survey feet),8034,9003,9807,4497,8801,0,9102,8802,-57,9102,8805,0.9996,9201,8806,1640416.667,9003,8807,0,9003,,,,,,
 Pima County zone 2 Central (ft),8062,9002,9807,4495,8801,31.15,9110,8802,-112.1,9110,8805,1.00009,9201,8806,1800000.0,9002,8807,1000000.0,9002,,,,,,
 Pima County zone 3 West (ft),8063,9002,9807,4495,8801,31.3,9110,8802,-113.1,9110,8805,1.000055,9201,8806,600000.0,9002,8807,0.0,9002,,,,,,
 Pima County zone 4 Mt. Lemmon (ft),8064,9002,9801,4495,8801,30.3,9110,8802,-110.45,9110,8805,0.9998,9201,8806,30000.0,9002,8807,-620000.0,9002,,,,,,
 Oregon Burns-Harper zone (meter),8273,9001,9807,4499,8801,43.3,9110,8802,-117.4,9110,8805,1.00014,9201,8806,90000.0,9001,8807,0.0,9001,,,,,,
 Oregon Burns-Harper zone (international foot),8274,9002,9807,4495,8801,43.3,9110,8802,-117.4,9110,8805,1.00014,9201,8806,295275.5906,9002,8807,0.0,9002,,,,,,
 Oregon Canyon City-Burns zone (meter),8275,9001,9807,4499,8801,43.3,9110,8802,-119.0,9110,8805,1.00022,9201,8806,20000.0,9001,8807,0.0,9001,,,,,,
 Oregon Canyon City-Burns zone (international foot),8276,9002,9807,4495,8801,43.3,9110,8802,-119.0,9110,8805,1.00022,9201,8806,65616.7979,9002,8807,0.0,9002,,,,,,
 Oregon Coast Range North zone (meter),8277,9001,9801,4499,8801,45.35,9110,8802,-123.25,9110,8805,1.000045,9201,8806,30000.0,9001,8807,20000.0,9001,,,,,,
 Oregon Coast Range North zone (international foot),8278,9002,9801,4495,8801,45.35,9110,8802,-123.25,9110,8805,1.000045,9201,8806,98425.1969,9002,8807,65616.7979,9002,,,,,,
 Oregon Dayville-Prairie City zone (meter),8279,9001,9807,4499,8801,44.15,9110,8802,-119.38,9110,8805,1.00012,9201,8806,20000.0,9001,8807,0.0,9001,,,,,,
 Oregon Dayville-Prairie City zone (international foot),8280,9002,9807,4495,8801,44.15,9110,8802,-119.38,9110,8805,1.00012,9201,8806,65616.7979,9002,8807,0.0,9002,,,,,,
 Oregon Denio-Burns zone (meter),8281,9001,9807,4499,8801,41.45,9110,8802,-118.25,9110,8805,1.00019,9201,8806,80000.0,9001,8807,0.0,9001,,,,,,
 Oregon Denio-Burns zone (international foot),8282,9002,9807,4495,8801,41.45,9110,8802,-118.25,9110,8805,1.00019,9201,8806,262467.1916,9002,8807,0.0,9002,,,,,,
 Oregon Halfway zone (meter),8283,9001,9801,4499,8801,45.15,9110,8802,-117.15,9110,8805,1.000085,9201,8806,40000.0,9001,8807,70000.0,9001,,,,,,
 Oregon Halfway zone (international foot),8284,9002,9801,4495,8801,45.15,9110,8802,-117.15,9110,8805,1.000085,9201,8806,131233.5958,9002,8807,229658.7927,9002,,,,,,
 Oregon Medford-Diamond Lake zone (meter),8285,9001,9801,4499,8801,42.0,9110,8802,-122.15,9110,8805,1.00004,9201,8806,60000.0,9001,8807,-60000.0,9001,,,,,,
 Oregon Medford-Diamond Lake zone (international foot),8286,9002,9801,4495,8801,42.0,9110,8802,-122.15,9110,8805,1.00004,9201,8806,196850.3937,9002,8807,-196850.3937,9002,,,,,,
 Oregon Mitchell zone (meter),8287,9001,9801,4499,8801,47.0,9110,8802,-120.15,9110,8805,0.99927,9201,8806,30000.0,9001,8807,290000.0,9001,,,,,,
 Oregon Mitchell zone (international foot),8288,9002,9801,4495,8801,47.0,9110,8802,-120.15,9110,8805,0.99927,9201,8806,98425.1969,9002,8807,951443.5696,9002,,,,,,
 Oregon North Central zone (meter),8289,9001,9801,4499,8801,46.1,9110,8802,-120.3,9110,8805,1.0,9201,8806,100000.0,9001,8807,140000.0,9001,,,,,,
 Oregon North Central zone (international foot),8290,9002,9801,4495,8801,46.1,9110,8802,-120.3,9110,8805,1.0,9201,8806,328083.9895,9002,8807,459317.5853,9002,,,,,,
 Oregon Ochoco Summit zone (meter),8291,9001,9801,4499,8801,43.3,9110,8802,-120.3,9110,8805,1.00006,9201,8806,40000.0,9001,8807,-80000.0,9001,,,,,,
 Oregon Ochoco Summit zone (international foot),8292,9002,9801,4495,8801,43.3,9110,8802,-120.3,9110,8805,1.00006,9201,8806,131233.5958,9002,8807,-262467.1916,9002,,,,,,
 Oregon Owyhee zone (meter),8293,9001,9807,4499,8801,41.45,9110,8802,-117.35,9110,8805,1.00018,9201,8806,70000.0,9001,8807,0.0,9001,,,,,,
 Oregon Owyhee zone (international foot),8294,9002,9807,4495,8801,41.45,9110,8802,-117.35,9110,8805,1.00018,9201,8806,229658.7927,9002,8807,0.0,9002,,,,,,
 Oregon Pilot Rock-Ukiah zone (meter),8295,9001,9801,4499,8801,46.1,9110,8802,-119.0,9110,8805,1.000025,9201,8806,50000.0,9001,8807,130000.0,9001,,,,,,
 Oregon Pilot Rock-Ukiah zone (international foot),8296,9002,9801,4495,8801,46.1,9110,8802,-119.0,9110,8805,1.000025,9201,8806,164041.9948,9002,8807,426509.1864,9002,,,,,,
 Oregon Prairie City-Brogan zone (meter),8297,9001,9801,4499,8801,44.0,9110,8802,-118.0,9110,8805,1.00017,9201,8806,60000.0,9001,8807,0.0,9001,,,,,,
 Oregon Prairie City-Brogan zone (international foot),8298,9002,9801,4495,8801,44.0,9110,8802,-118.0,9110,8805,1.00017,9201,8806,196850.3937,9002,8807,0.0,9002,,,,,,
 Oregon Riley-Lakeview zone (meter),8299,9001,9807,4499,8801,41.45,9110,8802,-120.2,9110,8805,1.000215,9201,8806,70000.0,9001,8807,0.0,9001,,,,,,
 Oregon Riley-Lakeview zone (international foot),8300,9002,9807,4495,8801,41.45,9110,8802,-120.2,9110,8805,1.000215,9201,8806,229658.7927,9002,8807,0.0,9002,,,,,,
 Oregon Siskiyou Pass zone (meter),8301,9001,9801,4499,8801,42.3,9110,8802,-122.35,9110,8805,1.00015,9201,8806,10000.0,9001,8807,60000.0,9001,,,,,,
 Oregon Siskiyou Pass zone (international foot),8302,9002,9801,4495,8801,42.3,9110,8802,-122.35,9110,8805,1.00015,9201,8806,32808.399,9002,8807,196850.3937,9002,,,,,,
 Oregon Ukiah-Fox zone (meter),8303,9001,9801,4499,8801,45.15,9110,8802,-119.0,9110,8805,1.00014,9201,8806,30000.0,9001,8807,90000.0,9001,,,,,,
 Oregon Ukiah-Fox zone (international foot),8304,9002,9801,4495,8801,45.15,9110,8802,-119.0,9110,8805,1.00014,9201,8806,98425.1969,9002,8807,295275.5906,9002,,,,,,
 Oregon Wallowa zone (meter),8305,9001,9807,4495,8801,45.15,9110,8802,-117.3,9110,8805,1.000195,9201,8806,60000.0,9001,8807,0.0,9001,,,,,,
 Oregon Wallowa zone (international foot),8306,9002,9807,4495,8801,45.15,9110,8802,-117.3,9110,8805,1.000195,9201,8806,196850.3937,9002,8807,0.0,9002,,,,,,
 Oregon Warner Highway zone (meter),8307,9001,9801,4499,8801,42.3,9110,8802,-120.0,9110,8805,1.000245,9201,8806,40000.0,9001,8807,60000.0,9001,,,,,,
 Oregon Warner Highway zone (international foot),8308,9002,9801,4495,8801,42.3,9110,8802,-120.0,9110,8805,1.000245,9201,8806,131233.5958,9002,8807,196850.3937,9002,,,,,,
 Oregon Willamette Pass zone (meter),8309,9001,9807,4499,8801,43.0,9110,8802,-122.0,9110,8805,1.000223,9201,8806,20000.0,9001,8807,0.0,9001,,,,,,
 Oregon Willamette Pass zone (international foot),8310,9002,9807,4495,8801,43.0,9110,8802,-122.0,9110,8805,1.000223,9201,8806,65616.7979,9002,8807,0.0,9002,,,,,,
 NCRS Las Vegas zone (m),8373,9001,9807,4499,8801,36.15,9110,8802,-114.58,9110,8805,1.0001,9201,8806,100000.0,9001,8807,200000.0,9001,,,,,,
 NCRS Las Vegas zone (ftUS),8374,9003,9807,4497,8801,36.15,9110,8802,-114.58,9110,8805,1.0001,9201,8806,328083.3333,9003,8807,656166.6667,9003,,,,,,
 NCRS Las Vegas high elevation zone (m),8375,9001,9807,4499,8801,36.15,9110,8802,-114.58,9110,8805,1.000135,9201,8806,300000.0,9001,8807,400000.0,9001,,,,,,
 NCRS Las Vegas high elevation zone (ftUS),8376,9003,9807,4497,8801,36.15,9110,8802,-114.58,9110,8805,1.000135,9201,8806,984250.0,9003,8807,1312333.3333,9003,,,,,,
 Kansas regional zone 1 Goodland (ftUS),8458,9003,9807,4497,8801,37.3,9110,8802,-101.36,9110,8805,1.000156,9201,8806,1500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 2 Colby (ftUS),8459,9003,9807,4497,8801,37.3,9110,8802,-100.57,9110,8805,1.000134,9201,8806,2500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 3 Oberlin (ftUS),8490,9003,9807,4497,8801,37.3,9110,8802,-100.21,9110,8805,1.000116,9201,8806,3500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 4 Hays (ftUS),8491,9003,9807,4497,8801,37.3,9110,8802,-99.27,9110,8805,1.000082,9201,8806,4500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 5 Great Bend (ftUS),8492,9003,9807,4497,8801,37.3,9110,8802,-98.4,9110,8805,1.000078,9201,8806,5500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 6 Beliot (ftUS),8493,9003,9807,4497,8801,37.3,9110,8802,-98.09,9110,8805,1.000068,9201,8806,6500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 7 Salina (ftUS),8494,9003,9807,4497,8801,37.3,9110,8802,-97.2,9110,8805,1.000049,9201,8806,7500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 8 Manhattan (ftUS),8495,9003,9801,4497,8801,39.1,9110,8802,-96.3,9110,8805,1.000044,9201,8806,8500000.0,9003,8807,600000.0,9003,,,,,,
 Kansas regional zone 9 Emporia (ftUS),8498,9003,9801,4497,8801,38.3,9110,8802,-96.3,9110,8805,1.00005,9201,8806,9500000.0,9003,8807,300000.0,9003,,,,,,
 Kansas regional zone 10 Atchison (ftUS),8499,9003,9801,4497,8801,39.38,9110,8802,-95.45,9110,8805,1.00004,9201,8806,10500000.0,9003,8807,700000.0,9003,,,,,,
 Kansas regional zone 11 Kansas City (ftUS),8500,9003,9801,4497,8801,39.06,9110,8802,-95.15,9110,8805,1.000033,9201,8806,11500000.0,9003,8807,600000.0,9003,,,,,,
 Kansas regional zone 12 Ulysses (ftUS),8501,9003,9807,4497,8801,36.45,9110,8802,-101.25,9110,8805,1.00014,9201,8806,12500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 13 Garden City (ftUS),8502,9003,9807,4497,8801,36.45,9110,8802,-100.24,9110,8805,1.000109,9201,8806,13500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 14 Dodge City (ftUS),8503,9003,9807,4497,8801,36.45,9110,8802,-99.4,9110,8805,1.000097,9201,8806,14500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 15 Larned (ftUS),8504,9003,9807,4497,8801,36.45,9110,8802,-99.12,9110,8805,1.000087,9201,8806,15500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 16 Pratt (ftUS),8505,9003,9807,4497,8801,36.45,9110,8802,-98.33,9110,8805,1.000069,9201,8806,16500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 17 Wichita (ftUS),8506,9003,9801,4497,8801,37.46,9110,8802,-97.3,9110,8805,1.000059,9201,8806,17500000.0,9003,8807,400000.0,9003,,,,,,
 Kansas regional zone 18 Arkansas City (ftUS),8507,9003,9801,4497,8801,37.11,9110,8802,-97.3,9110,8805,1.000055,9201,8806,18500000.0,9003,8807,200000.0,9003,,,,,,
 Kansas regional zone 19 Coffeyville (ftUS),8515,9003,9807,4497,8801,36.45,9110,8802,-95.58,9110,8805,1.000034,9201,8806,19500000.0,9003,8807,0.0,9003,,,,,,
 Kansas regional zone 20 Pittsburg (ftUS),8516,9003,9807,4497,8801,36.45,9110,8802,-95.05,9110,8805,1.000031,9201,8806,20500000.0,9003,8807,0.0,9003,,,,,,
 SPCS83 Alabama East zone (US survey foot),9746,9003,9807,4497,8801,30.3,9110,8802,-85.5,9110,8805,0.99996,9201,8806,656166.667,9003,8807,0.0,9003,,,,,,
 SPCS83 Alabama West zone (US survey foot),9747,9003,9807,4497,8801,30.0,9110,8802,-87.3,9110,8805,0.999933333,9201,8806,1968500.0,9003,8807,0.0,9003,,,,,,
 Alabama CS27 East zone,10101,9003,9807,4497,8801,30.3,9110,8802,-85.5,9110,8805,0.99996,9201,8806,500000,9003,8807,0,9003,,,,,,
 Alabama CS27 West zone,10102,9003,9807,4497,8801,30,9110,8802,-87.3,9110,8805,0.999933333,9201,8806,500000,9003,8807,0,9003,,,,,,
 SPCS83 Alabama East zone (meters),10131,9001,9807,4499,8801,30.3,9110,8802,-85.5,9110,8805,0.99996,9201,8806,200000,9001,8807,0,9001,,,,,,
@ -773,39 +512,6 @@ Illinois CS27 East zone,11201,9003,9807,4497,8801,36.4,9110,8802,-88.2,9110,8805
 Illinois CS27 West zone,11202,9003,9807,4497,8801,36.4,9110,8802,-90.1,9110,8805,0.999941177,9201,8806,500000,9003,8807,0,9003,,,,,,
 SPCS83 Illinois East zone (meters),11231,9001,9807,4499,8801,36.4,9110,8802,-88.2,9110,8805,0.999975,9201,8806,300000,9001,8807,0,9001,,,,,,
 SPCS83 Illinois West zone (meters),11232,9001,9807,4499,8801,36.4,9110,8802,-90.1,9110,8805,0.999941177,9201,8806,700000,9001,8807,0,9001,,,,,,
 Illinois Coordinate System of 1983 Aurora zone (US survey foot),11233,9003,9807,1053,8801,41.15,9110,8802,-88.3,9110,8805,1.00003,9201,8806,3773000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Chicago zone (US survey foot),11234,9003,9807,1053,8801,41.15,9110,8802,-87.48,9110,8805,1.000023,9201,8806,4757000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Moline zone (US survey foot),11235,9003,9801,1053,8801,41.33,9110,8802,-90.36,9110,8805,1.000024,9201,8806,5741000.0,9003,8807,755000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Sterling zone (US survey foot),11236,9003,9801,1053,8801,41.33,9110,8802,-90.03,9110,8805,1.00002,9201,8806,6726000.0,9003,8807,755000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Ottawa zone (US survey foot),11237,9003,9801,1053,8801,41.18,9110,8802,-89.03,9110,8805,1.000023,9201,8806,7743000.0,9003,8807,755000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Joliet zone (US survey foot),11238,9003,9807,1053,8801,40.33,9110,8802,-88.0,9110,8805,1.000022,9201,8806,8694000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Monmouth zone (US survey foot),11239,9003,9807,1053,8801,40.12,9110,8802,-90.51,9110,8805,1.000024,9201,8806,9678000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Galesburg zone (US survey foot),11240,9003,9807,1053,8801,37.15,9110,8802,-90.06,9110,8805,1.000023,9201,8806,230000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Peoria zone (US survey foot),11241,9003,9807,1053,8801,37.24,9110,8802,-89.39,9110,8805,1.000023,9201,8806,1378000.0,9003,8807,622000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Eureka zone (US survey foot),11242,9003,9807,1053,8801,37.27,9110,8802,-89.18,9110,8805,1.000025,9201,8806,2756000.0,9003,8807,427000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Bloomington zone (US survey foot),11243,9003,9801,1053,8801,40.3,9110,8802,-88.51,9110,8805,1.000031,9201,8806,3773000.0,9003,8807,1739000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Pontiac zone (US survey foot),11244,9003,9801,1053,8801,40.54,9110,8802,-88.33,9110,8805,1.000025,9201,8806,4757000.0,9003,8807,1739000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Watseka zone (US survey foot),11245,9003,9801,1053,8801,40.45,9110,8802,-87.57,9110,8805,1.000024,9201,8806,5741000.0,9003,8807,1739000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Quincy zone (US survey foot),11246,9003,9807,1053,8801,36.45,9110,8802,-91.15,9110,8805,1.000023,9201,8806,6726000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Macomb zone (US survey foot),11247,9003,9807,1053,8801,36.48,9110,8802,-90.36,9110,8805,1.000024,9201,8806,7710000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Lincoln zone (US survey foot),11248,9003,9801,1053,8801,40.09,9110,8802,-89.48,9110,8805,1.000018,9201,8806,8760000.0,9003,8807,1739000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Decatur zone (US survey foot),11249,9003,9807,1053,8801,36.18,9110,8802,-88.48,9110,8805,1.000024,9201,8806,9678000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Champaign zone (US survey foot),11250,9003,9801,1053,8801,40.09,9110,8802,-88.0,9110,8805,1.000026,9201,8806,328000.0,9003,8807,2822000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Jacksonville zone (US survey foot),11251,9003,9801,1053,8801,39.39,9110,8802,-90.36,9110,8805,1.000023,9201,8806,1247000.0,9003,8807,2822000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Springfield zone (US survey foot),11252,9003,9801,1053,8801,39.45,9110,8802,-89.39,9110,8805,1.000022,9201,8806,2329000.0,9003,8807,2887000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Charleston zone (US survey foot),11253,9003,9801,1053,8801,39.39,9110,8802,-88.0,9110,8805,1.000024,9201,8806,3773000.0,9003,8807,2756000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Jerseyville zone (US survey foot),11254,9003,9807,1053,8801,32.51,9110,8802,-90.3,9110,8805,1.000019,9201,8806,4757000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Carlinville zone (US survey foot),11255,9003,9801,1053,8801,39.18,9110,8802,-90.09,9110,8805,1.00002,9201,8806,5741000.0,9003,8807,2756000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Taylorville zone (US survey foot),11256,9003,9807,1053,8801,33.09,9110,8802,-89.24,9110,8805,1.000023,9201,8806,6726000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Effingham zone (US survey foot),11257,9003,9801,1053,8801,38.57,9110,8802,-89.0,9110,8805,1.000019,9201,8806,7710000.0,9003,8807,2756000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Robinson zone (US survey foot),11258,9003,9801,1053,8801,39.06,9110,8802,-88.0,9110,8805,1.000017,9201,8806,8694000.0,9003,8807,2756000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Belleville zone (US survey foot),11259,9003,9807,1053,8801,32.21,9110,8802,-90.0,9110,8805,1.000016,9201,8806,9678000.0,9003,8807,492000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Mount Vernon zone (US survey foot),11260,9003,9801,1053,8801,38.27,9110,8802,-89.09,9110,8805,1.000015,9201,8806,328000.0,9003,8807,3773000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Olney zone (US survey foot),11261,9003,9801,1053,8801,38.33,9110,8802,-88.09,9110,8805,1.000013,9201,8806,1247000.0,9003,8807,3773000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Carbondale zone (US survey foot),11262,9003,9801,1053,8801,37.54,9110,8802,-88.57,9110,8805,1.000012,9201,8806,2395000.0,9003,8807,3773000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Metropolis zone (US survey foot),11263,9003,9801,1053,8801,37.12,9110,8802,-88.54,9110,8805,1.00001,9201,8806,3642000.0,9003,8807,3839000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Freeport zone (US survey foot),11264,9003,9801,1053,8801,42.12,9110,8802,-89.57,9110,8805,1.000029,9201,8806,1804000.0,9003,8807,755000.0,9003,,,,,,
 Illinois Coordinate System of 1983 Rockford zone (US survey foot),11265,9003,9807,1053,8801,41.15,9110,8802,-89.15,9110,8805,1.000029,9201,8806,2822000.0,9003,8807,492000.0,9003,,,,,,
 Indiana CS27 East zone,11301,9003,9807,4497,8801,37.3,9110,8802,-85.4,9110,8805,0.999966667,9201,8806,500000,9003,8807,0,9003,,,,,,
 Indiana CS27 West zone,11302,9003,9807,4497,8801,37.3,9110,8802,-87.05,9110,8805,0.999966667,9201,8806,500000,9003,8807,0,9003,,,,,,
 SPCS83 Indiana East zone (meters),11331,9001,9807,4499,8801,37.3,9110,8802,-85.4,9110,8805,0.999966667,9201,8806,100000,9001,8807,250000,9001,,,,,,
--- a/data/maps/4UMaps.xml
+++ b/data/maps/4UMaps.xml
@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>4UMaps</name>
 	<url>https://tileserver.4umaps.com/$z/$x/$y.png</url>
 	<zoom min="2" max="15"/>
 	<bounds bottom="-65"/>
 	<copyright>Map data: © OpenStreetMap contributors (ODbL) | Rendering: © 4UMaps.eu</copyright>
 </map>
--- a/data/maps/mtbmap-cz.xml
+++ b/data/maps/mtbmap-cz.xml
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map xmlns="http://www.gpxsee.org/map/1.4">
 	<name>mtbmap.cz</name>
 	<url>https://tile.mtbmap.cz/mtbmap_tiles/$z/$x/$y.png</url>
 	<copyright>Map data: OpenStreetMap, USGS | Rendering: Martin Tesař</copyright>
 </map>
--- a/data/mapsforge/default.xml
+++ b/data/mapsforge/default.xml
--- a/data/style/style.xml
+++ b/data/style/style.xml
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,8 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 13.39
+VERSION = 13.13
 QT += core \
    gui \
@ -17,15 +18,20 @@ QT += core \
    svg \
    serialport
 greaterThan(QT_MAJOR_VERSION, 5) {
-    QT += openglwidgets
+    QT += openglwidgets \
          core5compat
 }
 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
    src/GUI/crosshairitem.h \
    src/GUI/motioninfoitem.h \
    src/GUI/pluginparameters.h \
    src/common/garmin.h \
    src/common/coordinates.h \
    src/common/hash.h \
    src/common/linec.h \
    src/common/range.h \
    src/common/rectc.h \
    src/common/textcodec.h \
@ -37,12 +43,10 @@ HEADERS += src/common/config.h \
    src/common/greatcircle.h \
    src/common/programpaths.h \
    src/common/tifffile.h \
    src/common/downloader.h \
    src/common/polygon.h \
    src/common/color.h \
    src/common/csv.h \
    src/GUI/crosshairitem.h \
    src/GUI/motioninfoitem.h \
    src/GUI/pluginparameters.h \
    src/GUI/authenticationwidget.h \
    src/GUI/axislabelitem.h \
    src/GUI/dirselectwidget.h \
@ -117,23 +121,12 @@ 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 \
    src/map/ENC/mapdata.h \
    src/map/ENC/atlasdata.h \
    src/map/ENC/objects.h \
    src/map/ENC/rastertile.h \
    src/map/ENC/style.h \
    src/map/IMG/demfile.h \
    src/map/IMG/demtile.h \
    src/map/IMG/demtree.h \
    src/map/IMG/jls.h \
    src/map/IMG/section.h \
    src/map/IMG/zoom.h \
    src/map/conversion.h \
@ -141,10 +134,8 @@ HEADERS += src/common/config.h \
    src/map/encjob.h \
    src/map/encmap.h \
    src/map/ENC/iso8211.h \
    src/map/filter.h \
    src/map/gemfmap.h \
    src/map/gmifile.h \
    src/map/metatype.h \
    src/map/oruxmap.h \
    src/map/osmdroidmap.h \
    src/map/proj/polyconic.h \
@ -198,7 +189,6 @@ HEADERS += src/common/config.h \
    src/map/sqlitemap.h \
    src/map/utm.h \
    src/map/map.h \
    src/map/dem.h \
    src/map/maplist.h \
    src/map/onlinemap.h \
    src/map/tile.h \
@ -241,7 +231,6 @@ HEADERS += src/common/config.h \
    src/map/mapsforgemap.h \
    src/map/worldfilemap.h \
    src/map/imgmap.h \
    src/map/hillshading.h \
    src/data/itnparser.h \
    src/data/link.h \
    src/data/onmoveparsers.h \
@ -267,6 +256,8 @@ HEADERS += src/common/config.h \
    src/data/oziparsers.h \
    src/data/locparser.h \
    src/data/slfparser.h \
    src/data/dem.h \
    src/data/demloader.h \
    src/data/area.h \
    src/data/exifparser.h \
    src/data/cupparser.h \
@ -276,6 +267,10 @@ HEADERS += src/common/config.h \
    src/data/geojsonparser.h
 SOURCES += src/main.cpp \
    src/GUI/crosshairitem.cpp \
    src/GUI/motioninfoitem.cpp \
    src/GUI/pluginparameters.cpp \
    src/GUI/settings.cpp \
    src/common/coordinates.cpp \
    src/common/rectc.cpp \
    src/common/range.cpp \
@ -284,11 +279,8 @@ SOURCES += src/main.cpp \
    src/common/greatcircle.cpp \
    src/common/programpaths.cpp \
    src/common/tifffile.cpp \
    src/common/downloader.cpp \
    src/common/csv.cpp \
    src/GUI/crosshairitem.cpp \
    src/GUI/motioninfoitem.cpp \
    src/GUI/pluginparameters.cpp \
    src/GUI/settings.cpp \
    src/GUI/authenticationwidget.cpp \
    src/GUI/axislabelitem.cpp \
    src/GUI/dirselectwidget.cpp \
@ -347,23 +339,16 @@ SOURCES += src/main.cpp \
    src/GUI/pngexportdialog.cpp \
    src/GUI/projectioncombobox.cpp \
    src/GUI/passwordedit.cpp \
-    src/data/txtparser.cpp \
+    src/data/gpsdumpparser.cpp \
-    src/data/vkxparser.cpp \
+    src/data/twonavparser.cpp \
    src/data/vtkparser.cpp \
    src/map/downloader.cpp \
    src/map/demloader.cpp \
    src/map/ENC/atlasdata.cpp \
    src/map/ENC/mapdata.cpp \
    src/map/ENC/rastertile.cpp \
    src/map/ENC/style.cpp \
    src/map/IMG/demfile.cpp \
    src/map/IMG/demtree.cpp \
    src/map/IMG/jls.cpp \
    src/map/conversion.cpp \
    src/map/encatlas.cpp \
    src/map/encmap.cpp \
    src/map/ENC/iso8211.cpp \
    src/map/filter.cpp \
    src/map/gemfmap.cpp \
    src/map/gmifile.cpp \
    src/map/oruxmap.cpp \
@ -441,7 +426,6 @@ SOURCES += src/main.cpp \
    src/map/geocentric.cpp \
    src/map/jnxmap.cpp \
    src/map/map.cpp \
    src/map/dem.cpp \
    src/map/geotiffmap.cpp \
    src/map/image.cpp \
    src/map/mbtilesmap.cpp \
@ -452,9 +436,6 @@ SOURCES += src/main.cpp \
    src/map/aqmmap.cpp \
    src/map/mapsforgemap.cpp \
    src/map/worldfilemap.cpp \
    src/map/hillshading.cpp \
    src/data/gpsdumpparser.cpp \
    src/data/twonavparser.cpp \
    src/data/address.cpp \
    src/data/itnparser.cpp \
    src/data/onmoveparsers.cpp \
@ -475,13 +456,16 @@ SOURCES += src/main.cpp \
    src/data/oziparsers.cpp \
    src/data/locparser.cpp \
    src/data/slfparser.cpp \
    src/data/dem.cpp \
    src/data/demloader.cpp \
    src/data/exifparser.cpp \
    src/data/cupparser.cpp \
    src/data/gpiparser.cpp \
    src/data/smlparser.cpp \
    src/data/geojsonparser.cpp
-DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
    QT_NO_DEPRECATED_WARNINGS
 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@ -501,7 +485,7 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_hu.ts \
    lang/gpxsee_it.ts \
    lang/gpxsee_eo.ts \
-    lang/gpxsee_zh_CN.ts \
+    lang/gpxsee_zh.ts \
    lang/gpxsee_ca.ts \
    lang/gpxsee_ko.ts
@ -526,11 +510,10 @@ macx {
 }
 win32 {
    CONFIG += no_batch
    RESOURCES += theme-color.qrc
    QMAKE_TARGET_DESCRIPTION = GPXSee
-    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2025 Martin Tuma
+    QMAKE_TARGET_COPYRIGHT = Copyright (c) 2023 Martin Tuma
    RC_ICONS = icons/app/gpxsee.ico \
        icons/formats/gpx.ico \
        icons/formats/tcx.ico \
@ -565,9 +548,7 @@ 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
 }
@ -597,13 +578,11 @@ unix:!macx:!android {
 }
 android {
-    QT += core5compat
+    RESOURCES += theme-color.qrc
    HEADERS += src/GUI/navigationwidget.h
    SOURCES += src/GUI/navigationwidget.cpp
    RESOURCES += theme-color.qrc
    defineReplace(versionCode) {
        segments = $$split(1, ".")
        for (segment, segments): \
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -5,138 +5,98 @@
 	</qresource>
 	<!-- Common map stuff -->
-	<qresource prefix="/symbols">
+	<qresource prefix="/map">
-		<file alias="bunker.svg">icons/map/symbols/bunker.svg</file>
+		<file alias="arrow.png">icons/map/arrow.png</file>
-		<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
+		<file alias="arrow@2x.png">icons/map/arrow@2x.png</file>
-		<file alias="cross.svg">icons/map/symbols/cross.svg</file>
+		<file alias="water-arrow.png">icons/map/water-arrow.png</file>
-		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
+		<file alias="water-arrow@2x.png">icons/map/water-arrow@2x.png</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) -->
+	<!-- POIs (IMG & ENC style) -->
 	<qresource prefix="/POI">
-		<file alias="airfield-11.svg">icons/map/POI/airfield-11.svg</file>
+		<file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
-		<file alias="airport-11.svg">icons/map/POI/airport-11.svg</file>
+		<file alias="airport-11.png">icons/map/POI/airport-11.png</file>
-		<file alias="alcohol-shop-11.svg">icons/map/POI/alcohol-shop-11.svg</file>
+		<file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
-		<file alias="amusement-park-11.svg">icons/map/POI/amusement-park-11.svg</file>
+		<file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
-		<file alias="bakery-11.svg">icons/map/POI/bakery-11.svg</file>
+		<file alias="bank-11.png">icons/map/POI/bank-11.png</file>
-		<file alias="bank-11.svg">icons/map/POI/bank-11.svg</file>
+		<file alias="bar-11.png">icons/map/POI/bar-11.png</file>
-		<file alias="bar-11.svg">icons/map/POI/bar-11.svg</file>
+		<file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
-		<file alias="barrier-11.svg">icons/map/POI/barrier-11.svg</file>
+		<file alias="beach-11.png">icons/map/POI/beach-11.png</file>
-		<file alias="baseball-11.svg">icons/map/POI/baseball-11.svg</file>
+		<file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
-		<file alias="basketball-11.svg">icons/map/POI/basketball-11.svg</file>
+		<file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
-		<file alias="bbq-11.svg">icons/map/POI/bbq-11.svg</file>
+		<file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
-		<file alias="beach-11.svg">icons/map/POI/beach-11.svg</file>
+		<file alias="bus-11.png">icons/map/POI/bus-11.png</file>
-		<file alias="beer-11.svg">icons/map/POI/beer-11.svg</file>
+		<file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
-		<file alias="bicycle-11.svg">icons/map/POI/bicycle-11.svg</file>
+		<file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
-		<file alias="bowling-alley-11.svg">icons/map/POI/bowling-alley-11.svg</file>
+		<file alias="car-11.png">icons/map/POI/car-11.png</file>
-		<file alias="building-alt1-11.svg">icons/map/POI/building-alt1-11.svg</file>
+		<file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
-		<file alias="bridge-11.svg">icons/map/POI/bridge-11.svg</file>
+		<file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
-		<file alias="bus-11.svg">icons/map/POI/bus-11.svg</file>
+		<file alias="casino-11.png">icons/map/POI/casino-11.png</file>
-		<file alias="cafe-11.svg">icons/map/POI/cafe-11.svg</file>
+		<file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
-		<file alias="campsite-11.svg">icons/map/POI/campsite-11.svg</file>
+		<file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
-		<file alias="car-11.svg">icons/map/POI/car-11.svg</file>
+		<file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
-		<file alias="car-rental-11.svg">icons/map/POI/car-rental-11.svg</file>
+		<file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
-		<file alias="car-repair-11.svg">icons/map/POI/car-repair-11.svg</file>
+		<file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
-		<file alias="casino-11.svg">icons/map/POI/casino-11.svg</file>
+		<file alias="dam-11.png">icons/map/POI/dam-11.png</file>
-		<file alias="castle-11.svg">icons/map/POI/castle-11.svg</file>
+		<file alias="danger-11.png">icons/map/POI/danger-11.png</file>
-		<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
+		<file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
-		<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
+		<file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
-		<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
+		<file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
-		<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
+		<file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
-		<file alias="communications-tower-11.svg">icons/map/POI/communications-tower-11.svg</file>
+		<file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
-		<file alias="convenience-11.svg">icons/map/POI/convenience-11.svg</file>
+		<file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
-		<file alias="cricket-11.svg">icons/map/POI/cricket-11.svg</file>
+		<file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
-		<file alias="cross-11.svg">icons/map/POI/cross-11.svg</file>
+		<file alias="garden-11.png">icons/map/POI/garden-11.png</file>
-		<file alias="dam-11.svg">icons/map/POI/dam-11.svg</file>
+		<file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
-		<file alias="danger-11.svg">icons/map/POI/danger-11.svg</file>
+		<file alias="golf-11.png">icons/map/POI/golf-11.png</file>
-		<file alias="defibrillator-11.svg">icons/map/POI/defibrillator-11.svg</file>
+		<file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
-		<file alias="doctor-11.svg">icons/map/POI/doctor-11.svg</file>
+		<file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
-		<file alias="drinking-water-11.svg">icons/map/POI/drinking-water-11.svg</file>
+		<file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
-		<file alias="fast-food-11.svg">icons/map/POI/fast-food-11.svg</file>
+		<file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
-		<file alias="embassy-11.svg">icons/map/POI/embassy-11.svg</file>
+		<file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
-		<file alias="entrance-alt1-11.svg">icons/map/POI/entrance-alt1-11.svg</file>
+		<file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
-		<file alias="ferry-11.svg">icons/map/POI/ferry-11.svg</file>
+		<file alias="information-11.png">icons/map/POI/information-11.png</file>
-		<file alias="fire-station-11.svg">icons/map/POI/fire-station-11.svg</file>
+		<file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
-		<file alias="fitness-centre-11.svg">icons/map/POI/fitness-centre-11.svg</file>
+		<file alias="library-11.png">icons/map/POI/library-11.png</file>
-		<file alias="fuel-11.svg">icons/map/POI/fuel-11.svg</file>
+		<file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
-		<file alias="furniture-11.svg">icons/map/POI/furniture-11.svg</file>
+		<file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
-		<file alias="garden-11.svg">icons/map/POI/garden-11.svg</file>
+		<file alias="museum-11.png">icons/map/POI/museum-11.png</file>
-		<file alias="garden-centre-11.svg">icons/map/POI/garden-centre-11.svg</file>
+		<file alias="park-11.png">icons/map/POI/park-11.png</file>
-		<file alias="golf-11.svg">icons/map/POI/golf-11.svg</file>
+		<file alias="parking-11.png">icons/map/POI/parking-11.png</file>
-		<file alias="grocery-11.svg">icons/map/POI/grocery-11.svg</file>
+		<file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
-		<file alias="hairdresser-11.svg">icons/map/POI/hairdresser-11.svg</file>
+		<file alias="picnic-site-11.png">icons/map/POI/picnic-site-11.png</file>
-		<file alias="harbor-11.svg">icons/map/POI/harbor-11.svg</file>
+		<file alias="place-of-worship-11.png">icons/map/POI/place-of-worship-11.png</file>
-		<file alias="hardware-11.svg">icons/map/POI/hardware-11.svg</file>
+		<file alias="police-11.png">icons/map/POI/police-11.png</file>
-		<file alias="heliport-11.svg">icons/map/POI/heliport-11.svg</file>
+		<file alias="post-11.png">icons/map/POI/post-11.png</file>
-		<file alias="home-11.svg">icons/map/POI/home-11.svg</file>
+		<file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
-		<file alias="horse-riding-11.svg">icons/map/POI/horse-riding-11.svg</file>
+		<file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
-		<file alias="hospital-11.svg">icons/map/POI/hospital-11.svg</file>
+		<file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
-		<file alias="hot-spring.svg">icons/map/POI/hot-spring.svg</file>
+		<file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
-		<file alias="ice-cream-11.svg">icons/map/POI/ice-cream-11.svg</file>
+		<file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
-		<file alias="information-11.svg">icons/map/POI/information-11.svg</file>
+		<file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
-		<file alias="landmark-11.svg">icons/map/POI/landmark-11.svg</file>
+		<file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
-		<file alias="laundry-11.svg">icons/map/POI/laundry-11.svg</file>
+		<file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
-		<file alias="library-11.svg">icons/map/POI/library-11.svg</file>
+		<file alias="school-11.png">icons/map/POI/school-11.png</file>
-		<file alias="lighthouse-11.svg">icons/map/POI/lighthouse-11.svg</file>
+		<file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
-		<file alias="lodging-11.svg">icons/map/POI/lodging-11.svg</file>
+		<file alias="shop-11.png">icons/map/POI/shop-11.png</file>
-		<file alias="monument-11.svg">icons/map/POI/monument-11.svg</file>
+		<file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
-		<file alias="mountain-11.svg">icons/map/POI/mountain-11.svg</file>
+		<file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
-		<file alias="museum-11.svg">icons/map/POI/museum-11.svg</file>
+		<file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
-		<file alias="observation-tower.svg">icons/map/POI/observation-tower.svg</file>
+		<file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
-		<file alias="park-11.svg">icons/map/POI/park-11.svg</file>
+		<file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
-		<file alias="parking-11.svg">icons/map/POI/parking-11.svg</file>
+		<file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
-		<file alias="parking-garage-11.svg">icons/map/POI/parking-garage-11.svg</file>
+		<file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
-		<file alias="pharmacy-11.svg">icons/map/POI/pharmacy-11.svg</file>
+		<file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
-		<file alias="picnic-site-11.svg">icons/map/POI/picnic-site-11.svg</file>
+		<file alias="village-11.png">icons/map/POI/village-11.png</file>
-		<file alias="place-of-worship-11.svg">icons/map/POI/place-of-worship-11.svg</file>
+		<file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
-		<file alias="police-11.svg">icons/map/POI/police-11.svg</file>
+		<file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
-		<file alias="post-11.svg">icons/map/POI/post-11.svg</file>
+		<file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
 		<file alias="rail-11.svg">icons/map/POI/rail-11.svg</file>
 		<file alias="rail-light-11.svg">icons/map/POI/rail-light-11.svg</file>
 		<file alias="rail-metro-11.svg">icons/map/POI/rail-metro-11.svg</file>
 		<file alias="religious-christian-11.svg">icons/map/POI/religious-christian-11.svg</file>
 		<file alias="religious-jewish-11.svg">icons/map/POI/religious-jewish-11.svg</file>
 		<file alias="religious-muslim-11.svg">icons/map/POI/religious-muslim-11.svg</file>
 		<file alias="restaurant-11.svg">icons/map/POI/restaurant-11.svg</file>
 		<file alias="restaurant-noodle-11.svg">icons/map/POI/restaurant-noodle-11.svg</file>
 		<file alias="restaurant-pizza-11.svg">icons/map/POI/restaurant-pizza-11.svg</file>
 		<file alias="restaurant-seafood-11.svg">icons/map/POI/restaurant-seafood-11.svg</file>
 		<file alias="roadblock-11.svg">icons/map/POI/roadblock-11.svg</file>
 		<file alias="school-11.svg">icons/map/POI/school-11.svg</file>
 		<file alias="shelter-11.svg">icons/map/POI/shelter-11.svg</file>
 		<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>
-	<!-- Marine stuff (IMG & ENC style) -->
+	<!-- marine stuff (IMG & ENC style) -->
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
 		<file alias="light-platform.png">icons/map/marine/light-platform.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
@ -193,10 +153,6 @@
 		<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>
@ -206,31 +162,142 @@
 		<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
 		<file alias="windmill.png">icons/map/marine/windmill.png</file>
 		<file alias="flagstaff.png">icons/map/marine/flagstaff.png</file>
 		<file alias="deviation-dolphin.png">icons/map/marine/deviation-dolphin.png</file>
 		<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) -->
+	<!-- Mapsforge rendertheme -->
-	<qresource prefix="/patterns">
+	<qresource prefix="/mapsforge">
-		<file alias="cemetery.svg">icons/map/patterns/cemetery.svg</file>
+		<file alias="default.xml">data/mapsforge/default.xml</file>
 		<file alias="military-area.svg">icons/map/patterns/military-area.svg</file>
 		<file alias="nature-reserve.svg">icons/map/patterns/nature-reserve.svg</file>
 		<file alias="orchard.svg">icons/map/patterns/orchard.svg</file>
 		<file alias="vineyard.svg">icons/map/patterns/vineyard.svg</file>
 		<file alias="wetland.svg">icons/map/patterns/wetland.svg</file>
 	</qresource>
-	<!-- Mapsforge style -->
+		<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
-	<qresource prefix="/style">
+		<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
-		<file alias="style.xml">data/style/style.xml</file>
+		<file alias="patterns/coniferous.svg">icons/map/mapsforge/patterns/coniferous.svg</file>
 		<file alias="patterns/marsh.png">icons/map/mapsforge/patterns/marsh.png</file>
 		<file alias="patterns/dot.png">icons/map/mapsforge/patterns/dot.png</file>
 		<file alias="patterns/cemetery.png">icons/map/mapsforge/patterns/cemetery.png</file>
 		<file alias="patterns/rail.png">icons/map/mapsforge/patterns/rail.png</file>
 		<file alias="patterns/access-destination.png">icons/map/mapsforge/patterns/access-destination.png</file>
 		<file alias="patterns/deciduous.svg">icons/map/mapsforge/patterns/deciduous.svg</file>
 		<file alias="patterns/grass.svg">icons/map/mapsforge/patterns/grass.svg</file>
 		<file alias="patterns/wood-mixed.png">icons/map/mapsforge/patterns/wood-mixed.png</file>
 		<file alias="patterns/wood-deciduous.png">icons/map/mapsforge/patterns/wood-deciduous.png</file>
 		<file alias="patterns/pike.png">icons/map/mapsforge/patterns/pike.png</file>
 		<file alias="patterns/wood-coniferous.png">icons/map/mapsforge/patterns/wood-coniferous.png</file>
 		<file alias="patterns/coniferous_and_deciduous.svg">icons/map/mapsforge/patterns/coniferous_and_deciduous.svg</file>
 		<file alias="patterns/arrow.png">icons/map/mapsforge/patterns/arrow.png</file>
 		<file alias="patterns/military.png">icons/map/mapsforge/patterns/military.png</file>
 		<file alias="patterns/scrub.svg">icons/map/mapsforge/patterns/scrub.svg</file>
 		<file alias="patterns/nature-reserve.png">icons/map/mapsforge/patterns/nature-reserve.png</file>
 		<file alias="patterns/swamp.svg">icons/map/mapsforge/patterns/swamp.svg</file>
 		<file alias="patterns/quarry.svg">icons/map/mapsforge/patterns/quarry.svg</file>
 		<file alias="patterns/access-private.png">icons/map/mapsforge/patterns/access-private.png</file>
 		<file alias="symbols/barrier/blocks.svg">icons/map/mapsforge/symbols/barrier/blocks.svg</file>
 		<file alias="symbols/barrier/stile.svg">icons/map/mapsforge/symbols/barrier/stile.svg</file>
 		<file alias="symbols/barrier/cycle_barrier.svg">icons/map/mapsforge/symbols/barrier/cycle_barrier.svg</file>
 		<file alias="symbols/barrier/lift_gate.svg">icons/map/mapsforge/symbols/barrier/lift_gate.svg</file>
 		<file alias="symbols/barrier/bollard.svg">icons/map/mapsforge/symbols/barrier/bollard.svg</file>
 		<file alias="symbols/barrier/gate.svg">icons/map/mapsforge/symbols/barrier/gate.svg</file>
 		<file alias="symbols/dot_blue.svg">icons/map/mapsforge/symbols/dot_blue.svg</file>
 		<file alias="symbols/dot_blue_dark.svg">icons/map/mapsforge/symbols/dot_blue_dark.svg</file>
 		<file alias="symbols/peak.svg">icons/map/mapsforge/symbols/peak.svg</file>
 		<file alias="symbols/traffic_signal.svg">icons/map/mapsforge/symbols/traffic_signal.svg</file>
 		<file alias="symbols/place_of_worship/hindu.svg">icons/map/mapsforge/symbols/place_of_worship/hindu.svg</file>
 		<file alias="symbols/place_of_worship/unknown.svg">icons/map/mapsforge/symbols/place_of_worship/unknown.svg</file>
 		<file alias="symbols/place_of_worship/islamic.svg">icons/map/mapsforge/symbols/place_of_worship/islamic.svg</file>
 		<file alias="symbols/place_of_worship/jewish.svg">icons/map/mapsforge/symbols/place_of_worship/jewish.svg</file>
 		<file alias="symbols/place_of_worship/shinto.svg">icons/map/mapsforge/symbols/place_of_worship/shinto.svg</file>
 		<file alias="symbols/place_of_worship/buddhist.svg">icons/map/mapsforge/symbols/place_of_worship/buddhist.svg</file>
 		<file alias="symbols/place_of_worship/christian.svg">icons/map/mapsforge/symbols/place_of_worship/christian.svg</file>
 		<file alias="symbols/volcano.svg">icons/map/mapsforge/symbols/volcano.svg</file>
 		<file alias="symbols/bench.svg">icons/map/mapsforge/symbols/bench.svg</file>
 		<file alias="symbols/transport/parking_private.svg">icons/map/mapsforge/symbols/transport/parking_private.svg</file>
 		<file alias="symbols/transport/helicopter.svg">icons/map/mapsforge/symbols/transport/helicopter.svg</file>
 		<file alias="symbols/transport/rental_bicycle.svg">icons/map/mapsforge/symbols/transport/rental_bicycle.svg</file>
 		<file alias="symbols/transport/train_station2.svg">icons/map/mapsforge/symbols/transport/train_station2.svg</file>
 		<file alias="symbols/transport/parking.svg">icons/map/mapsforge/symbols/transport/parking.svg</file>
 		<file alias="symbols/transport/slipway.svg">icons/map/mapsforge/symbols/transport/slipway.svg</file>
 		<file alias="symbols/transport/bus_stop.svg">icons/map/mapsforge/symbols/transport/bus_stop.svg</file>
 		<file alias="symbols/transport/bus_station.svg">icons/map/mapsforge/symbols/transport/bus_station.svg</file>
 		<file alias="symbols/transport/airport2.svg">icons/map/mapsforge/symbols/transport/airport2.svg</file>
 		<file alias="symbols/transport/fuel.svg">icons/map/mapsforge/symbols/transport/fuel.svg</file>
 		<file alias="symbols/transport/lighthouse.svg">icons/map/mapsforge/symbols/transport/lighthouse.svg</file>
 		<file alias="symbols/transport/traffic_lights.svg">icons/map/mapsforge/symbols/transport/traffic_lights.svg</file>
 		<file alias="symbols/transport/tram_stop.svg">icons/map/mapsforge/symbols/transport/tram_stop.svg</file>
 		<file alias="symbols/food/bar.svg">icons/map/mapsforge/symbols/food/bar.svg</file>
 		<file alias="symbols/food/cafe.svg">icons/map/mapsforge/symbols/food/cafe.svg</file>
 		<file alias="symbols/food/drinkingtap.svg">icons/map/mapsforge/symbols/food/drinkingtap.svg</file>
 		<file alias="symbols/food/pub.svg">icons/map/mapsforge/symbols/food/pub.svg</file>
 		<file alias="symbols/food/fastfood.svg">icons/map/mapsforge/symbols/food/fastfood.svg</file>
 		<file alias="symbols/food/biergarten.svg">icons/map/mapsforge/symbols/food/biergarten.svg</file>
 		<file alias="symbols/food/restaurant.svg">icons/map/mapsforge/symbols/food/restaurant.svg</file>
 		<file alias="symbols/railway-crossing.svg">icons/map/mapsforge/symbols/railway-crossing.svg</file>
 		<file alias="symbols/accommodation/hotel2.svg">icons/map/mapsforge/symbols/accommodation/hotel2.svg</file>
 		<file alias="symbols/accommodation/camping.svg">icons/map/mapsforge/symbols/accommodation/camping.svg</file>
 		<file alias="symbols/accommodation/chalet.svg">icons/map/mapsforge/symbols/accommodation/chalet.svg</file>
 		<file alias="symbols/accommodation/alpinehut.svg">icons/map/mapsforge/symbols/accommodation/alpinehut.svg</file>
 		<file alias="symbols/accommodation/shelter2.svg">icons/map/mapsforge/symbols/accommodation/shelter2.svg</file>
 		<file alias="symbols/accommodation/caravan_park.svg">icons/map/mapsforge/symbols/accommodation/caravan_park.svg</file>
 		<file alias="symbols/accommodation/hostel.svg">icons/map/mapsforge/symbols/accommodation/hostel.svg</file>
 		<file alias="symbols/health/doctors2.svg">icons/map/mapsforge/symbols/health/doctors2.svg</file>
 		<file alias="symbols/health/hospital.svg">icons/map/mapsforge/symbols/health/hospital.svg</file>
 		<file alias="symbols/health/pharmacy.svg">icons/map/mapsforge/symbols/health/pharmacy.svg</file>
 		<file alias="symbols/chair_lift.svg">icons/map/mapsforge/symbols/chair_lift.svg</file>
 		<file alias="symbols/education/school.svg">icons/map/mapsforge/symbols/education/school.svg</file>
 		<file alias="symbols/education/nursery3.svg">icons/map/mapsforge/symbols/education/nursery3.svg</file>
 		<file alias="symbols/education/university.svg">icons/map/mapsforge/symbols/education/university.svg</file>
 		<file alias="symbols/money/atm2.svg">icons/map/mapsforge/symbols/money/atm2.svg</file>
 		<file alias="symbols/money/bank2.svg">icons/map/mapsforge/symbols/money/bank2.svg</file>
 		<file alias="symbols/shopping/marketplace.svg">icons/map/mapsforge/symbols/shopping/marketplace.svg</file>
 		<file alias="symbols/shopping/bicycle.svg">icons/map/mapsforge/symbols/shopping/bicycle.svg</file>
 		<file alias="symbols/shopping/alcohol.svg">icons/map/mapsforge/symbols/shopping/alcohol.svg</file>
 		<file alias="symbols/shopping/diy.svg">icons/map/mapsforge/symbols/shopping/diy.svg</file>
 		<file alias="symbols/shopping/bakery.svg">icons/map/mapsforge/symbols/shopping/bakery.svg</file>
 		<file alias="symbols/shopping/greengrocer.svg">icons/map/mapsforge/symbols/shopping/greengrocer.svg</file>
 		<file alias="symbols/shopping/laundrette.svg">icons/map/mapsforge/symbols/shopping/laundrette.svg</file>
 		<file alias="symbols/shopping/car_repair.svg">icons/map/mapsforge/symbols/shopping/car_repair.svg</file>
 		<file alias="symbols/shopping/butcher.svg">icons/map/mapsforge/symbols/shopping/butcher.svg</file>
 		<file alias="symbols/shopping/book.svg">icons/map/mapsforge/symbols/shopping/book.svg</file>
 		<file alias="symbols/shopping/convenience.svg">icons/map/mapsforge/symbols/shopping/convenience.svg</file>
 		<file alias="symbols/shopping/supermarket.svg">icons/map/mapsforge/symbols/shopping/supermarket.svg</file>
 		<file alias="symbols/poi/mountain_pass.svg">icons/map/mapsforge/symbols/poi/mountain_pass.svg</file>
 		<file alias="symbols/poi/embassy2.svg">icons/map/mapsforge/symbols/poi/embassy2.svg</file>
 		<file alias="symbols/poi/cave.svg">icons/map/mapsforge/symbols/poi/cave.svg</file>
 		<file alias="symbols/cable_car.svg">icons/map/mapsforge/symbols/cable_car.svg</file>
 		<file alias="symbols/railway-crossing-small.svg">icons/map/mapsforge/symbols/railway-crossing-small.svg</file>
 		<file alias="symbols/dot_magenta.svg">icons/map/mapsforge/symbols/dot_magenta.svg</file>
 		<file alias="symbols/dot_black.svg">icons/map/mapsforge/symbols/dot_black.svg</file>
 		<file alias="symbols/gondola.svg">icons/map/mapsforge/symbols/gondola.svg</file>
 		<file alias="symbols/dot_white.svg">icons/map/mapsforge/symbols/dot_white.svg</file>
 		<file alias="symbols/amenity/recycling.svg">icons/map/mapsforge/symbols/amenity/recycling.svg</file>
 		<file alias="symbols/amenity/firestation3.svg">icons/map/mapsforge/symbols/amenity/firestation3.svg</file>
 		<file alias="symbols/amenity/telephone.svg">icons/map/mapsforge/symbols/amenity/telephone.svg</file>
 		<file alias="symbols/amenity/post_box.svg">icons/map/mapsforge/symbols/amenity/post_box.svg</file>
 		<file alias="symbols/amenity/fountain2.svg">icons/map/mapsforge/symbols/amenity/fountain2.svg</file>
 		<file alias="symbols/amenity/playground.svg">icons/map/mapsforge/symbols/amenity/playground.svg</file>
 		<file alias="symbols/amenity/library.svg">icons/map/mapsforge/symbols/amenity/library.svg</file>
 		<file alias="symbols/amenity/post_office.svg">icons/map/mapsforge/symbols/amenity/post_office.svg</file>
 		<file alias="symbols/amenity/police2.svg">icons/map/mapsforge/symbols/amenity/police2.svg</file>
 		<file alias="symbols/amenity/toilets.svg">icons/map/mapsforge/symbols/amenity/toilets.svg</file>
 		<file alias="symbols/tourist/picnic.svg">icons/map/mapsforge/symbols/tourist/picnic.svg</file>
 		<file alias="symbols/tourist/monument.svg">icons/map/mapsforge/symbols/tourist/monument.svg</file>
 		<file alias="symbols/tourist/archaeological2.svg">icons/map/mapsforge/symbols/tourist/archaeological2.svg</file>
 		<file alias="symbols/tourist/museum.svg">icons/map/mapsforge/symbols/tourist/museum.svg</file>
 		<file alias="symbols/tourist/attraction.svg">icons/map/mapsforge/symbols/tourist/attraction.svg</file>
 		<file alias="symbols/tourist/information.svg">icons/map/mapsforge/symbols/tourist/information.svg</file>
 		<file alias="symbols/tourist/theatre.svg">icons/map/mapsforge/symbols/tourist/theatre.svg</file>
 		<file alias="symbols/tourist/zoo.svg">icons/map/mapsforge/symbols/tourist/zoo.svg</file>
 		<file alias="symbols/tourist/cinema2.svg">icons/map/mapsforge/symbols/tourist/cinema2.svg</file>
 		<file alias="symbols/tourist/castle2.svg">icons/map/mapsforge/symbols/tourist/castle2.svg</file>
 		<file alias="symbols/tourist/ruin.svg">icons/map/mapsforge/symbols/tourist/ruin.svg</file>
 		<file alias="symbols/tourist/memorial.svg">icons/map/mapsforge/symbols/tourist/memorial.svg</file>
 		<file alias="symbols/tourist/view_point.svg">icons/map/mapsforge/symbols/tourist/view_point.svg</file>
 		<file alias="symbols/tourist/windmill.svg">icons/map/mapsforge/symbols/tourist/windmill.svg</file>
 		<file alias="symbols/water/weir.svg">icons/map/mapsforge/symbols/water/weir.svg</file>
 		<file alias="symbols/sport/swimming_outdoor.svg">icons/map/mapsforge/symbols/sport/swimming_outdoor.svg</file>
 		<file alias="symbols/sport/tennis.svg">icons/map/mapsforge/symbols/sport/tennis.svg</file>
 		<file alias="symbols/sport/shooting.svg">icons/map/mapsforge/symbols/sport/shooting.svg</file>
 		<file alias="symbols/sport/stadium.svg">icons/map/mapsforge/symbols/sport/stadium.svg</file>
 		<file alias="symbols/sport/soccer.svg">icons/map/mapsforge/symbols/sport/soccer.svg</file>
 		<file alias="symbols/sport/golf.svg">icons/map/mapsforge/symbols/sport/golf.svg</file>
 		<file alias="symbols/oneway.svg">icons/map/mapsforge/symbols/oneway.svg</file>
 	</qresource>
 </RCC>
--- a/icons/formats/scripts/extensions
+++ b/icons/formats/scripts/extensions
@ -32,5 +32,3 @@ trk:#cccccc
 gemf:#147085
 000:#000000
 031:#000000
 vtk:#632433
 vkx:#00ccff
--- a/icons/formats/scripts/icns.sh
+++ b/icons/formats/scripts/icns.sh
@ -4,7 +4,7 @@ while read e; do
 	IFS=":"; set $e
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
-	sed -e "s/\$EXT/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
 	ICONSET=$1.iconset
 	mkdir $ICONSET
--- a/icons/formats/scripts/ico.sh
+++ b/icons/formats/scripts/ico.sh
@ -4,7 +4,7 @@ while read e; do
 	IFS=":"; set $e
 	EXT=`echo $1 | tr /a-z/ /A-Z/`
-	sed -e "s/\$EXT/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
+	sed -e "s/\$EXTENSION/$EXT/" -e "s/\$COLOR/$2/" icon-template.svg > $1.svg
 	convert -density 400 -background none $1.svg -define icon:auto-resize $1.ico
 	rm $1.svg
 done < extensions
--- a/icons/formats/scripts/icon-template.svg
+++ b/icons/formats/scripts/icon-template.svg
@ -13,8 +13,8 @@
  <g transform="translate(16.573463,124.9782)">
    <rect y="0" x="0" id="textrect" height="50" width="120" style="fill:$COLOR;fill-opacity:1;stroke:none;"/>
 <!--
-    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXT</text>
+    <text y="28" x="60" dominant-baseline="central" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
 -->
-    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXT</text>
+    <text y="25" x="60" dy="0.36em" text-anchor="middle" style="fill:#FFFFFF;font-size:39px;font-family:Helvetica;font-weight:bold;">$EXTENSION</text>
  </g>
 </svg>
--- a/icons/formats/vkx.icns
+++ b/icons/formats/vkx.icns
--- a/icons/formats/vkx.ico
+++ b/icons/formats/vkx.ico
--- a/icons/formats/vtk.icns
+++ b/icons/formats/vtk.icns
--- a/icons/formats/vtk.ico
+++ b/icons/formats/vtk.ico
--- a/icons/map/POI/airfield-11.png
+++ b/icons/map/POI/airfield-11.png
--- a/icons/map/POI/airfield-11.svg
+++ b/icons/map/POI/airfield-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="airfield-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path5" d="M5,0.5H3.5C3,0.5,3,0,3.5,0h4&#xA;&#x9;C8,0,8,0.5,7.5,0.5H6C6,0.5,6.5,1,6.5,2v1H11v1.5l-4.5,2L6,10l1.5,0.5V11h-4v-0.5L5,10L4.5,6.5L0,4.5V3h4.5V2C4.5,1,5,0.5,5,0.5z"/>
 </svg>
--- a/icons/map/POI/airport-11.png
+++ b/icons/map/POI/airport-11.png
--- a/icons/map/POI/airport-11.svg
+++ b/icons/map/POI/airport-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="airport-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M6.5,6.4V6L11,6.5V5L6.5,3.2V1.5c0-1-0.5-1.5-1-1.5s-1,0.5-1,1.5v1.7L0,5v1.4L4.5,6v0.4v1.1v1.8L3,10v1l2.5-0.5L8,11v-1&#xA;&#x9;L6.5,9.2V7.5V6.4z"/>
 </svg>
--- a/icons/map/POI/alcohol-shop-11.svg
+++ b/icons/map/POI/alcohol-shop-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="alcohol-shop-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M7,4v2.5c0.0018,0.6341,0.4021,1.1986,1,1.41V10H7.5C7.2239,10,7,10.2239,7,10.5S7.2239,11,7.5,11h2&#xA;&#x9;c0.2761,0,0.5-0.2239,0.5-0.5S9.7761,10,9.5,10H9V7.91c0.5979-0.2114,0.9982-0.7759,1-1.41V4H7z M9.5,6.5c0,0.5523-0.4477,1-1,1&#xA;&#x9;s-1-0.4477-1-1v-2h2V6.5z M4.21,2.85V2.5c0.1961,0,0.355-0.1589,0.355-0.355S4.4061,1.79,4.21,1.79V1.44&#xA;&#x9;c0.0001-0.1933-0.1566-0.3501-0.3499-0.3501c-0.0034,0-0.0068,0-0.0101,0.0001H3.14C2.9468,1.0845,2.7857,1.2366,2.7801,1.4299&#xA;&#x9;C2.78,1.4332,2.78,1.4366,2.78,1.44v0.35c-0.1961,0-0.355,0.1589-0.355,0.355S2.5839,2.5,2.78,2.5v0.35C2.79,3.87,1,5,1,6v4.25&#xA;&#x9;c-0.0056,0.3866,0.3033,0.7044,0.6899,0.71c0.0067,0.0001,0.0134,0.0001,0.0201,0h3.58c0.3628-0.0329,0.6561-0.3097,0.71-0.67V6&#xA;&#x9;C6,5.09,4.21,3.81,4.21,2.85z M3.5,9C2.6716,9,2,8.3284,2,7.5S2.6716,6,3.5,6S5,6.6716,5,7.5S4.3284,9,3.5,9z"/>
 </svg>
--- a/icons/map/POI/amusement-park-11.png
+++ b/icons/map/POI/amusement-park-11.png
--- a/icons/map/POI/amusement-park-11.svg
+++ b/icons/map/POI/amusement-park-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="amusement-park-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path5082" d="M5.5,1C3.0206,1,1,3.0206,1,5.5c0,1.7919,1.0627,3.3316,2.584,4.0547L2.5,11h6L7.416,9.5547&#xA;&#x9;C8.9373,8.8316,10,7.2919,10,5.5C10,3.0206,7.9794,1,5.5,1z M5.375,2.0117v1.9941c-0.3108,0.026-0.6057,0.1482-0.8438,0.3496&#xA;&#x9;L3.1191,2.9434C3.7146,2.3888,4.5013,2.0428,5.375,2.0117z M5.625,2.0117c0.8737,0.0311,1.6604,0.3771,2.2559,0.9316L6.4688,4.3555&#xA;&#x9;c-0.0007-0.0007-0.0013-0.0013-0.002-0.002C6.229,4.1532,5.9348,4.0317,5.625,4.0059V2.0117z M2.9434,3.1191l1.4121,1.4121&#xA;&#x9;c-0.0007,0.0007-0.0013,0.0013-0.002,0.002C4.1532,4.771,4.0317,5.0652,4.0059,5.375H2.0117&#xA;&#x9;C2.0428,4.5013,2.3888,3.7146,2.9434,3.1191z M8.0566,3.1191C8.6112,3.7146,8.9572,4.5013,8.9883,5.375H6.9941&#xA;&#x9;c-0.026-0.3108-0.1482-0.6057-0.3496-0.8438L8.0566,3.1191z M2.0117,5.625h1.9941c0.026,0.3108,0.1482,0.6057,0.3496,0.8438&#xA;&#x9;L2.9434,7.8809C2.3888,7.2854,2.0428,6.4987,2.0117,5.625z M6.9941,5.625h1.9941C8.9572,6.4987,8.6112,7.2854,8.0566,7.8809&#xA;&#x9;L6.6445,6.4688c0.0007-0.0007,0.0013-0.0013,0.002-0.002C6.8468,6.229,6.9683,5.9348,6.9941,5.625z M4.5312,6.6445&#xA;&#x9;c0.0007,0.0007,0.0013,0.0013,0.002,0.002C4.6716,6.7624,4.8297,6.8524,5,6.9121v2.0391C4.2765,8.8476,3.6278,8.5303,3.1191,8.0566&#xA;&#x9;L4.5312,6.6445z M6.4688,6.6445l1.4121,1.4121C7.3722,8.5303,6.7235,8.8476,6,8.9512V6.9121C6.1711,6.852,6.33,6.7613,6.4688,6.6445&#xA;&#x9;z"/>
 </svg>
--- a/icons/map/POI/bakery-11.png
+++ b/icons/map/POI/bakery-11.png
--- a/icons/map/POI/bakery-11.svg
+++ b/icons/map/POI/bakery-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="bakery-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path5836" d="M4.5,2c-1,0-1,1-1,1L5,7.5&#xA;&#x9;C5,7.5,5,8,5.5,8S6,7.5,6,7.5L7.5,3c0,0,0-1-1-1H4.5z M9,3.5l-2,4h1.5l1,1H10c1,0,1-0.9,1-0.9V6.3L9,3.5z M0,6.3v1.2&#xA;&#x9;c0,0,0.0296,1.0097,1,1c0.9704-0.0097,0.5,0,0.5,0l1-1H4l-2-4L0,6.3z"/>
 </svg>
--- a/icons/map/POI/bank-11.png
+++ b/icons/map/POI/bank-11.png
--- a/icons/map/POI/bank-11.svg
+++ b/icons/map/POI/bank-11.svg
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="bank-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path5622" d="M1,2C0,2,0,3,0,3v5c0,1,1,1,1,1h9c1,0,1-1,1-1V3c0,0,0-1-1-1H1z M1,3h1.5C2.7761,3,3,3.2239,3,3.5&#xA;&#x9;S2.7761,4,2.5,4S2,3.7761,2,3.5L1.5,4C1.7761,4,2,4.2239,2,4.5S1.7761,5,1.5,5S1,4.7761,1,4.5V3z M5.5,3c1.1046,0,2,1.1193,2,2.5&#xA;&#x9;S6.6046,8,5.5,8s-2-1.1193-2-2.5S4.3954,3,5.5,3z M8.5,3H10v1.5C10,4.7761,9.7761,5,9.5,5S9,4.7761,9,4.5S9.2239,4,9.5,4L9,3.5&#xA;&#x9;C9,3.7761,8.7761,4,8.5,4S8,3.7761,8,3.5S8.2239,3,8.5,3z M1.5,6C1.7761,6,2,6.2239,2,6.5S1.7761,7,1.5,7L2,7.5&#xA;&#x9;C2,7.2239,2.2239,7,2.5,7S3,7.2239,3,7.5S2.7761,8,2.5,8H1V6.5C1,6.2239,1.2239,6,1.5,6z M9.5,6C9.7761,6,10,6.2239,10,6.5V8H8.5&#xA;&#x9;C8.2239,8,8,7.7761,8,7.5S8.2239,7,8.5,7S9,7.2239,9,7.5L9.5,7C9.2239,7,9,6.7761,9,6.5S9.2239,6,9.5,6z"/>
  <path id="path5835" d="M4.9023,4.25C4.8261,4.321,4.7584,4.4051,4.7012,4.5h1.5977c-0.0572-0.0949-0.125-0.179-0.2012-0.25H4.9023z&#xA;&#x9; M4.5859,4.75C4.5575,4.8303,4.5359,4.9141,4.5215,5h1.959C6.4661,4.9141,6.4445,4.8303,6.416,4.75H4.5859z M4.5,5.25&#xA;&#x9;C4.4998,5.3339,4.5063,5.4177,4.5195,5.5h1.959C6.4924,5.4178,6.4996,5.334,6.5,5.25H4.5z M4.5859,5.75&#xA;&#x9;C4.6171,5.8387,4.6564,5.9226,4.7031,6h1.5957c0.046-0.0775,0.0847-0.1614,0.1152-0.25H4.5859z M4.9023,6.25&#xA;&#x9;c0.0109,0.0107,0.022,0.0211,0.0332,0.0312L4.5,6.5h2L6.0645,6.2812C6.0757,6.2711,6.0868,6.2607,6.0977,6.25H4.9023z M4.582,6.75&#xA;&#x9;C4.611,6.8289,4.638,6.9091,4.6914,7h1.627c0.0524-0.091,0.0778-0.1711,0.1055-0.25H4.582z M4.8926,7.25&#xA;&#x9;C5.0395,7.3915,5.2332,7.5,5.5,7.5c0.2739,0,0.4701-0.1085,0.6172-0.25H4.8926z"/>
 </svg>
--- a/icons/map/POI/bar-11.png
+++ b/icons/map/POI/bar-11.png
--- a/icons/map/POI/bar-11.svg
+++ b/icons/map/POI/bar-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="bar-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path15601-4-2_2_" d="M5.4883,1C4.9759,1,0.5,1,1,1.5L5,6v2.5C5,9,2.5,9,2.5,10h6&#xA;&#x9;C8.5,9,6,9,6,8.5V6l4-4.5C10.5,1,6.0006,1,5.4883,1z M2.5,2h6l-1,1h-4L2.5,2z"/>
 </svg>
--- a/icons/map/POI/barrier-11.svg
+++ b/icons/map/POI/barrier-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="barrier-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M9.5,2h-8a.5.5,0,0,0-.5.5v4a.5.5,0,0,0,.5.5H2V9.5a.5.5,0,0,0,1,0V9H8v.5a.5.5,0,0,0,1,0V7h.5a.5.5,0,0,0,.5-.5v-4A.5.5,0,0,0,9.5,2ZM2,3H3.5l3,3h-2L2,3.5ZM2,6V4.5L3.5,6ZM3,8V7H8V8ZM9,6H7.5l-3-3h2L9,5.5ZM9,4.5,7.5,3H9Z"/>
 </svg>
--- a/icons/map/POI/baseball-11.svg
+++ b/icons/map/POI/baseball-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/basketball-11.svg
+++ b/icons/map/POI/basketball-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/bbq-11.png
+++ b/icons/map/POI/bbq-11.png
--- a/icons/map/POI/bbq-11.svg
+++ b/icons/map/POI/bbq-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bbq-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M4,1.75c0,0,0-1,1-1c0,0,0.5,0,0.5-0.5C5.5,0.1119,5.6119,0,5.75,0S6,0.1119,6,0.25c0,0,0,1-1,1c0,0-0.5,0-0.5,0.5&#xA;&#x9;C4.5,1.8881,4.3881,2,4.25,2S4,1.8881,4,1.75z M2.25,2C2.3881,2,2.5,1.8881,2.5,1.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1&#xA;&#x9;C4,0.1119,3.8881,0,3.75,0S3.5,0.1119,3.5,0.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C2,1.8881,2.1119,2,2.25,2z M6.25,2&#xA;&#x9;C6.3881,2,6.5,1.8881,6.5,1.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C8,0.1119,7.8881,0,7.75,0S7.5,0.1119,7.5,0.25&#xA;&#x9;c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C6,1.8881,6.1119,2,6.25,2z M9.75,0C9.6119,0,9.5,0.1119,9.5,0.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C8,1.8881,8.1119,2,8.25,2S8.5,1.8881,8.5,1.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C10,0.1119,9.8881,0,9.75,0z&#xA;&#x9; M6.6746,5.865C6.6745,5.8654,6.6741,5.8657,6.674,5.866l2.3,4.782v0.009c0.055,0.1215,0.0014,0.2646-0.12,0.32&#xA;&#x9;c-0.1237,0.0574-0.2705,0.0037-0.328-0.12L7.845,9.5H4c0,0.2029-0.0411,0.4036-0.1209,0.5901&#xA;&#x9;C3.5532,10.8518,2.6717,11.205,1.91,10.8792c-0.7617-0.3259-1.115-1.2074-0.7891-1.9691C1.4468,8.1484,2.3283,7.7952,3.09,8.121&#xA;&#x9;c0.0531,0.0208,0.1048,0.0449,0.155,0.072L4.278,5.85C2.9692,5.5125,2.0408,4.351,2,3h7C9,3,8.9985,5.2823,6.6746,5.865z M3.25,9.5&#xA;&#x9;c0-0.4142-0.3358-0.75-0.75-0.75S1.75,9.0858,1.75,9.5s0.3358,0.75,0.75,0.75S3.25,9.9142,3.25,9.5z M6.1731,5.9562&#xA;&#x9;C5.9635,5.9829,5.7419,6,5.5,6C5.2147,6,4.787,5.953,4.787,5.953l-1.144,2.58C3.7659,8.6688,3.8607,8.8275,3.922,9h3.673&#xA;&#x9;L6.1731,5.9562z"/>
 </svg>
--- a/icons/map/POI/beach-11.png
+++ b/icons/map/POI/beach-11.png
--- a/icons/map/POI/beach-11.svg
+++ b/icons/map/POI/beach-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="beach-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M3.5,1.65V4.47a1.7027,1.7027,0,0,0-.58-.04c-.28.07-.56.47-.83.57A3.1261,3.1261,0,0,1,3.5,1.65Zm2.31-.62L7.26,3.45a1.2164,1.2164,0,0,1,.45-.31c.27-.07.7.13,1,.09A3.1057,3.1057,0,0,0,5.81,1.03ZM.9839,10h8.99A4.8406,4.8406,0,0,0,6.9,8.68L5.57,3.74c.46-.04,1.02.06,1.27-.01L5.23,1.04a3.5252,3.5252,0,0,0-.62.11A2.96,2.96,0,0,0,4,1.38v3.1c.25-.08.68-.42,1.08-.6L6.35,8.63q-.39-.03-.84-.03C1.99,8.6.9839,10,.9839,10Z"/>
 </svg>
--- a/icons/map/POI/beer-11.svg
+++ b/icons/map/POI/beer-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="beer-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M5.5,1c-2.3,0-3,0.66-3,0.66v2c0.0328,0.9197,0.2577,1.8223,0.66,2.65c0.376,0.9646,0.376,2.0354,0,3c0,0,0,0.66,2.32,0.66&#xA;&#x9;S7.8,9.31,7.8,9.31c-0.376-0.9646-0.376-2.0354,0-3c0.4023-0.8277,0.6272-1.7303,0.66-2.65v-2C8.46,1.66,7.8,1,5.5,1z M5.5,9.28&#xA;&#x9;C4.9736,9.3066,4.4465,9.2458,3.94,9.1c0.1326-0.4787,0.1999-0.9732,0.2-1.47h2.72c-0.0144,0.2198-0.0144,0.4402,0,0.66&#xA;&#x9;C6.8939,8.5635,6.9474,8.8342,7.02,9.1C6.5269,9.2448,6.0136,9.309,5.5,9.29V9.28z M7.82,3.28c-1.5116,0.4425-3.1184,0.4425-4.63,0&#xA;&#x9;L3.18,2c1.5151-0.4422,3.1249-0.4422,4.64,0c0,0,0.03,1.33,0,1.33L7.82,3.28z"/>
 </svg>
--- a/icons/map/POI/bicycle-11.svg
+++ b/icons/map/POI/bicycle-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="bicycle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path4804" d="&#xA;&#x9;M6.5,1.5c-0.6761-0.01-0.6761,1.0096,0,1H7V3.211L4.252,4.7813L3.7383,3.5h0.7148c0.6761,0.01,0.6761-1.0096,0-1H2.4258&#xA;&#x9;c-0.6761-0.01-0.6761,1.0096,0,1h0.2344l0.4316,1.0781C2.9011,4.5311,2.7047,4.5001,2.5,4.5001c-1.3748,0-2.5,1.1252-2.5,2.5&#xA;&#x9;s1.1252,2.5,2.5,2.5S5,8.3748,5,7.0001c0-0.4713-0.1399-0.9078-0.3691-1.2852l2.4707-1.4121L7.5039,4.711&#xA;&#x9;C6.6216,5.0981,6,5.9792,6,7.0001c0,1.3748,1.1252,2.5,2.5,2.5s2.5-1.1252,2.5-2.5c0-1.2959-1.0034-2.3575-2.2695-2.4766L8,3.793V2&#xA;&#x9;c0-0.2761-0.2239-0.5-0.5-0.5H6.5z M2.5,5.5C3.3344,5.5,4,6.1657,4,7S3.3344,8.5,2.5,8.5S1,7.8344,1,7S1.6656,5.5,2.5,5.5z&#xA;&#x9; M8.4551,5.504h0.002c0.0299,0.003,0.06,0.003,0.0898,0C9.3587,5.5289,10,6.1818,10,7.0001c0,0.8344-0.6656,1.5-1.5,1.5&#xA;&#x9;S7,7.8345,7,7.0001C7,6.1811,7.6424,5.5279,8.4551,5.504L8.4551,5.504z"/>
 </svg>
--- a/icons/map/POI/bowling-alley-11.png
+++ b/icons/map/POI/bowling-alley-11.png
--- a/icons/map/POI/bowling-alley-11.svg
+++ b/icons/map/POI/bowling-alley-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bowling-alley-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path id="icon_concepts:_sports_leisure" d="M6.02,3.94c.04-.1.13-.4.17-.49A2.8252,2.8252,0,0,0,4.5,3a3.5,3.5,0,0,0,0,7,2.88,2.88,0,0,0,1.54-.4,8.5971,8.5971,0,0,1-.4-2.61A12.7588,12.7588,0,0,1,6.02,3.94ZM2.5,6.98a.48.48,0,1,1,.48-.48A.4867.4867,0,0,1,2.5,6.98Zm1-2a.48.48,0,1,1,.48-.48A.4867.4867,0,0,1,3.5,4.98Zm1,2a.48.48,0,1,1,.48-.48A.4867.4867,0,0,1,4.5,6.98ZM8.0981,2.4992c0-.5-.1-.5-.1-1,0-.7816.5-.7.5-.7s.5-.0814.5.7c0,.5-.1.5-.1,1,0,1.5,1.075,2.5039,1.075,4.5,0,1.5-.475,3-.975,3h-1c-.5,0-.975-1.5-.975-3C7.0231,5.0031,8.0981,3.9992,8.0981,2.4992Z"/>
 </svg>
--- a/icons/map/POI/bridge-11.png
+++ b/icons/map/POI/bridge-11.png
--- a/icons/map/POI/bridge-11.svg
+++ b/icons/map/POI/bridge-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="bridge-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M0,5.835V9h1c0-1.105,0.896-2.006,2-2.006c1.103,0,1.998,0.903,2,2.006h1c0-1.105,0.895-2.006,1.999-2.006&#xA;&#x9;C9.102,6.994,9.997,7.897,10,9h1V5.835C8.083,1.806,2.389,2.312,0,5.835z M2,6H0.5C0.919,5.449,1.426,4.966,2,4.582V6z M4,6H2.5&#xA;&#x9;V4.263C2.963,4.016,3.491,3.806,4,3.682V6z M6,6H4.5V3.578c0.496-0.081,1-0.102,1.5-0.062V6z M8,6H6.5V3.579&#xA;&#x9;C7.017,3.663,7.52,3.811,8,4.02V6z M8.5,6V4.264C9.28,4.691,9.968,5.287,10.5,6H8.5z"/>
 </svg>
--- a/icons/map/POI/building-alt1-11.png
+++ b/icons/map/POI/building-alt1-11.png
--- a/icons/map/POI/building-alt1-11.svg
+++ b/icons/map/POI/building-alt1-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="building-alt1-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M8,9.5v-5C8,4.2,7.8,4,7.5,4H6V1L3,2v7.5H2V10h7V9.5H8z M5,9.5H4V3h1V9.5z"/>
 </svg>
--- a/icons/map/POI/bus-11.png
+++ b/icons/map/POI/bus-11.png
--- a/icons/map/POI/bus-11.svg
+++ b/icons/map/POI/bus-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="bus-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path8043" d="M3,0C2,0,1,0.5312,1,2v4v3.5c0,0,0,0.5,0.5,0.5L2,10.0156V10.5&#xA;&#x9;c0,0,0,0.5,0.5,0.5H3c0,0,0.5,0,0.5-0.5v-0.4844L7.5,10v0.5c0,0,0,0.5,0.5,0.5h0.5C9,11,9,10.5,9,10.5v-0.4844L9.5,10&#xA;&#x9;c0,0,0.5,0,0.5-0.5V6V2c0-1.5-1-2-2-2H3z M3.75,1h3.5C7.3885,1,7.5,1.1115,7.5,1.25S7.3885,1.5,7.25,1.5h-3.5&#xA;&#x9;C3.6115,1.5,3.5,1.3885,3.5,1.25S3.6115,1,3.75,1z M3,2h5c1,0,1,1,1,1v2c0,0,0,1-1,1H3C2,6,2,5,2,5V3C2,3,2,2,3,2z M2.75,7.5&#xA;&#x9;c0.4142,0,0.75,0.3358,0.75,0.75C3.5,8.6642,3.1642,9,2.75,9S2,8.6642,2,8.25C2,7.8358,2.3358,7.5,2.75,7.5z M8.25,7.5&#xA;&#x9;C8.6642,7.5,9,7.8358,9,8.25C9,8.6642,8.6642,9,8.25,9C7.8358,9,7.5,8.6642,7.5,8.25C7.5,7.8358,7.8358,7.5,8.25,7.5z"/>
 </svg>
--- a/icons/map/POI/cafe-11.png
+++ b/icons/map/POI/cafe-11.png
--- a/icons/map/POI/cafe-11.svg
+++ b/icons/map/POI/cafe-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="cafe-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M7,9.5C7,9.7761,6.7761,10,6.5,10h-4C2.2239,10,2,9.7761,2,9.5S2.2239,9,2.5,9h4C6.7761,9,7,9.2239,7,9.5z M8,3H7V2H2v4&#xA;&#x9;c0.0016,1.3807,1.1222,2.4987,2.5029,2.4971C5.4948,8.4959,6.3921,7.9085,6.79,7H8c1.1046,0,2-0.8954,2-2S9.1046,3,8,3z M8,6H7V4h1&#xA;&#x9;c0.5523,0,1,0.4477,1,1S8.5523,6,8,6z"/>
 </svg>
--- a/icons/map/POI/campsite-11.png
+++ b/icons/map/POI/campsite-11.png
--- a/icons/map/POI/campsite-11.svg
+++ b/icons/map/POI/campsite-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="campsite-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M5.92,2.19C5.7745,1.9553,5.4663,1.8829,5.2316,2.0284C5.166,2.0691,5.1107,2.1244,5.07,2.19L1.5,8h-1&#xA;&#x9;C0.2724,7.9555,0.0517,8.104,0.0072,8.3316C0.0034,8.3509,0.001,8.3704,0,8.39V9.5C-0.0056,9.7706,0.2092,9.9944,0.4798,10&#xA;&#x9;c0.0067,0.0001,0.0135,0.0001,0.0202,0h10c0.2706,0.0056,0.4944-0.2092,0.5-0.4798c0.0001-0.0067,0.0001-0.0135,0-0.0202V8.39&#xA;&#x9;c-0.0123-0.2316-0.21-0.4095-0.4416-0.3972C10.5388,7.9938,10.5193,7.9962,10.5,8h-1L5.92,2.19z M5.5,3l3,5h-6L5.5,3z"/>
 </svg>
--- a/icons/map/POI/car-11.png
+++ b/icons/map/POI/car-11.png
--- a/icons/map/POI/car-11.svg
+++ b/icons/map/POI/car-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="car-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M9,4L8.11,1.34C8.0418,1.1381,7.8531,1.0016,7.64,1H3.36C3.1469,1.0016,2.9582,1.1381,2.89,1.34L2,4C1.4477,4,1,4.4477,1,5&#xA;&#x9;v3h1v1c0,0.5523,0.4477,1,1,1s1-0.4477,1-1V8h3v1c0,0.5523,0.4477,1,1,1s1-0.4477,1-1V8h1V5C10,4.4477,9.5523,4,9,4z M3,7&#xA;&#x9;C2.4477,7,2,6.5523,2,6s0.4477-1,1-1s1,0.4477,1,1S3.5523,7,3,7z M3,4l0.62-2h3.76L8,4H3z M8,7C7.4477,7,7,6.5523,7,6s0.4477-1,1-1&#xA;&#x9;s1,0.4477,1,1S8.5523,7,8,7z"/>
 </svg>
--- a/icons/map/POI/car-rental-11.png
+++ b/icons/map/POI/car-rental-11.png
--- a/icons/map/POI/car-rental-11.svg
+++ b/icons/map/POI/car-rental-11.svg
@ -1,7 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="car-rental-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <g>
    <path d="M9.0252,7H8.84L8.5615,5.3301C8.4824,4.8491,8.0713,4.5,7.583,4.5H3.417c-0.4883,0-0.8994,0.3491-0.9785,0.8291L2.1599,7&#xA;&#x9;&#x9;H1.981C1.4391,7,1,7.4391,1,7.9809V10h1c0,0.5522,0.4477,1,1,1s1-0.4478,1-1h3c0,0.5522,0.4477,1,1,1s1-0.4478,1-1h1V7.9748&#xA;&#x9;&#x9;C10,7.4364,9.5635,7,9.0252,7z M3.25,9C2.8358,9,2.5,8.6642,2.5,8.25c0-0.4142,0.3358-0.75,0.75-0.75S4,7.8358,4,8.25&#xA;&#x9;&#x9;C4,8.6642,3.6642,9,3.25,9z M3.1708,7L3.417,5.5l4.1582-0.0068L7.8264,7H3.1708z M7.75,9C7.3358,9,7,8.6642,7,8.25&#xA;&#x9;&#x9;C7,7.8358,7.3358,7.5,7.75,7.5S8.5,7.8358,8.5,8.25C8.5,8.6642,8.1642,9,7.75,9z"/>
    <path d="M9.4969,0H7.9973C7.4465,0,7,0.4465,7,0.9972V1H2.5l-1,1l1,1l1-1l1,1l1-1l1,1h0.5008C7.0031,3.5526,7.4509,4,8.004,4&#xA;&#x9;&#x9;h1.4938C9.7751,4,10,3.7751,10,3.4977V0.5031C10,0.2252,9.7748,0,9.4969,0z M9,2.5C9,2.7761,8.7761,3,8.5,3S8,2.7761,8,2.5v-1&#xA;&#x9;&#x9;C8,1.2238,8.2239,1,8.5,1S9,1.2238,9,1.5V2.5z"/>
  </g>
 </svg>
--- a/icons/map/POI/car-repair-11.png
+++ b/icons/map/POI/car-repair-11.png
--- a/icons/map/POI/car-repair-11.svg
+++ b/icons/map/POI/car-repair-11.svg
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="car-repair-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M9.5,1.25H4.3517C4.0547,0.5176,3.3389,0,2.5,0C1.7616,0,1.1238,0.4047,0.7774,1H2.5L3,2L2.5,3H0.7774&#xA;&#x9;C1.1238,3.5953,1.7616,4,2.5,4c0.8389,0,1.5547-0.5176,1.8517-1.25H9.5c0.4141,0,0.75-0.3359,0.75-0.75S9.9141,1.25,9.5,1.25z"/>
  <path d="M8.3105,7.0344l-0.249-1.2043C7.9824,5.3491,7.5713,5,7.083,5H3.917C3.4287,5,3.0176,5.3491,2.9424,5.8101L2.6891,7.0355&#xA;&#x9;C2.2987,7.1191,2,7.4498,2,7.8651V10h0.5c0,0.5522,0.4477,1,1,1s1-0.4478,1-1h2c0,0.5522,0.4477,1,1,1s1-0.4478,1-1H9V7.8597&#xA;&#x9;C9,7.4453,8.7008,7.1157,8.3105,7.0344z M3.75,9C3.3358,9,3,8.6642,3,8.25C3,7.8358,3.3358,7.5,3.75,7.5S4.5,7.8358,4.5,8.25&#xA;&#x9;C4.5,8.6642,4.1642,9,3.75,9z M3.7134,7L3.917,6l3.1621,0.0122L7.2831,7H3.7134z M7.25,9C6.8358,9,6.5,8.6642,6.5,8.25&#xA;&#x9;c0-0.4142,0.3358-0.75,0.75-0.75S8,7.8358,8,8.25C8,8.6642,7.6642,9,7.25,9z"/>
 </svg>
--- a/icons/map/POI/casino-11.png
+++ b/icons/map/POI/casino-11.png
--- a/icons/map/POI/casino-11.svg
+++ b/icons/map/POI/casino-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="casino-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M6.1364,6.85C6.4266,7.2446,6.8886,7.5,7.4091,7.5C8.2877,7.5,9,6.7725,9,5.875c0-0.3667-0.1234-0.7014-0.324-0.9733&#xA;&#x9;L8.6818,4.9L5.5,1L2.3182,4.9L2.324,4.9017C2.1234,5.1736,2,5.5083,2,5.875C2,6.7725,2.7123,7.5,3.5909,7.5&#xA;&#x9;c0.5205,0,0.9825-0.2554,1.2728-0.65C4.918,6.776,5.0147,6.6443,5.125,6.4942V8.5c0,0.5-1.75,0.75-1.75,0.75&#xA;&#x9;C3.1679,9.25,3,9.4179,3,9.625S3.1679,10,3.375,10h1.75h0.75h1.75C7.8321,10,8,9.8321,8,9.625S7.8321,9.25,7.625,9.25&#xA;&#x9;c0,0-1.75-0.25-1.75-0.75V6.4942C5.9853,6.6443,6.082,6.776,6.1364,6.85z"/>
 </svg>
--- a/icons/map/POI/castle-11.svg
+++ b/icons/map/POI/castle-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="castle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M8.67,0.81v1.48C8.6812,2.6709,8.3815,2.9888,8.0006,3C8.0004,3,8.0002,3,8,3H3.09c-0.381,0.0056-0.6944-0.2988-0.7-0.6799&#xA;&#x9;C2.3899,2.3134,2.3899,2.3067,2.39,2.3V0.81c0-0.1905,0.1545-0.345,0.345-0.345S3.08,0.6195,3.08,0.81V1.5H4V1l0,0&#xA;&#x9;c0-0.2761,0.2239-0.5,0.5-0.5S5,0.7239,5,1l0,0v0.5h1V1l0,0c0-0.2761,0.2239-0.5,0.5-0.5S7,0.7239,7,1l0,0v0.5h1V0.81&#xA;&#x9;C7.9679,0.625,8.0919,0.449,8.2769,0.4169c0.185-0.0321,0.361,0.0919,0.3931,0.2769C8.6767,0.7323,8.6767,0.7716,8.67,0.81z&#xA;&#x9; M10.06,9.63c0,0.1933-0.1567,0.35-0.35,0.35h0H1.35C1.1567,9.9799,1.0001,9.8231,1.0002,9.6298&#xA;&#x9;C1.0004,9.4366,1.1569,9.2801,1.35,9.28H1.7c0.3754,0.0112,0.6888-0.284,0.7-0.6594c0.0004-0.0135,0.0004-0.0271,0-0.0406&#xA;&#x9;c0,0,0.7-3.2,0.7-3.89C3.0944,4.3145,3.3943,4.0056,3.7699,4C3.7766,3.9999,3.7833,3.9999,3.79,4h3.48&#xA;&#x9;c0.3754-0.0112,0.6888,0.284,0.7,0.6594c0.0004,0.0135,0.0004,0.0271,0,0.0406c0,0.7,0.7,3.89,0.7,3.89&#xA;&#x9;c-0.0112,0.3754,0.284,0.6888,0.6594,0.7c0.0135,0.0004,0.0271,0.0004,0.0406,0h0.34c0.1933,0,0.35,0.1567,0.35,0.35v0V9.63z&#xA;&#x9; M6.5,7.5c0-0.5523-0.4477-1-1-1s-1,0.4477-1,1v2h2V7.5z"/>
 </svg>
--- a/icons/map/POI/cemetery-11.png
+++ b/icons/map/POI/cemetery-11.png
--- a/icons/map/POI/cemetery-11.svg
+++ b/icons/map/POI/cemetery-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="cemetery-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M8.65,8H8l0,0l1-5.61c0.0167-0.1981-0.1304-0.3722-0.3286-0.3889C8.6577,1.9999,8.6438,1.9996,8.63,2H7.16&#xA;&#x9;c0-0.65-0.7-1-1.67-1S3.66,1.35,3.66,2H2.35C2.1512,2.0048,1.994,2.1699,1.9988,2.3686C1.999,2.3758,1.9994,2.3829,2,2.39L3,8l0,0&#xA;&#x9;H2.35C2.1567,7.9999,1.9999,8.1566,1.9999,8.3499c0,0.0034,0,0.0068,0.0001,0.0101V10h7V8.36&#xA;&#x9;c0.0055-0.1932-0.1466-0.3543-0.3399-0.3599C8.6568,8,8.6534,8,8.65,8z M7,5H4V4h3V5z"/>
 </svg>
--- a/icons/map/POI/cinema-11.png
+++ b/icons/map/POI/cinema-11.png
--- a/icons/map/POI/cinema-11.svg
+++ b/icons/map/POI/cinema-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="cinema-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M10,5.5v2C10,7.7761,9.7761,8,9.5,8S9,7.7761,9,7.5l0,0C8.9427,7.2478,8.7433,7.0523,8.49,7H8v1.63&#xA;&#x9;C8,8.8343,7.8343,9,7.63,9H1.37C1.1657,9,1,8.8343,1,8.63V5.37C1,5.1657,1.1657,5,1.37,5h6.26C7.8343,5,8,5.1657,8,5.37V6h0.49&#xA;&#x9;C8.7433,5.9477,8.9427,5.7522,9,5.5C9,5.2239,9.2239,5,9.5,5S10,5.2239,10,5.5z M2.5,2C1.6716,2,1,2.6716,1,3.5S1.6716,5,2.5,5&#xA;&#x9;S4,4.3284,4,3.5S3.3284,2,2.5,2z M2.5,4C2.2239,4,2,3.7761,2,3.5S2.2239,3,2.5,3S3,3.2239,3,3.5S2.7761,4,2.5,4z M6,1&#xA;&#x9;C4.8954,1,4,1.8954,4,3s0.8954,2,2,2s2-0.8954,2-2S7.1046,1,6,1z M6,4C5.4477,4,5,3.5523,5,3s0.4477-1,1-1s1,0.4477,1,1&#xA;&#x9;S6.5523,4,6,4z"/>
 </svg>
--- a/icons/map/POI/clothing-store-11.png
+++ b/icons/map/POI/clothing-store-11.png
--- a/icons/map/POI/clothing-store-11.svg
+++ b/icons/map/POI/clothing-store-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="clothing-store-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="rect4181-0-0" d="&#xA;&#x9;M2.5,1l-2,2v2h2v5h6V5h2V3l-2-2H7L5.5,4L4,1H2.5z"/>
 </svg>
--- a/icons/map/POI/college-11.svg
+++ b/icons/map/POI/college-11.svg
@ -1,7 +0,0 @@
 <?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>
--- a/icons/map/POI/communications-tower-11.png
+++ b/icons/map/POI/communications-tower-11.png
--- a/icons/map/POI/communications-tower-11.svg
+++ b/icons/map/POI/communications-tower-11.svg
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="communications-tower-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <g id="communications-tower-11">
    <path d="M7.6553,3.5645h-.4V1.4482h.4ZM3.7017,1.4482h-.4V3.5645h.4Zm6-.2851h-.4V4.4414h.4Zm-8.023,0h-.4V4.4414h.4ZM5.7572,4.1683l.4366,0h0a.3541.3541,0,0,1,.3457.2812L7.5792,9.4366H9V10H2V9.4366H3.434L4.4731,4.45a.3548.3548,0,0,1,.3453-.2813l.4388,0V2.912h0A.9155.9155,0,0,1,4.59,2.0373a.9272.9272,0,1,1,1.167.8874Zm-.96,2.1881H6.2159L5.9072,4.875H5.106ZM4.383,8.3447H6.63L6.2786,6.6572H4.7346ZM6.8577,9.4366l-.1648-.7911H4.32l-.1648.7911Z"/>
  </g>
 </svg>
--- a/icons/map/POI/convenience-11.png
+++ b/icons/map/POI/convenience-11.png
--- a/icons/map/POI/convenience-11.svg
+++ b/icons/map/POI/convenience-11.svg
@ -1,6 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="convenience-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <g id="convenience-store-11">
    <path d="M8.8211,4.2685h-.62c-.1554-.6-.28-1.0651-.2826-1.0734l-.0111-.05c0-.0011-.12-.5479-.41-.5479H3.519c-.2889,0-.4091.5468-.41.5523-.008.0333-.136.5119-.293,1.1185h-.62c.1756-.6809.3228-1.2291.3228-1.2291s.1875-1.0417,1-1.0417h.4963a.4932.4932,0,0,1,.4829-.4153h2a.4932.4932,0,0,1,.4829.4153h.5171c.8125,0,1,1.0417,1,1.0417S8.6454,3.5876,8.8211,4.2685ZM2.9189,9.9954a.4945.4945,0,0,1-.4828-.368c-.23-.8736-.8-3.0538-.9379-3.63a.5.5,0,1,1,0-1h8a.5.5,0,0,1,0,1c-.1375.5763-.7156,2.7587-.9487,3.6313a.4948.4948,0,0,1-.4825.3665Zm1.094-3.2968a.5129.5129,0,0,0-1.0235,0V8.51a.5129.5129,0,0,0,1.0235,0Zm1.9971,0a.5129.5129,0,0,0-1.0235,0V8.51a.5129.5129,0,0,0,1.0235,0Zm2.0058,0a.5129.5129,0,0,0-1.0236,0V8.51a.5129.5129,0,0,0,1.0236,0Z"/>
  </g>
 </svg>
--- a/icons/map/POI/cricket-11.svg
+++ b/icons/map/POI/cricket-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/cross-11.svg
+++ b/icons/map/POI/cross-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/dam-11.png
+++ b/icons/map/POI/dam-11.png
--- a/icons/map/POI/dam-11.svg
+++ b/icons/map/POI/dam-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="dam-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M10,7.51c0,0.2761-0.2239,0.5-0.5,0.5l0,0C9.241,8.0319,9.0006,8.1539,8.83,8.35c-0.2714,0.2887-0.6175,0.4964-1,0.6&#xA;&#x9;C7.2185,9.1316,6.5566,8.9924,6.07,8.58L5.73,8.23c-0.2997-0.2948-0.7803-0.2948-1.08,0L5,9.38&#xA;&#x9;c0.0664,0.268-0.0971,0.5392-0.3651,0.6055C4.5908,9.9965,4.5454,10.0013,4.5,10h-3C1.2239,10,1,9.7761,1,9.5v-8&#xA;&#x9;C0.9999,1.2277,1.2178,1.0054,1.49,1h0.7c0.2346-0.0011,0.4384,0.1611,0.49,0.39L3.41,3.9l0.1-0.06C3.67,3.72,3.82,3.57,4,3.44&#xA;&#x9;c0.7076-0.5968,1.7424-0.5968,2.45,0C6.6,3.57,6.74,3.71,6.89,3.83c0.2847,0.2546,0.7153,0.2546,1,0l0.41-0.4&#xA;&#x9;C8.6306,3.1458,9.0541,2.9928,9.49,3l0,0c0.2761,0,0.5,0.2239,0.5,0.5S9.7661,4,9.49,4l0,0C9.231,4.0219,8.9906,4.1439,8.82,4.34&#xA;&#x9;c-0.2714,0.2887-0.6175,0.4964-1,0.6C7.2085,5.1216,6.5466,4.9824,6.06,4.57L5.73,4.23C5.4324,3.9262,4.9449,3.9213,4.6411,4.2189&#xA;&#x9;C4.6374,4.2226,4.6337,4.2263,4.63,4.23C4.49,4.35,4.36,4.48,4.21,4.6C4.0521,4.7221,3.8768,4.8198,3.69,4.89l0.67,2.32&#xA;&#x9;c0.6727-0.3402,1.4836-0.2458,2.06,0.24c0.15,0.13,0.29,0.27,0.44,0.39c0.2847,0.2546,0.7153,0.2546,1,0L8.3,7.42&#xA;&#x9;C8.6321,7.1394,9.0554,6.99,9.49,7l0,0C9.7661,6.9944,9.9944,7.2137,10,7.4898C10.0001,7.4965,10.0001,7.5033,10,7.51z"/>
 </svg>
--- a/icons/map/POI/danger-11.png
+++ b/icons/map/POI/danger-11.png
--- a/icons/map/POI/danger-11.svg
+++ b/icons/map/POI/danger-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="danger-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M6.62,8.5l3.11,1.55l-0.45,0.89L5.5,9.06l-3.78,1.89l-0.45-0.89L4.38,8.5l-3.1-1.55l0.45-0.89L5.5,7.94l3.78-1.89l0.44,0.9&#xA;&#x9;L6.62,8.5z M8.5,3.21V3.5l-1,1v1l-2,1l-2-1v-1l-1-1V3C2.4438,1.3994,3.6958,0.0562,5.2964,0C5.3643-0.0024,5.4322-0.0024,5.5,0&#xA;&#x9;c1.7059,0.0484,3.0495,1.4705,3.0011,3.1764C8.5008,3.1876,8.5004,3.1988,8.5,3.21z M4.71,2.71c0-0.4363-0.3537-0.79-0.79-0.79&#xA;&#x9;S3.13,2.2737,3.13,2.71c0,0.4363,0.3537,0.79,0.79,0.79l0,0C4.3563,3.5,4.71,3.1463,4.71,2.71z M5,4.5H4.5v1H5V4.5z M6.5,4.5H6v1&#xA;&#x9;h0.5V4.5z M7.86,2.71c0-0.4363-0.3537-0.79-0.79-0.79S6.28,2.2737,6.28,2.71S6.6337,3.5,7.07,3.5l0,0&#xA;&#x9;C7.5063,3.5,7.86,3.1463,7.86,2.71z"/>
 </svg>
--- a/icons/map/POI/defibrillator-11.svg
+++ b/icons/map/POI/defibrillator-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/doctor-11.svg
+++ b/icons/map/POI/doctor-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="doctor-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M9.5,5.87c0.0017-0.8174-0.6596-1.4813-1.477-1.483S6.5417,5.0466,6.54,5.864C6.5386,6.54,6.9955,7.131,7.65,7.3v0.42&#xA;&#x9;c0,1.0245-0.8305,1.855-1.855,1.855S3.94,8.7445,3.94,7.72l0,0C3.9776,6.8275,4.3787,5.9893,5.05,5.4H5&#xA;&#x9;c0.718-0.4684,1.1564-1.2628,1.17-2.12V1.79c0-0.613-0.4969-1.11-1.11-1.11c-0.0033,0-0.0067,0-0.01,0H4.5&#xA;&#x9;c-0.2043,0-0.37,0.1657-0.37,0.37S4.2957,1.42,4.5,1.42h0.55c0.2043,0,0.37,0.1657,0.37,0.37v1.49l0,0&#xA;&#x9;c0,1.0178-0.8222,1.8445-1.84,1.85V5.4l0,0V5.13C2.5583,5.1355,1.7255,4.3117,1.72,3.29c0-0.0033,0-0.0067,0-0.01l0,0V1.79&#xA;&#x9;c0-0.2043,0.1657-0.37,0.37-0.37l0,0h0.52c0.2043,0,0.37-0.1657,0.3699-0.3701C2.9799,0.8456,2.8143,0.68,2.61,0.68H2.09&#xA;&#x9;C1.4848,0.6909,0.9999,1.1847,1,1.79v1.49C0.9978,4.1241,1.4086,4.9158,2.1,5.4l0,0c0.6676,0.591,1.065,1.429,1.1,2.32&#xA;&#x9;c0,1.4332,1.1618,2.595,2.595,2.595S8.39,9.1532,8.39,7.72V7.3C9.0424,7.1316,9.4986,6.5438,9.5,5.87z M8,6.61&#xA;&#x9;c-0.4087,0-0.74-0.3313-0.74-0.74S7.5913,5.13,8,5.13s0.74,0.3313,0.74,0.74l0,0C8.74,6.2787,8.4087,6.61,8,6.61z"/>
 </svg>
--- a/icons/map/POI/drinking-water-11.png
+++ b/icons/map/POI/drinking-water-11.png
--- a/icons/map/POI/drinking-water-11.svg
+++ b/icons/map/POI/drinking-water-11.svg
@ -1,5 +0,0 @@
 <?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="drinking-water-11">
  <path d="M5,11H3a0.51,0.51,0,0,1-.5-0.4L1,5.6A0.5,0.5,0,0,1,1.5,5h5A0.5,0.5,0,0,1,7,5.6l-1.49,5A0.51,0.51,0,0,1,5,11ZM2.76,8L5.22,8,5.89,6H2.11Z"/>
  <path d="M4.5,0h0A1.5,1.5,0,0,0,3,1.51v2a0.5,0.5,0,0,0,.5.5h1A0.5,0.5,0,0,0,5,3.5v-1A0.5,0.5,0,0,1,5.5,2H10V0H4.5Z"/>
 </svg>
--- a/icons/map/POI/embassy-11.svg
+++ b/icons/map/POI/embassy-11.svg
@ -1,4 +0,0 @@
 <?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>
--- a/icons/map/POI/entrance-alt1-11.png
+++ b/icons/map/POI/entrance-alt1-11.png
--- a/icons/map/POI/entrance-alt1-11.svg
+++ b/icons/map/POI/entrance-alt1-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="entrance-alt1-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M4.793,7.263A.5.5,0,0,0,5.5,7.97L7.743,5.677a.25.25,0,0,0,0-.354h0L5.489,3.042a.5.5,0,0,0-.707.707L6,5H1.5a.5.5,0,0,0,0,1H6ZM9,1H4.5a.5.5,0,0,0,0,1h4a.5.5,0,0,1,.5.5v6a.5.5,0,0,1-.5.5h-4a.5.5,0,0,0,0,1H9a1,1,0,0,0,1-1V2A1,1,0,0,0,9,1Z"/>
 </svg>
--- a/icons/map/POI/fast-food-11.png
+++ b/icons/map/POI/fast-food-11.png
--- a/icons/map/POI/fast-food-11.svg
+++ b/icons/map/POI/fast-food-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="fast-food-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M10,8L10,8c0,1.1046-0.8954,2-2,2H3c-1.1046,0-2-0.8954-2-2H10z M10,5H1C0.4477,5,0,5.4477,0,6s0.4477,1,1,1h9&#xA;&#x9;c0.5523,0,1-0.4477,1-1S10.5523,5,10,5z M8.55,1H2.46C1.6537,1,1,1.6536,1,2.46c0,0.0033,0,0.0067,0,0.01V4h9V2.47&#xA;&#x9;C10.0055,1.6637,9.3564,1.0055,8.55,1C8.55,1,8.55,1,8.55,1z M3.55,3C3.2752,3.0276,3.0301,2.8273,3.0025,2.5525&#xA;&#x9;C2.9749,2.2777,3.1753,2.0326,3.45,2.005c0.2748-0.0276,0.5199,0.1727,0.5475,0.4475C3.9991,2.4683,3.9999,2.4841,4,2.5&#xA;&#x9;C4,2.7761,3.7761,3,3.5,3H3.55z M7.55,3C7.2752,3.0276,7.0301,2.8273,7.0025,2.5525S7.1753,2.0326,7.45,2.005&#xA;&#x9;c0.2748-0.0276,0.5199,0.1727,0.5475,0.4475C7.9991,2.4683,7.9999,2.4841,8,2.5C8,2.7761,7.7761,3,7.5,3H7.55z"/>
 </svg>
--- a/icons/map/POI/ferry-11.svg
+++ b/icons/map/POI/ferry-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="ferry-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M11,9.45v0.77c-0.2167,0.0089-0.4213,0.1022-0.57,0.26c-0.2266,0.2196-0.5054,0.3779-0.81,0.46&#xA;&#x9;c-0.5149,0.1365-1.0639,0.0296-1.49-0.29L7.8,10.38c-0.2669-0.2313-0.6631-0.2313-0.93,0c-0.12,0.09-0.23,0.2-0.35,0.28&#xA;&#x9;c-0.6333,0.452-1.4889,0.4316-2.1-0.05l-0.33-0.27c-0.2457-0.185-0.5843-0.185-0.83,0c-0.16,0.11-0.3,0.25-0.46,0.36&#xA;&#x9;c-0.601,0.4185-1.399,0.4185-2,0l-0.26-0.21C0.4009,10.3346,0.2078,10.238,0,10.22V9.45c0.2162-0.0231,0.4345,0.015,0.63,0.11&#xA;&#x9;C0.8642,9.6894,1.0882,9.8365,1.3,10c0.1841,0.1814,0.4478,0.2567,0.7,0.2c0.093-0.0244,0.181-0.0651,0.26-0.12&#xA;&#x9;c0.13-0.09,0.25-0.2,0.38-0.3c0.616-0.4518,1.454-0.4518,2.07,0l0.4,0.31c0.2416,0.1752,0.5684,0.1752,0.81,0l0.4-0.31&#xA;&#x9;c0.6181-0.4567,1.4619-0.4567,2.08,0l0.38,0.3c0.2437,0.18,0.5763,0.18,0.82,0L10,9.77C10.2882,9.5546,10.6403,9.4419,11,9.45z&#xA;&#x9; M2.61,7.61L1,5l1-0.91V1.15C2.0163,0.5061,2.546-0.0057,3.19,0h4.62C8.454-0.0057,8.9837,0.5061,9,1.15v2.94L10,5L8.39,7.62&#xA;&#x9;C7.5729,7.0755,6.4952,7.1324,5.74,7.76L5.5,8l0,0L5.3,7.82C4.5536,7.1506,3.4512,7.0646,2.61,7.61z M2.81,3.61L5.5,2l2.69,1.63&#xA;&#x9;V1.15c0.0114-0.1985-0.1403-0.3686-0.3388-0.38c-0.0137-0.0008-0.0275-0.0008-0.0412,0H3.19&#xA;&#x9;C2.9915,0.7586,2.8214,0.9103,2.81,1.1088c-0.0008,0.0137-0.0008,0.0275,0,0.0412v2.48V3.61z"/>
 </svg>
--- a/icons/map/POI/fire-station-11.png
+++ b/icons/map/POI/fire-station-11.png
--- a/icons/map/POI/fire-station-11.svg
+++ b/icons/map/POI/fire-station-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="fire-station-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path id="path10041-3-2" d="M5.5,0l-2,4L2,2&#xA;&#x9;C1.595,2.7121,0,4.1667,0,6c0,2.7001,2.7999,5,5.5,5S11,8.7001,11,6c0-1.8333-1.595-3.2879-2-4L7.5,4L5.5,0z M5.5,5.5&#xA;&#x9;c0,0,2,1.585,2,3c0,0.6111-0.7778,1.2778-2,1.2778s-2-0.6667-2-1.2778C3.5,7.1336,5.5,5.5,5.5,5.5z"/>
 </svg>
--- a/icons/map/POI/fitness-centre-11.png
+++ b/icons/map/POI/fitness-centre-11.png
--- a/icons/map/POI/fitness-centre-11.svg
+++ b/icons/map/POI/fitness-centre-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="fitness-centre-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
  <path d="M7,6H4V5H7ZM2,3V4H1V5A.5.5,0,0,0,1,6V7H2V8H3.5V3Zm8,2V4H9V3H7.5V8H9V7h1V6a.5.5,0,0,0,0-1Z"/>
 </svg>
--- a/icons/map/POI/fuel-11.png
+++ b/icons/map/POI/fuel-11.png
--- a/icons/map/POI/fuel-11.svg
+++ b/icons/map/POI/fuel-11.svg
@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" id="fuel-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
  <path d="M9.5,3H9V1.5l0,0C9,1.2239,8.7761,1,8.5,1S8,1.2239,8,1.5l0,0V3c0,0.5523,0.4477,1,1,1v4.25C9,8.3881,8.8881,8.5,8.75,8.5&#xA;&#x9;S8.5,8.3881,8.5,8.25V6.5C8.5,5.6716,7.8284,5,7,5V2c0-0.5523-0.4477-1-1-1H2C1.4477,1,1,1.4477,1,2v7c0,0.5523,0.4477,1,1,1h4&#xA;&#x9;c0.5523,0,1-0.4477,1-1V6c0.2761,0,0.5,0.2239,0.5,0.5v1.75c0,0.6904,0.5596,1.25,1.25,1.25S10,8.9404,10,8.25V3.5&#xA;&#x9;C10,3.2239,9.7761,3,9.5,3z M6,4.5C6.0056,4.7706,5.7908,4.9944,5.5202,5C5.5201,5,5.5201,5,5.52,5h-3&#xA;&#x9;C2.2384,5.0056,2.0056,4.7818,2,4.5002C2,4.5001,2,4.5001,2,4.5l0,0V3c0-0.2761,0.2239-0.5,0.5-0.5h3C5.7761,2.5,6,2.7239,6,3V4.5z"/>
 </svg>
--- a/icons/map/POI/furniture-11.png
+++ b/icons/map/POI/furniture-11.png
--- a/Show More
+++ b/Show More