Code cleanup

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 13.27.{build}
+version: 13.28.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 13.27
+VERSION = 13.28
 
 
 QT += core \

pkg/windows/gpxsee64.nsi

@@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.27"
+!define VERSION "13.28"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/map/mapsforge/rastertile.cpp

@@ -107,20 +107,20 @@ void RasterTile::processPointLabels(const QList<MapData::Point> &points,
 
 		for (int j = 0; j < symbols.size(); j++) {
 			const Style::Symbol *ri = symbols.at(j);
-
+			if (ri->rule().match(point.tags)) {
-			if (ri->rule().match(point.tags))
-				if (!si || si->priority() < ri->priority())
 				si = ri;
+				break;
+			}
 		}
 
 		for (int j = 0; j < labels.size(); j++) {
 			const Style::TextRender *ri = labels.at(j);
 			if (ri->rule().match(point.tags)) {
 				if ((lbl = label(ri->key(), point.tags))) {
-					if (si && si->id() != ri->symbolId())
+					if (!si || si->id() == ri->symbolId()) {
-						continue;
-					if (!ti || ti->priority() < ri->priority())
 						ti = ri;
+						break;
+					}
 				}
 			}
 		}
@@ -166,24 +166,23 @@ void RasterTile::processAreaLabels(const QVector<PainterPath> &paths,
 
 		for (int j = 0; j < symbols.size(); j++) {
 			const Style::Symbol *ri = symbols.at(j);
-
+			if (ri->rule().match(path.path->closed, path.path->tags)) {
-			if (ri->rule().match(path.path->closed, path.path->tags))
-				if (!si || si->priority() < ri->priority())
 				si = ri;
+				break;
+			}
 		}
 
 		for (int j = 0; j < labels.size(); j++) {
 			const Style::TextRender *ri = labels.at(j);
 			if (ri->rule().match(path.path->closed, path.path->tags)) {
 				if ((lbl = label(ri->key(), path.path->tags))) {
-					if (si && si->id() != ri->symbolId())
+					if (!si || si->id() == ri->symbolId()) {
-						continue;
-
 						ti = ri;
 						break;
 					}
 				}
 			}
+		}
 
 		if (ti || si)
 			items.append(PathText(&path, lbl, si, ti));
@@ -232,15 +231,6 @@ void RasterTile::processLineLabels(const QVector<PainterPath> &paths,
 		if (path.path->closed)
 			continue;
 
-		for (int j = 0; j < labels.size(); j++) {
-			const Style::TextRender *ri = labels.at(j);
-			if (ri->rule().match(path.path->closed, path.path->tags)) {
-				if ((lbl = label(ri->key(), path.path->tags)))
-					ti = ri;
-				break;
-			}
-		}
-
 		for (int j = 0; j < symbols.size(); j++) {
 			const Style::Symbol *ri = symbols.at(j);
 			if (ri->rule().match(path.path->closed, path.path->tags)) {
@@ -249,6 +239,18 @@ void RasterTile::processLineLabels(const QVector<PainterPath> &paths,
 			}
 		}
 
+		for (int j = 0; j < labels.size(); j++) {
+			const Style::TextRender *ri = labels.at(j);
+			if (ri->rule().match(path.path->closed, path.path->tags)) {
+				if ((lbl = label(ri->key(), path.path->tags))) {
+					if (!si || si->id() == ri->symbolId()) {
+						ti = ri;
+						break;
+					}
+				}
+			}
+		}
+
 		if (ti || si)
 			items.append(PathText(&path, lbl, si, ti));
 	}

src/map/mapsforge/style.cpp

@@ -759,6 +759,12 @@ void Style::load(const MapData &data, qreal ratio)
 
 	if (!QFileInfo::exists(path) || !loadXml(path, data, ratio))
 		loadXml(":/mapsforge/default.xml", data, ratio);
+
+	std::sort(_symbols.begin(), _symbols.end());
+	std::sort(_lineSymbols.begin(), _lineSymbols.end());
+	std::stable_sort(_pointLabels.begin(), _pointLabels.end());
+	std::stable_sort(_areaLabels.begin(), _areaLabels.end());
+	std::stable_sort(_pathLabels.begin(), _pathLabels.end());
 }
 
 void Style::clear()

src/map/mapsforge/style.h

@@ -217,6 +217,9 @@ public:
 		unsigned key() const {return _key;}
 		int priority() const {return _priority;}
 
+		bool operator<(const TextRender &other) const
+		  {return _priority > other._priority;}
+
 	private:
 		friend class Style;
 
@@ -239,6 +242,9 @@ public:
 		bool rotate() const {return _rotate;}
 		int priority() const {return _priority;}
 
+		bool operator<(const Symbol &other) const
+		  {return _priority > other._priority;}
+
 	private:
 		friend class Style;