root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Some more ENC style improvements and fixes

Browse Source
This commit is contained in:
Martin Tůma 2022-12-04 12:39:47 +01:00
parent 07954b7d1a
commit b7ea02bc44
93 changed files with 263 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
gpxsee.qrc
View File

@ -55,85 +55,85 @@
<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/map/IMG/POI/airfield-11.png</file> <file alias="airfield-11.png">icons/map/POI/airfield-11.png</file>
<file alias="airport-11.png">icons/map/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/map/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/map/IMG/POI/bakery-11.png</file> <file alias="bakery-11.png">icons/map/POI/bakery-11.png</file>
<file alias="bank-11.png">icons/map/IMG/POI/bank-11.png</file> <file alias="bank-11.png">icons/map/POI/bank-11.png</file>
<file alias="bar-11.png">icons/map/IMG/POI/bar-11.png</file> <file alias="bar-11.png">icons/map/POI/bar-11.png</file>
<file alias="bbq-11.png">icons/map/IMG/POI/bbq-11.png</file> <file alias="bbq-11.png">icons/map/POI/bbq-11.png</file>
<file alias="beach-11.png">icons/map/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/map/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/map/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/map/IMG/POI/bridge-11.png</file> <file alias="bridge-11.png">icons/map/POI/bridge-11.png</file>
<file alias="bus-11.png">icons/map/IMG/POI/bus-11.png</file> <file alias="bus-11.png">icons/map/POI/bus-11.png</file>
<file alias="cafe-11.png">icons/map/IMG/POI/cafe-11.png</file> <file alias="cafe-11.png">icons/map/POI/cafe-11.png</file>
<file alias="campsite-11.png">icons/map/IMG/POI/campsite-11.png</file> <file alias="campsite-11.png">icons/map/POI/campsite-11.png</file>
<file alias="car-11.png">icons/map/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/map/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/map/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/map/IMG/POI/casino-11.png</file> <file alias="casino-11.png">icons/map/POI/casino-11.png</file>
<file alias="cemetery-11.png">icons/map/IMG/POI/cemetery-11.png</file> <file alias="cemetery-11.png">icons/map/POI/cemetery-11.png</file>
<file alias="cinema-11.png">icons/map/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/map/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/map/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/map/IMG/POI/convenience-11.png</file> <file alias="convenience-11.png">icons/map/POI/convenience-11.png</file>
<file alias="dam-11.png">icons/map/IMG/POI/dam-11.png</file> <file alias="dam-11.png">icons/map/POI/dam-11.png</file>
<file alias="danger-11.png">icons/map/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/map/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/map/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/map/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/map/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/map/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/map/IMG/POI/fuel-11.png</file> <file alias="fuel-11.png">icons/map/POI/fuel-11.png</file>
<file alias="furniture-11.png">icons/map/IMG/POI/furniture-11.png</file> <file alias="furniture-11.png">icons/map/POI/furniture-11.png</file>
<file alias="garden-11.png">icons/map/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/map/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/map/IMG/POI/golf-11.png</file> <file alias="golf-11.png">icons/map/POI/golf-11.png</file>
<file alias="grocery-11.png">icons/map/IMG/POI/grocery-11.png</file> <file alias="grocery-11.png">icons/map/POI/grocery-11.png</file>
<file alias="hairdresser-11.png">icons/map/IMG/POI/hairdresser-11.png</file> <file alias="hairdresser-11.png">icons/map/POI/hairdresser-11.png</file>
<file alias="harbor-11.png">icons/map/IMG/POI/harbor-11.png</file> <file alias="harbor-11.png">icons/map/POI/harbor-11.png</file>
<file alias="hardware-11.png">icons/map/IMG/POI/hardware-11.png</file> <file alias="hardware-11.png">icons/map/POI/hardware-11.png</file>
<file alias="heliport-11.png">icons/map/IMG/POI/heliport-11.png</file> <file alias="heliport-11.png">icons/map/POI/heliport-11.png</file>
<file alias="hospital-11.png">icons/map/IMG/POI/hospital-11.png</file> <file alias="hospital-11.png">icons/map/POI/hospital-11.png</file>
<file alias="information-11.png">icons/map/IMG/POI/information-11.png</file> <file alias="information-11.png">icons/map/POI/information-11.png</file>
<file alias="landmark-11.png">icons/map/IMG/POI/landmark-11.png</file> <file alias="landmark-11.png">icons/map/POI/landmark-11.png</file>
<file alias="library-11.png">icons/map/IMG/POI/library-11.png</file> <file alias="library-11.png">icons/map/POI/library-11.png</file>
<file alias="lodging-11.png">icons/map/IMG/POI/lodging-11.png</file> <file alias="lodging-11.png">icons/map/POI/lodging-11.png</file>
<file alias="mountain-11.png">icons/map/IMG/POI/mountain-11.png</file> <file alias="mountain-11.png">icons/map/POI/mountain-11.png</file>
<file alias="museum-11.png">icons/map/IMG/POI/museum-11.png</file> <file alias="museum-11.png">icons/map/POI/museum-11.png</file>
<file alias="park-11.png">icons/map/IMG/POI/park-11.png</file> <file alias="park-11.png">icons/map/POI/park-11.png</file>
<file alias="parking-11.png">icons/map/IMG/POI/parking-11.png</file> <file alias="parking-11.png">icons/map/POI/parking-11.png</file>
<file alias="pharmacy-11.png">icons/map/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/map/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/map/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/map/IMG/POI/police-11.png</file> <file alias="police-11.png">icons/map/POI/police-11.png</file>
<file alias="post-11.png">icons/map/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/map/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/map/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/map/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/map/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/map/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/map/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/map/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/map/IMG/POI/roadblock-11.png</file> <file alias="roadblock-11.png">icons/map/POI/roadblock-11.png</file>
<file alias="school-11.png">icons/map/IMG/POI/school-11.png</file> <file alias="school-11.png">icons/map/POI/school-11.png</file>
<file alias="shelter-11.png">icons/map/IMG/POI/shelter-11.png</file> <file alias="shelter-11.png">icons/map/POI/shelter-11.png</file>
<file alias="shop-11.png">icons/map/IMG/POI/shop-11.png</file> <file alias="shop-11.png">icons/map/POI/shop-11.png</file>
<file alias="skiing-11.png">icons/map/IMG/POI/skiing-11.png</file> <file alias="skiing-11.png">icons/map/POI/skiing-11.png</file>
<file alias="soccer-11.png">icons/map/IMG/POI/soccer-11.png</file> <file alias="soccer-11.png">icons/map/POI/soccer-11.png</file>
<file alias="swimming-11.png">icons/map/IMG/POI/swimming-11.png</file> <file alias="swimming-11.png">icons/map/POI/swimming-11.png</file>
<file alias="theatre-11.png">icons/map/IMG/POI/theatre-11.png</file> <file alias="theatre-11.png">icons/map/POI/theatre-11.png</file>
<file alias="telephone-11.png">icons/map/IMG/POI/telephone-11.png</file> <file alias="telephone-11.png">icons/map/POI/telephone-11.png</file>
<file alias="toilet-11.png">icons/map/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/map/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/map/IMG/POI/viewpoint-11.png</file> <file alias="viewpoint-11.png">icons/map/POI/viewpoint-11.png</file>
<file alias="village-11.png">icons/map/IMG/POI/village-11.png</file> <file alias="village-11.png">icons/map/POI/village-11.png</file>
<file alias="waterfall-11.png">icons/map/IMG/POI/waterfall-11.png</file> <file alias="waterfall-11.png">icons/map/POI/waterfall-11.png</file>
<file alias="wetland-11.png">icons/map/IMG/POI/wetland-11.png</file> <file alias="wetland-11.png">icons/map/POI/wetland-11.png</file>
<file alias="zoo-11.png">icons/map/IMG/POI/zoo-11.png</file> <file alias="zoo-11.png">icons/map/POI/zoo-11.png</file>
</qresource> </qresource>
<!-- marine stuff (IMG & ENC style) --> <!-- marine stuff (IMG & ENC style) -->
@ -165,6 +165,7 @@
<file alias="church.png">icons/map/marine/church.png</file> <file alias="church.png">icons/map/marine/church.png</file>
<file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file> <file alias="triangulation-point.png">icons/map/marine/triangulation-point.png</file>
<file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file> <file alias="yacht-harbor.png">icons/map/marine/yacht-harbor.png</file>
<file alias="fishing-harbor.png">icons/map/marine/fishing-harbor.png</file>
<file alias="pile.png">icons/map/marine/pile.png</file> <file alias="pile.png">icons/map/marine/pile.png</file>
<file alias="spar-buoy.png">icons/map/marine/spar-buoy.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="mooring-buoy.png">icons/map/marine/mooring-buoy.png</file>
@ -186,6 +187,8 @@
<file alias="silo.png">icons/map/marine/silo.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="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="entry-prohibited-line.png">icons/map/marine/entry-prohibited-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>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

0
icons/map/IMG/POI/airfield-11.png → icons/map/POI/airfield-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

0
icons/map/IMG/POI/airport-11.png → icons/map/POI/airport-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

0
icons/map/IMG/POI/amusement-park-11.png → icons/map/POI/amusement-park-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

0
icons/map/IMG/POI/bakery-11.png → icons/map/POI/bakery-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

0
icons/map/IMG/POI/bank-11.png → icons/map/POI/bank-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

0
icons/map/IMG/POI/bar-11.png → icons/map/POI/bar-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

0
icons/map/IMG/POI/bbq-11.png → icons/map/POI/bbq-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

0
icons/map/IMG/POI/beach-11.png → icons/map/POI/beach-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

0
icons/map/IMG/POI/bowling-alley-11.png → icons/map/POI/bowling-alley-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 386 B

0
icons/map/IMG/POI/bridge-11.png → icons/map/POI/bridge-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
icons/map/IMG/POI/building-alt1-11.png → icons/map/POI/building-alt1-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 343 B

After

Width:  |  Height:  |  Size: 343 B

0
icons/map/IMG/POI/bus-11.png → icons/map/POI/bus-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

0
icons/map/IMG/POI/cafe-11.png → icons/map/POI/cafe-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

0
icons/map/IMG/POI/campsite-11.png → icons/map/POI/campsite-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
icons/map/IMG/POI/car-11.png → icons/map/POI/car-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 368 B

After

Width:  |  Height:  |  Size: 368 B

0
icons/map/IMG/POI/car-rental-11.png → icons/map/POI/car-rental-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

0
icons/map/IMG/POI/car-repair-11.png → icons/map/POI/car-repair-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

0
icons/map/IMG/POI/casino-11.png → icons/map/POI/casino-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
icons/map/IMG/POI/cemetery-11.png → icons/map/POI/cemetery-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 357 B

0
icons/map/IMG/POI/cinema-11.png → icons/map/POI/cinema-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

0
icons/map/IMG/POI/clothing-store-11.png → icons/map/POI/clothing-store-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

0
icons/map/IMG/POI/communications-tower-11.png → icons/map/POI/communications-tower-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

0
icons/map/IMG/POI/convenience-11.png → icons/map/POI/convenience-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 650 B

After

Width:  |  Height:  |  Size: 650 B

0
icons/map/IMG/POI/dam-11.png → icons/map/POI/dam-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 376 B

0
icons/map/IMG/POI/danger-11.png → icons/map/POI/danger-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 421 B

After

Width:  |  Height:  |  Size: 421 B

0
icons/map/IMG/POI/drinking-water-11.png → icons/map/POI/drinking-water-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

0
icons/map/IMG/POI/entrance-alt1-11.png → icons/map/POI/entrance-alt1-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
icons/map/IMG/POI/fast-food-11.png → icons/map/POI/fast-food-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

0
icons/map/IMG/POI/fire-station-11.png → icons/map/POI/fire-station-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

0
icons/map/IMG/POI/fitness-centre-11.png → icons/map/POI/fitness-centre-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

0
icons/map/IMG/POI/fuel-11.png → icons/map/POI/fuel-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

0
icons/map/IMG/POI/furniture-11.png → icons/map/POI/furniture-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

0
icons/map/IMG/POI/garden-11.png → icons/map/POI/garden-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

0
icons/map/IMG/POI/garden-centre-11.png → icons/map/POI/garden-centre-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
icons/map/IMG/POI/golf-11.png → icons/map/POI/golf-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

0
icons/map/IMG/POI/grocery-11.png → icons/map/POI/grocery-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

0
icons/map/IMG/POI/hairdresser-11.png → icons/map/POI/hairdresser-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 380 B

0
icons/map/IMG/POI/harbor-11.png → icons/map/POI/harbor-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

0
icons/map/IMG/POI/hardware-11.png → icons/map/POI/hardware-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
icons/map/IMG/POI/heliport-11.png → icons/map/POI/heliport-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 390 B

After

Width:  |  Height:  |  Size: 390 B

0
icons/map/IMG/POI/hospital-11.png → icons/map/POI/hospital-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

0
icons/map/IMG/POI/information-11.png → icons/map/POI/information-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

0
icons/map/IMG/POI/landmark-11.png → icons/map/POI/landmark-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

0
icons/map/IMG/POI/library-11.png → icons/map/POI/library-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 410 B

After

Width:  |  Height:  |  Size: 410 B

0
icons/map/IMG/POI/licence.txt → icons/map/POI/licence.txt
View File

0
icons/map/IMG/POI/lodging-11.png → icons/map/POI/lodging-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

0
icons/map/IMG/POI/mountain-11.png → icons/map/POI/mountain-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 384 B

0
icons/map/IMG/POI/museum-11.png → icons/map/POI/museum-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
icons/map/IMG/POI/park-11.png → icons/map/POI/park-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

0
icons/map/IMG/POI/parking-11.png → icons/map/POI/parking-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

0
icons/map/IMG/POI/pharmacy-11.png → icons/map/POI/pharmacy-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 364 B

0
icons/map/IMG/POI/picnic-site-11.png → icons/map/POI/picnic-site-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

0
icons/map/IMG/POI/place-of-worship-11.png → icons/map/POI/place-of-worship-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

0
icons/map/IMG/POI/police-11.png → icons/map/POI/police-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 394 B

0
icons/map/IMG/POI/post-11.png → icons/map/POI/post-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
icons/map/IMG/POI/religious-christian-11.png → icons/map/POI/religious-christian-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
icons/map/IMG/POI/religious-jewish-11.png → icons/map/POI/religious-jewish-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 359 B

0
icons/map/IMG/POI/religious-muslim-11.png → icons/map/POI/religious-muslim-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 401 B

0
icons/map/IMG/POI/restaurant-11.png → icons/map/POI/restaurant-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

0
icons/map/IMG/POI/restaurant-noodle-11.png → icons/map/POI/restaurant-noodle-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

0
icons/map/IMG/POI/restaurant-pizza-11.png → icons/map/POI/restaurant-pizza-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 396 B

0
icons/map/IMG/POI/restaurant-seafood-11.png → icons/map/POI/restaurant-seafood-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

0
icons/map/IMG/POI/roadblock-11.png → icons/map/POI/roadblock-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

0
icons/map/IMG/POI/school-11.png → icons/map/POI/school-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 333 B

0
icons/map/IMG/POI/shelter-11.png → icons/map/POI/shelter-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 325 B

0
icons/map/IMG/POI/shop-11.png → icons/map/POI/shop-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

0
icons/map/IMG/POI/skiing-11.png → icons/map/POI/skiing-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

0
icons/map/IMG/POI/soccer-11.png → icons/map/POI/soccer-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

0
icons/map/IMG/POI/swimming-11.png → icons/map/POI/swimming-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

0
icons/map/IMG/POI/telephone-11.png → icons/map/POI/telephone-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 377 B

0
icons/map/IMG/POI/theatre-11.png → icons/map/POI/theatre-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 428 B

After

Width:  |  Height:  |  Size: 428 B

0
icons/map/IMG/POI/toilet-11.png → icons/map/POI/toilet-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

0
icons/map/IMG/POI/town-hall-11.png → icons/map/POI/town-hall-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

0
icons/map/IMG/POI/viewpoint-11.png → icons/map/POI/viewpoint-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 383 B

After

Width:  |  Height:  |  Size: 383 B

0
icons/map/IMG/POI/village-11.png → icons/map/POI/village-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 373 B

0
icons/map/IMG/POI/waterfall-11.png → icons/map/POI/waterfall-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

0
icons/map/IMG/POI/wetland-11.png → icons/map/POI/wetland-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
icons/map/IMG/POI/zoo-11.png → icons/map/POI/zoo-11.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 382 B

BIN
icons/map/marine/cable-area-line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
icons/map/marine/distance-mark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 152 B

BIN
icons/map/marine/dw-route-line.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 259 B

BIN
icons/map/marine/fishing-harbor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 394 B

BIN
icons/map/marine/monument.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 698 B

BIN
icons/map/marine/pipeline-area-line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 B

BIN
icons/map/marine/radar-transponder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 362 B

BIN
icons/map/marine/silo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 218 B

2
src/map/ENC/attributes.h
View File

@ -9,9 +9,11 @@
#define CATMOR 40 #define CATMOR 40
#define CATTRK 54 #define CATTRK 54
#define CATREA 56 #define CATREA 56
#define CATSCF 65
#define CATWRK 71 #define CATWRK 71
#define DRVAL1 87 #define DRVAL1 87
#define ELEVAT 90 #define ELEVAT 90
#define FUNCTN 94
#define OBJNAM 116 #define OBJNAM 116
#define ORIENT 117 #define ORIENT 117
#define RESTRN 131 #define RESTRN 131

7
src/map/ENC/mapdata.cpp
View File

@ -493,7 +493,9 @@ MapData::Attr MapData::pointAttr(const ISO8211::Record &r, uint OBJL)
|| (OBJL == WRECKS && key == CATWRK) || (OBJL == WRECKS && key == CATWRK)
|| (OBJL == MORFAC && key == CATMOR) || (OBJL == MORFAC && key == CATMOR)
|| (OBJL == UWTROC && key == WATLEV) || (OBJL == UWTROC && key == WATLEV)
|| (OBJL == BUAARE && key == CATBUA)) || (OBJL == BUAARE && key == CATBUA)
|| (OBJL == SMCFAC && key == CATSCF)
|| (OBJL == BUISGL && key == FUNCTN))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toByteArray().toUInt();
else if (OBJL == I_DISMAR && key == CATDIS) else if (OBJL == I_DISMAR && key == CATDIS)
subtype |= av.at(1).toByteArray().toUInt(); subtype |= av.at(1).toByteArray().toUInt();
@ -552,7 +554,8 @@ MapData::Attr MapData::polyAttr(const ISO8211::Record &r, uint OBJL)
if ((OBJL == RESARE && key == CATREA) if ((OBJL == RESARE && key == CATREA)
|| (OBJL == I_RESARE && key == CATREA) || (OBJL == I_RESARE && key == CATREA)
|| (OBJL == ACHARE && key == CATACH) || (OBJL == ACHARE && key == CATACH)
|| (OBJL == I_ACHARE && key == I_CATACH)) || (OBJL == I_ACHARE && key == I_CATACH)
|| (OBJL == HRBFAC && key == CATHAF))
subtype = av.at(1).toByteArray().toUInt(); subtype = av.at(1).toByteArray().toUInt();
else if ((OBJL == RESARE && key == RESTRN) else if ((OBJL == RESARE && key == RESTRN)
|| (OBJL == I_RESARE && key == I_RESTRN)) { || (OBJL == I_RESARE && key == I_RESTRN)) {

4
src/map/ENC/objects.h
View File

@ -19,6 +19,7 @@
#define BOYLAT 17 #define BOYLAT 17
#define BOYSAW 18 #define BOYSAW 18
#define BOYSPP 19 #define BOYSPP 19
#define CBLARE 20
#define CBLOHD 21 #define CBLOHD 21
#define CBLSUB 22 #define CBLSUB 22
#define CANALS 23 #define CANALS 23
@ -52,6 +53,7 @@
#define OBSTRN 86 #define OBSTRN 86
#define OFSPLF 87 #define OFSPLF 87
#define PILPNT 90 #define PILPNT 90
#define PIPARE 92
#define PIPOHD 93 #define PIPOHD 93
#define PIPSOL 94 #define PIPSOL 94
#define PONTON 95 #define PONTON 95
@ -69,11 +71,13 @@
#define SLCONS 122 #define SLCONS 122
#define SILTNK 125 #define SILTNK 125
#define SLOTOP 126 #define SLOTOP 126
#define SMCFAC 128
#define SOUNDG 129 #define SOUNDG 129
#define TSELNE 145 #define TSELNE 145
#define TSSBND 146 #define TSSBND 146
#define TSSLPT 148 #define TSSLPT 148
#define TSEZNE 150 #define TSEZNE 150
#define TUNNEL 151
#define UWTROC 153 #define UWTROC 153
#define UNSARE 154 #define UNSARE 154
#define WRECKS 159 #define WRECKS 159

19
src/map/ENC/rastertile.cpp
View File

@ -229,6 +229,25 @@ void RasterTile::processPoints(QList<TextItem*> &textItems)
else else
delete item; delete item;
} }
for (int i = 0; i < _polygons.size(); i++) {
const MapData::Poly *poly = _polygons.at(i);
if (poly->type()>>16 == HRBFAC) {
const Style::Point &style = s.point(poly->type());
const QImage *img = style.img().isNull() ? 0 : &style.img();
if (!img)
continue;
TextPointItem *item = new TextPointItem(
ll2xy(centroid(poly->path().first())).toPoint(), 0, 0,
&style.img(), 0, 0, 0, 0);
if (item->isValid() && !item->collides(textItems))
textItems.append(item);
else
delete item;
}
}
} }
void RasterTile::processLines(QList<TextItem*> &textItems) void RasterTile::processLines(QList<TextItem*> &textItems)

43
src/map/ENC/style.cpp
View File

@ -94,6 +94,10 @@ void Style::defaultPolygonStyle()
Qt::Dense7Pattern)); Qt::Dense7Pattern));
_polygons[TYPE(I_LOKBSN)] = Polygon(QBrush(QColor("#333333"), _polygons[TYPE(I_LOKBSN)] = Polygon(QBrush(QColor("#333333"),
Qt::Dense7Pattern)); Qt::Dense7Pattern));
_polygons[TYPE(TUNNEL)] = Polygon(Qt::NoBrush, QPen(QColor("#a3a3a3"), 1,
Qt::DashLine));
_polygons[TYPE(CBLARE)] = Polygon(QImage(":/marine/cable-area-line.png"));
_polygons[TYPE(PIPARE)] = Polygon(QImage(":/marine/pipeline-area-line.png"));
_drawOrder _drawOrder
<< TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0)
@ -102,15 +106,15 @@ void Style::defaultPolygonStyle()
<< SUBTYPE(DEPARE, 6) << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON) << SUBTYPE(DEPARE, 6) << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON)
<< TYPE(RIVERS) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(LOKBSN) << TYPE(RIVERS) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(LOKBSN)
<< TYPE(I_LOKBSN) << TYPE(BUAARE) << TYPE(BUISGL) << TYPE(SILTNK) << TYPE(I_LOKBSN) << TYPE(BUAARE) << TYPE(BUISGL) << TYPE(SILTNK)
<< TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(I_BRIDGE) << TYPE(I_TERMNL) << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(I_BRIDGE) << TYPE(TUNNEL)
<< TYPE(SLCONS) << TYPE(I_SLCONS) << TYPE(PONTON) << TYPE(I_PONTON) << TYPE(I_TERMNL) << TYPE(SLCONS) << TYPE(I_SLCONS) << TYPE(PONTON)
<< TYPE(HULKES) << TYPE(I_HULKES) << TYPE(FLODOC) << TYPE(I_FLODOC) << TYPE(I_PONTON) << TYPE(HULKES) << TYPE(I_HULKES) << TYPE(FLODOC)
<< TYPE(DRYDOC) << TYPE(DAMCON) << TYPE(PYLONS) << TYPE(MORFAC) << TYPE(I_FLODOC) << TYPE(DRYDOC) << TYPE(DAMCON) << TYPE(PYLONS)
<< TYPE(GATCON) << TYPE(I_GATCON) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(MORFAC) << TYPE(GATCON) << TYPE(I_GATCON) << TYPE(DMPGRD)
<< TYPE(OBSTRN) << TYPE(UWTROC) << TYPE(DWRTPT) << SUBTYPE(ACHARE, 1) << TYPE(TSEZNE) << TYPE(OBSTRN) << TYPE(UWTROC) << TYPE(DWRTPT)
<< SUBTYPE(I_ACHARE, 1) << SUBTYPE(RESARE, 9) << SUBTYPE(RESARE, 2) << SUBTYPE(ACHARE, 1) << SUBTYPE(I_ACHARE, 1) << SUBTYPE(RESARE, 9)
<< SUBTYPE(I_RESARE, 2) << SUBTYPE(RESARE, 17) << SUBTYPE(I_RESARE, 17) << SUBTYPE(RESARE, 2) << SUBTYPE(I_RESARE, 2) << SUBTYPE(RESARE, 17)
<< TYPE(PRCARE); << SUBTYPE(I_RESARE, 17) << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE);
} }
void Style::defaultLineStyle() void Style::defaultLineStyle()
@ -204,6 +208,7 @@ void Style::defaultPointStyle()
Small); Small);
_points[SUBTYPE(UWTROC, 5)] = Point(QImage(":/marine/rock-dangerous.png"), _points[SUBTYPE(UWTROC, 5)] = Point(QImage(":/marine/rock-dangerous.png"),
Small); Small);
_points[SUBTYPE(HRBFAC, 4)] = Point(QImage(":/marine/fishing-harbor.png"));
_points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/marine/yacht-harbor.png")); _points[SUBTYPE(HRBFAC, 5)] = Point(QImage(":/marine/yacht-harbor.png"));
_points[TYPE(ACHBRT)] = Point(QImage(":/marine/anchorage.png")); _points[TYPE(ACHBRT)] = Point(QImage(":/marine/anchorage.png"));
_points[TYPE(I_ACHBRT)] = Point(QImage(":/marine/anchorage.png")); _points[TYPE(I_ACHBRT)] = Point(QImage(":/marine/anchorage.png"));
@ -225,6 +230,26 @@ void Style::defaultPointStyle()
_points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png")); _points[TYPE(RTPBCN)] = Point(QImage(":/marine/radar-transponder.png"));
_points[TYPE(SILTNK)] = Point(QImage(":/marine/silo.png")); _points[TYPE(SILTNK)] = Point(QImage(":/marine/silo.png"));
_points[TYPE(I_TRNBSN)] = Point(QImage(":/marine/turning-basin.png")); _points[TYPE(I_TRNBSN)] = Point(QImage(":/marine/turning-basin.png"));
_points[SUBTYPE(SMCFAC, 7)] = Point(QImage(":/POI/restaurant-11.png"));
_points[SUBTYPE(SMCFAC, 11)] = Point(QImage(":/POI/pharmacy-11.png"));
_points[SUBTYPE(SMCFAC, 12)] = Point(QImage(":/POI/drinking-water-11.png"));
_points[SUBTYPE(SMCFAC, 13)] = Point(QImage(":/POI/fuel-11.png"));
_points[SUBTYPE(SMCFAC, 18)] = Point(QImage(":/POI/toilet-11.png"));
_points[SUBTYPE(SMCFAC, 20)] = Point(QImage(":/POI/telephone-11.png"));
_points[SUBTYPE(SMCFAC, 22)] = Point(QImage(":/POI/parking-11.png"));
_points[SUBTYPE(SMCFAC, 25)] = Point(QImage(":/POI/campsite-11.png"));
_points[SUBTYPE(BUISGL, 2)] = Point(QImage(":/POI/harbor-11.png"));
_points[SUBTYPE(BUISGL, 5)] = Point(QImage(":/POI/hospital-11.png"));
_points[SUBTYPE(BUISGL, 6)] = Point(QImage(":/POI/post-11.png"));
_points[SUBTYPE(BUISGL, 7)] = Point(QImage(":/POI/lodging-11.png"));
_points[SUBTYPE(BUISGL, 9)] = Point(QImage(":/POI/police-11.png"));
_points[SUBTYPE(BUISGL, 13)] = Point(QImage(":/POI/bank-11.png"));
_points[SUBTYPE(BUISGL, 19)] = Point(QImage(":/POI/school-11.png"));
_points[SUBTYPE(BUISGL, 20)] = Point(QImage(":/POI/religious-christian-11.png"));
_points[SUBTYPE(BUISGL, 22)] = Point(QImage(":/POI/religious-jewish-11.png"));
_points[SUBTYPE(BUISGL, 26)] = Point(QImage(":/POI/religious-muslim-11.png"));
_points[SUBTYPE(BUISGL, 42)] = Point(QImage(":/POI/bus-11.png"));
} }
Style::Style() Style::Style()

234
src/map/IMG/style.cpp
View File

@ -415,137 +415,137 @@ void Style::defaultPointStyle()
_points[TYPE(0x03)].setTextFontSize(Large); _points[TYPE(0x03)].setTextFontSize(Large);
// POI // POI
_points[0x2a00] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a00] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a01] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a01] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a02] = Point(QImage(":/IMG/restaurant-noodle-11.png")); _points[0x2a02] = Point(QImage(":/POI/restaurant-noodle-11.png"));
_points[0x2a03] = Point(QImage(":/IMG/bbq-11.png")); _points[0x2a03] = Point(QImage(":/POI/bbq-11.png"));
_points[0x2a04] = Point(QImage(":/IMG/restaurant-noodle-11.png")); _points[0x2a04] = Point(QImage(":/POI/restaurant-noodle-11.png"));
_points[0x2a05] = Point(QImage(":/IMG/bakery-11.png")); _points[0x2a05] = Point(QImage(":/POI/bakery-11.png"));
_points[0x2a06] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a06] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a07] = Point(QImage(":/IMG/fast-food-11.png")); _points[0x2a07] = Point(QImage(":/POI/fast-food-11.png"));
_points[0x2a08] = Point(QImage(":/IMG/restaurant-pizza-11.png")); _points[0x2a08] = Point(QImage(":/POI/restaurant-pizza-11.png"));
_points[0x2a09] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a09] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a0a] = Point(QImage(":/IMG/restaurant-pizza-11.png")); _points[0x2a0a] = Point(QImage(":/POI/restaurant-pizza-11.png"));
_points[0x2a0b] = Point(QImage(":/IMG/restaurant-seafood-11.png")); _points[0x2a0b] = Point(QImage(":/POI/restaurant-seafood-11.png"));
_points[0x2a0c] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a0c] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a0d] = Point(QImage(":/IMG/bakery-11.png")); _points[0x2a0d] = Point(QImage(":/POI/bakery-11.png"));
_points[0x2a0e] = Point(QImage(":/IMG/cafe-11.png")); _points[0x2a0e] = Point(QImage(":/POI/cafe-11.png"));
_points[0x2a0f] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a0f] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a10] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a10] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a11] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a11] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a12] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a12] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2a13] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x2a13] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x2b01] = Point(QImage(":/IMG/lodging-11.png")); _points[0x2b01] = Point(QImage(":/POI/lodging-11.png"));
_points[0x2b02] = Point(QImage(":/IMG/lodging-11.png")); _points[0x2b02] = Point(QImage(":/POI/lodging-11.png"));
_points[0x2b03] = Point(QImage(":/IMG/campsite-11.png")); _points[0x2b03] = Point(QImage(":/POI/campsite-11.png"));
_points[0x2b04] = Point(QImage(":/IMG/village-11.png")); _points[0x2b04] = Point(QImage(":/POI/village-11.png"));
_points[0x2b06] = Point(QImage(":/IMG/shelter-11.png")); _points[0x2b06] = Point(QImage(":/POI/shelter-11.png"));
_points[0x2c01] = Point(QImage(":/IMG/amusement-park-11.png")); _points[0x2c01] = Point(QImage(":/POI/amusement-park-11.png"));
_points[0x2c02] = Point(QImage(":/IMG/museum-11.png")); _points[0x2c02] = Point(QImage(":/POI/museum-11.png"));
_points[0x2c03] = Point(QImage(":/IMG/library-11.png")); _points[0x2c03] = Point(QImage(":/POI/library-11.png"));
_points[0x2c04] = Point(QImage(":/IMG/landmark-11.png")); _points[0x2c04] = Point(QImage(":/POI/landmark-11.png"));
_points[0x2c05] = Point(QImage(":/IMG/school-11.png")); _points[0x2c05] = Point(QImage(":/POI/school-11.png"));
_points[0x2c06] = Point(QImage(":/IMG/garden-11.png")); _points[0x2c06] = Point(QImage(":/POI/garden-11.png"));
_points[0x2c07] = Point(QImage(":/IMG/zoo-11.png")); _points[0x2c07] = Point(QImage(":/POI/zoo-11.png"));
_points[0x2c08] = Point(QImage(":/IMG/soccer-11.png")); _points[0x2c08] = Point(QImage(":/POI/soccer-11.png"));
_points[0x2c0a] = Point(QImage(":/IMG/bar-11.png")); _points[0x2c0a] = Point(QImage(":/POI/bar-11.png"));
_points[0x2c0b] = Point(QImage(":/IMG/place-of-worship-11.png")); _points[0x2c0b] = Point(QImage(":/POI/place-of-worship-11.png"));
_points[0x2c0d] = Point(QImage(":/IMG/religious-muslim-11.png")); _points[0x2c0d] = Point(QImage(":/POI/religious-muslim-11.png"));
_points[0x2c0e] = Point(QImage(":/IMG/religious-christian-11.png")); _points[0x2c0e] = Point(QImage(":/POI/religious-christian-11.png"));
_points[0x2c10] = Point(QImage(":/IMG/religious-jewish-11.png")); _points[0x2c10] = Point(QImage(":/POI/religious-jewish-11.png"));
_points[0x2d01] = Point(QImage(":/IMG/theatre-11.png")); _points[0x2d01] = Point(QImage(":/POI/theatre-11.png"));
_points[0x2d02] = Point(QImage(":/IMG/bar-11.png")); _points[0x2d02] = Point(QImage(":/POI/bar-11.png"));
_points[0x2d03] = Point(QImage(":/IMG/cinema-11.png")); _points[0x2d03] = Point(QImage(":/POI/cinema-11.png"));
_points[0x2d04] = Point(QImage(":/IMG/casino-11.png")); _points[0x2d04] = Point(QImage(":/POI/casino-11.png"));
_points[0x2d05] = Point(QImage(":/IMG/golf-11.png")); _points[0x2d05] = Point(QImage(":/POI/golf-11.png"));
_points[0x2d06] = Point(QImage(":/IMG/skiing-11.png")); _points[0x2d06] = Point(QImage(":/POI/skiing-11.png"));
_points[0x2d07] = Point(QImage(":/IMG/bowling-alley-11.png")); _points[0x2d07] = Point(QImage(":/POI/bowling-alley-11.png"));
_points[0x2d09] = Point(QImage(":/IMG/swimming-11.png")); _points[0x2d09] = Point(QImage(":/POI/swimming-11.png"));
_points[0x2d0a] = Point(QImage(":/IMG/fitness-centre-11.png")); _points[0x2d0a] = Point(QImage(":/POI/fitness-centre-11.png"));
_points[0x2d0b] = Point(QImage(":/IMG/airfield-11.png")); _points[0x2d0b] = Point(QImage(":/POI/airfield-11.png"));
_points[0x2e02] = Point(QImage(":/IMG/grocery-11.png")); _points[0x2e02] = Point(QImage(":/POI/grocery-11.png"));
_points[0x2e03] = Point(QImage(":/IMG/shop-11.png")); _points[0x2e03] = Point(QImage(":/POI/shop-11.png"));
_points[0x2e05] = Point(QImage(":/IMG/pharmacy-11.png")); _points[0x2e05] = Point(QImage(":/POI/pharmacy-11.png"));
_points[0x2e06] = Point(QImage(":/IMG/convenience-11.png")); _points[0x2e06] = Point(QImage(":/POI/convenience-11.png"));
_points[0x2e07] = Point(QImage(":/IMG/clothing-store-11.png")); _points[0x2e07] = Point(QImage(":/POI/clothing-store-11.png"));
_points[0x2e08] = Point(QImage(":/IMG/garden-centre-11.png")); _points[0x2e08] = Point(QImage(":/POI/garden-centre-11.png"));
_points[0x2e09] = Point(QImage(":/IMG/furniture-11.png")); _points[0x2e09] = Point(QImage(":/POI/furniture-11.png"));
_points[0x2e0a] = Point(QImage(":/IMG/shop-11.png")); _points[0x2e0a] = Point(QImage(":/POI/shop-11.png"));
_points[0x2e0c] = Point(QImage(":/IMG/shop-11.png")); _points[0x2e0c] = Point(QImage(":/POI/shop-11.png"));
_points[0x2f01] = Point(QImage(":/IMG/fuel-11.png")); _points[0x2f01] = Point(QImage(":/POI/fuel-11.png"));
_points[0x2f02] = Point(QImage(":/IMG/car-rental-11.png")); _points[0x2f02] = Point(QImage(":/POI/car-rental-11.png"));
_points[0x2f03] = Point(QImage(":/IMG/car-repair-11.png")); _points[0x2f03] = Point(QImage(":/POI/car-repair-11.png"));
_points[0x2f04] = Point(QImage(":/IMG/airport-11.png")); _points[0x2f04] = Point(QImage(":/POI/airport-11.png"));
_points[0x2f05] = Point(QImage(":/IMG/post-11.png")); _points[0x2f05] = Point(QImage(":/POI/post-11.png"));
_points[0x2f06] = Point(QImage(":/IMG/bank-11.png")); _points[0x2f06] = Point(QImage(":/POI/bank-11.png"));
_points[0x2f07] = Point(QImage(":/IMG/car-11.png")); _points[0x2f07] = Point(QImage(":/POI/car-11.png"));
_points[0x2f08] = Point(QImage(":/IMG/bus-11.png")); _points[0x2f08] = Point(QImage(":/POI/bus-11.png"));
_points[0x2f09] = Point(QImage(":/IMG/harbor-11.png")); _points[0x2f09] = Point(QImage(":/POI/harbor-11.png"));
_points[0x2f0b] = Point(QImage(":/IMG/parking-11.png")); _points[0x2f0b] = Point(QImage(":/POI/parking-11.png"));
_points[0x2f0b].setTextFontSize(None); _points[0x2f0b].setTextFontSize(None);
_points[0x2f0c] = Point(QImage(":/IMG/toilet-11.png")); _points[0x2f0c] = Point(QImage(":/POI/toilet-11.png"));
_points[0x2f0c].setTextFontSize(None); _points[0x2f0c].setTextFontSize(None);
_points[0x2f10] = Point(QImage(":/IMG/hairdresser-11.png")); _points[0x2f10] = Point(QImage(":/POI/hairdresser-11.png"));
_points[0x2f12].setTextFontSize(None); _points[0x2f12].setTextFontSize(None);
_points[0x2f13] = Point(QImage(":/IMG/hardware-11.png")); _points[0x2f13] = Point(QImage(":/POI/hardware-11.png"));
_points[0x2f17] = Point(QImage(":/IMG/bus-11.png")); _points[0x2f17] = Point(QImage(":/POI/bus-11.png"));
_points[0x3001] = Point(QImage(":/IMG/police-11.png")); _points[0x3001] = Point(QImage(":/POI/police-11.png"));
_points[0x3002] = Point(QImage(":/IMG/hospital-11.png")); _points[0x3002] = Point(QImage(":/POI/hospital-11.png"));
_points[0x3003] = Point(QImage(":/IMG/town-hall-11.png")); _points[0x3003] = Point(QImage(":/POI/town-hall-11.png"));
_points[0x3006] = Point(QImage(":/IMG/entrance-alt1-11.png")); _points[0x3006] = Point(QImage(":/POI/entrance-alt1-11.png"));
_points[0x3007] = Point(QImage(":/IMG/town-hall-11.png")); _points[0x3007] = Point(QImage(":/POI/town-hall-11.png"));
_points[0x3008] = Point(QImage(":/IMG/fire-station-11.png")); _points[0x3008] = Point(QImage(":/POI/fire-station-11.png"));
_points[0x4000] = Point(QImage(":/IMG/golf-11.png")); _points[0x4000] = Point(QImage(":/POI/golf-11.png"));
_points[0x4300] = Point(QImage(":/IMG/harbor-11.png")); _points[0x4300] = Point(QImage(":/POI/harbor-11.png"));
_points[0x4400] = Point(QImage(":/IMG/fuel-11.png")); _points[0x4400] = Point(QImage(":/POI/fuel-11.png"));
_points[0x4500] = Point(QImage(":/IMG/restaurant-11.png")); _points[0x4500] = Point(QImage(":/POI/restaurant-11.png"));
_points[0x4600] = Point(QImage(":/IMG/bar-11.png")); _points[0x4600] = Point(QImage(":/POI/bar-11.png"));
_points[0x4900] = Point(QImage(":/IMG/park-11.png")); _points[0x4900] = Point(QImage(":/POI/park-11.png"));
_points[0x4a00] = Point(QImage(":/IMG/picnic-site-11.png")); _points[0x4a00] = Point(QImage(":/POI/picnic-site-11.png"));
_points[0x4c00] = Point(QImage(":/IMG/information-11.png")); _points[0x4c00] = Point(QImage(":/POI/information-11.png"));
_points[0x4800] = Point(QImage(":/IMG/campsite-11.png")); _points[0x4800] = Point(QImage(":/POI/campsite-11.png"));
_points[0x4a00] = Point(QImage(":/IMG/picnic-site-11.png")); _points[0x4a00] = Point(QImage(":/POI/picnic-site-11.png"));
_points[0x4b00] = Point(QImage(":/IMG/hospital-11.png")); _points[0x4b00] = Point(QImage(":/POI/hospital-11.png"));
_points[0x4c00] = Point(QImage(":/IMG/information-11.png")); _points[0x4c00] = Point(QImage(":/POI/information-11.png"));
_points[0x4d00] = Point(QImage(":/IMG/parking-11.png")); _points[0x4d00] = Point(QImage(":/POI/parking-11.png"));
_points[0x4d00].setTextFontSize(None); _points[0x4d00].setTextFontSize(None);
_points[0x4e00] = Point(QImage(":/IMG/toilet-11.png")); _points[0x4e00] = Point(QImage(":/POI/toilet-11.png"));
_points[0x4e00].setTextFontSize(None); _points[0x4e00].setTextFontSize(None);
_points[0x5000] = Point(QImage(":/IMG/drinking-water-11.png")); _points[0x5000] = Point(QImage(":/POI/drinking-water-11.png"));
_points[0x5000].setTextFontSize(None); _points[0x5000].setTextFontSize(None);
_points[0x5100] = Point(QImage(":/IMG/telephone-11.png")); _points[0x5100] = Point(QImage(":/POI/telephone-11.png"));
_points[0x5200] = Point(QImage(":/IMG/viewpoint-11.png")); _points[0x5200] = Point(QImage(":/POI/viewpoint-11.png"));
_points[0x5300] = Point(QImage(":/IMG/skiing-11.png")); _points[0x5300] = Point(QImage(":/POI/skiing-11.png"));
_points[0x5400] = Point(QImage(":/IMG/swimming-11.png")); _points[0x5400] = Point(QImage(":/POI/swimming-11.png"));
_points[0x5500] = Point(QImage(":/IMG/dam-11.png")); _points[0x5500] = Point(QImage(":/POI/dam-11.png"));
_points[0x5700] = Point(QImage(":/IMG/danger-11.png")); _points[0x5700] = Point(QImage(":/POI/danger-11.png"));
_points[0x5800] = Point(QImage(":/IMG/roadblock-11.png")); _points[0x5800] = Point(QImage(":/POI/roadblock-11.png"));
_points[0x5900] = Point(QImage(":/IMG/airport-11.png")); _points[0x5900] = Point(QImage(":/POI/airport-11.png"));
_points[0x5901] = Point(QImage(":/IMG/airport-11.png")); _points[0x5901] = Point(QImage(":/POI/airport-11.png"));
_points[0x5904] = Point(QImage(":/IMG/heliport-11.png")); _points[0x5904] = Point(QImage(":/POI/heliport-11.png"));
_points[0x6401] = Point(QImage(":/IMG/bridge-11.png")); _points[0x6401] = Point(QImage(":/POI/bridge-11.png"));
_points[0x6402] = Point(QImage(":/IMG/building-alt1-11.png")); _points[0x6402] = Point(QImage(":/POI/building-alt1-11.png"));
_points[0x6403] = Point(QImage(":/IMG/cemetery-11.png")); _points[0x6403] = Point(QImage(":/POI/cemetery-11.png"));
_points[0x6404] = Point(QImage(":/IMG/religious-christian-11.png")); _points[0x6404] = Point(QImage(":/POI/religious-christian-11.png"));
_points[0x6407] = Point(QImage(":/IMG/dam-11.png")); _points[0x6407] = Point(QImage(":/POI/dam-11.png"));
_points[0x6408] = Point(QImage(":/IMG/hospital-11.png")); _points[0x6408] = Point(QImage(":/POI/hospital-11.png"));
_points[0x6409] = Point(QImage(":/IMG/dam-11.png")); _points[0x6409] = Point(QImage(":/POI/dam-11.png"));
_points[0x640d] = Point(QImage(":/IMG/communications-tower-11.png")); _points[0x640d] = Point(QImage(":/POI/communications-tower-11.png"));
_points[0x640e] = Point(QImage(":/IMG/park-11.png")); _points[0x640e] = Point(QImage(":/POI/park-11.png"));
_points[0x640f] = Point(QImage(":/IMG/post-11.png")); _points[0x640f] = Point(QImage(":/POI/post-11.png"));
_points[0x6411] = Point(QImage(":/IMG/communications-tower-11.png")); _points[0x6411] = Point(QImage(":/POI/communications-tower-11.png"));
_points[0x6508] = Point(QImage(":/IMG/waterfall-11.png")); _points[0x6508] = Point(QImage(":/POI/waterfall-11.png"));
_points[0x6513] = Point(QImage(":/IMG/wetland-11.png")); _points[0x6513] = Point(QImage(":/POI/wetland-11.png"));
_points[0x6604] = Point(QImage(":/IMG/beach-11.png")); _points[0x6604] = Point(QImage(":/POI/beach-11.png"));
_points[0x6616] = Point(QImage(":/IMG/mountain-11.png")); _points[0x6616] = Point(QImage(":/POI/mountain-11.png"));
// NT types // NT types