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

Compare commits

...

408 Commits
11.0 ... 12.3

Author SHA1 Message Date
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
fafe6c4b03 Various KML/KMZ parsing fixes and code cleanup 2022-09-02 22:53:38 +02:00
b156e25023 Properly handle PhotoOverlay icon URLs 2022-09-02 09:55:11 +02:00
e15deccfca Added Catalan localization stub 2022-09-02 08:42:28 +02:00
9b24bccfed Added PhotoOverlay support
+ non-shared styles
2022-09-02 08:36:58 +02:00
589c602d21 Document styles are not inherited 2022-09-01 00:49:21 +02:00
b7df3cbe0e Added support for KMZ data files + KML icons
fixes #312
2022-09-01 00:28:00 +02:00
f08f5893a3 Only offset the waypoint icons when they are using the symbol icons 2022-09-01 00:25:48 +02:00
1d5f7db12f Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-08-30 08:58:07 +02:00
532a1eb69f Translated using Weblate (Norwegian Bokmål)
Currently translated at 98.7% (458 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-08-20 11:22:56 +02:00
1efb4e494d Properly abort the connections on timeout 2022-08-17 01:50:24 +02:00
4653f771a6 Code cleanup 2022-08-15 09:12:37 +02:00
22e5ffaa0c Added support for non-SQL Orux maps
+ error handling fixes/improvements
2022-08-11 23:39:36 +02:00
9a4514a464 Version++ 2022-08-11 23:38:48 +02:00
7d47f243ea Added Orux maps to supported offline maps 2022-08-11 01:02:58 +02:00
18c2613302 Updated Qt6 version to Qt 6.3 2022-08-11 00:11:40 +02:00
e2bdc1aae6 Added support for RD grid and Ellipsoidal mercator projections
+ removed (aparently) unsupported projections
2022-08-11 00:04:45 +02:00
a245043573 Merge remote-tracking branch 'weblate/master' 2022-08-08 23:28:04 +02:00
42dbc91143 Translated using Weblate (German)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2022-08-08 23:27:19 +02:00
23a7c6d4eb Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-08-08 23:26:40 +02:00
b6b4319f89 Translated using Weblate (Esperanto)
Currently translated at 92.8% (431 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-08-08 23:26:39 +02:00
8673c00a23 Translated using Weblate (Hungarian)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-08-08 23:26:39 +02:00
90280fb018 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-08-08 23:26:39 +02:00
285022c17a Translated using Weblate (Turkish)
Currently translated at 100.0% (464 of 464 strings)

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

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-08-08 23:26:38 +02:00
bbf5c09377 Translated using Weblate (Russian)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-08-08 23:26:38 +02:00
e1c7ad18e6 Translated using Weblate (Finnish)
Currently translated at 97.4% (452 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2022-08-08 23:26:38 +02:00
99792f2984 Translated using Weblate (Czech)
Currently translated at 100.0% (464 of 464 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2022-08-08 23:26:19 +02:00
6d2e6f64d3 Added support for LAEA projections to Orux maps 2022-08-08 23:24:33 +02:00
183cb4825c Fixed cut&paste errors 2022-08-08 10:11:19 +02:00
7b8fff7440 Properly sort the Orux maps zoom levels 2022-08-08 00:21:24 +02:00
a01ff33768 Add another alias for WGS84 2022-08-08 00:20:30 +02:00
c3117bb3ac Fixed projection parameters parsing in Orux maps 2022-08-07 23:44:48 +02:00
20fe804293 Localization update 2022-08-07 22:34:36 +02:00
525f70f15e Fixed PNG/PDF export dialogues on Android 2022-08-07 22:31:10 +02:00
209df67380 Orux maps desktop integration 2022-08-07 22:30:38 +02:00
6e40d8cbc7 Handle Orux maps as directories
(there can not be two Orux maps in the same directory)
2022-08-05 08:40:38 +02:00
0ef28cda0f Fixed map calibration 2022-08-05 08:34:16 +02:00
1b83f88b27 Switch to macos-latest as macos-10.15 was cancelled 2022-08-04 00:13:10 +02:00
a40ed633ae Version++ 2022-08-04 00:07:41 +02:00
399299d192 Added support for Orux maps 2022-08-04 00:06:36 +02:00
ec68557de5 NDK root, again... 2022-07-31 17:10:32 +02:00
c68fc72387 Another atempt to set the NDK path... 2022-07-31 16:51:39 +02:00
3c9da66a51 Added missing NDK path 2022-07-31 16:43:32 +02:00
22e56e06fd Back to qt install @v2 2022-07-31 14:22:51 +02:00
2e9d173f53 Added missing Java distribution 2022-07-31 14:05:46 +02:00
84b7da13f0 Some more CI tools version updates 2022-07-31 14:00:51 +02:00
ed74d0c069 Updated Qt/Qt install action versions 2022-07-31 13:51:27 +02:00
218eb3be56 Added GEMF and Osmdroid SQLite maps support info 2022-07-31 13:43:46 +02:00
5795395107 Added missing GEMF icon resource entry 2022-07-31 13:22:33 +02:00
e8b1ce2c29 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-07-30 15:19:46 +02:00
ea159a4a79 Added missing GEMF MIME type 2022-07-23 00:41:59 +02:00
f43786e0ae GEMF OS X desktop integration 2022-07-23 00:39:17 +02:00
cae25ba2db Merge branch 'origin/master' into Weblate. 2022-07-22 20:35:17 +02:00
a0c52069c3 Added Windows & Linux GEMF files desktop integration 2022-07-22 20:34:33 +02:00
475ca98527 Create translation files in android CI build 2022-07-22 19:06:45 +02:00
529aefdb46 Merge branch 'origin/master' into Weblate. 2022-07-22 19:06:11 +02:00
312eb127c4 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-07-20 18:19:31 +02:00
e9d93bcc03 Properly sort th map types 2022-07-18 08:52:12 +02:00
c4353a04a4 Translated using Weblate (German)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/de/
2022-07-18 07:39:52 +02:00
bbc00eadb2 Translated using Weblate (Czech)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/cs/
2022-07-18 07:39:52 +02:00
aef757521c Translated using Weblate (Esperanto)
Currently translated at 92.8% (430 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-07-17 18:17:40 +02:00
ce35bfa196 Translated using Weblate (Hungarian)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-07-17 18:17:40 +02:00
803ed91b73 Translated using Weblate (Ukrainian)
Currently translated at 99.7% (462 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-07-17 18:17:40 +02:00
642e75074b Translated using Weblate (Turkish)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-07-17 18:17:40 +02:00
491f9f1cae Translated using Weblate (Swedish)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-07-17 18:17:39 +02:00
c46e656410 Translated using Weblate (Russian)
Currently translated at 100.0% (463 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-07-17 18:17:39 +02:00
636752991d Translated using Weblate (Finnish)
Currently translated at 97.4% (451 of 463 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2022-07-17 18:17:39 +02:00
c4b6226f8d Merge branch 'origin/master' into Weblate. 2022-07-15 22:29:43 +02:00
6cb209983f Localization update 2022-07-15 22:29:16 +02:00
825e5e6068 Merge branch 'origin/master' into Weblate. 2022-07-15 21:53:10 +02:00
2cb186e674 Removed debug code 2022-07-15 21:52:46 +02:00
4f3bdb4370 Merge branch 'origin/master' into Weblate. 2022-07-15 21:41:33 +02:00
91150e97db Added support for GEMF maps 2022-07-15 21:24:49 +02:00
f52547dc2c Translated using Weblate (Hungarian)
Currently translated at 100.0% (462 of 462 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-07-10 19:19:56 +02:00
377ebc0f7a Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (462 of 462 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-07-09 10:19:53 +02:00
3418a5ddd6 Translated using Weblate (Hungarian)
Currently translated at 100.0% (462 of 462 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-07-09 10:19:52 +02:00
0e8760d4c7 Translated using Weblate (Turkish)
Currently translated at 100.0% (462 of 462 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-07-08 08:21:50 +02:00
586e2a03f9 Translated using Weblate (Swedish)
Currently translated at 100.0% (462 of 462 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-07-08 06:52:06 +02:00
9b135f2579 Localization update 2022-07-08 02:14:47 +02:00
9ae771084b Make the graph tabs display configurable on Android 2022-07-08 02:14:47 +02:00
8b4daa43e3 Improved error reporting 2022-07-08 02:14:47 +02:00
efd496d38c Removed accidentaly commited QtCreator project file 2022-07-07 11:14:11 +02:00
5488f5c531 Remove missleading translation comments
(the given arrows are missing in most fonts)
2022-07-07 00:56:06 +02:00
1c6c47d42d Merge remote-tracking branch 'weblate/master' 2022-07-07 00:51:23 +02:00
699baf14bd Various localization and translations fixes 2022-07-07 00:45:53 +02:00
ce6486ecd2 Translated using Weblate (Russian)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-07-07 00:45:36 +02:00
c9330bf273 Enable localization on Android 2022-07-06 19:43:56 +02:00
06f19bc77c Merge branch 'origin/master' into Weblate. 2022-07-06 19:43:34 +02:00
53f1c66ab0 Translated missing CZ and DE strings 2022-07-06 19:32:00 +02:00
2a2dcb926e Merge branch 'origin/master' into Weblate. 2022-07-06 19:31:53 +02:00
97fdcfdd74 Code cleanup 2022-07-06 14:58:41 +02:00
1bc40cd428 Merge branch 'origin/master' into Weblate. 2022-07-06 14:58:10 +02:00
90c1e52fb5 Fixed map bounds issues 2022-07-06 12:50:57 +02:00
851e99cc66 Merge branch 'origin/master' into Weblate. 2022-07-06 12:50:40 +02:00
c79ee01912 Added Osmdroid SQLite maps desktop integration 2022-07-06 09:26:42 +02:00
fc43076789 Merge branch 'origin/master' into Weblate. 2022-07-06 09:26:34 +02:00
c3f94f8c1a Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-07-06 09:26:33 +02:00
01310944eb Translated using Weblate (Esperanto)
Currently translated at 93.0% (429 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-07-06 09:26:33 +02:00
609596341d Translated using Weblate (Hungarian)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-07-06 09:26:33 +02:00
6c27ccf6e5 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-07-06 09:26:32 +02:00
4e086ae5f6 Translated using Weblate (Turkish)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-07-06 09:26:32 +02:00
4d74190d27 Translated using Weblate (Swedish)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-07-06 09:26:32 +02:00
5a868e25dd Translated using Weblate (Russian)
Currently translated at 99.7% (460 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-07-06 09:26:32 +02:00
e53a8b0333 Translated using Weblate (Finnish)
Currently translated at 97.3% (449 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2022-07-06 09:26:31 +02:00
50e65d95c5 Added some more translators comments 2022-07-05 12:13:42 +02:00
46dec308f9 Merge branch 'origin/master' into Weblate. 2022-07-05 12:13:30 +02:00
56a5c386ae Translated using Weblate (Swedish)
Currently translated at 100.0% (461 of 461 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-07-05 12:13:29 +02:00
6771344c60 Merge remote-tracking branch 'weblate/master' 2022-07-05 12:02:14 +02:00
a149a40221 Localization update 2022-07-05 11:33:04 +02:00
028d87b443 Added support for Osmdroid SQLite maps 2022-07-05 11:32:14 +02:00
74b73d8700 Limit line lengths in line-based parsers 2022-07-05 11:08:57 +02:00
99365c3ac8 Added translators comments for "up" and "down" 2022-07-03 20:47:28 +02:00
8dc9bca93e Merge branch 'origin/master' into Weblate. 2022-07-03 20:47:22 +02:00
20fecb3e99 Translated using Weblate (Esperanto)
Currently translated at 93.0% (428 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/
2022-07-03 18:20:05 +02:00
bec747e90a Translated using Weblate (Hungarian)
Currently translated at 100.0% (460 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-07-03 18:20:05 +02:00
e56116b64c Translated using Weblate (Ukrainian)
Currently translated at 100.0% (460 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
2022-07-03 18:20:04 +02:00
a94602785c Translated using Weblate (Russian)
Currently translated at 99.7% (459 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
2022-07-03 18:20:04 +02:00
d083e217f9 Translated using Weblate (Finnish)
Currently translated at 97.3% (448 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
2022-07-03 18:20:04 +02:00
f370642c81 Fixed android GUI layout issues 2022-06-30 23:57:39 +02:00
f675558014 Merge branch 'origin/master' into Weblate. 2022-06-30 23:57:26 +02:00
a1167f3daa Translated using Weblate (Chinese (Simplified))
Currently translated at 99.7% (459 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/zh_Hans/
2022-06-30 23:57:26 +02:00
52fc890697 Translated using Weblate (Hungarian)
Currently translated at 100.0% (460 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
2022-06-30 23:57:25 +02:00
1366dd0f53 Translated using Weblate (Turkish)
Currently translated at 100.0% (460 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/
2022-06-30 23:57:25 +02:00
ca1e5d8dae Translated using Weblate (Norwegian Bokmål)
Currently translated at 98.4% (453 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
2022-06-30 23:57:24 +02:00
f6f3741796 Translated using Weblate (Swedish)
Currently translated at 100.0% (460 of 460 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/
2022-06-30 06:16:47 +02:00
24584c44c3 Localization update 2022-06-30 00:32:20 +02:00
23e8154a1f Fixed map dir loading on Android 2022-06-19 23:05:01 +02:00
7118794b26 Added android builds Qt6 dependency info 2022-06-12 00:05:12 +02:00
5af3808895 Properly compute the header size
+ code cleanup
2022-06-11 10:19:14 +02:00
1f2e460c87 Silenced clang warning 2022-06-11 09:48:55 +02:00
57c524e08a Version++ 2022-06-11 09:35:01 +02:00
e35cf68309 Upload APK artifact from Android build 2022-06-11 00:02:23 +02:00
3be8ec748a Use java 11 in Android build 2022-06-10 23:40:47 +02:00
5ba00e016b Added OpenSSL to the android build 2022-06-10 23:26:28 +02:00
0f3fea5460 Improved map errors reporting 2022-06-10 08:09:07 +02:00
e7d6c3f76a Do not make unnecessary checks when loading IMG maps and TrekBuddy atlases 2022-06-09 00:38:25 +02:00
ca0089e486 Added missing Android Qt modules install 2022-06-04 14:20:26 +02:00
c9930a7aa3 Make Android OpenSSL support optional 2022-06-04 14:12:54 +02:00
c9b06ba3cf Try to install both the desktop and the Android Qt
(broken aqtinstall workaround)
2022-06-04 13:53:35 +02:00
a168d28d81 Remove debug stuff 2022-06-04 13:29:01 +02:00
8f05346ced Debug CI 2022-06-04 13:10:35 +02:00
8e62bd83d6 Yet another atempt to fix Android CI build... 2022-06-04 12:57:41 +02:00
471ea7a6ee Some more CI debug 2022-06-04 12:53:29 +02:00
353a606864 Use android_armv7 2022-06-04 12:38:17 +02:00
3dc998a5c0 Try the default arch 2022-06-04 12:32:14 +02:00
22e25671ce Remove nonexistent qt6 module 2022-06-04 12:01:21 +02:00
6d07af868e Try again with a newer aqt version... 2022-06-04 11:56:48 +02:00
d9f57eddf2 Specify Android build 2022-06-04 11:04:37 +02:00
ad664d5299 Added some CI debug stuff 2022-06-04 10:53:52 +02:00
13dc02d144 Added Android CI build 2022-06-04 10:39:29 +02:00
306116dbde Fixed possible crash on map unload 2022-06-02 23:22:34 +02:00
ca1c576562 Fixed Android build 2022-06-02 22:08:40 +02:00
feb1650ed0 Allow tile cache sizes up to 2GB 2022-06-02 19:14:34 +02:00
e6e41c846c Increase the default tile image cache size
On big IMG maps that are "digitaly" zoomed out, the tile memory may not be
sufficient for the whole display area which leads to "cache ping-pong", image
artefacts and 100% CPU usage. 512MB RAM should be available for everyone on
the desktop these days...
2022-06-02 19:03:12 +02:00
20adecec89 Code cleanup 2022-06-02 19:02:46 +02:00
8cb08d05ca Version++ 2022-06-02 18:35:44 +02:00
7bd03494db Code cleanup 2022-06-02 18:35:27 +02:00
7ba19b8c0a Use asynchronous tiles rendering in IMG maps
On Android devices, the rendering is very slow so use the same approach as
already used in Mapsforge maps.
2022-06-02 18:31:40 +02:00
25869200db Fixed broken map zooming using the mouse wheel
(introduced in 11.0)
2022-06-02 18:30:19 +02:00
af0bb2e268 Updated features, build and download info 2022-05-30 19:13:12 +02:00
481 changed files with 22334 additions and 10551 deletions

View File

@ -1,4 +1,4 @@
version: 11.0.{build} version: 12.3.{build}
configuration: configuration:
- Release - Release
@ -11,7 +11,7 @@ environment:
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.2\msvc2019_64 - QTDIR: C:\Qt\6.4\msvc2019_64
NSISDEF: /DQT6 NSISDEF: /DQT6
install: install:
@ -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\csv installer\csv /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

53
.github/workflows/android.yml vendored Normal file
View File

@ -0,0 +1,53 @@
name: Android
on:
push:
branches:
- master
jobs:
build:
name: GPXSee
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Run sdkmanager update
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- 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;23.1.7779620"
- name: Setup NDK path
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
- name: Install Qt (Desktop)
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==2.1.0'
version: '6.4.0'
- name: Install Qt (Android)
uses: jurplel/install-qt-action@v3
with:
aqtversion: '==2.1.0'
version: '6.4.0'
target: 'android'
arch: 'android_armv7'
modules: qtpositioning qt5compat qtserialport
- name: Install Android OpenSSL
run: git clone https://github.com/KDAB/android_openssl.git
- name: Create localization
run: lrelease gpxsee.pro
- name: Configure build
run: qmake gpxsee.pro OPENSSL_PATH=android_openssl
- name: Build project
run: make -j2 apk
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: GPXSee-armv7.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

@ -8,14 +8,16 @@ on:
jobs: jobs:
qt5: qt5:
name: GPXSee Qt5 build name: GPXSee Qt5 build
runs-on: macos-10.15 runs-on: macos-latest
steps: steps:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV 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 dependencies
run: brew install qt5 run: |
brew update
brew install qt5
- name: Create localization - name: Create localization
run: lrelease gpxsee.pro run: lrelease gpxsee.pro
- name: Configure build - name: Configure build
@ -25,7 +27,7 @@ jobs:
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg run: macdeployqt GPXSee.app -dmg
- 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
@ -37,9 +39,11 @@ jobs:
- name: Set environment variables - name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV 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 dependencies
run: brew install qt6 run: |
brew update
brew install qt6
- name: Create localization - name: Create localization
run: lrelease gpxsee.pro run: lrelease gpxsee.pro
- name: Configure build - name: Configure build
@ -49,7 +53,7 @@ jobs:
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg run: macdeployqt GPXSee.app -dmg
- 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,10 @@ 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, ESRI World-File georeferenced images). Mapsforge vector maps, QCT maps, GEMF maps, Osmdroid SQLite maps, Orux maps,
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.
* Support for DEM files (SRTM HGT). * Support for DEM files (SRTM HGT).
@ -21,14 +22,14 @@ GPS log file formats.
* Full-screen mode. * Full-screen mode.
* HiDPI/Retina displays & maps support. * HiDPI/Retina displays & maps support.
* Real-time GPS position. * Real-time GPS position.
* Native GUI for Windows, Mac OS X and Linux. * Windows, macOS, Linux and Android builds.
![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png) ![GPXSee - Linux](https://a.fsdn.com/con/app/proj/gpxsee/screenshots/linux2.png)
## Build ## Build
Build requirements: Build requirements:
* Qt5 >= 5.11 or Qt 6.x* * 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:
@ -38,12 +39,12 @@ qmake gpxsee.pro
make # nmake on windows make # nmake on windows
``` ```
_* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML
files as support for such files was dropped in Qt6._
## Download ## Download
* [Windows & OS X builds](http://sourceforge.net/projects/gpxsee) * [Windows & OS X builds](https://sourceforge.net/projects/gpxsee)
* [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee) * [Linux packages](https://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)
* [Android APKs](https://play.google.com/store/apps/details?id=org.gpxsee.gpxsee)
## Changelog ## Changelog
[Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes) [Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)
@ -63,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,4 +74,4 @@ different, GPL compatible, licenses:
[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](pkg/csv) - BSD/EPSG/Public domain
* [Mapsforge render theme](data/default.xml) and its [icons](icons/mapsforge) - LGPLv3 * [Mapsforge render theme](data/default.xml) and its [icons](icons/map/mapsforge) - LGPLv3

View File

Can't render this file because it is too large.

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

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 11.0 VERSION = 12.3
QT += core \ QT += core \
gui \ gui \
@ -14,7 +14,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 +26,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 \
@ -114,8 +116,20 @@ 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/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/encmap.h \
src/map/ENC/iso8211.h \
src/map/gemfmap.h \
src/map/oruxmap.h \
src/map/osmdroidmap.h \
src/map/proj/polyconic.h \ src/map/proj/polyconic.h \
src/map/proj/webmercator.h \ src/map/proj/webmercator.h \
src/map/proj/transversemercator.h \ src/map/proj/transversemercator.h \
@ -127,7 +141,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 \
@ -248,8 +262,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 \
@ -318,6 +332,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/mapdata.cpp \
src/map/ENC/rastertile.cpp \
src/map/ENC/style.cpp \
src/map/encmap.cpp \
src/map/ENC/iso8211.cpp \
src/map/gemfmap.cpp \
src/map/oruxmap.cpp \
src/map/osmdroidmap.cpp \
src/map/proj/polyconic.cpp \ src/map/proj/polyconic.cpp \
src/map/proj/webmercator.cpp \ src/map/proj/webmercator.cpp \
src/map/proj/transversemercator.cpp \ src/map/proj/transversemercator.cpp \
@ -328,7 +350,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 \
@ -451,23 +473,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 csv.path = Contents/Resources
csv.files = pkg/csv csv.files = data/csv
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 csv lproj
} }
win32 { win32 {
@ -502,7 +528,9 @@ win32 {
icons/formats/omd.ico \ icons/formats/omd.ico \
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/000.ico
DEFINES += _USE_MATH_DEFINES \ DEFINES += _USE_MATH_DEFINES \
NOGDI NOGDI
} }
@ -510,9 +538,9 @@ 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/*) csv.files = $$files(data/csv/*)
csv.path = $$PREFIX/share/gpxsee/csv csv.path = $$PREFIX/share/gpxsee/csv
symbols.files = $$files(icons/symbols/*.png) symbols.files = $$files(icons/symbols/*.png)
symbols.path = $$PREFIX/share/gpxsee/symbols symbols.path = $$PREFIX/share/gpxsee/symbols
@ -520,15 +548,20 @@ unix:!macx:!android {
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 csv 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): \
@ -545,8 +578,11 @@ android {
return($$first(vCode)$$first(suffix)) return($$first(vCode)$$first(suffix))
} }
include($$OPENSSL_PATH/openssl.pri) !include($$OPENSSL_PATH/openssl.pri) {
message("OpenSSL not found, building without HTTPS support!")
}
ANDROID_TARGET_SDK_VERSION = 31
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
@ -555,11 +591,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/*) csv.files = $$files(data/csv/*)
csv.path = /assets/csv csv.path = /assets/csv
symbols.files = $$files(icons/symbols/*.png) symbols.files = $$files(icons/symbols/*.png)
symbols.path = /assets/symbols symbols.path = /assets/symbols
INSTALLS += maps csv symbols translations.files = $$files(lang/*.qm)
translations.path = /assets/translations
INSTALLS += maps csv symbols translations
} }

View File

@ -55,247 +55,285 @@
<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 --> <!-- POIs (IMG & ENC style) -->
<qresource prefix="/IMG"> <qresource prefix="/POI">
<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file> <file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file> <file alias="airport-11.png">icons/map/POI/airport-11.png</file>
<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file> <file alias="amusement-park-11.png">icons/map/POI/amusement-park-11.png</file>
<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file> <file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file> <file alias="bank-11.png">icons/map/POI/bank-11.png</file>
<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file> <file alias="bar-11.png">icons/map/POI/bar-11.png</file>
<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file> <file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file> <file alias="beach-11.png">icons/map/POI/beach-11.png</file>
<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file> <file alias="bowling-alley-11.png">icons/map/POI/bowling-alley-11.png</file>
<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file> <file alias="building-alt1-11.png">icons/map/POI/building-alt1-11.png</file>
<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file> <file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file> <file alias="bus-11.png">icons/map/POI/bus-11.png</file>
<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file> <file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file> <file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
<file alias="car-11.png">icons/IMG/POI/car-11.png</file> <file alias="car-11.png">icons/map/POI/car-11.png</file>
<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file> <file alias="car-rental-11.png">icons/map/POI/car-rental-11.png</file>
<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file> <file alias="car-repair-11.png">icons/map/POI/car-repair-11.png</file>
<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file> <file alias="casino-11.png">icons/map/POI/casino-11.png</file>
<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file> <file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file> <file alias="cinema-11.png">icons/map/POI/cinema-11.png</file>
<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file> <file alias="clothing-store-11.png">icons/map/POI/clothing-store-11.png</file>
<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file> <file alias="communications-tower-11.png">icons/map/POI/communications-tower-11.png</file>
<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file> <file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file> <file alias="dam-11.png">icons/map/POI/dam-11.png</file>
<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file> <file alias="danger-11.png">icons/map/POI/danger-11.png</file>
<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file> <file alias="drinking-water-11.png">icons/map/POI/drinking-water-11.png</file>
<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file> <file alias="fast-food-11.png">icons/map/POI/fast-food-11.png</file>
<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file> <file alias="entrance-alt1-11.png">icons/map/POI/entrance-alt1-11.png</file>
<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file> <file alias="fire-station-11.png">icons/map/POI/fire-station-11.png</file>
<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file> <file alias="fitness-centre-11.png">icons/map/POI/fitness-centre-11.png</file>
<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file> <file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file> <file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file> <file alias="garden-11.png">icons/map/POI/garden-11.png</file>
<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file> <file alias="garden-centre-11.png">icons/map/POI/garden-centre-11.png</file>
<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file> <file alias="golf-11.png">icons/map/POI/golf-11.png</file>
<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file> <file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file> <file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file> <file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file> <file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file> <file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file> <file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
<file alias="information-11.png">icons/IMG/POI/information-11.png</file> <file alias="information-11.png">icons/map/POI/information-11.png</file>
<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file> <file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
<file alias="library-11.png">icons/IMG/POI/library-11.png</file> <file alias="library-11.png">icons/map/POI/library-11.png</file>
<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file> <file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file> <file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file> <file alias="museum-11.png">icons/map/POI/museum-11.png</file>
<file alias="park-11.png">icons/IMG/POI/park-11.png</file> <file alias="park-11.png">icons/map/POI/park-11.png</file>
<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file> <file alias="parking-11.png">icons/map/POI/parking-11.png</file>
<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file> <file alias="pharmacy-11.png">icons/map/POI/pharmacy-11.png</file>
<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-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/IMG/POI/place-of-worship-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/IMG/POI/police-11.png</file> <file alias="police-11.png">icons/map/POI/police-11.png</file>
<file alias="post-11.png">icons/IMG/POI/post-11.png</file> <file alias="post-11.png">icons/map/POI/post-11.png</file>
<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file> <file alias="religious-christian-11.png">icons/map/POI/religious-christian-11.png</file>
<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file> <file alias="religious-jewish-11.png">icons/map/POI/religious-jewish-11.png</file>
<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file> <file alias="religious-muslim-11.png">icons/map/POI/religious-muslim-11.png</file>
<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file> <file alias="restaurant-11.png">icons/map/POI/restaurant-11.png</file>
<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file> <file alias="restaurant-noodle-11.png">icons/map/POI/restaurant-noodle-11.png</file>
<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file> <file alias="restaurant-pizza-11.png">icons/map/POI/restaurant-pizza-11.png</file>
<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file> <file alias="restaurant-seafood-11.png">icons/map/POI/restaurant-seafood-11.png</file>
<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file> <file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
<file alias="school-11.png">icons/IMG/POI/school-11.png</file> <file alias="school-11.png">icons/map/POI/school-11.png</file>
<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file> <file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file> <file alias="shop-11.png">icons/map/POI/shop-11.png</file>
<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file> <file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file> <file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file> <file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file> <file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file> <file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file> <file alias="toilet-11.png">icons/map/POI/toilet-11.png</file>
<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file> <file alias="town-hall-11.png">icons/map/POI/town-hall-11.png</file>
<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file> <file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
<file alias="village-11.png">icons/IMG/POI/village-11.png</file> <file alias="village-11.png">icons/map/POI/village-11.png</file>
<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file> <file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file> <file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file> <file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
</qresource>
<file alias="light-major.png">icons/IMG/marine/light-major.png</file> <!-- marine stuff (IMG & ENC style) -->
<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file> <qresource prefix="/marine">
<file alias="buoy.png">icons/IMG/marine/buoy.png</file> <file alias="light-major.png">icons/map/marine/light-major.png</file>
<file alias="beacon.png">icons/IMG/marine/beacon.png</file> <file alias="light-platform.png">icons/map/marine/light-platform.png</file>
<file alias="rock-exposed.png">icons/IMG/marine/rock-exposed.png</file> <file alias="buoy.png">icons/map/marine/buoy.png</file>
<file alias="rock-dangerous.png">icons/IMG/marine/rock-dangerous.png</file> <file alias="beacon.png">icons/map/marine/beacon.png</file>
<file alias="wreck.png">icons/IMG/marine/wreck.png</file> <file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
<file alias="wreck-exposed.png">icons/IMG/marine/wreck-exposed.png</file> <file alias="rock-dangerous.png">icons/map/marine/rock-dangerous.png</file>
<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file> <file alias="wreck.png">icons/map/marine/wreck.png</file>
<file alias="obstruction-covers.png">icons/IMG/marine/obstruction-covers.png</file> <file alias="wreck-exposed.png">icons/map/marine/wreck-exposed.png</file>
<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file> <file alias="wreck-dangerous.png">icons/map/marine/wreck-dangerous.png</file>
<file alias="noanchor-line.png">icons/IMG/marine/noanchor-line.png</file> <file alias="obstruction.png">icons/map/marine/obstruction.png</file>
<file alias="cable-line.png">icons/IMG/marine/cable-line.png</file> <file alias="obstruction-covers.png">icons/map/marine/obstruction-covers.png</file>
<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file> <file alias="anchor-line.png">icons/map/marine/anchor-line.png</file>
<file alias="cable.png">icons/IMG/marine/cable.png</file> <file alias="noanchor-line.png">icons/map/marine/noanchor-line.png</file>
<file alias="anchorage.png">icons/IMG/marine/anchorage.png</file> <file alias="cable-line.png">icons/map/marine/cable-line.png</file>
<file alias="anchoring-prohibited.png">icons/IMG/marine/anchoring-prohibited.png</file> <file alias="pipeline.png">icons/map/marine/pipeline.png</file>
<file alias="church.png">icons/IMG/marine/church.png</file> <file alias="cable.png">icons/map/marine/cable.png</file>
<file alias="triangulation-point.png">icons/IMG/marine/triangulation-point.png</file> <file alias="anchorage.png">icons/map/marine/anchorage.png</file>
<file alias="yacht-harbor.png">icons/IMG/marine/yacht-harbor.png</file> <file alias="anchoring-prohibited.png">icons/map/marine/anchoring-prohibited.png</file>
<file alias="pile.png">icons/IMG/marine/pile.png</file> <file alias="church.png">icons/map/marine/church.png</file>
<file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file> <file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file> <file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
<file alias="tower.png">icons/IMG/marine/tower.png</file> <file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
<file alias="chimney.png">icons/IMG/marine/chimney.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>
</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/gemf.icns Normal file

Binary file not shown.

BIN
icons/formats/gemf.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 KiB

View File

@ -29,3 +29,5 @@ omd:#ed09cb
ghp:#ed09cb ghp:#ed09cb
qct:#370642 qct:#370642
trk:#cccccc trk:#cccccc
gemf:#147085
000:#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

View File

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

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