From 981bd33680ff4290863abd3225ff2a32dac74f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Wed, 5 Apr 2023 19:27:25 +0200
Subject: [PATCH] Properly encapsulate the ENC-specific text point

---
 src/map/ENC/rastertile.cpp | 15 ---------------
 src/map/ENC/rastertile.h   | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp
index c8a6a2e5..9a4c5ac4 100644
--- a/src/map/ENC/rastertile.cpp
+++ b/src/map/ENC/rastertile.cpp
@@ -2,31 +2,16 @@
 #include <QPainter>
 #include "common/linec.h"
 #include "map/bitmapline.h"
-#include "map/textpointitem.h"
 #include "map/textpathitem.h"
 #include "style.h"
 #include "rastertile.h"
 
 using namespace ENC;
 
-#define ICON_PADDING 2
 #define TSSLPT_SIZE  0.005 /* ll */
 #define RDOCAL_SIZE  12 /* px */
 #define CURENT_SIZE  12 /* px */
 
-class PointItem : public TextPointItem
-{
-public:
-	PointItem(const QPoint &point, const QString *text, const QFont *font,
-	  const QImage *img, const QImage *rimg, const QColor *color,
-	  const QColor *haloColor) : TextPointItem(point, text, font, img, color,
-	  haloColor, 0, ICON_PADDING), _rimg(rimg) {}
-	~PointItem() {delete _rimg;}
-
-private:
-	const QImage *_rimg;
-};
-
 typedef QMap<Coordinates, const MapData::Point*> PointMap;
 
 const float C1 = 0.866025f; /* sqrt(3)/2 */
diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h
index 1652f986..718793ca 100644
--- a/src/map/ENC/rastertile.h
+++ b/src/map/ENC/rastertile.h
@@ -4,6 +4,7 @@
 #include <QPixmap>
 #include "map/projection.h"
 #include "map/transform.h"
+#include "map/textpointitem.h"
 #include "mapdata.h"
 
 class TextItem;
@@ -30,6 +31,19 @@ public:
 	void render();
 
 private:
+	class PointItem : public TextPointItem
+	{
+	public:
+		PointItem(const QPoint &point, const QString *text, const QFont *font,
+		  const QImage *img, const QImage *rimg, const QColor *color,
+		  const QColor *haloColor) : TextPointItem(point, text, font, img, color,
+		  haloColor, 0, 2), _rimg(rimg) {}
+		~PointItem() {delete _rimg;}
+
+	private:
+		const QImage *_rimg;
+	};
+
 	QPointF ll2xy(const Coordinates &c) const
 	  {return _transform.proj2img(_proj.ll2xy(c));}
 	QPainterPath painterPath(const Polygon &polygon) const;