Package: merkaartor
Version: 0.12+svn13563-1
Severity: normal
Tags: patch
Hi!
As written to upstream maillist at
http://www.mail-archive.com/merkaar...@openstreetmap.org/msg00655.html
without replies..
Apparantly, at least maemo mapper can create descriptions on
trackpoints
without marking it as waypoints.
I would like the description shown in the info box as well as the
trackpoint
shown a bit different.
After reading the code a bit, I figured out that only waypoints showed
descriptions and was marked special, so I just duplicated it to just
check for
descriptions.
Patch attached.
/Sune
-- System Information:
Debian Release: 5.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (200, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
Versions of packages merkaartor depends on:
ii libc6 2.9-4 GNU C Library: Shared libraries
ii libexiv2-4 0.17.1-1 EXIF/IPTC metadata manipulation li
ii libgcc1 1:4.3.3-4 GCC support library
ii libqt4-network 4.4.3-2 Qt 4 network module
ii libqt4-svg 4.4.3-2 Qt 4 SVG module
ii libqt4-webkit 4.4.3-2 Qt 4 WebKit module
ii libqt4-xml 4.4.3-2 Qt 4 XML module
ii libqtcore4 4.4.3-2 Qt 4 core module
ii libqtgui4 4.4.3-2 Qt 4 GUI module
ii libstdc++6 4.3.3-4 The GNU Standard C++ Library v3
ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime
merkaartor recommends no packages.
merkaartor suggests no packages.
-- debconf-show failed
--- a/Map/TrackPoint.cpp
+++ b/Map/TrackPoint.cpp
@@ -390,12 +390,12 @@
if (speed())
D += "<i>"+QApplication::translate("MapFeature", "speed")+":
</i>" + QString::number(speed(), 'f', 4) + "<br/>";
+ if ((i = findKey("_description_")) < tagSize())
+ D += "<i>"+QApplication::translate("MapFeature",
"description")+": </i>" + tagValue(i) + "<br/>";
+
if ((i = findKey("_waypoint_")) < tagSize()) {
D += "<p><b>"+QApplication::translate("MapFeature",
"Waypoint")+"</b><br/>";
- if ((i = findKey("_description_")) < tagSize())
- D += "<i>"+QApplication::translate("MapFeature",
"description")+": </i>" + tagValue(i) + "<br/>";
-
if ((i = findKey("_comment_")) < tagSize())
D += "<i>"+QApplication::translate("MapFeature",
"comment")+": </i>" + tagValue(i) + "<br/>";
}
--- a/PaintStyle/EditPaintStyle.cpp
+++ b/PaintStyle/EditPaintStyle.cpp
@@ -223,7 +223,7 @@
{
QPointF P(p->theProjection.project(Pt));
- if (Pt->findKey("_waypoint_") != Pt->tagSize())
{
+ if (Pt->findKey("_waypoint_") != Pt->tagSize()
|| Pt->findKey("_description_") < Pt->tagSize()) {
QRectF R(P-QPointF(4,4),QSize(8,8));
p->thePainter.fillRect(R,QColor(255,0,0,128));
}
