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

Compare commits

base: root:f5b0c3f0414830e0543dbdb12e642f2a2ca7a372
Branches Tags
root:master
root:gh-pages
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0
..
compare: root:4281e809be65af59ce2902cc56cdffa59f289b91
Branches Tags
root:master
root:gh-pages
root:13.31
root:13.30
root:13.29
root:13.28
root:13.27
root:13.26
root:13.25
root:13.24
root:13.23
root:13.22
root:13.21
root:13.20
root:13.19
root:13.18
root:13.17
root:13.16
root:13.15
root:13.14
root:13.13
root:13.12
root:13.11
root:13.10
root:13.9
root:13.8
root:13.7
root:13.6
root:13.5
root:13.4
root:13.3
root:13.2
root:13.1
root:13.0
root:12.4
root:12.3
root:12.2
root:12.1
root:12.0
root:11.12
root:11.11
root:11.10
root:11.9
root:11.8
root:11.7
root:11.6
root:11.5
root:11.4
root:11.3
root:11.2
root:11.1
root:11.0
root:10.7
root:10.6
root:10.5
root:10.4
root:10.3
root:10.2
root:10.1
root:10.0
root:9.12
root:9.11
root:9.10
root:9.9
root:9.8
root:9.7
root:9.6
root:9.5
root:9.4
root:9.3
root:9.2
root:9.1
root:9.0
root:8.9
root:8.8
root:8.7
root:8.6
root:8.5
root:8.4
root:8.3
root:8.2
root:8.1
root:8.0
root:7.38
root:7.37
root:7.36
root:7.35
root:7.34
root:7.33
root:7.32
root:7.31
root:7.30
root:7.29
root:7.28
root:7.27
root:7.26
root:7.25
root:7.24
root:7.23
root:7.22
root:7.21
root:7.20
root:7.19
root:7.18
root:7.17
root:7.16
root:7.15
root:7.14
root:7.13
root:7.12
root:7.11
root:7.10
root:7.9
root:7.8
root:7.7
root:7.6
root:7.5
root:7.4
root:7.3
root:7.2
root:7.1
root:7.0
root:6.3
root:6.2
root:6.1
root:6.0
root:5.18
root:5.17
root:5.16
root:5.15
root:5.14
root:5.13
root:5.12
root:5.11
root:5.10
root:5.9
root:5.8
root:5.7
root:5.6
root:5.5
root:5.4
root:5.3
root:5.2
root:5.1
root:5.0
root:4.19
root:4.18
root:4.17
root:4.16
root:4.15
root:4.14
root:4.13
root:4.12
root:4.11
root:4.10
root:4.9
root:4.8
root:4.7
root:4.6
root:4.5
root:4.4
root:4.3
root:4.2
root:4.1
root:4.0
root:3.10
root:3.9
root:3.8
root:3.7
root:3.6
root:3.5
root:3.4
root:3.3
root:3.2
root:3.1
root:3.0
root:2.20
root:2.19
root:2.18
root:2.17
root:2.16
root:2.15
root:2.14
root:2.13
root:2.12
root:2.11
root:2.10
root:2.9
root:2.8
root:2.7
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.1
root:1.0

No commits in common. "f5b0c3f0414830e0543dbdb12e642f2a2ca7a372" and "4281e809be65af59ce2902cc56cdffa59f289b91" have entirely different histories.
f5b0c3f041 ... 4281e809be

5 changed files with 10 additions and 35 deletions
Show Stats Expand all files Collapse all files

18
data/style/style.xml
View File

@ -569,16 +569,8 @@
</rule>
</rule>
</rule>
<rule e="node" k="place" v="suburb">
<rule e="node" k="*" v="*" zoom-min="12" zoom-max="13">
<caption fill="#000000" font-size="14" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
</rule>
<rule e="node" k="*" v="*" zoom-min="14" zoom-max="17">
<caption fill="#000000" font-size="16" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
</rule>
</rule>
<rule e="node" k="place" v="quarter" zoom-min="14" zoom-max="17">
<caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
<rule e="node" k="place" v="suburb" zoom-min="15" zoom-max="17">
<caption fill="#000000" font-size="16" k="name" priority="25" stroke="#FFFFFF" stroke-width="2"/>
</rule>
<!-- Nature POIs -->
@ -1031,10 +1023,4 @@
</rule>
</rule>
<rule e="any" k="military" v="bunker|bunker_disused" zoom-min="17">
<symbol id="bunker" src=":/symbols/bunker.svg" symbol-width="11" symbol-height="9" 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="bunker"/>
</rule>
</rule>
</rendertheme>

1
gpxsee.qrc
View File

@ -6,7 +6,6 @@
<!-- Common map stuff -->
<qresource prefix="/symbols">
<file alias="bunker.svg">icons/map/symbols/bunker.svg</file>
<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
<file alias="exit.svg">icons/map/symbols/exit.svg</file>
<file alias="flow.svg">icons/map/symbols/flow.svg</file>

10
icons/map/symbols/bunker.svg
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 11 9" height="9" width="11" version="1.1">
<g stroke-width="1.5" stroke="#000000" fill="none">
<rect x="2" y="2" width="7" height="5"/>
<line x1="0" y1="0" x2="2" y2="2"/>
<line x1="11" y1="0" x2="9" y2="2"/>
<line x1="0" y1="9" x2="2" y2="7"/>
<line x1="11" y1="9" x2="9" y2="7"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 363 B

10
icons/map/symbols/cliff.svg
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 4 5" height="5" width="4" version="1.1">
<g stroke-width="1.0" stroke="#666666">
<path d="M 0.5,0 V 5"/>
<path d="M 0,0.5 H 4"/>
</g>
<svg viewBox="0 0 4 5" height="5" width="4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<g>
<path d="M 0.5,0 V 5" stroke-width="1.0" stroke="#666666"/>
<path d="M 0,0.5 H 4" stroke-width="1.0" stroke="#666666"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 320 B

6
icons/map/symbols/saddle.svg
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 9 11" height="11" width="9" version="1.1">
<g stroke-width="1" stroke="#000000" fill="none">
<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5"/>
<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5"/>
<g>
<path d="M 1.5,1.5 L3,3 L 3,8 L 1.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
<path d="M 7.5,1.5 L6,3 L 6,8 L 7.5,9.5" stroke-width="1" stroke="#000000" fill="none"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 300 B