1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-01 13:29:16 +02:00

Compare commits

...

471 Commits
11.4 ... 13.8

Author SHA1 Message Date
7bf7385cf1 ENC atlases/catalogues desktop integration (Mac) 2023-09-07 20:57:30 +02:00
b312d4a5c6 ENC atlases/catalogues desktop integration (Linux, Windows) 2023-09-07 18:25:26 +02:00
b1f104c2ec Added support for ENC atlases (catalogues) 2023-09-07 09:31:23 +02:00
864326210a Cosmetics 2023-09-04 11:05:17 +02:00
6658297587 A less agressive cable area line 2023-09-04 11:04:30 +02:00
0f26114f5d Two-way radio reporting points 2023-09-03 10:59:43 +02:00
f85634af3f Fixed Android build 2023-08-30 20:56:04 +02:00
05ae8fa557 Localization update 2023-08-30 20:46:16 +02:00
903c925e2a Added the "Don't show again" checkbox also to map load error messages 2023-08-30 20:43:29 +02:00
f60c08c57e Cosmetics 2023-08-30 20:43:13 +02:00
a52a41f56e Merge branch 'origin/master' into Weblate. 2023-08-29 22:08:19 +02:00
490052bc6c Fixed broken "Use styles" persistent configuration
Fixes #511
2023-08-29 22:06:08 +02:00
6cba68f0d1 The logging period is apparently an int, not a byte in GHP files 2023-08-29 22:03:05 +02:00
raf
f7b19d7a45 Translated using Weblate (Catalan)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-08-29 12:53:08 +02:00
681f6c5b09 Version++ 2023-08-28 20:24:37 +02:00
e34f77f1a1 Use the real file names for suffix extraction on Android
Many file URLs/paths that are passed to GPXSee on Android are unusable for
extracting the file suffix due to the Android file name mangling. Use
the converted "display names" for suffix extraction where possible.
2023-08-28 20:18:38 +02:00
00e8004042 Improve GHP data detection
Do not consider all files with size divisible by 20 as valid GHP data... Require
at least on valid data point.
2023-08-28 20:14:30 +02:00
c9a46be7a8 Added missing quiet uninstaller entry 2023-08-24 09:08:03 +02:00
128ce8d78c Added missing windmill and flagstaff landmark icons 2023-08-24 09:07:01 +02:00
04ef7ba092 If there are multiple labels for a point, use the one with the highest priority 2023-08-19 13:36:20 +02:00
f683525fce Fixed/improved map info background rendering settings
All text items on the map (including path marker info) have now the same
background color (the map background color) and the "info background" option
also applies to all items now.
2023-08-19 11:01:12 +02:00
f5d4974d57 Back to the previous workaround
Until we can switch to something newer than Qt 6.4.0 (which we can't due to
numerous Qt bugs...), we have to hardcode the android SDK version here due
to QTBUG-112465.
2023-08-18 23:24:54 +02:00
e0e2d38ec1 Try a cleaner gradle fix/workaround 2023-08-18 22:58:04 +02:00
80b9dcfd5e broken androiddeployqt workaround 2023-08-18 22:48:42 +02:00
836163a8b2 Version++ 2023-08-18 22:17:43 +02:00
9cead54213 Switched to Android SDK 33 2023-08-18 22:16:43 +02:00
03711ede97 Re-introduce the zoom level offset
Most Mapsforge themes expect the zoom levels to be offset by one from
the standard OSM zoom levels. Additionally, the rendering is much faster
which always helps when dealing with a format that slow like Mapsforge...
2023-08-13 13:00:05 +02:00
ab8ab9d731 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-08-12 19:29:39 +02:00
d2d529b574 Translated using Weblate (Hungarian)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2023-08-12 19:29:38 +02:00
8647898d2a Translated using Weblate (Turkish)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2023-08-12 19:29:38 +02:00
a91f0d183f Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2023-08-12 19:29:38 +02:00
15add7652d Translated using Weblate (Danish)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/da/
2023-08-12 19:29:37 +02:00
ced2b37ebc Translated using Weblate (Swedish)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2023-08-12 19:29:37 +02:00
2315f1d5e9 Translated using Weblate (Russian)
Currently translated at 100.0% (468 of 468 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-08-12 19:29:37 +02:00
984a8b6afc Try to open all files when browsing using the keys 2023-08-12 07:44:36 +02:00
aa72e6e2ad Updated German translations 2023-08-12 07:02:04 +02:00
09df5589b6 Updated Czech translations 2023-08-12 07:01:35 +02:00
1b3d7b9b0f Localization update 2023-08-12 06:58:28 +02:00
f998148fec Added option to surpress error messages
Closes #487
2023-08-12 06:55:50 +02:00
183c35ec7a Merge branch 'origin/master' into Weblate. 2023-08-09 01:19:29 +02:00
7e10e6640c Added support for the "base-stroke-width" rendertheme parameters 2023-08-09 01:19:41 +02:00
97b61451b1 Removed the zoom level offset hack
In the Mapsforge library the offset is dependent on the tile size which is
in turn dependent on whether the tiles are hidpi or not. In other words
the Mapsforge library is broken and inconsistent between hidpi/non-hdpi
displays. GPXSee is consistent here and we have thus tochoose one zoom level
mapping (i.e. what zoom level corresponds to what resolution). Lets choose
"no offset" = more details on a given zoom level/resolution.
2023-08-09 01:12:42 +02:00
092c56468c Update the theme to the latest Mapsforge version 2023-08-08 00:53:06 +02:00
b6ef58e342 Merge branch 'origin/master' into Weblate. 2023-08-08 00:52:31 +02:00
4d6d9b3e4f Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-08-07 11:51:35 +02:00
d064cedbbe Apply the Mapsforge maps zoom levels offset
Offset the Mapsforge zoom level when fetching data/rendering the tiles to get
the expected data/sizes/widths for the tiles at the given zoom level.
2023-08-05 18:56:55 +02:00
8ab728f81d Desktop QT still needs to be installed manually for Android build 2023-08-05 09:59:35 +02:00
6670dc32b5 Build arm64_v8a targets on Android 2023-08-05 09:51:04 +02:00
61b51e5596 Be more tolerant to unknown file header data 2023-08-04 09:34:36 +02:00
4bf81e020f Yet another code cleanup 2023-08-03 00:39:56 +02:00
4bcbce671d Merge remote-tracking branch 'weblate/master' 2023-08-01 23:39:55 +02:00
e07e109c7d Code cleanup 2023-08-01 23:38:33 +02:00
e9609c5167 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2023-08-01 23:38:30 +02:00
dcf45475ba Show the arrows even when no label is set 2023-08-01 23:21:49 +02:00
6ce2a63a1c Version++ 2023-07-31 23:38:50 +02:00
3e8b54f605 Added hi-dpi one-way street (+ water ways) arrows 2023-07-31 23:36:14 +02:00
c6af082fa3 Merge branch 'origin/master' into Weblate. 2023-07-24 19:03:57 +02:00
66036f6cd7 Yet another one-way arrows improvement 2023-07-24 19:04:19 +02:00
c644ea2170 Translated using Weblate (Esperanto)
Currently translated at 94.4% (441 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-07-23 11:03:14 +02:00
04041a2d9c Translated using Weblate (Ukrainian)
Currently translated at 99.1% (463 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2023-07-23 11:03:13 +02:00
6a128c8eb4 Translated using Weblate (Russian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-07-23 11:03:13 +02:00
1a08e50c3e Translated using Weblate (Finnish)
Currently translated at 97.6% (456 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-07-23 11:03:13 +02:00
dd0dec54df Merge branch 'origin/master' into Weblate. 2023-07-14 10:33:46 +02:00
dfda3a6630 Use less agressive one-way street arrows 2023-07-14 10:33:45 +02:00
c03e24ce52 Merge branch 'origin/master' into Weblate. 2023-07-14 09:54:24 +02:00
96e762beb5 Properly mark one-way streets in data from NET links 2023-07-14 09:52:27 +02:00
cbd2d99739 Merge branch 'origin/master' into Weblate. 2023-07-13 12:00:41 +02:00
b4be5ea206 Display one-way streets info in IMG maps 2023-07-13 11:59:53 +02:00
3e0b732a65 Merge branch 'origin/master' into Weblate. 2023-07-06 10:57:05 +02:00
56c77df176 Build universal x86_64/arm64 binaries on OS X 2023-07-06 10:56:56 +02:00
1871f85acc Yet another ENV path fix 2023-07-06 10:19:26 +02:00
4b51d30e00 Merge branch 'origin/master' into Weblate. 2023-07-06 10:19:13 +02:00
3ec636632f Fixed ENV file path 2023-07-06 10:12:32 +02:00
40c41b88e3 Merge branch 'origin/master' into Weblate. 2023-07-06 10:12:17 +02:00
fcd02e4978 Merge branch 'origin/master' into Weblate. 2023-07-06 10:07:33 +02:00
5e1af275b8 Switched to MSVC 2022 and Qt 6.5 2023-07-06 10:07:13 +02:00
0f4bb95d57 Merge branch 'origin/master' into Weblate. 2023-07-04 20:27:49 +02:00
cd220216dd Do not affect the map object scaling when resizing the tiles 2023-07-04 20:27:41 +02:00
2efac25629 Merge branch 'origin/master' into Weblate. 2023-06-30 09:58:22 +02:00
0d6b02f466 Removed obsolete include 2023-06-30 09:55:35 +02:00
2f74c4bbb6 Merge branch 'origin/master' into Weblate. 2023-06-29 07:22:32 +02:00
059c515175 Added graph pinch zooming
Fixes #501
2023-06-29 07:22:11 +02:00
raf
66ba8268a3 Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-06-28 12:52:20 +02:00
e328321b19 Merge branch 'origin/master' into Weblate. 2023-06-23 13:56:58 +02:00
1dc963b133 Revert "Removed SDK/buildtools workaround"
This reverts commit f0036bfd28.
2023-06-23 10:08:30 +02:00
f0036bfd28 Removed SDK/buildtools workaround 2023-06-23 09:33:04 +02:00
688861bf65 Code cleanup 2023-06-23 09:30:44 +02:00
8b20124533 Translated using Weblate (Hungarian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2023-06-20 12:52:11 +02:00
c449024584 Version++ 2023-06-14 00:42:16 +02:00
41188360bf Make the Mapsforge tiles sufficient large for the layout 2023-06-14 00:40:00 +02:00
1086a74f99 Back to Qt 6.4 on Windows 2023-06-12 01:03:49 +02:00
7b5a1c701d Switched Qt 6 CI builds to Qt 6.5 2023-06-11 08:30:43 +02:00
9afeaf672a Properly match symbols to captions 2023-06-10 08:11:18 +02:00
5ddd63e697 Do not limit text that was not inserted 2023-06-06 07:32:42 +02:00
88fa1ed786 Some more Mapsforge maps rendering improvements 2023-06-06 07:18:31 +02:00
1233d20a21 Added support for lineSymbols in Mapsforge maps 2023-06-04 23:56:00 +02:00
1746eddb8d Code cleanup 2023-06-03 13:35:29 +02:00
ecda5103c8 Properly handle Mapsforge style menus 2023-05-31 01:01:42 +02:00
50b0ff1c56 Cosmetics 2023-05-29 23:19:28 +02:00
2b300fab54 Code cleanup 2023-05-29 23:19:16 +02:00
961061b643 Added rescue station 2023-05-28 11:28:12 +02:00
8bebea53ad Added LNDELV elevation values 2023-05-28 10:40:39 +02:00
c3b484bb75 Properly include std::isnan() 2023-05-26 21:57:45 +02:00
d6d43baec5 Optimization 2023-05-26 21:30:27 +02:00
c6c3e0978c Use generic icon rotate instead of special icon draw functions 2023-05-26 21:28:44 +02:00
320b04c3fa Added support for line "dy" parameter 2023-05-22 23:29:04 +02:00
ab7185bd25 Version++ 2023-05-22 23:28:50 +02:00
822a0c2866 Tile search can be done lock-free 2023-05-21 09:14:19 +02:00
a92d6efec6 Do not do any time consuming actions in the mapview redraw callback
On all vector maps (ENC, IMG and Mapsforge), do the data loading
asynchronous like the tile rendering.
2023-05-19 19:33:22 +02:00
4615709b99 Merge branch 'origin/master' into Weblate. 2023-05-19 01:31:46 +02:00
8a72b20af8 Added support for all paths scaling modes 2023-05-19 01:30:54 +02:00
f86aa8c012 Merge branch 'origin/master' into Weblate. 2023-05-17 23:15:09 +02:00
e351eb6370 Only preallocate the memory when usin moveto/lineto 2023-05-17 23:10:45 +02:00
81e967f20d Only fetch data when the rect is valid 2023-05-17 23:08:17 +02:00
dbf5828e65 Merge branch 'origin/master' into Weblate. 2023-05-16 23:03:34 +02:00
cf81a90865 Some more micro-optimizations & code cleanup 2023-05-16 23:03:07 +02:00
37d408c953 Translated using Weblate (Danish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/da/
2023-05-16 21:51:52 +02:00
61c3ed60d7 Translated using Weblate (French)
Currently translated at 99.7% (466 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
2023-05-14 00:53:09 +02:00
04c203625f Version++ 2023-05-13 15:05:10 +02:00
d0cea97c90 Added support for custom HTTP headers in map tile requests 2023-05-13 15:01:35 +02:00
ddc7eb7149 Do not outline soundings like in ENC maps 2023-05-12 10:19:52 +02:00
bb22ad95b7 Use the point label as additional source for the id hash
Some (marine) maps have different points with the same type on the same
position.
2023-05-11 22:57:35 +02:00
682fcc09cc Merge branch 'origin/master' into Weblate. 2023-05-11 21:31:32 +02:00
60e83b24f9 Use as much as possible of the 64b hash in Qt6 2023-05-11 21:31:10 +02:00
c30501185c Merge branch 'origin/master' into Weblate. 2023-05-07 21:20:08 +02:00
9b3c11cc68 Version++ 2023-05-07 21:19:55 +02:00
61f77ef19e Merge branch 'origin/master' into Weblate. 2023-05-07 21:16:26 +02:00
c0834491d3 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2023-05-07 21:16:25 +02:00
e6fdd0f53d Fixed crash on empty routes 2023-05-07 21:15:44 +02:00
fe444e88a3 Merge branch 'origin/master' into Weblate. 2023-05-06 21:53:53 +02:00
d9c0770b51 Code cleanup 2023-05-06 21:53:40 +02:00
3a0e9bb733 Merge branch 'origin/master' into Weblate. 2023-05-06 16:15:14 +02:00
ca6c7247c0 Added missing cache insert 2023-05-06 16:14:49 +02:00
0b25cb9f81 Merge branch 'origin/master' into Weblate. 2023-05-04 21:49:22 +02:00
190a961242 Fixed wrong date info on tracks with segments 2023-05-04 21:49:02 +02:00
ccfb748404 Fixed KMZ maps bounds computation 2023-05-04 21:14:52 +02:00
b19c3a83f3 Merge branch 'origin/master' into Weblate. 2023-05-04 09:52:05 +02:00
a4a54101a3 Removed forgotten debug stuff 2023-05-04 09:51:42 +02:00
728361ad7b Merge branch 'origin/master' into Weblate. 2023-05-04 09:41:07 +02:00
af58893cbe Version++ 2023-05-04 09:41:02 +02:00
97e12d809f Map API refactoring
Including several map providers refactoring/rewrite
especial KML, JNX and TrekBuddy atlases.
2023-05-04 09:38:35 +02:00
raf
f5e3e5bd21 Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-04-29 11:48:37 +02:00
d593b073d5 Removed obsolete translations strings 2023-04-27 23:50:40 +02:00
62aabe0c56 If there are broken matrix limits, ignore them 2023-04-27 00:16:54 +02:00
2bd25dd9b0 Fixed build with Qt < 5.13 2023-04-25 23:33:54 +02:00
79e9a49245 Merge remote-tracking branch 'weblate/master' 2023-04-25 23:10:27 +02:00
e319ca4df1 Translated using Weblate (Korean)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ko/
2023-04-25 23:09:42 +02:00
55724594ec This drives me crazy! 2023-04-25 23:08:27 +02:00
8cea06f2ad Improve SQLite-based maps error reporting 2023-04-25 22:52:55 +02:00
1d589e25d8 Some more Mapsforge microoptimizations + code cleanup 2023-04-25 22:11:47 +02:00
b64065e076 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-04-25 00:10:35 +02:00
d8af928004 Translated using Weblate (Turkish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2023-04-25 00:10:35 +02:00
c6766debff Merge remote-tracking branch 'weblate/master' 2023-04-25 00:03:17 +02:00
1eaaf719fd Code cleanup 2023-04-25 00:02:50 +02:00
4a0b7ec83e German translation 2023-04-23 11:05:21 +02:00
c844eca91e Czech translation 2023-04-23 11:05:08 +02:00
823a39bcac Merge branch 'origin/master' into Weblate. 2023-04-23 11:05:05 +02:00
64a4d633a3 Translated using Weblate (Hungarian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2023-04-23 11:05:05 +02:00
6c91060cbb Some more Mapsforge micro-optimizations 2023-04-23 11:01:18 +02:00
420fb3ecd2 Translated using Weblate (Swedish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2023-04-23 08:51:43 +02:00
2232e47821 Localization updte 2023-04-23 01:33:03 +02:00
72ca4f2182 German translation 2023-04-23 00:37:31 +02:00
0f4de11ae7 Merge branch 'origin/master' into Weblate. 2023-04-22 17:28:45 +02:00
ce4f0472c0 Use integers as tag keys in Mapsforge maps 2023-04-22 17:28:32 +02:00
330b2362e5 Translated using Weblate (Turkish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2023-04-21 11:52:29 +02:00
dacaeca71a Fixed broken links
Reflect the recent project structure changes.
2023-04-19 23:54:59 +02:00
229af4c749 The coordinates and the point type are sufficient for a unique ID 2023-04-19 00:33:04 +02:00
raf
f8d40850a7 Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-04-17 23:37:22 +02:00
e5fa37d61e Translated using Weblate (Korean)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ko/
2023-04-17 23:37:21 +02:00
c5af66d860 Translated using Weblate (Danish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/da/
2023-04-17 23:37:21 +02:00
adc09da815 Added missing Garmin GPX power extension 2023-04-17 23:32:48 +02:00
a928cc4ccb Cosmetics 2023-04-16 09:42:00 +02:00
6f49d11903 Merge branch 'origin/master' into Weblate. 2023-04-15 03:20:09 +02:00
raf
f93ddd740d Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-04-15 03:20:08 +02:00
835ea9d957 Added missing NAD83(2011)-based projected coordinate systems 2023-04-15 03:19:42 +02:00
2824751615 Allow advanced CSV formating in CRS files 2023-04-15 03:18:52 +02:00
f7865556ae Fixed Windows build 2023-04-14 00:17:55 +02:00
9e013d13d3 Merge branch 'origin/master' into Weblate. 2023-04-14 00:17:53 +02:00
53c6f08af5 Fixed Android build 2023-04-14 00:04:09 +02:00
04321d17b3 Merge branch 'origin/master' into Weblate. 2023-04-14 00:04:06 +02:00
5292ccafa7 Merge branch 'origin/master' into Weblate. 2023-04-13 23:53:55 +02:00
66fce56803 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-04-13 23:53:54 +02:00
df3485badf Translated using Weblate (Swedish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2023-04-13 23:53:54 +02:00
dc799f4642 Use a new/better location for the CRS data 2023-04-13 23:53:31 +02:00
5ca04dd78a Czech translation 2023-04-13 23:51:53 +02:00
7bfae8a398 Code cleanup 2023-04-13 23:51:25 +02:00
55b727c72a Translated using Weblate (Hungarian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2023-04-13 09:50:31 +02:00
fea1f61235 Localization update 2023-04-13 09:40:06 +02:00
4724d1deb5 Version++ 2023-04-13 09:03:20 +02:00
e5199f8648 Redesigned CRS logic (including CSV files structure) 2023-04-13 08:39:33 +02:00
aec052edaf Fixed elevation source selection logic 2023-04-10 17:21:02 +02:00
1bbc57173e Add only valid graph segments to the graphs
Fixes #489
2023-04-10 13:06:19 +02:00
52ea52ff4e Fixed broken graphs when data contains empty segments
fixes #490
2023-04-10 10:00:30 +02:00
b6ca28e159 Render circles 2023-04-08 00:34:33 +02:00
648627b17f Use style-defined priorities
+ code cleanup
2023-04-06 23:29:05 +02:00
2aa759a4bc Filter all way references, not only "ref"s 2023-04-06 09:41:31 +02:00
84dc58da71 Code cleanup 2023-04-05 21:50:19 +02:00
25838ad02d Removed obsolete header include 2023-04-05 21:02:20 +02:00
d11483cd94 Merge branch 'origin/master' into Weblate. 2023-04-05 19:28:37 +02:00
6cd122f59b Fix/improve Mapsforge tiles rendering 2023-04-05 19:28:17 +02:00
981bd33680 Properly encapsulate the ENC-specific text point 2023-04-05 19:27:25 +02:00
2697507c3a Merge branch 'origin/master' into Weblate. 2023-04-04 00:31:47 +02:00
8b24aa17e2 Increase path render instructions cache 2023-04-04 00:29:50 +02:00
6fc5a2f67d Added support for the "text-transform" attribute 2023-04-04 00:22:15 +02:00
d794de5818 Added support for curved lines 2023-04-03 23:53:57 +02:00
81f695a672 Fixed crash on empty IMG/GMAP maps 2023-04-03 23:29:35 +02:00
9580ddd54a Merge branch 'origin/master' into Weblate. 2023-04-02 21:27:06 +02:00
20aaf68405 Do not bundle the unused SQL plugins (ODBC, PostgreSQL) 2023-04-02 21:24:52 +02:00
cdc0a64ead Merge branch 'origin/master' into Weblate. 2023-04-02 18:58:31 +02:00
f2218126ef Version++ 2023-04-02 18:58:24 +02:00
14670868bb Translated using Weblate (Esperanto)
Currently translated at 94.2% (440 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-04-02 18:39:07 +02:00
6a73b6358d Translated using Weblate (Finnish)
Currently translated at 97.8% (457 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-04-02 18:39:07 +02:00
7e89f339f4 Remove obsolete environment variables setup 2023-04-02 15:31:54 +02:00
9e80319577 Remove the Qt5 modules... 2023-04-02 15:22:19 +02:00
0596201fb2 Fixed Qt5 modules list 2023-04-02 15:17:02 +02:00
dce078bca6 Use Qt 5.15.2 as the Qt5 version for OS X builds 2023-04-02 15:11:37 +02:00
34f935462f Use the official Qt builds instead of homebrew in mac builds 2023-04-02 15:02:55 +02:00
84a592998d Only tile big (> Qt OpenGL cache size / 2) images 2023-04-02 14:36:03 +02:00
c114383c85 Do not outline countour height entries 2023-04-01 12:04:21 +02:00
ab2f8d8350 Added major NAD83(2011)-based projections 2023-03-30 00:01:16 +02:00
164e59602e Added missing BCNCAR rendering 2023-03-30 00:00:45 +02:00
1b858ac4f2 Back to Qt 6.4.0 2023-03-26 19:35:42 +02:00
0a58808017 Try Qt 6.4.3 in Android builds 2023-03-26 19:25:23 +02:00
b80cd05d4b Added currents rendering 2023-03-25 13:31:15 +01:00
66c951f38c Merge branch 'origin/master' into Weblate. 2023-03-25 10:55:47 +01:00
46109d0ce0 Render masts as pylons 2023-03-25 10:55:32 +01:00
cd1f80f2c1 Label sizes adjustment 2023-03-25 00:12:06 +01:00
02699b0636 Merge branch 'origin/master' into Weblate. 2023-03-25 00:12:03 +01:00
bb8727755a Properly crop the image 2023-03-24 23:07:28 +01:00
69831f0c90 Merge branch 'origin/master' into Weblate. 2023-03-24 23:07:22 +01:00
dbe407d9d9 Various ENC rendering improvements 2023-03-24 22:54:53 +01:00
b78d4741f6 Merge branch 'origin/master' into Weblate. 2023-03-24 22:54:50 +01:00
405b1397e9 Merge branch 'origin/master' into Weblate. 2023-03-24 09:24:25 +01:00
raf
2f280c744b Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-03-24 09:24:25 +01:00
54d6016b1a A better point items layout algorithm 2023-03-24 09:18:13 +01:00
65afd802ce A better "entry prohibited" line 2023-03-24 09:17:28 +01:00
e6b96d8717 Merge branch 'origin/master' into Weblate. 2023-03-23 01:05:49 +01:00
f057ebdbb7 Added fog signals rendering 2023-03-23 01:05:44 +01:00
f941dce573 Merge branch 'origin/master' into Weblate. 2023-03-22 00:43:25 +01:00
416bd3472f Render lights merged with the root objects, not as separate objects 2023-03-22 00:41:03 +01:00
034a9d9b28 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2023-03-19 23:39:43 +01:00
048198dfe1 Removed duplicit map error debug output 2023-03-18 10:11:11 +01:00
a50fa28c08 Properly chceck for GCS/PCS files 2023-03-18 09:51:07 +01:00
152f17f15a Do not try to load the style when it does not exist 2023-03-18 09:04:55 +01:00
873db27768 Version++ 2023-03-16 23:42:57 +01:00
62f3343f75 Render international border lines 2023-03-16 21:37:27 +01:00
07581f027b Fixed header length check 2023-03-16 20:58:28 +01:00
b3767e85e1 Added missing nmea serial port baudrate setting 2023-03-16 02:03:40 +01:00
4fdeb3169f Translated using Weblate (Esperanto)
Currently translated at 93.1% (435 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-03-12 23:00:19 +01:00
18836107af Translated using Weblate (Ukrainian)
Currently translated at 99.5% (465 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2023-03-12 23:00:19 +01:00
630fef2143 Translated using Weblate (Russian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-03-12 23:00:19 +01:00
00c8d70eab Translated using Weblate (Finnish)
Currently translated at 97.4% (455 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-03-12 23:00:18 +01:00
426490ef4d Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2023-03-07 01:50:18 +01:00
raf
f166bfeb81 Translated using Weblate (Catalan)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2023-03-04 17:48:51 +01:00
8d3b76ee03 Translated using Weblate (Hungarian)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2023-03-04 17:48:51 +01:00
fbe8f048dd Translated using Weblate (Turkish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2023-03-04 17:48:51 +01:00
334037b67e Translated using Weblate (Swedish)
Currently translated at 100.0% (467 of 467 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2023-03-04 17:48:50 +01:00
4acc0a25e0 Fixed DEM cache size configuration 2023-03-03 07:36:30 +01:00
3f4cc56cbe Translation update 2023-03-03 07:23:01 +01:00
59a91e0fa7 Localization update 2023-03-03 07:20:10 +01:00
e3aa98a93d Removed unnecessary metadata from icons 2023-03-03 00:16:43 +01:00
0300f044ad Add outlines to some more marine icons 2023-03-03 00:05:26 +01:00
f275938fef Make the DEM cache configurable 2023-03-03 00:04:03 +01:00
3b43e28b03 Some more missing outlines 2023-03-02 01:27:08 +01:00
b2c9fc8873 Decreased the oversize church icon 2023-03-02 01:00:14 +01:00
6105783a6d Redesigned marine icons
Added marine icons outlines to make the icons visible on dark backgrounds.
2023-03-02 00:43:20 +01:00
267094dc6c Fixed build with older Qt versions 2023-03-01 00:23:01 +01:00
7be3a27196 Added support for 0.5" (7201x7201) DEM tiles
+ DEM cache limit fix
2023-02-28 23:59:52 +01:00
00a349575c Marine maps draw order fix 2023-02-28 23:58:03 +01:00
f026387d76 Fixed broken handling of IMG "multi-maps" (maps with overviews) 2023-02-27 22:06:31 +01:00
108444d29b Fix multiple MSVC warnings 2023-02-25 11:06:14 +01:00
6e2c0472c6 Do not compile empty files 2023-02-25 11:05:38 +01:00
c0a1054a54 Added "brew update" 2023-02-25 10:10:49 +01:00
ed638bb5fc Fixed marine charts rendering 2023-02-24 20:00:50 +01:00
ae3d190e08 Do not unnecessary convert the image tiles to pixmaps 2023-02-23 22:46:45 +01:00
a5916cad90 Make the MSVC2019 Debug builds compile 2023-02-23 22:45:42 +01:00
aea8402016 Version++ 2023-02-22 23:31:26 +01:00
7a53fb8e01 Remove the qpainter/qimage draw workaround
Seems to be fixed in newer Qt versions and it did not properly work in older
Qt versions anyway...
2023-02-22 23:22:18 +01:00
f952e02535 Allow arbitrary large images
GeoTIFFs can be very huge, the limit of 128MB set in Qt6 is not sufficient for
real-life aerial images. Behave like Qt5 with no limit.
2023-02-22 22:45:18 +01:00
9538d15d79 Fixed centroid computation 2023-02-19 14:47:57 +01:00
8a9b7dc7ec Fixed CodeQL build setup 2023-02-18 12:17:19 +01:00
9149ea9f56 Synchronize the ts files with the current sources 2023-02-18 11:49:12 +01:00
eb665324ad Translated using Weblate (Italian)
Currently translated at 89.9% (419 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/it/
2023-02-18 11:13:39 +01:00
588278d015 Translated using Weblate (Spanish)
Currently translated at 75.9% (354 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/es/
2023-02-18 11:13:39 +01:00
491e020677 Translated using Weblate (French)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
2023-02-18 10:55:52 +01:00
05aaece28d Merge branch 'origin/master' into Weblate. 2023-02-16 01:13:57 +01:00
be983ff779 Version++ 2023-02-16 01:13:50 +01:00
fef7300f2f Merge branch 'origin/master' into Weblate. 2023-02-15 01:54:39 +01:00
7febd2971e Fixed GeoJSON waypoint properties parsing 2023-02-15 01:40:28 +01:00
211ff46487 Report the correct error message on invalid "when" tag 2023-02-15 01:39:33 +01:00
2cd084443a Merge branch 'origin/master' into Weblate. 2023-02-14 00:59:04 +01:00
b7415ca2c9 Fixed areas digital zoom handling 2023-02-14 00:58:44 +01:00
bbdb473931 Merge branch 'origin/master' into Weblate. 2023-02-14 00:55:59 +01:00
dec70f6bfe Fixed area items hovering 2023-02-14 00:55:55 +01:00
4f661128ba Do not load into memory files that are definitely not JSON files 2023-02-14 00:55:55 +01:00
15bc9ac774 Fixed NMEA line limit check 2023-02-14 00:55:55 +01:00
f8fa104ff3 Translated using Weblate (Korean)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ko/
2023-02-11 01:57:20 +01:00
d26842efd3 Update gpxsee.desktop (#479) 2023-02-10 08:39:21 +01:00
1480f8ad02 Cosmetics 2023-02-10 00:17:07 +01:00
b73ad9772f Fixed broken waypoint settings 2023-02-10 00:16:16 +01:00
e6bc548524 Merge remote-tracking branch 'weblate/master' 2023-02-09 00:37:04 +01:00
0d71e34665 Translated using Weblate (Danish)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/da/
2023-02-09 00:36:28 +01:00
f575e79a70 Merge remote-tracking branch 'weblate/master' 2023-02-09 00:35:58 +01:00
903b73d9a4 Set OpenStreetMap as the default map 2023-02-09 00:35:22 +01:00
42f2f3377b Merge branch 'origin/master' into Weblate. 2023-02-07 23:13:13 +01:00
3b798e627b Be much more greedy when promoting the supported file types
File association on Android is broken by design resulting in two options:
1) associate almost everything
2) associate only some extensions which does not work most of the time

Lets choose #1
2023-02-07 23:09:10 +01:00
be5291a6c6 Merge branch 'origin/master' into Weblate. 2023-02-07 00:32:51 +01:00
7bb2c3a09d Added Android "desktop" integration 2023-02-07 00:32:36 +01:00
5467b55ff2 Translated using Weblate (Finnish)
Currently translated at 97.4% (454 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-02-06 00:41:05 +01:00
820350d60b Fixed Android build 2023-02-05 00:06:02 +01:00
3801ff7bcb Settings refactoring 2023-02-04 23:59:47 +01:00
3b6e6c03a7 Fix the module name 2023-02-01 22:57:41 +01:00
a1a6fade92 Update the CI configurations to fetch the Qt serialport module 2023-02-01 22:54:59 +01:00
c001235e91 Code cleanup 2023-02-01 22:49:03 +01:00
c01b9da10c Version++
As we require the serialport Qt plugin now, increase the major number.
2023-02-01 22:41:57 +01:00
e4d42453a0 Require the serialport Qt module
The serialport module is a dependency of the nmea positioning plugin. Without
being explicitly specified, the Qt deploy tools skip the nmea positioning plugin
when creating the application package.
2023-02-01 22:36:41 +01:00
d6d316676c Properly use the default positioning plugin as the default option 2023-02-01 22:26:36 +01:00
973abedf3e A better current path macro 2023-02-01 09:41:18 +01:00
505f01a990 Code cleanup 2023-01-31 19:21:14 +01:00
78b091fbbc Fixed license info 2023-01-31 19:20:30 +01:00
80ec7f624e Moved maps and csv from pkg to data 2023-01-26 01:51:46 +01:00
bfeb6d266e Some more iso8211 code cleanup 2023-01-26 01:13:15 +01:00
af3e5d41c2 Split the config header to config+hash headers 2023-01-26 01:11:56 +01:00
51511a9bf9 Fixed broken parsing of KML tracks with empty coordinates 2023-01-25 09:01:20 +01:00
2549204662 Use CFBundleLocalizations instead of lproj directories 2023-01-24 23:01:40 +01:00
b826c856fc Extended Info.plist with some more bundle info 2023-01-24 09:19:13 +01:00
1afe74242a Properly handle locales with sub-languages 2023-01-24 08:33:48 +01:00
b43412b135 Added Korean localization 2023-01-23 23:48:00 +01:00
bbad4eb8d9 Merge branch 'origin/master' into Weblate. 2023-01-23 23:10:54 +01:00
f6c128fbf6 Create localization lproj directories on OS X
+ pkg dir structure cleanup
2023-01-23 23:11:05 +01:00
b955c4d45e Translated using Weblate (Korean)
Currently translated at 100.0% (440 of 440 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ko/
2023-01-23 15:50:01 +01:00
e26a776576 Translated using Weblate (Esperanto)
Currently translated at 93.1% (434 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2023-01-23 15:49:59 +01:00
52c4e97be5 Translated using Weblate (Russian)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2023-01-23 15:49:59 +01:00
49bd2b9501 Translated using Weblate (Finnish)
Currently translated at 97.2% (453 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2023-01-23 15:49:59 +01:00
ab76521990 ISO8211 API cleanup 2023-01-19 10:08:17 +01:00
ee73908231 Do not treat Ozimaps as directories
Directory parsing was stopped at the level of the map which is not what we
want - users would have to create separate directories for every Ozimap.
2023-01-19 10:04:03 +01:00
3af98b6785 Fixed typo 2023-01-16 21:16:20 +01:00
05657ccdce Version++ 2023-01-15 10:10:48 +01:00
a698aa96cd Trying to fix the Android CI build...
no. 5
2023-01-14 15:20:40 +01:00
a7fef63461 Trying to fix the Android CI build...
no. 4
2023-01-14 15:08:58 +01:00
83217d31a7 Trying to fix the Android CI build...
no. 3
2023-01-14 14:46:45 +01:00
4191f5414f Trying to fix the Android CI build...
no. 2
2023-01-14 14:20:04 +01:00
bf81994aa0 Trying to fix the Android CI build... 2023-01-14 14:00:43 +01:00
21c02010f7 Improved marine charts render style 2023-01-14 13:00:36 +01:00
c209e24db8 Optimization/code cleanup 2023-01-14 08:45:18 +01:00
9ff7ecea97 ENC signal stations 2023-01-11 23:03:54 +01:00
78e3c78197 Added safety zone lines 2023-01-09 23:58:03 +01:00
38cd871178 Cleanup 2023-01-05 22:13:26 +01:00
5594bf74b6 Run the CodeQL action manually only 2023-01-05 22:02:25 +01:00
65515143eb Added missing include guard prefix 2023-01-05 21:44:03 +01:00
29895420b6 Fixed broken temperature units translations 2023-01-01 16:54:44 +01:00
88f7e13500 Added alignment check 2022-12-23 08:35:59 +01:00
51335a0f84 Added missing build dependencies 2022-12-16 16:34:32 +01:00
077cc20934 Create codeql.yml 2022-12-16 16:23:59 +01:00
ae49e9f2fd Turbulences and pilot boarding places 2022-12-10 18:41:35 +01:00
ca3e0eda49 Yet another ENC style improvement 2022-12-10 11:59:48 +01:00
d33716e3af Various ENC render style enhancements 2022-12-08 00:29:39 +01:00
ff2dd6cdec Code cleanup 2022-12-05 08:52:27 +01:00
3dfb3caf40 @#$%^&! Gimp 2022-12-04 23:13:40 +01:00
7900e88907 Some more ENC style improvements 2022-12-04 23:09:59 +01:00
9b90cf5783 Fixed display order 2022-12-04 19:32:55 +01:00
ed8791a847 Version++ 2022-12-04 12:41:31 +01:00
b7ea02bc44 Some more ENC style improvements and fixes 2022-12-04 12:39:47 +01:00
07954b7d1a Prohibited areas 2022-11-26 19:22:09 +01:00
08dbb315cb Turning basins 2022-11-26 16:51:12 +01:00
82b8314b74 Some more ENC stuff 2022-11-26 15:14:41 +01:00
12b17487ac Some more ENC render style enhancements 2022-11-26 13:05:08 +01:00
a05098f502 Fixed render order 2022-11-25 23:23:08 +01:00
4cfb967e39 Some more ENC render style improvements 2022-11-25 23:20:35 +01:00
04f45013eb Some more inland wates ECDIS style fixes/improvements 2022-11-25 02:16:17 +01:00
0c8a77a4ca Fixed broken inland ECDIS styles 2022-11-24 09:34:03 +01:00
03c9dbd2a7 Back to Qt 6.4.0 2022-11-23 20:54:55 +01:00
2a2cd5ff59 Use Qt 6.4.1 for Android CI builds 2022-11-23 20:40:09 +01:00
3b134d52aa Distinguish some more OSs 2022-11-23 20:20:35 +01:00
5fbc95f206 Version++ 2022-11-20 08:43:12 +01:00
f47a5e50ad MORFAC & CRANES rendering 2022-11-19 23:55:17 +01:00
0c5076eaaf Added missing fences rendering 2022-11-19 16:15:50 +01:00
2438150679 Updated github action components 2022-11-19 13:20:46 +01:00
d04c070fe1 Fixed typo 2022-11-17 22:03:30 +01:00
ac5f4cafeb Code cleanup 2022-11-17 13:26:45 +01:00
ccb0364e76 Some more missing ENC objects 2022-11-17 13:05:38 +01:00
414bdead17 Docks render style 2022-11-17 10:37:05 +01:00
8cf09a68d1 Some more missing ENC render style 2022-11-17 08:25:53 +01:00
e4c79d7275 Added missing dams and pylons rendering 2022-11-16 22:51:16 +01:00
a718f1e122 Properly handle non-ASCII characters
(Support for UCS-2 encoded files is still missing as there is no such sample
file available.)
2022-11-16 22:47:30 +01:00
6507764545 Version++ 2022-11-16 00:39:23 +01:00
bd2d66ecd3 Added traffic lines arrows 2022-11-14 22:29:27 +01:00
c09525f306 Fixed map order 2022-11-14 07:09:46 +01:00
5bc7487c3a Still wrong... Fixed the broken mask. 2022-11-11 11:26:15 +01:00
9b73b0f70e Fixed broken points ordering 2022-11-11 10:40:59 +01:00
4f1f3e569b Limit ENC maps zooms
+ somemore style adjustments
2022-11-10 23:53:34 +01:00
e4847ac243 Some more ENC objects to render 2022-11-10 09:43:14 +01:00
8b039cb9a7 Merge branch 'origin/master' into Weblate. 2022-11-10 07:34:02 +01:00
37bff3d50c Version++ 2022-11-10 07:33:51 +01:00
70941405ad Merge branch 'origin/master' into Weblate. 2022-11-09 23:13:26 +01:00
c96a0fd8f4 Added missing traffic separation line style 2022-11-09 23:12:40 +01:00
5ad8f762f7 Merge branch 'origin/master' into Weblate. 2022-11-09 21:38:28 +01:00
raf
297f5f13fb Translated using Weblate (Catalan)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2022-11-09 21:38:27 +01:00
985ccaf931 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-11-09 21:38:27 +01:00
877d9331e4 ENC map style enhancement
+ code cleanup
2022-11-09 21:37:33 +01:00
9d8c23bc32 Fixed crash on ENC map unload 2022-11-09 21:37:05 +01:00
51dd85f973 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-11-08 13:04:32 +01:00
af688314fb Define symbols draw order 2022-11-08 01:16:38 +01:00
1946c3cc6f Image polygon lines 2022-11-08 00:38:45 +01:00
8ae8c3b0a3 Added missing 000 files association 2022-11-06 22:13:53 +01:00
733b018350 Updated README info 2022-11-06 16:09:41 +01:00
810e999068 Removed unused header include 2022-11-06 16:00:51 +01:00
6de21ff702 Merge branch 'origin/master' into Weblate. 2022-11-06 15:31:18 +01:00
b13bac3af9 Use asynchronous tile rendering in ENC maps 2022-11-06 15:26:28 +01:00
294490bb12 Merge branch 'origin/master' into Weblate. 2022-11-06 14:20:55 +01:00
e1d1842fa6 Fixed error handling 2022-11-06 14:20:19 +01:00
ae4405ca9d Merge branch 'origin/master' into Weblate. 2022-11-06 12:33:32 +01:00
59523f46ef Rather read the files twice than storing all the data in memory 2022-11-06 12:33:24 +01:00
75100cd500 Added unsurveyed area render style 2022-11-06 10:12:45 +01:00
f138323f5a Translated using Weblate (German)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2022-11-06 08:42:00 +01:00
18618aadb9 Translated using Weblate (Hungarian)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-11-06 08:41:02 +01:00
a7c698fc27 Translated using Weblate (Turkish)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-11-06 08:41:02 +01:00
ddb072e1df Translated using Weblate (Swedish)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-11-06 08:41:02 +01:00
091393ad5f Translated using Weblate (Czech)
Currently translated at 100.0% (466 of 466 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2022-11-06 08:41:02 +01:00
f277a0368a OS X ENC desktop integration 2022-11-05 23:54:37 +01:00
015598b951 ENC inland waters style hack 2022-11-05 20:38:08 +01:00
67209c4ad5 Do not outline soundings 2022-11-05 17:43:32 +01:00
d215e881f6 Localization update 2022-11-05 17:25:38 +01:00
13aa45d3ca ENC Linux & Windows desktop integration 2022-11-05 17:24:32 +01:00
3385fc86d3 Code cleanup 2022-11-05 14:08:08 +01:00
fdd3613c4a Drop the unused lines background drawing 2022-11-05 13:41:13 +01:00
4ce5dfbcf9 Yet another ENC style improvement 2022-11-05 13:34:01 +01:00
2b34140746 Icons structure cleanup 2022-11-05 10:12:14 +01:00
0dee97dc54 Improved ENC render style 2022-11-05 09:47:13 +01:00
8ef1aa0f40 Added missing attributes header file 2022-11-04 22:51:54 +01:00
5ef31f47f2 Improved ENC style 2022-11-04 22:47:21 +01:00
cc2703e71d ENC parser optimizations 2022-11-04 09:53:37 +01:00
37f9d97a9e Cosmetics 2022-11-04 09:34:54 +01:00
e8f3d028dd Fixed build with some Qt versions
+ ENC style enhancements
2022-11-04 09:22:17 +01:00
f8d856b7ee Added support for ENC maps 2022-11-04 09:03:36 +01:00
a2e22cd93b Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-10-16 11:29:55 +02:00
0f56e40d04 Merge branch 'origin/master' into Weblate. 2022-10-12 23:36:47 +02:00
073f4dc9b6 Version++ 2022-10-12 23:36:33 +02:00
94b1815e81 Some more missing marine style stuff 2022-10-12 23:34:47 +02:00
befe8b8ed8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-10-10 20:10:31 +02:00
2abc9ae246 Added android:exported required in SDK 31 2022-10-08 19:39:15 +02:00
4543311c95 Set Android target SDK version to 31 2022-10-08 19:14:19 +02:00
7bc5021989 Switched CI builds to Qt 6.4 2022-10-08 15:38:36 +02:00
26d2bc4f5d Preserve the configured path line style when no style is provided in the data 2022-10-07 21:54:39 +02:00
20f4f72999 Merge remote-tracking branch 'weblate/master' 2022-10-04 18:36:43 +02:00
cf62368ffc Version++ 2022-10-04 18:36:20 +02:00
072ba10e65 Merge branch 'origin/master' into Weblate. 2022-10-03 00:38:01 +02:00
76b0e9ac2f Do not depend on a specific Style/StyleMap element order 2022-10-03 00:36:38 +02:00
raf
530a54e924 Translated using Weblate (Catalan)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2022-09-29 10:17:52 +02:00
3b1a4f2ccb Translated using Weblate (German)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2022-09-26 23:00:34 +02:00
723f994527 Translated using Weblate (Czech)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2022-09-26 22:59:06 +02:00
743747979e Merge branch 'origin/master' into Weblate. 2022-09-26 22:51:55 +02:00
579d8a5c6e Updated USGS maps (zoom 16) 2022-09-26 22:51:46 +02:00
a019ff3930 OziExplorer files styles support 2022-09-26 22:51:17 +02:00
05bcbddf77 Fixed multiple gx::track parsing issues 2022-09-26 22:50:40 +02:00
e18ac6da02 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-09-26 15:23:51 +02:00
e87999573a Translated using Weblate (Hungarian)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-09-26 15:23:51 +02:00
6407dfabea Translated using Weblate (Turkish)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-09-26 15:23:51 +02:00
f8fe454e72 Translated using Weblate (Swedish)
Currently translated at 100.0% (465 of 465 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-09-26 15:23:51 +02:00
ad2f108fa8 Localization update 2022-09-25 11:06:31 +02:00
418b1a8614 Added missing "use styles" setting save/restore 2022-09-25 11:05:13 +02:00
a59e7a058d Made data styles usage configurable 2022-09-25 02:15:24 +02:00
36b5746456 Fixed MultiGeometry handling 2022-09-24 13:20:58 +02:00
c0f2c1b7ad Fixed Qt6 build 2022-09-23 23:57:58 +02:00
1921087346 Multiple data styles fixes 2022-09-23 21:36:02 +02:00
a8299050c5 Added support for "data defined" styles 2022-09-23 02:35:09 +02:00
e8e1e98775 Version++ 2022-09-14 22:31:53 +02:00
6768647070 Fixed broken zoom 0 on HiDPI displays 2022-09-14 00:21:50 +02:00
de63009edd Enabled Catalan localization 2022-09-06 09:31:27 +02:00
raf
125f99e8f4 Translated using Weblate (Catalan)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2022-09-06 00:36:06 +02:00
raf
092929a967 Translated using Weblate (Catalan)
Currently translated at 63.3% (294 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/
2022-09-02 23:20:28 +02:00
554 changed files with 26282 additions and 17296 deletions

View File

@ -1,23 +1,23 @@
version: 11.4.{build} version: 13.8.{build}
configuration: configuration:
- Release - Release
image: image:
- Visual Studio 2019 - Visual Studio 2022
environment: environment:
NSISDIR: C:\Program Files (x86)\NSIS NSISDIR: C:\Program Files (x86)\NSIS
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
matrix: matrix:
- QTDIR: C:\Qt\5.15\msvc2019_64 - QTDIR: C:\Qt\5.15\msvc2019_64
- QTDIR: C:\Qt\6.3\msvc2019_64 - QTDIR: C:\Qt\6.5\msvc2019_64
NSISDEF: /DQT6 NSISDEF: /DQT6
install: install:
- cmd: |- - cmd: |-
set PATH=%QTDIR%\bin;%NSISDIR%;%PATH% set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
build_script: build_script:
- cmd: |- - cmd: |-
@ -28,9 +28,9 @@ build_script:
md installer md installer
copy release\GPXSee.exe installer copy release\GPXSee.exe installer
windeployqt --release installer\GPXSee.exe windeployqt --release installer\GPXSee.exe
copy pkg\gpxsee64.nsi installer copy pkg\windows\gpxsee64.nsi installer
xcopy pkg\csv installer\csv /i xcopy data\CRS installer\CRS /i
xcopy pkg\maps installer\maps /i xcopy data\maps installer\maps /i
xcopy lang\*.qm installer\translations\ /sy xcopy lang\*.qm installer\translations\ /sy
xcopy icons\symbols installer\symbols /i xcopy icons\symbols installer\symbols /i
copy licence.txt installer copy licence.txt installer

View File

@ -22,22 +22,22 @@ jobs:
- name: Run sdkmanager update - name: Run sdkmanager update
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- name: Install android platform, platform-tools, build-tools and ndk - name: Install android platform, platform-tools, build-tools and ndk
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670" 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 - name: Setup NDK path
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
- name: Install Qt (Desktop) - name: Install Qt (Desktop)
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v3
with: with:
aqtversion: '==2.1.0' aqtversion: '==3.1.*'
version: '6.3.1' version: '6.4.0'
- name: Install Qt (Android) - name: Install Qt (Android)
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v3
with: with:
aqtversion: '==2.1.0' aqtversion: '==3.1.*'
version: '6.3.1' version: '6.4.0'
target: 'android' target: 'android'
arch: 'android_armv7' arch: 'android_arm64_v8a'
modules: qtpositioning qt5compat modules: qtimageformats qtpositioning qtserialport qt5compat
- name: Install Android OpenSSL - name: Install Android OpenSSL
run: git clone https://github.com/KDAB/android_openssl.git run: git clone https://github.com/KDAB/android_openssl.git
- name: Create localization - name: Create localization
@ -47,7 +47,7 @@ jobs:
- name: Build project - name: Build project
run: make -j2 apk run: make -j2 apk
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: GPXSee-armv7.apk name: GPXSee-arm64_v8a.apk
path: android-build/build/outputs/apk/debug/android-build-debug.apk path: android-build/build/outputs/apk/debug/android-build-debug.apk

45
.github/workflows/codeql.yml vendored Normal file
View File

@ -0,0 +1,45 @@
name: "CodeQL"
on: [workflow_dispatch]
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'cpp' ]
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install dependencies
run: |
sudo apt-get update
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@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"

View File

@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev 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: Create localization - name: Create localization
run: lrelease gpxsee.pro run: lrelease gpxsee.pro
- name: Configure build - name: Configure build

View File

@ -10,12 +10,12 @@ jobs:
name: GPXSee Qt5 build name: GPXSee Qt5 build
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Install dependencies - name: Install Qt
run: brew install qt5 uses: jurplel/install-qt-action@v3
with:
version: '5.15.2'
- name: Create localization - name: Create localization
run: lrelease gpxsee.pro run: lrelease gpxsee.pro
- name: Configure build - name: Configure build
@ -23,9 +23,9 @@ jobs:
- name: Build project - name: Build project
run: make -j3 run: make -j3
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg run: macdeployqt GPXSee.app -dmg -appstore-compliant
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: GPXSee-qt5.dmg name: GPXSee-qt5.dmg
path: GPXSee.dmg path: GPXSee.dmg
@ -34,22 +34,23 @@ jobs:
name: GPXSee Qt6 build name: GPXSee Qt6 build
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Install dependencies - name: Install Qt
run: brew install qt6 uses: jurplel/install-qt-action@v3
with:
version: '6.5.1'
modules: qtpositioning qt5compat qtserialport
- name: Create localization - name: Create localization
run: lrelease gpxsee.pro run: lrelease gpxsee.pro
- name: Configure build - name: Configure build
run: qmake gpxsee.pro run: qmake gpxsee.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64"
- name: Build project - name: Build project
run: make -j3 run: make -j3
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg run: macdeployqt GPXSee.app -dmg -appstore-compliant
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: GPXSee-qt6.dmg name: GPXSee-qt6.dmg
path: GPXSee.dmg path: GPXSee.dmg

View File

@ -9,9 +9,9 @@ GPS log file formats.
* User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS,
QuadTiles). QuadTiles).
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, * Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps, Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts,
AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps, ENC charts, KMZ maps, AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps,
QCT maps, GEMF maps, Osmdroid SQLite maps, Orux maps, Mapsforge vector maps, QCT maps, GEMF maps, Osmdroid SQLite maps, Orux maps,
ESRI World-File georeferenced images). ESRI World-File georeferenced images).
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
graphs. graphs.
@ -29,7 +29,7 @@ GPS log file formats.
## Build ## Build
Build requirements: Build requirements:
* Qt5 >= 5.11 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: msvc2017, gcc 7.5.0, clang/Apple LLVM version * C++11 or newer compiler (tested: msvc2019, gcc 7.5.0, clang/Apple LLVM version
10.0.0) 10.0.0)
Build steps: Build steps:
@ -64,7 +64,7 @@ GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
different, GPL compatible, licenses: different, GPL compatible, licenses:
* [Oxygen icons](icons/GUI) - LGPLv3 * [Oxygen icons](icons/GUI) - LGPLv3
* [Mapbox Maki icons](icons/IMG/POI) - CC0 * [Mapbox Maki icons](icons/map/POI) - CC0
* [Map Icons Collection](icons/symbols) - CC BY SA 3.0 * [Map Icons Collection](icons/symbols) - CC BY SA 3.0
* [RTree implementation](src/common/rtree.h) - Public domain * [RTree implementation](src/common/rtree.h) - Public domain
* [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp), * [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
@ -73,5 +73,5 @@ different, GPL compatible, licenses:
[Polyconic](src/map/proj/polyconic.cpp) and [Polyconic](src/map/proj/polyconic.cpp) and
[Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
Source Code Disclaimer Source Code Disclaimer
* [Projection parameters CSV files](pkg/csv) - BSD/EPSG/Public domain * [Projection parameters CSV files](data/CRS) - BSD/EPSG/Public domain
* [Mapsforge render theme](data/default.xml) and its [icons](icons/mapsforge) - LGPLv3 * [Mapsforge render theme](data/mapsforge/default.xml) and its [icons](icons/map/mapsforge) - LGPLv3

View File

@ -345,6 +345,7 @@ FEH2010,5593,1078,9122,7019,8901,9603,0,0,0,,,,
CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,, CIGD11,6135,1100,9122,7019,8901,9603,0,0,0,,,,
Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,, Nepal 1981,6207,1111,9122,7015,8901,9603,293.17,726.18,245.36,,,,
CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926 CGRS93,6311,1112,9122,7030,8901,9607,8.846,-4.394,-1.122,0.00237,0.146528,-0.130428,0.783926
NAD83(2011),6318,1116,9122,7019,8901,9603,0,0,0,,,,
Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,, Mexico ITRF2008,6365,1120,9122,7019,8901,9603,0,0,0,,,,
RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,, RDN2008,6706,1132,9122,7019,8901,9603,0,0,0,,,,
Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,, Aden 1925,6881,1135,9122,7012,8901,9603,-24,-203,268,,,,
1 HD1909 3819 1024 9122 7004 8901 9607 595.48 121.69 515.35 -4.115 2.9383 -0.853 -3.408
345 CIGD11 6135 1100 9122 7019 8901 9603 0 0 0
346 Nepal 1981 6207 1111 9122 7015 8901 9603 293.17 726.18 245.36
347 CGRS93 6311 1112 9122 7030 8901 9607 8.846 -4.394 -1.122 0.00237 0.146528 -0.130428 0.783926
348 NAD83(2011) 6318 1116 9122 7019 8901 9603 0 0 0
349 Mexico ITRF2008 6365 1120 9122 7019 8901 9603 0 0 0
350 RDN2008 6706 1132 9122 7019 8901 9603 0 0 0
351 Aden 1925 6881 1135 9122 7012 8901 9603 -24 -203 268

4370
data/CRS/pcs.csv Normal file

File diff suppressed because it is too large Load Diff

1706
data/CRS/projections.csv Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
<map xmlns="http://www.gpxsee.org/map/1.4"> <map xmlns="http://www.gpxsee.org/map/1.4">
<name>USGS Imagery</name> <name>USGS Imagery</name>
<url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url> <url>https://basemap.nationalmap.gov/ArcGIS/rest/services/USGSImageryOnly/MapServer/tile/$z/$y/$x</url>
<zoom min="2" max="15"/> <zoom min="2" max="16"/>
<bounds bottom="0" top="74"/> <bounds bottom="0" top="74"/>
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright> <copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
</map> </map>

View File

@ -2,6 +2,6 @@
<map xmlns="http://www.gpxsee.org/map/1.4"> <map xmlns="http://www.gpxsee.org/map/1.4">
<name>USGS Topo</name> <name>USGS Topo</name>
<url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url> <url>https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/$z/$y/$x</url>
<zoom min="2" max="15"/> <zoom min="2" max="16"/>
<copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright> <copyright>Map services and data available from U.S. Geological Survey, National Geospatial Program.</copyright>
</map> </map>

View File

@ -871,7 +871,7 @@
<caption fill="#5555AA" font-family="serif" font-size="14" font-style="bold_italic" <caption fill="#5555AA" font-family="serif" font-size="14" font-style="bold_italic"
k="name" priority="20" stroke="#FFFFFF" stroke-width="2.0" /> k="name" priority="20" stroke="#FFFFFF" stroke-width="2.0" />
</rule> </rule>
<rule e="node" k="place" v="isolated_dwelling" zoom-min="15"> <rule e="node" k="place" v="isolated_dwelling|neighbourhood" zoom-min="15">
<caption fill="#333380" font-size="12" font-style="bold" k="name" priority="5" <caption fill="#333380" font-size="12" font-style="bold" k="name" priority="5"
stroke="#FFFFFF" stroke-width="2.0" /> stroke="#FFFFFF" stroke-width="2.0" />
</rule> </rule>
@ -972,22 +972,26 @@
<!-- emergency --> <!-- emergency -->
<rule e="any" k="*" v="*"> <rule e="any" k="*" v="*">
<rule e="any" k="amenity|building" v="hospital|clinic" zoom-min="15"> <rule e="any" k="amenity|building" v="hospital|clinic" zoom-min="14">
<symbol id="hospital" src=":/mapsforge/symbols/health/hospital.svg" /> <symbol id="hospital" src=":/mapsforge/symbols/health/hospital.svg" />
<rule e="any" k="*" v="*" zoom-min="17"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above" <caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above"
priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="hospital" /> priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="hospital" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity" v="pharmacy" zoom-min="13"> <rule e="any" k="amenity" v="pharmacy" zoom-min="15">
<symbol id="pharmacy" src=":/mapsforge/symbols/health/pharmacy.svg" /> <symbol id="pharmacy" src=":/mapsforge/symbols/health/pharmacy.svg" />
<caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above" <rule e="any" k="*" v="*" zoom-min="17">
priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="pharmacy" /> <caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above"
priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="pharmacy" />
</rule>
</rule> </rule>
<rule e="any" k="amenity" v="doctors" zoom-min="14"> <rule e="any" k="amenity" v="doctors" zoom-min="15">
<symbol id="doctors" src=":/mapsforge/symbols/health/doctors2.svg" /> <symbol id="doctors" src=":/mapsforge/symbols/health/doctors2.svg" />
<caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above" <rule e="any" k="*" v="*" zoom-min="17">
priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="doctors" /> <caption fill="#DA0092" font-size="12" font-style="bold" k="name" position="above"
priority="10" stroke="#FFFFFF" stroke-width="2.0" symbol-id="doctors" />
</rule>
</rule> </rule>
<rule e="any" k="amenity|building" v="embassy" zoom-min="17"> <rule e="any" k="amenity|building" v="embassy" zoom-min="17">
<symbol id="embassy" src=":/mapsforge/symbols/poi/embassy2.svg" /> <symbol id="embassy" src=":/mapsforge/symbols/poi/embassy2.svg" />
@ -1040,21 +1044,21 @@
</rule> </rule>
<rule e="any" k="tourism" v="hostel" zoom-min="13"> <rule e="any" k="tourism" v="hostel" zoom-min="13">
<symbol id="hostel" src=":/mapsforge/symbols/accommodation/hostel.svg" /> <symbol id="hostel" src=":/mapsforge/symbols/accommodation/hostel.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2" symbol-id="hostel" /> stroke-width="2" symbol-id="hostel" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="tourism|building" v="hotel|guest_house|motel" zoom-min="13"> <rule e="any" k="tourism|building" v="hotel|guest_house|motel" zoom-min="13">
<symbol id="hotel" src=":/mapsforge/symbols/accommodation/hotel2.svg" /> <symbol id="hotel" src=":/mapsforge/symbols/accommodation/hotel2.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption display="never" fill="#0092DA" font-size="12" font-style="bold" k="name" <caption display="never" fill="#0092DA" font-size="12" font-style="bold" k="name"
stroke="#FFFFFF" stroke-width="2" symbol-id="hotel" /> stroke="#FFFFFF" stroke-width="2" symbol-id="hotel" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="tourism" v="chalet" zoom-min="13"> <rule e="any" k="tourism" v="chalet" zoom-min="13">
<symbol id="chalet" src=":/mapsforge/symbols/accommodation/chalet.svg" /> <symbol id="chalet" src=":/mapsforge/symbols/accommodation/chalet.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2" symbol-id="chalet" /> stroke-width="2" symbol-id="chalet" />
</rule> </rule>
@ -1109,7 +1113,7 @@
<!-- food --> <!-- food -->
<rule e="any" k="*" v="*"> <rule e="any" k="*" v="*">
<rule e="any" k="amenity" v="restaurant" zoom-min="14"> <rule e="any" k="amenity" v="restaurant" zoom-min="15">
<symbol id="restaurant" src=":/mapsforge/symbols/food/restaurant.svg" /> <symbol id="restaurant" src=":/mapsforge/symbols/food/restaurant.svg" />
<rule e="node" k="*" v="*" zoom-min="16"> <rule e="node" k="*" v="*" zoom-min="16">
<caption fill="#734A08" font-size="12" font-style="bold" k="name" position="above" <caption fill="#734A08" font-size="12" font-style="bold" k="name" position="above"
@ -1132,25 +1136,25 @@
<!-- shopping --> <!-- shopping -->
<rule e="any" k="*" v="*"> <rule e="any" k="*" v="*">
<rule e="any" k="shop" v="supermarket|department_store|mall" zoom-min="14"> <rule e="any" k="shop" v="supermarket|department_store|mall" zoom-min="15">
<symbol src=":/mapsforge/symbols/shopping/supermarket.svg" /> <symbol src=":/mapsforge/symbols/shopping/supermarket.svg" />
</rule> </rule>
<rule e="any" k="shop" v="convenience|general|kiosk" zoom-min="14"> <rule e="any" k="shop" v="convenience|general|kiosk" zoom-min="15">
<symbol src=":/mapsforge/symbols/shopping/convenience.svg" /> <symbol src=":/mapsforge/symbols/shopping/convenience.svg" />
</rule> </rule>
<rule e="any" k="shop" v="bakery" zoom-min="14"> <rule e="any" k="shop" v="bakery" zoom-min="15">
<symbol src=":/mapsforge/symbols/shopping/bakery.svg" /> <symbol src=":/mapsforge/symbols/shopping/bakery.svg" />
</rule> </rule>
<rule e="any" k="amenity" v="fuel" zoom-min="13"> <rule e="any" k="amenity" v="fuel" zoom-min="14">
<symbol id="fuel" src=":/mapsforge/symbols/transport/fuel.svg" /> <symbol id="fuel" src=":/mapsforge/symbols/transport/fuel.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="fuel" /> stroke-width="2.0" symbol-id="fuel" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity" v="marketplace" zoom-min="15"> <rule e="any" k="amenity" v="marketplace" zoom-min="15">
<symbol id="marketplace" src=":/mapsforge/symbols/shopping/marketplace.svg" /> <symbol id="marketplace" src=":/mapsforge/symbols/shopping/marketplace.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="marketplace" /> stroke-width="2.0" symbol-id="marketplace" />
</rule> </rule>
@ -1197,14 +1201,14 @@
</rule> </rule>
<rule e="any" k="amenity" v="atm" zoom-min="15"> <rule e="any" k="amenity" v="atm" zoom-min="15">
<symbol id="atm" src=":/mapsforge/symbols/money/atm2.svg" /> <symbol id="atm" src=":/mapsforge/symbols/money/atm2.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" position="above" <caption fill="#666666" font-size="12" font-style="bold" k="name" position="above"
stroke="#FFFFFF" stroke-width="2.0" symbol-id="atm" /> stroke="#FFFFFF" stroke-width="2.0" symbol-id="atm" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity" v="bank" zoom-min="15"> <rule e="any" k="amenity" v="bank" zoom-min="15">
<symbol id="bank" src=":/mapsforge/symbols/money/bank2.svg" /> <symbol id="bank" src=":/mapsforge/symbols/money/bank2.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" position="above" <caption fill="#666666" font-size="12" font-style="bold" k="name" position="above"
stroke="#FFFFFF" stroke-width="2.0" symbol-id="bank" /> stroke="#FFFFFF" stroke-width="2.0" symbol-id="bank" />
</rule> </rule>
@ -1237,35 +1241,35 @@
</rule> </rule>
<rule e="any" k="leisure" v="playground" zoom-min="16"> <rule e="any" k="leisure" v="playground" zoom-min="16">
<symbol id="playground" src=":/mapsforge/symbols/amenity/playground.svg" /> <symbol id="playground" src=":/mapsforge/symbols/amenity/playground.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="playground" /> stroke-width="2.0" symbol-id="playground" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity" v="kindergarten" zoom-min="17"> <rule e="any" k="amenity" v="kindergarten" zoom-min="17">
<symbol id="nursery" src=":/mapsforge/symbols/education/nursery3.svg" /> <symbol id="nursery" src=":/mapsforge/symbols/education/nursery3.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="nursery" /> stroke-width="2.0" symbol-id="nursery" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity|building" v="library" zoom-min="17"> <rule e="any" k="amenity|building" v="library" zoom-min="17">
<symbol id="library" src=":/mapsforge/symbols/amenity/library.svg" /> <symbol id="library" src=":/mapsforge/symbols/amenity/library.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="library" /> stroke-width="2.0" symbol-id="library" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity|building" v="school" zoom-min="17"> <rule e="any" k="amenity|building" v="school" zoom-min="17">
<symbol id="school" src=":/mapsforge/symbols/education/school.svg" /> <symbol id="school" src=":/mapsforge/symbols/education/school.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#39AC39" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="school" /> stroke-width="2.0" symbol-id="school" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="amenity" v="theatre" zoom-min="17"> <rule e="any" k="amenity" v="theatre" zoom-min="17">
<symbol id="theatre" src=":/mapsforge/symbols/tourist/theatre.svg" /> <symbol id="theatre" src=":/mapsforge/symbols/tourist/theatre.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#734A08" font-size="12" font-style="bold" k="name" stroke="#FFFFFF" <caption fill="#734A08" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
stroke-width="2.0" symbol-id="theatre" /> stroke-width="2.0" symbol-id="theatre" />
</rule> </rule>
@ -1343,25 +1347,25 @@
</rule> </rule>
<rule e="node" k="man_made" v="lighthouse" zoom-min="14"> <rule e="node" k="man_made" v="lighthouse" zoom-min="14">
<symbol id="lighthouse" src=":/mapsforge/symbols/transport/lighthouse.svg" /> <symbol id="lighthouse" src=":/mapsforge/symbols/transport/lighthouse.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#0092DA" font-size="12" font-style="bold" k="name" position="above" <caption fill="#0092DA" font-size="12" font-style="bold" k="name" position="above"
stroke="#FFFFFF" stroke-width="2.0" symbol-id="lighthouse" /> stroke="#FFFFFF" stroke-width="2.0" symbol-id="lighthouse" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="building" v="church|cathedral|chapel" zoom-min="14"> <rule e="any" k="building" v="church|cathedral|chapel" zoom-min="15">
<symbol src=":/mapsforge/symbols/place_of_worship/christian.svg" /> <symbol src=":/mapsforge/symbols/place_of_worship/christian.svg" />
</rule> </rule>
<rule e="any" k="amenity" v="place_of_worship" zoom-min="14"> <rule e="any" k="amenity" v="place_of_worship" zoom-min="15">
<rule e="any" k="religion" v="buddhist"> <rule e="any" k="religion" v="buddhist">
<symbol id="buddhist" src=":/mapsforge/symbols/place_of_worship/buddhist.svg" /> <symbol id="buddhist" src=":/mapsforge/symbols/place_of_worship/buddhist.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="buddhist" /> position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="buddhist" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="religion" v="christian"> <rule e="any" k="religion" v="christian">
<symbol id="christian" src=":/mapsforge/symbols/place_of_worship/christian.svg" /> <symbol id="christian" src=":/mapsforge/symbols/place_of_worship/christian.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" position="above" stroke="#FFFFFF" stroke-width="2.0"
symbol-id="christian" /> symbol-id="christian" />
@ -1369,35 +1373,35 @@
</rule> </rule>
<rule e="any" k="religion" v="hindu"> <rule e="any" k="religion" v="hindu">
<symbol id="hindu" src=":/mapsforge/symbols/place_of_worship/hindu.svg" /> <symbol id="hindu" src=":/mapsforge/symbols/place_of_worship/hindu.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="hindu" /> position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="hindu" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="religion" v="jewish"> <rule e="any" k="religion" v="jewish">
<symbol id="jewish" src=":/mapsforge/symbols/place_of_worship/jewish.svg" /> <symbol id="jewish" src=":/mapsforge/symbols/place_of_worship/jewish.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="jewish" /> position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="jewish" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="religion" v="muslim"> <rule e="any" k="religion" v="muslim">
<symbol id="muslim" src=":/mapsforge/symbols/place_of_worship/islamic.svg" /> <symbol id="muslim" src=":/mapsforge/symbols/place_of_worship/islamic.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="muslim" /> position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="muslim" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="religion" v="shinto"> <rule e="any" k="religion" v="shinto">
<symbol id="shinto" src=":/mapsforge/symbols/place_of_worship/shinto.svg" /> <symbol id="shinto" src=":/mapsforge/symbols/place_of_worship/shinto.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="shinto" /> position="above" stroke="#FFFFFF" stroke-width="2.0" symbol-id="shinto" />
</rule> </rule>
</rule> </rule>
<rule e="any" k="religion" v="~|*"> <rule e="any" k="religion" v="~|*">
<symbol id="religion-unknown" src=":/mapsforge/symbols/place_of_worship/unknown.svg" /> <symbol id="religion-unknown" src=":/mapsforge/symbols/place_of_worship/unknown.svg" />
<rule e="any" k="*" v="*" zoom-min="18"> <rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#666666" font-size="12" font-style="bold" k="name" <caption fill="#666666" font-size="12" font-style="bold" k="name"
position="above" stroke="#FFFFFF" stroke-width="2.0" position="above" stroke="#FFFFFF" stroke-width="2.0"
symbol-id="religion-unknown" /> symbol-id="religion-unknown" />
@ -1409,15 +1413,15 @@
<!-- sports --> <!-- sports -->
<rule e="any" k="*" v="*"> <rule e="any" k="*" v="*">
<rule e="any" k="leisure" v="water_park" zoom-min="14"> <rule e="any" k="leisure" v="water_park" zoom-min="15">
<symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" /> <symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" />
</rule> </rule>
<rule e="way" k="leisure" v="~" zoom-min="14"> <rule e="way" k="leisure" v="~" zoom-min="15">
<rule e="way" k="sport" v="swimming"> <rule e="way" k="sport" v="swimming">
<symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" /> <symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" />
</rule> </rule>
</rule> </rule>
<rule e="node" k="sport" v="swimming" zoom-min="14"> <rule e="node" k="sport" v="swimming" zoom-min="15">
<symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" /> <symbol src=":/mapsforge/symbols/sport/swimming_outdoor.svg" />
</rule> </rule>
<rule e="any" k="sport" v="soccer" zoom-min="16"> <rule e="any" k="sport" v="soccer" zoom-min="16">

View File

@ -3,7 +3,8 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 11.4 VERSION = 13.8
QT += core \ QT += core \
gui \ gui \
@ -14,7 +15,8 @@ QT += core \
widgets \ widgets \
printsupport \ printsupport \
positioning \ positioning \
svg svg \
serialport
greaterThan(QT_MAJOR_VERSION, 5) { greaterThan(QT_MAJOR_VERSION, 5) {
QT += openglwidgets \ QT += openglwidgets \
core5compat core5compat
@ -25,10 +27,11 @@ INCLUDEPATH += ./src
HEADERS += src/common/config.h \ HEADERS += src/common/config.h \
src/GUI/crosshairitem.h \ src/GUI/crosshairitem.h \
src/GUI/motioninfoitem.h \ src/GUI/motioninfoitem.h \
src/GUI/navigationwidget.h \
src/GUI/pluginparameters.h \ src/GUI/pluginparameters.h \
src/common/garmin.h \ src/common/garmin.h \
src/common/coordinates.h \ src/common/coordinates.h \
src/common/hash.h \
src/common/linec.h \
src/common/range.h \ src/common/range.h \
src/common/rectc.h \ src/common/rectc.h \
src/common/textcodec.h \ src/common/textcodec.h \
@ -43,6 +46,7 @@ HEADERS += src/common/config.h \
src/common/downloader.h \ src/common/downloader.h \
src/common/polygon.h \ src/common/polygon.h \
src/common/color.h \ src/common/color.h \
src/common/csv.h \
src/GUI/authenticationwidget.h \ src/GUI/authenticationwidget.h \
src/GUI/axislabelitem.h \ src/GUI/axislabelitem.h \
src/GUI/dirselectwidget.h \ src/GUI/dirselectwidget.h \
@ -114,8 +118,21 @@ HEADERS += src/common/config.h \
src/GUI/pngexportdialog.h \ src/GUI/pngexportdialog.h \
src/GUI/timezoneinfo.h \ src/GUI/timezoneinfo.h \
src/GUI/passwordedit.h \ src/GUI/passwordedit.h \
src/data/style.h \
src/data/twonavparser.h \ src/data/twonavparser.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/section.h \ src/map/IMG/section.h \
src/map/IMG/zoom.h \
src/map/conversion.h \
src/map/encatlas.h \
src/map/encjob.h \
src/map/encmap.h \
src/map/ENC/iso8211.h \
src/map/gemfmap.h \ src/map/gemfmap.h \
src/map/oruxmap.h \ src/map/oruxmap.h \
src/map/osmdroidmap.h \ src/map/osmdroidmap.h \
@ -130,7 +147,7 @@ HEADERS += src/common/config.h \
src/map/proj/krovak.h \ src/map/proj/krovak.h \
src/map/proj/polarstereographic.h \ src/map/proj/polarstereographic.h \
src/map/proj/obliquestereographic.h \ src/map/proj/obliquestereographic.h \
src/map/IMG/bitmapline.h \ src/map/bitmapline.h \
src/map/IMG/bitstream.h \ src/map/IMG/bitstream.h \
src/map/IMG/deltastream.h \ src/map/IMG/deltastream.h \
src/map/IMG/gmapdata.h \ src/map/IMG/gmapdata.h \
@ -241,7 +258,6 @@ HEADERS += src/common/config.h \
src/data/demloader.h \ src/data/demloader.h \
src/data/area.h \ src/data/area.h \
src/data/exifparser.h \ src/data/exifparser.h \
src/data/csv.h \
src/data/cupparser.h \ src/data/cupparser.h \
src/data/gpiparser.h \ src/data/gpiparser.h \
src/data/address.h \ src/data/address.h \
@ -251,8 +267,8 @@ HEADERS += src/common/config.h \
SOURCES += src/main.cpp \ SOURCES += src/main.cpp \
src/GUI/crosshairitem.cpp \ src/GUI/crosshairitem.cpp \
src/GUI/motioninfoitem.cpp \ src/GUI/motioninfoitem.cpp \
src/GUI/navigationwidget.cpp \
src/GUI/pluginparameters.cpp \ src/GUI/pluginparameters.cpp \
src/GUI/settings.cpp \
src/common/coordinates.cpp \ src/common/coordinates.cpp \
src/common/rectc.cpp \ src/common/rectc.cpp \
src/common/range.cpp \ src/common/range.cpp \
@ -262,6 +278,7 @@ SOURCES += src/main.cpp \
src/common/programpaths.cpp \ src/common/programpaths.cpp \
src/common/tifffile.cpp \ src/common/tifffile.cpp \
src/common/downloader.cpp \ src/common/downloader.cpp \
src/common/csv.cpp \
src/GUI/authenticationwidget.cpp \ src/GUI/authenticationwidget.cpp \
src/GUI/axislabelitem.cpp \ src/GUI/axislabelitem.cpp \
src/GUI/dirselectwidget.cpp \ src/GUI/dirselectwidget.cpp \
@ -321,6 +338,14 @@ SOURCES += src/main.cpp \
src/GUI/projectioncombobox.cpp \ src/GUI/projectioncombobox.cpp \
src/GUI/passwordedit.cpp \ src/GUI/passwordedit.cpp \
src/data/twonavparser.cpp \ src/data/twonavparser.cpp \
src/map/ENC/atlasdata.cpp \
src/map/ENC/mapdata.cpp \
src/map/ENC/rastertile.cpp \
src/map/ENC/style.cpp \
src/map/conversion.cpp \
src/map/encatlas.cpp \
src/map/encmap.cpp \
src/map/ENC/iso8211.cpp \
src/map/gemfmap.cpp \ src/map/gemfmap.cpp \
src/map/oruxmap.cpp \ src/map/oruxmap.cpp \
src/map/osmdroidmap.cpp \ src/map/osmdroidmap.cpp \
@ -334,7 +359,7 @@ SOURCES += src/main.cpp \
src/map/proj/krovak.cpp \ src/map/proj/krovak.cpp \
src/map/proj/polarstereographic.cpp \ src/map/proj/polarstereographic.cpp \
src/map/proj/obliquestereographic.cpp \ src/map/proj/obliquestereographic.cpp \
src/map/IMG/bitmapline.cpp \ src/map/bitmapline.cpp \
src/map/IMG/bitstream.cpp \ src/map/IMG/bitstream.cpp \
src/map/IMG/deltastream.cpp \ src/map/IMG/deltastream.cpp \
src/map/IMG/gmapdata.cpp \ src/map/IMG/gmapdata.cpp \
@ -430,7 +455,6 @@ SOURCES += src/main.cpp \
src/data/dem.cpp \ src/data/dem.cpp \
src/data/demloader.cpp \ src/data/demloader.cpp \
src/data/exifparser.cpp \ src/data/exifparser.cpp \
src/data/csv.cpp \
src/data/cupparser.cpp \ src/data/cupparser.cpp \
src/data/gpiparser.cpp \ src/data/gpiparser.cpp \
src/data/smlparser.cpp \ src/data/smlparser.cpp \
@ -457,23 +481,27 @@ TRANSLATIONS = lang/gpxsee_en.ts \
lang/gpxsee_hu.ts \ lang/gpxsee_hu.ts \
lang/gpxsee_it.ts \ lang/gpxsee_it.ts \
lang/gpxsee_eo.ts \ lang/gpxsee_eo.ts \
lang/gpxsee_zh.ts lang/gpxsee_zh.ts \
lang/gpxsee_ca.ts \
lang/gpxsee_ko.ts
macx { macx {
ICON = icons/app/gpxsee.icns ICON = icons/app/gpxsee.icns
QMAKE_INFO_PLIST = pkg/Info.plist QMAKE_INFO_PLIST = pkg/mac/Info.plist
locale.path = Contents/Resources/translations locale.path = Contents/Resources/translations
locale.files = $$files(lang/*.qm) locale.files = $$files(lang/*.qm)
csv.path = Contents/Resources crs.path = Contents/Resources
csv.files = pkg/csv crs.files = data/CRS
maps.path = Contents/Resources maps.path = Contents/Resources
maps.files = pkg/maps maps.files = data/maps
symbols.path = Contents/Resources/symbols symbols.path = Contents/Resources/symbols
symbols.files = $$files(icons/symbols/*.png) symbols.files = $$files(icons/symbols/*.png)
icons.path = Contents/Resources/icons icons.path = Contents/Resources/icons
icons.files = $$files(icons/formats/*.icns) icons.files = $$files(icons/formats/*.icns)
lproj.path = Contents/Resources
lproj.files = $$files(pkg/mac/lproj/*)
QMAKE_BUNDLE_DATA += locale maps symbols icons csv QMAKE_BUNDLE_DATA += locale maps symbols icons crs lproj
} }
win32 { win32 {
@ -509,7 +537,9 @@ win32 {
icons/formats/ghp.ico \ icons/formats/ghp.ico \
icons/formats/qct.ico \ icons/formats/qct.ico \
icons/formats/trk.ico \ icons/formats/trk.ico \
icons/formats/gemf.ico icons/formats/gemf.ico \
icons/formats/000.ico \
icons/formats/031.ico
DEFINES += _USE_MATH_DEFINES \ DEFINES += _USE_MATH_DEFINES \
NOGDI NOGDI
} }
@ -517,25 +547,30 @@ win32 {
unix:!macx:!android { unix:!macx:!android {
isEmpty(PREFIX):PREFIX = /usr/local isEmpty(PREFIX):PREFIX = /usr/local
maps.files = $$files(pkg/maps/*) maps.files = $$files(data/maps/*)
maps.path = $$PREFIX/share/gpxsee/maps maps.path = $$PREFIX/share/gpxsee/maps
csv.files = $$files(pkg/csv/*) crs.files = $$files(data/CRS/*)
csv.path = $$PREFIX/share/gpxsee/csv crs.path = $$PREFIX/share/gpxsee/CRS
symbols.files = $$files(icons/symbols/*.png) symbols.files = $$files(icons/symbols/*.png)
symbols.path = $$PREFIX/share/gpxsee/symbols symbols.path = $$PREFIX/share/gpxsee/symbols
locale.files = $$files(lang/*.qm) locale.files = $$files(lang/*.qm)
locale.path = $$PREFIX/share/gpxsee/translations locale.path = $$PREFIX/share/gpxsee/translations
icon.files = $$files(icons/app/hicolor/*) icon.files = $$files(icons/app/hicolor/*)
icon.path = $$PREFIX/share/icons/hicolor icon.path = $$PREFIX/share/icons/hicolor
desktop.files = pkg/gpxsee.desktop desktop.files = pkg/linux/gpxsee.desktop
desktop.path = $$PREFIX/share/applications desktop.path = $$PREFIX/share/applications
mime.files = pkg/gpxsee.xml mime.files = pkg/linux/gpxsee.xml
mime.path = $$PREFIX/share/mime/packages mime.path = $$PREFIX/share/mime/packages
appdata.files = pkg/linux/gpxsee.appdata.xml
appdata.path = $$PREFIX/share/metainfo
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
INSTALLS += target maps csv symbols locale icon desktop mime INSTALLS += target maps crs symbols locale icon desktop mime appdata
} }
android { android {
HEADERS += src/GUI/navigationwidget.h
SOURCES += src/GUI/navigationwidget.cpp
defineReplace(versionCode) { defineReplace(versionCode) {
segments = $$split(1, ".") segments = $$split(1, ".")
for (segment, segments): \ for (segment, segments): \
@ -556,6 +591,7 @@ android {
message("OpenSSL not found, building without HTTPS support!") message("OpenSSL not found, building without HTTPS support!")
} }
ANDROID_TARGET_SDK_VERSION = 33
ANDROID_VERSION_NAME = $$VERSION ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME) ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android
@ -564,13 +600,13 @@ android {
pkg/android/build.gradle \ pkg/android/build.gradle \
pkg/android/res/values/libs.xml pkg/android/res/values/libs.xml
maps.files = $$files(pkg/maps/*) maps.files = $$files(data/maps/*)
maps.path = /assets/maps maps.path = /assets/maps
csv.files = $$files(pkg/csv/*) crs.files = $$files(data/CRS/*)
csv.path = /assets/csv crs.path = /assets/CRS
symbols.files = $$files(icons/symbols/*.png) symbols.files = $$files(icons/symbols/*.png)
symbols.path = /assets/symbols symbols.path = /assets/symbols
translations.files = $$files(lang/*.qm) translations.files = $$files(lang/*.qm)
translations.path = /assets/translations translations.path = /assets/translations
INSTALLS += maps csv symbols translations INSTALLS += maps crs symbols translations
} }

View File

@ -55,247 +55,299 @@
<file alias="transform-move_32@2x.png">icons/GUI/transform-move_32@2x.png</file> <file alias="transform-move_32@2x.png">icons/GUI/transform-move_32@2x.png</file>
</qresource> </qresource>
<!-- IMG map style --> <!-- Common map stuff -->
<qresource prefix="/IMG"> <qresource prefix="/map">
<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file> <file alias="arrow.png">icons/map/arrow.png</file>
<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file> <file alias="arrow@2x.png">icons/map/arrow@2x.png</file>
<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file> <file alias="water-arrow.png">icons/map/water-arrow.png</file>
<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file> <file alias="water-arrow@2x.png">icons/map/water-arrow@2x.png</file>
<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file> </qresource>
<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file>
<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file>
<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file>
<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file>
<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file>
<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file>
<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file>
<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file>
<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file>
<file alias="car-11.png">icons/IMG/POI/car-11.png</file>
<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file>
<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file>
<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file>
<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file>
<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file>
<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file>
<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file>
<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file>
<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file>
<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file>
<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file>
<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file>
<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file>
<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file>
<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file>
<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file>
<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file>
<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file>
<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file>
<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file>
<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file>
<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file>
<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file>
<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file>
<file alias="information-11.png">icons/IMG/POI/information-11.png</file>
<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file>
<file alias="library-11.png">icons/IMG/POI/library-11.png</file>
<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file>
<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file>
<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file>
<file alias="park-11.png">icons/IMG/POI/park-11.png</file>
<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file>
<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file>
<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-11.png</file>
<file alias="place-of-worship-11.png">icons/IMG/POI/place-of-worship-11.png</file>
<file alias="police-11.png">icons/IMG/POI/police-11.png</file>
<file alias="post-11.png">icons/IMG/POI/post-11.png</file>
<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file>
<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file>
<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file>
<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file>
<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file>
<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file>
<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file>
<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file>
<file alias="school-11.png">icons/IMG/POI/school-11.png</file>
<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file>
<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file>
<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file>
<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file>
<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file>
<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file>
<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file>
<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file>
<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file>
<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file>
<file alias="village-11.png">icons/IMG/POI/village-11.png</file>
<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file>
<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file>
<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file>
<file alias="light-major.png">icons/IMG/marine/light-major.png</file> <!-- POIs (IMG & ENC style) -->
<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file> <qresource prefix="/POI">
<file alias="buoy.png">icons/IMG/marine/buoy.png</file> <file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
<file alias="beacon.png">icons/IMG/marine/beacon.png</file> <file alias="airport-11.png">icons/map/POI/airport-11.png</file>
<file alias="rock-exposed.png">icons/IMG/marine/rock-exposed.png</file> <file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
<file alias="rock-dangerous.png">icons/IMG/marine/rock-dangerous.png</file> <file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
<file alias="wreck.png">icons/IMG/marine/wreck.png</file> <file alias="bank-11.png">icons/map/POI/bank-11.png</file>
<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file> <file alias="bar-11.png">icons/map/POI/bar-11.png</file>
<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file> <file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
<file alias="obstruction-covers.png">icons/IMG/marine/obstruction-covers.png</file> <file alias="beach-11.png">icons/map/POI/beach-11.png</file>
<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file> <file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
<file alias="noanchor-line.png">icons/IMG/marine/noanchor-line.png</file> <file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
<file alias="cable-line.png">icons/IMG/marine/cable-line.png</file> <file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file> <file alias="bus-11.png">icons/map/POI/bus-11.png</file>
<file alias="cable.png">icons/IMG/marine/cable.png</file> <file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file> <file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
<file alias="anchoring-prohibited.png">icons/IMG/marine/anchoring-prohibited.png</file> <file alias="car-11.png">icons/map/POI/car-11.png</file>
<file alias="church.png">icons/IMG/marine/church.png</file> <file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
<file alias="triangulation-point.png">icons/IMG/marine/triangulation-point.png</file> <file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
<file alias="yacht-harbor.png">icons/IMG/marine/yacht-harbor.png</file> <file alias="casino-11.png">icons/map/POI/casino-11.png</file>
<file alias="pile.png">icons/IMG/marine/pile.png</file> <file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
<file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file> <file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file> <file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
<file alias="tower.png">icons/IMG/marine/tower.png</file> <file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
<file alias="chimney.png">icons/IMG/marine/chimney.png</file> <file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
<file alias="dam-11.png">icons/map/POI/dam-11.png</file>
<file alias="danger-11.png">icons/map/POI/danger-11.png</file>
<file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
<file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
<file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
<file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
<file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
<file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
<file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
<file alias="garden-11.png">icons/map/POI/garden-11.png</file>
<file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
<file alias="golf-11.png">icons/map/POI/golf-11.png</file>
<file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
<file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
<file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
<file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
<file alias="information-11.png">icons/map/POI/information-11.png</file>
<file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
<file alias="library-11.png">icons/map/POI/library-11.png</file>
<file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
<file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
<file alias="museum-11.png">icons/map/POI/museum-11.png</file>
<file alias="park-11.png">icons/map/POI/park-11.png</file>
<file alias="parking-11.png">icons/map/POI/parking-11.png</file>
<file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
<file alias="picnic-site-11.png">icons/map/POI/picnic-site-11.png</file>
<file alias="place-of-worship-11.png">icons/map/POI/place-of-worship-11.png</file>
<file alias="police-11.png">icons/map/POI/police-11.png</file>
<file alias="post-11.png">icons/map/POI/post-11.png</file>
<file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
<file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
<file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
<file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
<file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
<file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
<file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
<file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
<file alias="school-11.png">icons/map/POI/school-11.png</file>
<file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
<file alias="shop-11.png">icons/map/POI/shop-11.png</file>
<file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
<file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
<file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
<file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
<file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
<file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
<file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
<file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
<file alias="village-11.png">icons/map/POI/village-11.png</file>
<file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
<file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
<file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
</qresource>
<!-- 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>
<file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
<file alias="wreck.png">icons/map/marine/wreck.png</file>
<file alias="wreck-exposed.png">icons/map/marine/wreck-exposed.png</file>
<file alias="wreck-dangerous.png">icons/map/marine/wreck-dangerous.png</file>
<file alias="obstruction.png">icons/map/marine/obstruction.png</file>
<file alias="obstruction-covers.png">icons/map/marine/obstruction-covers.png</file>
<file alias="anchor-line.png">icons/map/marine/anchor-line.png</file>
<file alias="noanchor-line.png">icons/map/marine/noanchor-line.png</file>
<file alias="cable-line.png">icons/map/marine/cable-line.png</file>
<file alias="pipeline.png">icons/map/marine/pipeline.png</file>
<file alias="cable.png">icons/map/marine/cable.png</file>
<file alias="anchorage.png">icons/map/marine/anchorage.png</file>
<file alias="anchoring-prohibited.png">icons/map/marine/anchoring-prohibited.png</file>
<file alias="church.png">icons/map/marine/church.png</file>
<file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
<file alias="pile.png">icons/map/marine/pile.png</file>
<file alias="spar-buoy.png">icons/map/marine/spar-buoy.png</file>
<file alias="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
<file alias="tower.png">icons/map/marine/tower.png</file>
<file alias="chimney.png">icons/map/marine/chimney.png</file>
<file alias="platform.png">icons/map/marine/platform.png</file>
<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
<file alias="crane.png">icons/map/marine/crane.png</file>
<file alias="distance-mark.png">icons/map/marine/distance-mark.png</file>
<file alias="distance-mark-land.png">icons/map/marine/distance-mark-land.png</file>
<file alias="conveyor-line.png">icons/map/marine/conveyor-line.png</file>
<file alias="pipeline-overhead.png">icons/map/marine/pipeline-overhead.png</file>
<file alias="coast-guard.png">icons/map/marine/coast-guard.png</file>
<file alias="monument.png">icons/map/marine/monument.png</file>
<file alias="radio.png">icons/map/marine/radio.png</file>
<file alias="radar.png">icons/map/marine/radar.png</file>
<file alias="radar-transponder.png">icons/map/marine/radar-transponder.png</file>
<file alias="silo.png">icons/map/marine/silo.png</file>
<file alias="turning-basin.png">icons/map/marine/turning-basin.png</file>
<file alias="entry-prohibited-line.png">icons/map/marine/entry-prohibited-line.png</file>
<file alias="safety-zone-line.png">icons/map/marine/safety-zone-line.png</file>
<file alias="cable-area-line.png">icons/map/marine/cable-area-line.png</file>
<file alias="pipeline-area-line.png">icons/map/marine/pipeline-area-line.png</file>
<file alias="windmotor.png">icons/map/marine/windmotor.png</file>
<file alias="gauge.png">icons/map/marine/gauge.png</file>
<file alias="fishing-farm-line.png">icons/map/marine/fishing-farm-line.png</file>
<file alias="shipyard.png">icons/map/marine/shipyard.png</file>
<file alias="pylon.png">icons/map/marine/pylon.png</file>
<file alias="fleeting-area.png">icons/map/marine/fleeting-area.png</file>
<file alias="breakers.png">icons/map/marine/breakers.png</file>
<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="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>
<file alias="radio-call.png">icons/map/marine/radio-call.png</file>
<file alias="radio-call-2w.png">icons/map/marine/radio-call-2w.png</file>
<file alias="current.png">icons/map/marine/current.png</file>
<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>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->
<qresource prefix="/mapsforge"> <qresource prefix="/mapsforge">
<file alias="default.xml">data/default.xml</file> <file alias="default.xml">data/mapsforge/default.xml</file>
<file alias="patterns/hills.svg">icons/mapsforge/patterns/hills.svg</file> <file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
<file alias="patterns/farmland.svg">icons/mapsforge/patterns/farmland.svg</file> <file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
<file alias="patterns/coniferous.svg">icons/mapsforge/patterns/coniferous.svg</file> <file alias="patterns/coniferous.svg">icons/map/mapsforge/patterns/coniferous.svg</file>
<file alias="patterns/marsh.png">icons/mapsforge/patterns/marsh.png</file> <file alias="patterns/marsh.png">icons/map/mapsforge/patterns/marsh.png</file>
<file alias="patterns/dot.png">icons/mapsforge/patterns/dot.png</file> <file alias="patterns/dot.png">icons/map/mapsforge/patterns/dot.png</file>
<file alias="patterns/cemetery.png">icons/mapsforge/patterns/cemetery.png</file> <file alias="patterns/cemetery.png">icons/map/mapsforge/patterns/cemetery.png</file>
<file alias="patterns/rail.png">icons/mapsforge/patterns/rail.png</file> <file alias="patterns/rail.png">icons/map/mapsforge/patterns/rail.png</file>
<file alias="patterns/access-destination.png">icons/mapsforge/patterns/access-destination.png</file> <file alias="patterns/access-destination.png">icons/map/mapsforge/patterns/access-destination.png</file>
<file alias="patterns/deciduous.svg">icons/mapsforge/patterns/deciduous.svg</file> <file alias="patterns/deciduous.svg">icons/map/mapsforge/patterns/deciduous.svg</file>
<file alias="patterns/grass.svg">icons/mapsforge/patterns/grass.svg</file> <file alias="patterns/grass.svg">icons/map/mapsforge/patterns/grass.svg</file>
<file alias="patterns/wood-mixed.png">icons/mapsforge/patterns/wood-mixed.png</file> <file alias="patterns/wood-mixed.png">icons/map/mapsforge/patterns/wood-mixed.png</file>
<file alias="patterns/wood-deciduous.png">icons/mapsforge/patterns/wood-deciduous.png</file> <file alias="patterns/wood-deciduous.png">icons/map/mapsforge/patterns/wood-deciduous.png</file>
<file alias="patterns/pike.png">icons/mapsforge/patterns/pike.png</file> <file alias="patterns/pike.png">icons/map/mapsforge/patterns/pike.png</file>
<file alias="patterns/wood-coniferous.png">icons/mapsforge/patterns/wood-coniferous.png</file> <file alias="patterns/wood-coniferous.png">icons/map/mapsforge/patterns/wood-coniferous.png</file>
<file alias="patterns/coniferous_and_deciduous.svg">icons/mapsforge/patterns/coniferous_and_deciduous.svg</file> <file alias="patterns/coniferous_and_deciduous.svg">icons/map/mapsforge/patterns/coniferous_and_deciduous.svg</file>
<file alias="patterns/arrow.png">icons/mapsforge/patterns/arrow.png</file> <file alias="patterns/arrow.png">icons/map/mapsforge/patterns/arrow.png</file>
<file alias="patterns/military.png">icons/mapsforge/patterns/military.png</file> <file alias="patterns/military.png">icons/map/mapsforge/patterns/military.png</file>
<file alias="patterns/scrub.svg">icons/mapsforge/patterns/scrub.svg</file> <file alias="patterns/scrub.svg">icons/map/mapsforge/patterns/scrub.svg</file>
<file alias="patterns/nature-reserve.png">icons/mapsforge/patterns/nature-reserve.png</file> <file alias="patterns/nature-reserve.png">icons/map/mapsforge/patterns/nature-reserve.png</file>
<file alias="patterns/swamp.svg">icons/mapsforge/patterns/swamp.svg</file> <file alias="patterns/swamp.svg">icons/map/mapsforge/patterns/swamp.svg</file>
<file alias="patterns/quarry.svg">icons/mapsforge/patterns/quarry.svg</file> <file alias="patterns/quarry.svg">icons/map/mapsforge/patterns/quarry.svg</file>
<file alias="patterns/access-private.png">icons/mapsforge/patterns/access-private.png</file> <file alias="patterns/access-private.png">icons/map/mapsforge/patterns/access-private.png</file>
<file alias="symbols/barrier/blocks.svg">icons/mapsforge/symbols/barrier/blocks.svg</file> <file alias="symbols/barrier/blocks.svg">icons/map/mapsforge/symbols/barrier/blocks.svg</file>
<file alias="symbols/barrier/stile.svg">icons/mapsforge/symbols/barrier/stile.svg</file> <file alias="symbols/barrier/stile.svg">icons/map/mapsforge/symbols/barrier/stile.svg</file>
<file alias="symbols/barrier/cycle_barrier.svg">icons/mapsforge/symbols/barrier/cycle_barrier.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/mapsforge/symbols/barrier/lift_gate.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/mapsforge/symbols/barrier/bollard.svg</file> <file alias="symbols/barrier/bollard.svg">icons/map/mapsforge/symbols/barrier/bollard.svg</file>
<file alias="symbols/barrier/gate.svg">icons/mapsforge/symbols/barrier/gate.svg</file> <file alias="symbols/barrier/gate.svg">icons/map/mapsforge/symbols/barrier/gate.svg</file>
<file alias="symbols/dot_blue.svg">icons/mapsforge/symbols/dot_blue.svg</file> <file alias="symbols/dot_blue.svg">icons/map/mapsforge/symbols/dot_blue.svg</file>
<file alias="symbols/dot_blue_dark.svg">icons/mapsforge/symbols/dot_blue_dark.svg</file> <file alias="symbols/dot_blue_dark.svg">icons/map/mapsforge/symbols/dot_blue_dark.svg</file>
<file alias="symbols/peak.svg">icons/mapsforge/symbols/peak.svg</file> <file alias="symbols/peak.svg">icons/map/mapsforge/symbols/peak.svg</file>
<file alias="symbols/traffic_signal.svg">icons/mapsforge/symbols/traffic_signal.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/mapsforge/symbols/place_of_worship/hindu.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/mapsforge/symbols/place_of_worship/unknown.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/mapsforge/symbols/place_of_worship/islamic.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/mapsforge/symbols/place_of_worship/jewish.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/mapsforge/symbols/place_of_worship/shinto.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/mapsforge/symbols/place_of_worship/buddhist.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/mapsforge/symbols/place_of_worship/christian.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/mapsforge/symbols/volcano.svg</file> <file alias="symbols/volcano.svg">icons/map/mapsforge/symbols/volcano.svg</file>
<file alias="symbols/bench.svg">icons/mapsforge/symbols/bench.svg</file> <file alias="symbols/bench.svg">icons/map/mapsforge/symbols/bench.svg</file>
<file alias="symbols/transport/parking_private.svg">icons/mapsforge/symbols/transport/parking_private.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/mapsforge/symbols/transport/helicopter.svg</file> <file alias="symbols/transport/helicopter.svg">icons/map/mapsforge/symbols/transport/helicopter.svg</file>
<file alias="symbols/transport/rental_bicycle.svg">icons/mapsforge/symbols/transport/rental_bicycle.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/mapsforge/symbols/transport/train_station2.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/mapsforge/symbols/transport/parking.svg</file> <file alias="symbols/transport/parking.svg">icons/map/mapsforge/symbols/transport/parking.svg</file>
<file alias="symbols/transport/slipway.svg">icons/mapsforge/symbols/transport/slipway.svg</file> <file alias="symbols/transport/slipway.svg">icons/map/mapsforge/symbols/transport/slipway.svg</file>
<file alias="symbols/transport/bus_stop.svg">icons/mapsforge/symbols/transport/bus_stop.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/mapsforge/symbols/transport/bus_station.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/mapsforge/symbols/transport/airport2.svg</file> <file alias="symbols/transport/airport2.svg">icons/map/mapsforge/symbols/transport/airport2.svg</file>
<file alias="symbols/transport/fuel.svg">icons/mapsforge/symbols/transport/fuel.svg</file> <file alias="symbols/transport/fuel.svg">icons/map/mapsforge/symbols/transport/fuel.svg</file>
<file alias="symbols/transport/lighthouse.svg">icons/mapsforge/symbols/transport/lighthouse.svg</file> <file alias="symbols/transport/lighthouse.svg">icons/map/mapsforge/symbols/transport/lighthouse.svg</file>
<file alias="symbols/transport/traffic_lights.svg">icons/mapsforge/symbols/transport/traffic_lights.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/mapsforge/symbols/transport/tram_stop.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/mapsforge/symbols/food/bar.svg</file> <file alias="symbols/food/bar.svg">icons/map/mapsforge/symbols/food/bar.svg</file>
<file alias="symbols/food/cafe.svg">icons/mapsforge/symbols/food/cafe.svg</file> <file alias="symbols/food/cafe.svg">icons/map/mapsforge/symbols/food/cafe.svg</file>
<file alias="symbols/food/drinkingtap.svg">icons/mapsforge/symbols/food/drinkingtap.svg</file> <file alias="symbols/food/drinkingtap.svg">icons/map/mapsforge/symbols/food/drinkingtap.svg</file>
<file alias="symbols/food/pub.svg">icons/mapsforge/symbols/food/pub.svg</file> <file alias="symbols/food/pub.svg">icons/map/mapsforge/symbols/food/pub.svg</file>
<file alias="symbols/food/fastfood.svg">icons/mapsforge/symbols/food/fastfood.svg</file> <file alias="symbols/food/fastfood.svg">icons/map/mapsforge/symbols/food/fastfood.svg</file>
<file alias="symbols/food/biergarten.svg">icons/mapsforge/symbols/food/biergarten.svg</file> <file alias="symbols/food/biergarten.svg">icons/map/mapsforge/symbols/food/biergarten.svg</file>
<file alias="symbols/food/restaurant.svg">icons/mapsforge/symbols/food/restaurant.svg</file> <file alias="symbols/food/restaurant.svg">icons/map/mapsforge/symbols/food/restaurant.svg</file>
<file alias="symbols/railway-crossing.svg">icons/mapsforge/symbols/railway-crossing.svg</file> <file alias="symbols/railway-crossing.svg">icons/map/mapsforge/symbols/railway-crossing.svg</file>
<file alias="symbols/accommodation/hotel2.svg">icons/mapsforge/symbols/accommodation/hotel2.svg</file> <file alias="symbols/accommodation/hotel2.svg">icons/map/mapsforge/symbols/accommodation/hotel2.svg</file>
<file alias="symbols/accommodation/camping.svg">icons/mapsforge/symbols/accommodation/camping.svg</file> <file alias="symbols/accommodation/camping.svg">icons/map/mapsforge/symbols/accommodation/camping.svg</file>
<file alias="symbols/accommodation/chalet.svg">icons/mapsforge/symbols/accommodation/chalet.svg</file> <file alias="symbols/accommodation/chalet.svg">icons/map/mapsforge/symbols/accommodation/chalet.svg</file>
<file alias="symbols/accommodation/alpinehut.svg">icons/mapsforge/symbols/accommodation/alpinehut.svg</file> <file alias="symbols/accommodation/alpinehut.svg">icons/map/mapsforge/symbols/accommodation/alpinehut.svg</file>
<file alias="symbols/accommodation/shelter2.svg">icons/mapsforge/symbols/accommodation/shelter2.svg</file> <file alias="symbols/accommodation/shelter2.svg">icons/map/mapsforge/symbols/accommodation/shelter2.svg</file>
<file alias="symbols/accommodation/caravan_park.svg">icons/mapsforge/symbols/accommodation/caravan_park.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/mapsforge/symbols/accommodation/hostel.svg</file> <file alias="symbols/accommodation/hostel.svg">icons/map/mapsforge/symbols/accommodation/hostel.svg</file>
<file alias="symbols/health/doctors2.svg">icons/mapsforge/symbols/health/doctors2.svg</file> <file alias="symbols/health/doctors2.svg">icons/map/mapsforge/symbols/health/doctors2.svg</file>
<file alias="symbols/health/hospital.svg">icons/mapsforge/symbols/health/hospital.svg</file> <file alias="symbols/health/hospital.svg">icons/map/mapsforge/symbols/health/hospital.svg</file>
<file alias="symbols/health/pharmacy.svg">icons/mapsforge/symbols/health/pharmacy.svg</file> <file alias="symbols/health/pharmacy.svg">icons/map/mapsforge/symbols/health/pharmacy.svg</file>
<file alias="symbols/chair_lift.svg">icons/mapsforge/symbols/chair_lift.svg</file> <file alias="symbols/chair_lift.svg">icons/map/mapsforge/symbols/chair_lift.svg</file>
<file alias="symbols/education/school.svg">icons/mapsforge/symbols/education/school.svg</file> <file alias="symbols/education/school.svg">icons/map/mapsforge/symbols/education/school.svg</file>
<file alias="symbols/education/nursery3.svg">icons/mapsforge/symbols/education/nursery3.svg</file> <file alias="symbols/education/nursery3.svg">icons/map/mapsforge/symbols/education/nursery3.svg</file>
<file alias="symbols/education/university.svg">icons/mapsforge/symbols/education/university.svg</file> <file alias="symbols/education/university.svg">icons/map/mapsforge/symbols/education/university.svg</file>
<file alias="symbols/money/atm2.svg">icons/mapsforge/symbols/money/atm2.svg</file> <file alias="symbols/money/atm2.svg">icons/map/mapsforge/symbols/money/atm2.svg</file>
<file alias="symbols/money/bank2.svg">icons/mapsforge/symbols/money/bank2.svg</file> <file alias="symbols/money/bank2.svg">icons/map/mapsforge/symbols/money/bank2.svg</file>
<file alias="symbols/shopping/marketplace.svg">icons/mapsforge/symbols/shopping/marketplace.svg</file> <file alias="symbols/shopping/marketplace.svg">icons/map/mapsforge/symbols/shopping/marketplace.svg</file>
<file alias="symbols/shopping/bicycle.svg">icons/mapsforge/symbols/shopping/bicycle.svg</file> <file alias="symbols/shopping/bicycle.svg">icons/map/mapsforge/symbols/shopping/bicycle.svg</file>
<file alias="symbols/shopping/alcohol.svg">icons/mapsforge/symbols/shopping/alcohol.svg</file> <file alias="symbols/shopping/alcohol.svg">icons/map/mapsforge/symbols/shopping/alcohol.svg</file>
<file alias="symbols/shopping/diy.svg">icons/mapsforge/symbols/shopping/diy.svg</file> <file alias="symbols/shopping/diy.svg">icons/map/mapsforge/symbols/shopping/diy.svg</file>
<file alias="symbols/shopping/bakery.svg">icons/mapsforge/symbols/shopping/bakery.svg</file> <file alias="symbols/shopping/bakery.svg">icons/map/mapsforge/symbols/shopping/bakery.svg</file>
<file alias="symbols/shopping/greengrocer.svg">icons/mapsforge/symbols/shopping/greengrocer.svg</file> <file alias="symbols/shopping/greengrocer.svg">icons/map/mapsforge/symbols/shopping/greengrocer.svg</file>
<file alias="symbols/shopping/laundrette.svg">icons/mapsforge/symbols/shopping/laundrette.svg</file> <file alias="symbols/shopping/laundrette.svg">icons/map/mapsforge/symbols/shopping/laundrette.svg</file>
<file alias="symbols/shopping/car_repair.svg">icons/mapsforge/symbols/shopping/car_repair.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/mapsforge/symbols/shopping/butcher.svg</file> <file alias="symbols/shopping/butcher.svg">icons/map/mapsforge/symbols/shopping/butcher.svg</file>
<file alias="symbols/shopping/book.svg">icons/mapsforge/symbols/shopping/book.svg</file> <file alias="symbols/shopping/book.svg">icons/map/mapsforge/symbols/shopping/book.svg</file>
<file alias="symbols/shopping/convenience.svg">icons/mapsforge/symbols/shopping/convenience.svg</file> <file alias="symbols/shopping/convenience.svg">icons/map/mapsforge/symbols/shopping/convenience.svg</file>
<file alias="symbols/shopping/supermarket.svg">icons/mapsforge/symbols/shopping/supermarket.svg</file> <file alias="symbols/shopping/supermarket.svg">icons/map/mapsforge/symbols/shopping/supermarket.svg</file>
<file alias="symbols/poi/mountain_pass.svg">icons/mapsforge/symbols/poi/mountain_pass.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/mapsforge/symbols/poi/embassy2.svg</file> <file alias="symbols/poi/embassy2.svg">icons/map/mapsforge/symbols/poi/embassy2.svg</file>
<file alias="symbols/poi/cave.svg">icons/mapsforge/symbols/poi/cave.svg</file> <file alias="symbols/poi/cave.svg">icons/map/mapsforge/symbols/poi/cave.svg</file>
<file alias="symbols/cable_car.svg">icons/mapsforge/symbols/cable_car.svg</file> <file alias="symbols/cable_car.svg">icons/map/mapsforge/symbols/cable_car.svg</file>
<file alias="symbols/railway-crossing-small.svg">icons/mapsforge/symbols/railway-crossing-small.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/mapsforge/symbols/dot_magenta.svg</file> <file alias="symbols/dot_magenta.svg">icons/map/mapsforge/symbols/dot_magenta.svg</file>
<file alias="symbols/dot_black.svg">icons/mapsforge/symbols/dot_black.svg</file> <file alias="symbols/dot_black.svg">icons/map/mapsforge/symbols/dot_black.svg</file>
<file alias="symbols/gondola.svg">icons/mapsforge/symbols/gondola.svg</file> <file alias="symbols/gondola.svg">icons/map/mapsforge/symbols/gondola.svg</file>
<file alias="symbols/dot_white.svg">icons/mapsforge/symbols/dot_white.svg</file> <file alias="symbols/dot_white.svg">icons/map/mapsforge/symbols/dot_white.svg</file>
<file alias="symbols/amenity/recycling.svg">icons/mapsforge/symbols/amenity/recycling.svg</file> <file alias="symbols/amenity/recycling.svg">icons/map/mapsforge/symbols/amenity/recycling.svg</file>
<file alias="symbols/amenity/firestation3.svg">icons/mapsforge/symbols/amenity/firestation3.svg</file> <file alias="symbols/amenity/firestation3.svg">icons/map/mapsforge/symbols/amenity/firestation3.svg</file>
<file alias="symbols/amenity/telephone.svg">icons/mapsforge/symbols/amenity/telephone.svg</file> <file alias="symbols/amenity/telephone.svg">icons/map/mapsforge/symbols/amenity/telephone.svg</file>
<file alias="symbols/amenity/post_box.svg">icons/mapsforge/symbols/amenity/post_box.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/mapsforge/symbols/amenity/fountain2.svg</file> <file alias="symbols/amenity/fountain2.svg">icons/map/mapsforge/symbols/amenity/fountain2.svg</file>
<file alias="symbols/amenity/playground.svg">icons/mapsforge/symbols/amenity/playground.svg</file> <file alias="symbols/amenity/playground.svg">icons/map/mapsforge/symbols/amenity/playground.svg</file>
<file alias="symbols/amenity/library.svg">icons/mapsforge/symbols/amenity/library.svg</file> <file alias="symbols/amenity/library.svg">icons/map/mapsforge/symbols/amenity/library.svg</file>
<file alias="symbols/amenity/post_office.svg">icons/mapsforge/symbols/amenity/post_office.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/mapsforge/symbols/amenity/police2.svg</file> <file alias="symbols/amenity/police2.svg">icons/map/mapsforge/symbols/amenity/police2.svg</file>
<file alias="symbols/amenity/toilets.svg">icons/mapsforge/symbols/amenity/toilets.svg</file> <file alias="symbols/amenity/toilets.svg">icons/map/mapsforge/symbols/amenity/toilets.svg</file>
<file alias="symbols/tourist/picnic.svg">icons/mapsforge/symbols/tourist/picnic.svg</file> <file alias="symbols/tourist/picnic.svg">icons/map/mapsforge/symbols/tourist/picnic.svg</file>
<file alias="symbols/tourist/monument.svg">icons/mapsforge/symbols/tourist/monument.svg</file> <file alias="symbols/tourist/monument.svg">icons/map/mapsforge/symbols/tourist/monument.svg</file>
<file alias="symbols/tourist/archaeological2.svg">icons/mapsforge/symbols/tourist/archaeological2.svg</file> <file alias="symbols/tourist/archaeological2.svg">icons/map/mapsforge/symbols/tourist/archaeological2.svg</file>
<file alias="symbols/tourist/museum.svg">icons/mapsforge/symbols/tourist/museum.svg</file> <file alias="symbols/tourist/museum.svg">icons/map/mapsforge/symbols/tourist/museum.svg</file>
<file alias="symbols/tourist/attraction.svg">icons/mapsforge/symbols/tourist/attraction.svg</file> <file alias="symbols/tourist/attraction.svg">icons/map/mapsforge/symbols/tourist/attraction.svg</file>
<file alias="symbols/tourist/information.svg">icons/mapsforge/symbols/tourist/information.svg</file> <file alias="symbols/tourist/information.svg">icons/map/mapsforge/symbols/tourist/information.svg</file>
<file alias="symbols/tourist/theatre.svg">icons/mapsforge/symbols/tourist/theatre.svg</file> <file alias="symbols/tourist/theatre.svg">icons/map/mapsforge/symbols/tourist/theatre.svg</file>
<file alias="symbols/tourist/zoo.svg">icons/mapsforge/symbols/tourist/zoo.svg</file> <file alias="symbols/tourist/zoo.svg">icons/map/mapsforge/symbols/tourist/zoo.svg</file>
<file alias="symbols/tourist/cinema2.svg">icons/mapsforge/symbols/tourist/cinema2.svg</file> <file alias="symbols/tourist/cinema2.svg">icons/map/mapsforge/symbols/tourist/cinema2.svg</file>
<file alias="symbols/tourist/castle2.svg">icons/mapsforge/symbols/tourist/castle2.svg</file> <file alias="symbols/tourist/castle2.svg">icons/map/mapsforge/symbols/tourist/castle2.svg</file>
<file alias="symbols/tourist/ruin.svg">icons/mapsforge/symbols/tourist/ruin.svg</file> <file alias="symbols/tourist/ruin.svg">icons/map/mapsforge/symbols/tourist/ruin.svg</file>
<file alias="symbols/tourist/memorial.svg">icons/mapsforge/symbols/tourist/memorial.svg</file> <file alias="symbols/tourist/memorial.svg">icons/map/mapsforge/symbols/tourist/memorial.svg</file>
<file alias="symbols/tourist/view_point.svg">icons/mapsforge/symbols/tourist/view_point.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/mapsforge/symbols/tourist/windmill.svg</file> <file alias="symbols/tourist/windmill.svg">icons/map/mapsforge/symbols/tourist/windmill.svg</file>
<file alias="symbols/water/weir.svg">icons/mapsforge/symbols/water/weir.svg</file> <file alias="symbols/water/weir.svg">icons/map/mapsforge/symbols/water/weir.svg</file>
<file alias="symbols/sport/swimming_outdoor.svg">icons/mapsforge/symbols/sport/swimming_outdoor.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/mapsforge/symbols/sport/tennis.svg</file> <file alias="symbols/sport/tennis.svg">icons/map/mapsforge/symbols/sport/tennis.svg</file>
<file alias="symbols/sport/shooting.svg">icons/mapsforge/symbols/sport/shooting.svg</file> <file alias="symbols/sport/shooting.svg">icons/map/mapsforge/symbols/sport/shooting.svg</file>
<file alias="symbols/sport/stadium.svg">icons/mapsforge/symbols/sport/stadium.svg</file> <file alias="symbols/sport/stadium.svg">icons/map/mapsforge/symbols/sport/stadium.svg</file>
<file alias="symbols/sport/soccer.svg">icons/mapsforge/symbols/sport/soccer.svg</file> <file alias="symbols/sport/soccer.svg">icons/map/mapsforge/symbols/sport/soccer.svg</file>
<file alias="symbols/sport/golf.svg">icons/mapsforge/symbols/sport/golf.svg</file> <file alias="symbols/sport/golf.svg">icons/map/mapsforge/symbols/sport/golf.svg</file>
<file alias="symbols/oneway.svg">icons/mapsforge/symbols/oneway.svg</file> <file alias="symbols/oneway.svg">icons/map/mapsforge/symbols/oneway.svg</file>
</qresource> </qresource>
</RCC> </RCC>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 415 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

BIN
icons/formats/000.icns Normal file

Binary file not shown.

BIN
icons/formats/000.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

BIN
icons/formats/031.icns Normal file

Binary file not shown.

BIN
icons/formats/031.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

View File

@ -30,3 +30,5 @@ ghp:#ed09cb
qct:#370642 qct:#370642
trk:#cccccc trk:#cccccc
gemf:#147085 gemf:#147085
000:#000000
031:#000000

View File

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

View File

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

View File

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

View File

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

View File

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

View File

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 343 B

View File

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

View File

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 368 B

View File

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

View File

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 357 B

View File

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

View File

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 650 B

View File

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 376 B

View File

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 421 B

View File

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

View File

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

View File

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

View File

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

View File

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

View File

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

View File

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

View File

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

View File

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

View File

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

View File

@ -1,4 +1,4 @@
The IMG style icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/) The POI icons are Mapbox Maki icons (https://labs.mapbox.com/maki-icons/)
licensed under CC0. licensed under CC0.
----- -----

View File

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

View File

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 384 B

View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

View File

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 364 B

View File

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

View File

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

View File

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

View File

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View File

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 401 B

View File

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

View File

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

View File

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

Some files were not shown because too many files have changed in this diff Show More