diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 0b512969..12c49305 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -825,6 +825,11 @@ bool Style::isContourLine(quint32 type) || type == TYPE(0x23) || type == TYPE(0x24) || type == TYPE(0x25)); } +bool Style::isSpot(quint32 type) +{ + return (type == TYPE(0x62) || type == TYPE(0x63)); +} + #ifndef QT_NO_DEBUG static QString penColor(const QPen &pen) { diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index cd910fd4..cf36ff23 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -90,6 +90,7 @@ public: const QList &drawOrder() const {return _drawOrder;} static bool isContourLine(quint32 type); + static bool isSpot(quint32 type); private: struct Section { diff --git a/src/map/imgmap.cpp b/src/map/imgmap.cpp index 5446ca86..a0c5bb99 100644 --- a/src/map/imgmap.cpp +++ b/src/map/imgmap.cpp @@ -267,7 +267,7 @@ void IMGMap::drawPoints(QPainter *painter, QList &points) QVector items; for (int i = 0; i < points.size(); i++) { - const IMG::Point &point = points.at(i); + IMG::Point &point = points[i]; const Style::Point &style = _img.style().point(point.type); if (point.poi && _zoom < POI_MIN_ZOOM) @@ -300,6 +300,9 @@ void IMGMap::drawPoints(QPainter *painter, QList &points) if (!label && !img) continue; + if (Style::isSpot(point.type)) + convertUnits(point.label); + TextPointItem item(ll2xy(point.coordinates).toPoint(), label, font, img, color); if (!item.collides(items))