src/map/ENC/rastertile.cpp

@@ -216,8 +216,8 @@ void RasterTile::drawTextItems(QPainter *painter,
 
 static QRectF lightRect(const QPointF &pos, double range)
 {
-	double r = qMin(range * RANGE_FACTOR, (double)TEXT_EXTENT);
+	return QRectF(pos.x() - range * RANGE_FACTOR, pos.y() - range * RANGE_FACTOR,
-	return QRect(pos.x() - r, pos.y() - r, 2 * r, 2 * r);
+		  2*range * RANGE_FACTOR, 2*range * RANGE_FACTOR);
 }
 
 void RasterTile::drawSectorLights(QPainter *painter,

src/map/IMG/rastertile.cpp

@@ -26,6 +26,31 @@ using namespace IMG;
 #define AREA(rect) \
 	(rect.size().width() * rect.size().height())
 
+struct Sector
+{
+	Sector(Light::Color color, quint32 start, quint32 end)
+	  : color(color), start(start), end(end) {}
+
+	bool operator==(const Sector &other) const
+	{
+		return (color == other.color && start == other.start && end == other.end);
+	}
+	bool operator<(const Sector &other) const
+	{
+		if (color == other.color) {
+			if (start == other.start)
+				return end < other.end;
+			else
+				return start < other.start;
+		} else
+			return color < other.color;
+	}
+
+	Light::Color color;
+	quint32 start;
+	quint32 end;
+};
+
 static const QColor textColor(Qt::black);
 static const QColor haloColor(Qt::white);
 static const QColor shieldColor(Qt::white);
@@ -234,7 +259,7 @@ static QRect lightRect(const QPoint &pos, quint32 range)
 }
 
 void RasterTile::drawSectorLights(QPainter *painter,
-  const QList<const MapData::Point*> &lights) const
+  const QList<const MapData::Point *> &lights) const
 {
 	for (int i = 0; i < lights.size(); i++) {
 		const MapData::Point *p = lights.at(i);
@@ -304,7 +329,7 @@ void RasterTile::drawSectorLights(QPainter *painter,
 	}
 }
 
-static void removeDuplicitLabel(QList<TextItem*> &labels, const QString &text,
+static void removeDuplicitLabel(QList<TextItem *> &labels, const QString &text,
   const QRectF &tileRect)
 {
 	for (int i = 0; i < labels.size(); i++) {
@@ -514,7 +539,7 @@ static Light::Color ordinaryLight(const QVector<Light> &lights)
 }
 
 void RasterTile::processPoints(QList<MapData::Point> &points,
-  QList<TextItem*> &textItems, QList<TextItem*> &lights,
+  QList<TextItem*> &textItems, QList<TextItem *> &lights,
   QList<const MapData::Point*> &sectorLights)
 {
 	std::sort(points.begin(), points.end());

src/map/IMG/rastertile.h

@@ -9,6 +9,7 @@
 #include "style.h"
 
 class QPainter;
+class IMGMap;
 class TextItem;
 
 namespace IMG {
@@ -31,30 +32,23 @@ public:
 	void render();
 
 private:
-	struct Sector
+	typedef RTree<const MapData::Elevation*, double, 2> DEMTRee;
+
+	struct ElevationCTX
 	{
-		Sector(Light::Color color, quint32 start, quint32 end)
+		ElevationCTX(const DEMTRee &tree, const Coordinates &c, double &ele)
-		  : color(color), start(start), end(end) {}
+		  : tree(tree), c(c), ele(ele) {}
 
-		bool operator==(const Sector &other) const
+		const DEMTRee &tree;
-		{
+		const Coordinates &c;
-			return (color == other.color && start == other.start
+		double &ele;
-			  && end == other.end);
+	};
-		}
+	struct EdgeCTX
-		bool operator<(const Sector &other) const
+	{
-		{
+		EdgeCTX(const Coordinates &c, double &ele) : c(c), ele(ele) {}
-			if (color == other.color) {
-				if (start == other.start)
-					return end < other.end;
-				else
-					return start < other.start;
-			} else
-				return color < other.color;
-		}
 
-		Light::Color color;
+		const Coordinates &c;
-		quint32 start;
+		double &ele;
-		quint32 end;
 	};
 
 	void fetchData(QList<MapData::Poly> &polygons, QList<MapData::Poly> &lines,
@@ -76,7 +70,7 @@ private:
 	  const QList<const MapData::Point*> &lights) const;
 
 	void processPolygons(const QList<MapData::Poly> &polygons,
-	  QList<TextItem*> &textItems);
+	  QList<TextItem *> &textItems);
 	void processLines(QList<MapData::Poly> &lines, QList<TextItem*> &textItems,
 	  const QImage (&arrows)[2]);
 	void processPoints(QList<MapData::Point> &points,