data/mapsforge/default.xml

@@ -1144,7 +1144,7 @@
         <rule e="any" k="amenity" v="fuel" zoom-min="13">
             <symbol id="fuel" src=":/mapsforge/symbols/transport/fuel.svg" />
             <rule e="any" k="*" v="*" zoom-min="18">
-                <caption fill="#AC39AC" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
+                <caption fill="#0092DA" font-size="12" font-style="bold" k="name" stroke="#FFFFFF"
                     stroke-width="2.0" symbol-id="fuel" />
             </rule>
         </rule>

lang/gpxsee_ko.ts

@@ -866,7 +866,7 @@
         <location filename="../src/GUI/gui.cpp" line="907"/>
         <location filename="../src/GUI/gui.cpp" line="925"/>
         <source>CRS directory:</source>
-        <translation>CRS 디렉토리:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GCS/PCS directory:</source>

src/common/util.cpp

@@ -10,7 +10,6 @@
 #endif // Q_OS_ANDROID
 #include "util.h"
 
-#define SQLITE_DB_MAGIC "SQLite format 3"
 
 #ifdef Q_OS_ANDROID
 static QString documentName(const QString &path)
@@ -157,21 +156,3 @@ const QTemporaryDir &Util::tempDir()
 	static QTemporaryDir dir;
 	return dir;
 }
-
-bool Util::isSQLiteDB(const QString &path, QString &errorString)
-{
-	QFile file(path);
-	char magic[sizeof(SQLITE_DB_MAGIC)];
-
-	if (!file.open(QFile::ReadOnly)) {
-		errorString = file.errorString();
-		return false;
-	}
-	if ((file.read(magic, sizeof(magic)) < (qint64)sizeof(magic))
-	  || memcmp(SQLITE_DB_MAGIC, magic, sizeof(SQLITE_DB_MAGIC))) {
-		errorString = "Not a SQLite database file";
-		return false;
-	}
-
-	return true;
-}

src/common/util.h

@@ -16,7 +16,6 @@ namespace Util
 	QString file2name(const QString &path);
 	QString displayName(const QString &path);
 	const QTemporaryDir &tempDir();
-	bool isSQLiteDB(const QString &path, QString &errorString);
 }
 
 #endif // UTIL_H

src/map/mapsforge/rastertile.cpp

@@ -200,13 +200,6 @@ QPainterPath RasterTile::painterPath(const Polygon &polygon, bool curve) const
 {
 	QPainterPath path;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-	int size = 0;
-	for (int i = 0; i < polygon.size(); i++)
-		size += polygon.at(i).size();
-	path.reserve(size);
-#endif // QT 5.13
-
 	for (int i = 0; i < polygon.size(); i++) {
 		const QVector<Coordinates> &subpath = polygon.at(i);
 

src/map/mapsforge/style.cpp

@@ -138,13 +138,12 @@ void Style::area(QXmlStreamReader &reader, const QString &dir, qreal ratio,
 	PathRender ri(rule, _paths.size() + _circles.size());
 	const QXmlStreamAttributes &attr = reader.attributes();
 	QString file;
-	QColor fillColor;
 	int height = 0, width = 0;
 	bool ok;
 
 	ri._area = true;
 	if (attr.hasAttribute("fill"))
-		fillColor = QColor(attr.value("fill").toString());
+		ri._fillColor = QColor(attr.value("fill").toString());
 	if (attr.hasAttribute("stroke"))
 		ri._strokeColor = QColor(attr.value("stroke").toString());
 	if (attr.hasAttribute("stroke-width")) {
@@ -172,9 +171,7 @@ void Style::area(QXmlStreamReader &reader, const QString &dir, qreal ratio,
 	}
 
 	if (!file.isNull())
-		ri._brush = QBrush(image(file, width, height, ratio));
-	else if (fillColor.isValid())
-		ri._brush = QBrush(fillColor);
+		ri._fillImage = image(file, width, height, ratio);
 
 	if (ri.rule()._type == Rule::AnyType || ri.rule()._type == Rule::WayType)
 		_paths.append(ri);
@@ -655,9 +652,10 @@ QList<const Style::Symbol*> Style::areaSymbols(int zoom) const
 
 QPen Style::PathRender::pen(int zoom) const
 {
-	if (_strokeColor.isValid()) {
 	qreal width = (zoom >= 12)
 	  ? pow(1.5, zoom - 12) * _strokeWidth : _strokeWidth;
+
+	if (_strokeColor.isValid()) {
 		QPen p(QBrush(_strokeColor), width, Qt::SolidLine, _strokeCap,
 		  _strokeJoin);
 		if (!_strokeDasharray.isEmpty()) {
@@ -671,6 +669,16 @@ QPen Style::PathRender::pen(int zoom) const
 		return Qt::NoPen;
 }
 
+QBrush Style::PathRender::brush() const
+{
+	if (!_fillImage.isNull())
+		return QBrush(_fillImage);
+	else if (_fillColor.isValid())
+		return QBrush(_fillColor);
+	else
+		return Qt::NoBrush;
+}
+
 qreal Style::CircleRender::radius(int zoom) const
 {
 	return (_scale && zoom >= 12) ? pow(1.5, zoom - 12) * _radius : _radius;

src/map/mapsforge/style.h

@@ -11,6 +11,17 @@ class QXmlStreamReader;
 
 namespace Mapsforge {
 
+inline bool wcmp(const QByteArray &b1, const QByteArray &b2)
+{
+	int len = b1.length();
+
+	if (!len)
+		return true;
+	if (len != b2.length())
+		return false;
+	return !memcmp(b1.constData(), b2.constData(), len);
+}
+
 class Style
 {
 public:
@@ -76,13 +87,10 @@ public:
 
 			bool valueMatches(const QVector<MapData::Tag> &tags) const
 			{
-				for (int i = 0; i < _vals.size(); i++) {
-					for (int j = 0; j < tags.size(); j++) {
-						const QByteArray &ba = _vals.at(i);
-						if (!ba.size() || ba == tags.at(j).value)
+				for (int i = 0; i < _vals.size(); i++)
+					for (int j = 0; j < tags.size(); j++)
+						if (wcmp(_vals.at(i), tags.at(j).value))
 							return true;
-					}
-				}
 
 				return false;
 			}
@@ -140,7 +148,7 @@ public:
 
 		int zOrder() const {return _zOrder;}
 		QPen pen(int zoom) const;
-		const QBrush &brush() const {return _brush;}
+		QBrush brush() const;
 		bool area() const {return _area;}
 		bool curve() const {return _curve;}
 
@@ -148,12 +156,12 @@ public:
 		friend class Style;
 
 		int _zOrder;
-		QColor _strokeColor;
+		QColor _fillColor, _strokeColor;
 		qreal _strokeWidth;
 		QVector<qreal> _strokeDasharray;
 		Qt::PenCapStyle _strokeCap;
 		Qt::PenJoinStyle _strokeJoin;
-		QBrush _brush;
+		QImage _fillImage;
 		bool _area, _curve;
 	};
 

src/map/mbtilesmap.cpp

@@ -1,7 +1,6 @@
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QSqlField>
-#include <QSqlError>
 #include <QPainter>
 #include <QPixmapCache>
 #include <QImageReader>
@@ -49,15 +48,12 @@ MBTilesMap::MBTilesMap(const QString &fileName, QObject *parent)
   : Map(fileName, parent), _mapRatio(1.0), _tileRatio(1.0), _scalable(false),
   _scaledSize(0), _valid(false)
 {
-	if (!Util::isSQLiteDB(fileName, _errorString))
-		return;
-
 	_db = QSqlDatabase::addDatabase("QSQLITE", fileName);
 	_db.setDatabaseName(fileName);
 	_db.setConnectOptions("QSQLITE_OPEN_READONLY");
 
 	if (!_db.open()) {
-		_errorString = _db.lastError().text();
+		_errorString = "Error opening database file";
 		return;
 	}
 

src/map/oruxmap.cpp

@@ -413,12 +413,6 @@ OruxMap::OruxMap(const QString &fileName, QObject *parent)
 
 	if (dir.exists("OruxMapsImages.db")) {
 		QString dbFile(dir.absoluteFilePath("OruxMapsImages.db"));
-
-		if (!Util::isSQLiteDB(dbFile, _errorString)) {
-			_errorString = "OruxMapsImages.db: " + _errorString;
-			return;
-		}
-
 		_db = QSqlDatabase::addDatabase("QSQLITE", dbFile);
 		_db.setDatabaseName(dbFile);
 		_db.setConnectOptions("QSQLITE_OPEN_READONLY");

src/map/osmdroidmap.cpp

@@ -1,7 +1,6 @@
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QSqlField>
-#include <QSqlError>
 #include <QPainter>
 #include <QPixmapCache>
 #include <QImageReader>
@@ -19,15 +18,12 @@ OsmdroidMap::OsmdroidMap(const QString &fileName, QObject *parent)
 {
 	quint64 z, l = 0, r = 0, t = 0, b = 0;
 
-	if (!Util::isSQLiteDB(fileName, _errorString))
-		return;
-
 	_db = QSqlDatabase::addDatabase("QSQLITE", fileName);
 	_db.setDatabaseName(fileName);
 	_db.setConnectOptions("QSQLITE_OPEN_READONLY");
 
 	if (!_db.open()) {
-		_errorString = _db.lastError().text();
+		_errorString = "Error opening database file";
 		return;
 	}
 

src/map/sqlitemap.cpp

@@ -1,7 +1,6 @@
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QSqlField>
-#include <QSqlError>
 #include <QPainter>
 #include <QPixmapCache>
 #include <QImageReader>
@@ -17,15 +16,12 @@
 SqliteMap::SqliteMap(const QString &fileName, QObject *parent)
   : Map(fileName, parent), _mapRatio(1.0), _valid(false)
 {
-	if (!Util::isSQLiteDB(fileName, _errorString))
-		return;
-
 	_db = QSqlDatabase::addDatabase("QSQLITE", fileName);
 	_db.setDatabaseName(fileName);
 	_db.setConnectOptions("QSQLITE_OPEN_READONLY");
 
 	if (!_db.open()) {
-		_errorString = _db.lastError().text();
+		_errorString = "Error opening database file";
 		return;
 	}