1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-23 19:25:54 +01:00

Compare commits

...

6 Commits

Author SHA1 Message Date
5d3d2d7571 Embassies 2024-11-19 23:49:23 +01:00
72ae27f724 Distinguish schools and universities 2024-11-19 21:33:41 +01:00
a433ca3e1d Lock gates 2024-11-19 21:06:53 +01:00
26c99af3dc Observation towers 2024-11-19 20:46:13 +01:00
47b936dede Adjusted POI appearance levels 2024-11-19 19:12:25 +01:00
e8c8b86b81 Removed accidentally left debug output 2024-11-19 19:08:41 +01:00
6 changed files with 80 additions and 32 deletions

View File

@ -126,6 +126,9 @@
<rule e="way" closed="yes" k="waterway" v="dam" zoom-min="10">
<area fill="#bbbbbb"/>
</rule>
<rule e="way" k="waterway" v="lock_gate" zoom-min="10">
<line stroke="#000000" stroke-width="0.1"/>
</rule>
<rule e="way" k="waterway" v="weir" zoom-min="10">
<lineSymbol src=":/symbols/cliff.svg" repeat="true" display="always" repeat-gap="0" repeat-start="0" symbol-width="4" symbol-height="5"/>
<pathText fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2"/>
@ -681,12 +684,18 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="shelter"/>
</rule>
</rule>
<rule e="any" k="tourism|building" v="alpine_hut|hotel|hostel|guest_house|chalet|motel" zoom-min="16">
<rule e="any" k="tourism|building" v="alpine_hut" zoom-min="16">
<symbol id="lodging" src=":/POI/lodging-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lodging"/>
</rule>
</rule>
<rule e="any" k="tourism|building" v="hotel|hostel|guest_house|chalet|motel" zoom-min="17">
<symbol id="lodging" src=":/POI/lodging-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lodging"/>
</rule>
</rule>
<rule e="any" k="tourism|accommodation" v="camp_site|caravan_site" zoom-min="16">
<symbol id="camp" src=":/POI/campsite-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
@ -694,7 +703,7 @@
</rule>
</rule>
<rule e="any" k="man_made" v="lighthouse" zoom-min="16">
<rule e="any" k="man_made" v="lighthouse" zoom-min="15">
<symbol id="lighthouse" src=":/POI/lighthouse-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lighthouse"/>
@ -706,14 +715,24 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="com-tower"/>
</rule>
</rule>
<rule e="any" k="tower" v="observation" zoom-min="16">
<symbol id="obs-tower" src=":/POI/observation-tower.svg" symbol-width="11" priority="5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="obs-tower"/>
</rule>
</rule>
<rule e="any" k="amenity" v="theatre" zoom-min="16">
<symbol id="theatre" src=":/POI/theatre-11.svg" symbol-width="11"/>
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="theatre"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="theatre"/>
</rule>
</rule>
<rule e="any" k="amenity" v="cinema" zoom-min="16">
<symbol id="cinema" src=":/POI/cinema-11.svg" symbol-width="11"/>
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cinema"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cinema"/>
</rule>
</rule>
<rule e="any" k="tourism" v="museum" zoom-min="16">
<symbol id="museum" src=":/POI/museum-11.svg" symbol-width="11"/>
@ -739,9 +758,9 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="memorial"/>
</rule>
</rule>
<rule e="any" k="amenity" v="bank" zoom-min="16">
<rule e="any" k="amenity" v="bank" zoom-min="17">
<symbol id="bank" src=":/POI/bank-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bank"/>
</rule>
</rule>
@ -766,12 +785,24 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="townhall"/>
</rule>
</rule>
<rule e="any" k="amenity" v="school|university" zoom-min="16">
<rule e="any" k="amenity" v="university" zoom-min="16">
<symbol id="university" src=":/POI/college-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="university"/>
</rule>
</rule>
<rule e="any" k="amenity" v="school" zoom-min="16">
<symbol id="school" src=":/POI/school-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="school"/>
</rule>
</rule>
<rule e="any" k="amenity|building" v="embassy" zoom-min="16">
<symbol id="embassy" src=":/POI/embassy-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="17">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="embassy"/>
</rule>
</rule>
<rule e="any" k="sport" v="swimming" zoom-min="16">
<symbol id="swimming" src=":/POI/swimming-11.svg" symbol-width="11"/>
@ -779,56 +810,56 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="swimming"/>
</rule>
</rule>
<rule e="any" k="sport" v="golf" zoom-min="16">
<rule e="any" k="sport" v="golf" zoom-min="17">
<symbol id="golf" src=":/POI/golf-11.svg" symbol-width="11"/>
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="golf"/>
</rule>
<rule e="any" k="sport" v="soccer" zoom-min="16">
<rule e="any" k="sport" v="soccer" zoom-min="17">
<symbol id="soccer" src=":/POI/soccer-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="soccer"/>
</rule>
</rule>
<rule e="any" k="sport" v="tennis" zoom-min="16">
<rule e="any" k="sport" v="tennis" zoom-min="17">
<symbol id="tennis" src=":/POI/tennis-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="tennis"/>
</rule>
</rule>
<rule e="any" k="sport" v="skateboard" zoom-min="16">
<rule e="any" k="sport" v="skateboard" zoom-min="17">
<symbol id="skateboard" src=":/POI/skateboard-11.svg" symbol-width="11"/>
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="skateboard"/>
</rule>
</rule>
<rule e="any" k="amenity" v="restaurant" zoom-min="16">
<rule e="any" k="amenity" v="restaurant" zoom-min="17">
<symbol id="restaurant" src=":/POI/restaurant-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="restaurant"/>
</rule>
</rule>
<rule e="any" k="amenity" v="fast_food" zoom-min="16">
<rule e="any" k="amenity" v="fast_food" zoom-min="17">
<symbol id="fast-food" src=":/POI/fast-food-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="fast-food"/>
</rule>
</rule>
<rule e="any" k="amenity" v="cafe" zoom-min="16">
<rule e="any" k="amenity" v="cafe" zoom-min="17">
<symbol id="cafe" src=":/POI/cafe-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="cafe"/>
</rule>
</rule>
<rule e="any" k="amenity" v="bar" zoom-min="17">
<symbol id="bar" src=":/POI/bar-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bar"/>
</rule>
</rule>
<rule e="any" k="amenity" v="pub" zoom-min="16">
<rule e="any" k="amenity" v="pub" zoom-min="17">
<symbol id="pub" src=":/POI/beer-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="pub"/>
</rule>
</rule>
@ -843,21 +874,21 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="supermarket"/>
</rule>
</rule>
<rule e="any" k="shop" v="convenience" zoom-min="16">
<rule e="any" k="shop" v="convenience" zoom-min="17">
<symbol id="convenience" src=":/POI/shop-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="convenience"/>
</rule>
</rule>
<rule e="any" k="shop" v="doityourself|hardware" zoom-min="16">
<rule e="any" k="shop" v="doityourself|hardware" zoom-min="17">
<symbol id="hardware" src=":/POI/hardware-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hardware"/>
</rule>
</rule>
<rule e="any" k="shop" v="bakery" zoom-min="16">
<rule e="any" k="shop" v="bakery" zoom-min="17">
<symbol id="bakery" src=":/POI/bakery-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bakery"/>
</rule>
</rule>
@ -867,21 +898,21 @@
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="pharmacy"/>
</rule>
</rule>
<rule e="any" k="shop" v="bicycle" zoom-min="16">
<rule e="any" k="shop" v="bicycle" zoom-min="17">
<symbol id="bikeshop" src=":/POI/bicycle-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="bikeshop"/>
</rule>
</rule>
<rule e="any" k="shop" v="hairdresser" zoom-min="16">
<rule e="any" k="shop" v="hairdresser" zoom-min="17">
<symbol id="hairdresser" src=":/POI/hairdresser-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hairdresser"/>
</rule>
</rule>
<rule e="any" k="shop" v="beverages|alcohol" zoom-min="16">
<rule e="any" k="shop" v="beverages|alcohol" zoom-min="17">
<symbol id="alcohol" src=":/POI/alcohol-shop-11.svg" symbol-width="11" priority="-5"/>
<rule e="any" k="*" v="*" zoom-min="17">
<rule e="any" k="*" v="*" zoom-min="18">
<caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="alcohol"/>
</rule>
</rule>

View File

@ -41,6 +41,7 @@
<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
<file alias="communications-tower-11.svg">icons/map/POI/communications-tower-11.svg</file>
<file alias="convenience-11.svg">icons/map/POI/convenience-11.svg</file>
<file alias="dam-11.svg">icons/map/POI/dam-11.svg</file>
@ -48,6 +49,7 @@
<file alias="doctor-11.svg">icons/map/POI/doctor-11.svg</file>
<file alias="drinking-water-11.svg">icons/map/POI/drinking-water-11.svg</file>
<file alias="fast-food-11.svg">icons/map/POI/fast-food-11.svg</file>
<file alias="embassy-11.svg">icons/map/POI/embassy-11.svg</file>
<file alias="entrance-alt1-11.svg">icons/map/POI/entrance-alt1-11.svg</file>
<file alias="ferry-11.svg">icons/map/POI/ferry-11.svg</file>
<file alias="fire-station-11.svg">icons/map/POI/fire-station-11.svg</file>
@ -71,6 +73,7 @@
<file alias="monument-11.svg">icons/map/POI/monument-11.svg</file>
<file alias="mountain-11.svg">icons/map/POI/mountain-11.svg</file>
<file alias="museum-11.svg">icons/map/POI/museum-11.svg</file>
<file alias="observation-tower.svg">icons/map/POI/observation-tower.svg</file>
<file alias="park-11.svg">icons/map/POI/park-11.svg</file>
<file alias="parking-11.svg">icons/map/POI/parking-11.svg</file>
<file alias="pharmacy-11.svg">icons/map/POI/pharmacy-11.svg</file>

View File

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

After

Width:  |  Height:  |  Size: 526 B

View File

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

After

Width:  |  Height:  |  Size: 838 B

View File

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

After

Width:  |  Height:  |  Size: 618 B

View File

@ -418,7 +418,6 @@ void RasterTile::drawPaths(QPainter *painter, const QList<MapData::Path> &paths,
hillShadingInstructions(instructions);
std::sort(instructions.begin(), instructions.end());
qDebug() << instructions.size();
for (int i = 0; i < instructions.size(); i++) {
const RenderInstruction &is = instructions.at(i);
PainterPath *path = is.path();