mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-11-24 03:35:53 +01:00
Compare commits
No commits in common. "4281e809be65af59ce2902cc56cdffa59f289b91" and "cd44f350e1fb6b84ff88304c282b351c713f86c8" have entirely different histories.
4281e809be
...
cd44f350e1
@ -1,4 +1,4 @@
|
||||
version: 13.32.{build}
|
||||
version: 13.31.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
||||
@ -466,7 +466,7 @@
|
||||
<line stroke="#ffffff" stroke-width="0.4608" stroke-dasharray="2,2" stroke-linecap="butt" scale="all"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="14">
|
||||
<rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="15">
|
||||
<line stroke="#414141" stroke-width="0.2" stroke-linecap="butt"/>
|
||||
</rule>
|
||||
<rule e="way" k="railway" v="tram" zoom-min="15">
|
||||
@ -488,7 +488,7 @@
|
||||
<line stroke="#878787" stroke-width="0.4144" stroke-linecap="butt" stroke-dasharray="2,1" scale="all"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="14">
|
||||
<rule e="way" k="railway" v="narrow_gauge|light_rail|funicular" zoom-min="15">
|
||||
<line stroke="#414141" stroke-width="0.2" stroke-linecap="butt" stroke-dasharray="12,4"/>
|
||||
</rule>
|
||||
<rule e="way" k="railway" v="tram" zoom-min="15">
|
||||
@ -533,45 +533,27 @@
|
||||
</rule>
|
||||
</rule>
|
||||
|
||||
<!-- Town & village names -->
|
||||
<!-- Town & vilage names -->
|
||||
<rule e="node" k="place" v="locality|isolated_dwelling|farm" zoom-min="14">
|
||||
<caption fill="#000000" font-size="10" k="name" priority="10" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
<rule e="node" k="place" v="hamlet" zoom-min="12">
|
||||
<caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
|
||||
<caption fill="#000000" font-size="12" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
<rule e="node" k="place" v="village" zoom-min="11">
|
||||
<caption fill="#000000" font-size="14" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
|
||||
<caption fill="#000000" font-size="12" k="name" priority="20" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
<rule e="node" k="place" v="town" zoom-min="9" zoom-max="14">
|
||||
<rule e="node" k="*" v="*" zoom-max="10">
|
||||
<rule e="node" k="place" v="town" zoom-min="9">
|
||||
<caption fill="#000000" font-size="14" k="name" priority="30" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
<rule e="node" k="*" v="*" zoom-min="11">
|
||||
<caption fill="#000000" font-size="16" k="name" font-style="bold" priority="30" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="place" v="city">
|
||||
<rule e="node" k="*" v="*" zoom-max="10">
|
||||
<rule e="node" k="capital" v="yes|1|2">
|
||||
<caption fill="#000000" font-size="18" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="2" text-transform="uppercase"/>
|
||||
<caption fill="#000000" font-size="16" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="2" text-transform="uppercase"/>
|
||||
</rule>
|
||||
<rule e="node" k="capital" v="no|~">
|
||||
<caption fill="#000000" font-size="18" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="2"/>
|
||||
<caption fill="#000000" font-size="16" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
</rule>
|
||||
<rule e="node" k="*" v="*" zoom-min="11" zoom-max="14">
|
||||
<rule e="node" k="capital" v="yes|1|2">
|
||||
<caption fill="#000000" font-size="22" font-style="bold" k="name" priority="40" stroke="#FFFFFF" stroke-width="2" text-transform="uppercase"/>
|
||||
</rule>
|
||||
<rule e="node" k="capital" v="no|~">
|
||||
<caption fill="#000000" font-size="22" font-style="bold" k="name" priority="35" stroke="#FFFFFF" stroke-width="2"/>
|
||||
</rule>
|
||||
</rule>
|
||||
</rule>
|
||||
<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 -->
|
||||
<rule e="node" k="natural" v="peak" zoom-min="13">
|
||||
|
||||
@ -3,7 +3,7 @@ unix:!macx:!android {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 13.32
|
||||
VERSION = 13.31
|
||||
|
||||
|
||||
QT += core \
|
||||
|
||||
@ -37,7 +37,7 @@ Unicode true
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "13.32"
|
||||
!define VERSION "13.31"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
|
||||
@ -220,13 +220,8 @@ void RasterTile::drawLines(QPainter *painter, const QList<MapData::Line> &lines)
|
||||
void RasterTile::drawTextItems(QPainter *painter,
|
||||
const QList<TextItem*> &textItems)
|
||||
{
|
||||
QRectF rect(_rect);
|
||||
|
||||
for (int i = 0; i < textItems.size(); i++) {
|
||||
const TextItem *ti = textItems.at(i);
|
||||
if (rect.intersects(ti->boundingRect()))
|
||||
ti->paint(painter);
|
||||
}
|
||||
for (int i = 0; i < textItems.size(); i++)
|
||||
textItems.at(i)->paint(painter);
|
||||
}
|
||||
|
||||
void RasterTile::processPolygons(const QList<MapData::Poly> &polygons,
|
||||
|
||||
@ -217,13 +217,8 @@ void RasterTile::drawLines(QPainter *painter,
|
||||
void RasterTile::drawTextItems(QPainter *painter,
|
||||
const QList<TextItem*> &textItems) const
|
||||
{
|
||||
QRectF rect(_rect);
|
||||
|
||||
for (int i = 0; i < textItems.size(); i++) {
|
||||
const TextItem *ti = textItems.at(i);
|
||||
if (rect.intersects(ti->boundingRect()))
|
||||
ti->paint(painter);
|
||||
}
|
||||
for (int i = 0; i < textItems.size(); i++)
|
||||
textItems.at(i)->paint(painter);
|
||||
}
|
||||
|
||||
static void removeDuplicitLabel(QList<TextItem *> &labels, const QString &text,
|
||||
|
||||
@ -435,8 +435,8 @@ MapData::MapData(const QString &fileName)
|
||||
if (!readHeader(file))
|
||||
return;
|
||||
|
||||
_pathCache.setMaxCost(2048);
|
||||
_pointCache.setMaxCost(2048);
|
||||
_pathCache.setMaxCost(1024);
|
||||
_pointCache.setMaxCost(1024);
|
||||
|
||||
_valid = true;
|
||||
}
|
||||
|
||||
@ -231,13 +231,8 @@ void RasterTile::processLineLabels(const QVector<PainterPath> &paths,
|
||||
void RasterTile::drawTextItems(QPainter *painter,
|
||||
const QList<TextItem*> &textItems)
|
||||
{
|
||||
QRectF rect(_rect);
|
||||
|
||||
for (int i = 0; i < textItems.size(); i++) {
|
||||
const TextItem *ti = textItems.at(i);
|
||||
if (rect.intersects(ti->boundingRect()))
|
||||
ti->paint(painter);
|
||||
}
|
||||
for (int i = 0; i < textItems.size(); i++)
|
||||
textItems.at(i)->paint(painter);
|
||||
}
|
||||
|
||||
QPainterPath RasterTile::painterPath(const Polygon &polygon, bool curve) const
|
||||
|
||||
Loading…
Reference in New Issue
Block a user