Changed Travis build distro to focal

Minimal Qt version is now Qt 5.12

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: tumic0

.gitignore

@@ -0,0 +1,17 @@
+# Object files
+*.o
+
+# Protobuf stuff
+protobuf/vector_tile.pb.cc
+protobuf/vector_tile.pb.h
+
+# Qt stuff
+/.qmake.stash
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+Makefile*
+
+# lib
+libpbf.so
+pbf.dylib

.travis.yml

@@ -1,5 +1,5 @@
 language: c++
-dist: xenial
+dist: focal
 
 os:
   - linux
@@ -10,6 +10,7 @@ env:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt protobuf; fi

README.md

@@ -8,15 +8,11 @@ PBF(MVT) vector tiles without (almost, see usage) any application modifications.
 
 Standard Mapbox GL Styles are used for styling the maps. Most relevant style
 features used by [Maputnik](http://editor.openmaptiles.org) are supported.
-The style is loaded from the
+A default fallback style (OSM-Liberty) for OpenMapTiles is part of the plugin.
-[$AppDataLocation](http://doc.qt.io/qt-5/qstandardpaths.html)/style/style.json
-file on plugin load. If the style uses a sprite, the sprite JSON file must
-be named sprite.json and the sprite image sprite.png and both files must be
-placed in the same directory as the style itself. A default fallback style
-(OSM-Liberty) for OpenMapTiles is part of the plugin.
 
 "Plain" PBF files as well as gzip compressed files (as used in MBTiles) are
-supported by the plugin.
+supported by the plugin. The tile size is (since version 2.0 of the plugin) 512px
+to fit the styles and available data (OpenMapTiles, Mapbox tiles).
 
 ## Usage
 Due to a major design flaw in the Mapbox vector tiles specification - the zoom
@@ -33,14 +29,29 @@ The plugin supports vector scaling using QImageReader's setScaledSize() method,
 so when used like in the following example:
 ```cpp
 QImageReader reader(file, QString::number(zoom).toLatin1());
-reader.setScaledSize(QSize(512, 512));
+reader.setScaledSize(QSize(1024, 1024));
 reader.read(&image);
 ```
-you will get 512x512px tiles with a pixel ratio of 2 (= HiDPI tiles).
+you will get 1024x1024px tiles with a pixel ratio of 2 (= HiDPI tiles).
+
+For a sample code see the [pbf2png](https://github.com/tumic0/pbf2png)
+conversion utility.
+
+## Styles
+The map style is loaded from the
+[$AppDataLocation](http://doc.qt.io/qt-5/qstandardpaths.html)/style/style.json
+file on plugin load. If the style uses a sprite, the sprite JSON file must
+be named `sprite.json` and the sprite image `sprite.png` and both files must be
+placed in the same directory as the style itself. *A style compatible with the
+tiles data schema (Mapbox, OpenMapTiles, Tilezen) must be used.*
+
+For a list of "ready to use" styles see the
+[QtPBFImagePlugin-styles](https://github.com/tumic0/QtPBFImagePlugin-styles)
+repository.
 
 ## Build
 ### Requirements
-* Qt >= 5.4 (5.6 for HiDPI support)
+* Qt5 >= 5.12 or Qt6
 * Google Protocol Buffers (protobuf-lite)
 * Zlib
 
@@ -72,22 +83,45 @@ for most common distros available on OBS.
 style are ignored.
 * Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text layout
 algorithm to work properly.
+* Expressions are not supported in the styles, only property functions are implemented.
+
+## Changelog
+[Changelog](https://build.opensuse.org/package/view_file/home:tumic:QtPBFImagePlugin/QtPBFImagePlugin/libqt5-qtpbfimageformat.changes)
 
 ## Status
-A picture is worth a thousand words. Data and styles from https://openmaptiles.org.
+A picture is worth a thousand words.
-#### OSM-liberty
+#### OpenMapTiles
-![osm-liberty 2](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-2.png)
+
+* Data: [MapTiler](https://github.com/tumic0/GPXSee-maps/blob/master/World/MapTiler.tpl)
+* Style: [OSM-liberty](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/OpenMapTiles/osm-liberty/style.json)
+
 ![osm-liberty 5](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-5.png)
 ![osm-liberty 8](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-8.png)
-![osm-liberty 11](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-11.png)
+![osm-liberty 12](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-12.png)
 ![osm-liberty 14](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-14.png)
+![osm-liberty 15](https://tumic0.github.io/QtPBFImagePlugin/images/osm-liberty-15.png)
 
-#### Klokantech-basic
+#### Mapbox
-![klokantech-basic 2](https://tumic0.github.io/QtPBFImagePlugin/images/klokantech-basic-2.png)
+
-![klokantech-basic 4](https://tumic0.github.io/QtPBFImagePlugin/images/klokantech-basic-4.png)
+* Data: [Mapbox](https://github.com/tumic0/GPXSee-maps/blob/master/World/Mapbox.tpl)
-![klokantech-basic 8](https://tumic0.github.io/QtPBFImagePlugin/images/klokantech-basic-8.png)
+* Style: [Bright](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/Mapbox/bright/style.json)
-![klokantech-basic 13](https://tumic0.github.io/QtPBFImagePlugin/images/klokantech-basic-13.png)
+
-![klokantech-basic 14](https://tumic0.github.io/QtPBFImagePlugin/images/klokantech-basic-14.png)
+![bright 4](https://tumic0.github.io/QtPBFImagePlugin/images/bright-4.png)
+![bright 6](https://tumic0.github.io/QtPBFImagePlugin/images/bright-6.png)
+![bright 13](https://tumic0.github.io/QtPBFImagePlugin/images/bright-13.png)
+![bright 15](https://tumic0.github.io/QtPBFImagePlugin/images/bright-15.png)
+![bright 17](https://tumic0.github.io/QtPBFImagePlugin/images/bright-17.png)
+
+#### Tilezen
+
+* Data: [HERE](https://github.com/tumic0/GPXSee-maps/blob/master/World/here-vector.tpl)
+* Style: [Apollo-Bright](https://github.com/tumic0/QtPBFImagePlugin-styles/blob/master/Tilezen/apollo-bright/style.json)
+
+![apollo-bright 4](https://tumic0.github.io/QtPBFImagePlugin/images/apollo-bright-4.png)
+![apollo-bright 6](https://tumic0.github.io/QtPBFImagePlugin/images/apollo-bright-6.png)
+![apollo-bright 12](https://tumic0.github.io/QtPBFImagePlugin/images/apollo-bright-12.png)
+![apollo-bright 15](https://tumic0.github.io/QtPBFImagePlugin/images/apollo-bright-15.png)
+![apollo-bright 16](https://tumic0.github.io/QtPBFImagePlugin/images/apollo-bright-16.png)
 
 ## Applications using QtPBFImagePlugin
 * [GPXSee](https://www.gpxsee.org)

pbfplugin.pro

@@ -20,8 +20,7 @@ HEADERS += src/pbfhandler.h \
     src/textpointitem.h \
     src/font.h \
     src/textitem.h \
-    src/sprites.h \
+    src/sprites.h
-    src/config.h
 SOURCES += src/pbfplugin.cpp \
     src/pbfhandler.cpp \
     src/gzip.cpp \
@@ -37,6 +36,8 @@ SOURCES += src/pbfplugin.cpp \
     src/textitem.cpp
 RESOURCES += pbfplugin.qrc
 
+DEFINES += QT_NO_DEPRECATED_WARNINGS
+
 unix:!macx{
     LIBS += -lprotobuf-lite \
         -lz

src/config.h

@@ -1,10 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include <QtGlobal>
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#define ENABLE_HIDPI
-#endif // QT >= 5.6
-
-#endif // CONFIG_H

src/function.cpp

@@ -34,13 +34,19 @@ static QColor interpolate(const QPair<qreal, QColor> &p0,
 	  ? progress / difference
 	  : (pow(base, progress) - 1) / (pow(base, difference) - 1);
 
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	qreal p0h, p0s, p0l, p0a;
-	p0.second.getHslF(&p0h, &p0s, &p0l, &p0a);
 	qreal p1h, p1s, p1l, p1a;
+#else // QT6
+	float p0h, p0s, p0l, p0a;
+	float p1h, p1s, p1l, p1a;
+#endif // QT6
+	p0.second.getHslF(&p0h, &p0s, &p0l, &p0a);
 	p1.second.getHslF(&p1h, &p1s, &p1l, &p1a);
 
-	return QColor::fromHslF(f(p0h, p1h, ratio), f(p0s, p1s, ratio),
+	/* Qt returns a hue of -1 for achromatic colors. We convert it to a hue of 1
+	   using qAbs() to enable interpolation of grayscale colors */
+	return QColor::fromHslF(f(qAbs(p0h), qAbs(p1h), ratio), f(p0s, p1s, ratio),
 	  f(p0l, p1l, ratio), f(p0a, p1a, ratio));
 }
 

src/gzip.cpp

@@ -1,35 +1,58 @@
-#include <QtEndian>
+#include <QIODevice>
-#include <QDebug>
 #include <zlib.h>
 #include "gzip.h"
 
+#define CHUNK 16384
 
-QByteArray Gzip::uncompress(const QByteArray &data)
+QByteArray Gzip::uncompress(QIODevice *device, int limit)
 {
+	int ret;
+	z_stream strm;
+	unsigned char in[CHUNK];
+	unsigned char out[CHUNK];
+	qint64 rs;
 	QByteArray uba;
-	z_stream stream;
 
-	quint32 *size = (quint32*)(data.constData() + data.size() - sizeof(quint32));
-	uba.resize(qFromLittleEndian(*size));
 
-	stream.zalloc = Z_NULL;
+	strm.zalloc = Z_NULL;
-	stream.zfree = Z_NULL;
+	strm.zfree = Z_NULL;
-	stream.opaque = Z_NULL;
+	strm.opaque = Z_NULL;
+	strm.avail_in = 0;
+	strm.next_in = Z_NULL;
+	if (inflateInit2(&strm, MAX_WBITS + 16) != Z_OK)
+		return QByteArray();
 
-	stream.next_in  = (Bytef*)data.constData();
+	do {
-	stream.avail_in = data.size();
+		rs = device->read((char*)in, CHUNK);
-	stream.next_out = (Bytef*)uba.data();
+		if (rs < 0) {
-	stream.avail_out = uba.size();
+			(void)inflateEnd(&strm);
+			return QByteArray();
+		} else if (rs == 0)
+			break;
+		else
+			strm.avail_in = (uInt)rs;
+		strm.next_in = in;
 
-	if (inflateInit2(&stream, MAX_WBITS + 16) != Z_OK)
+		do {
-		return uba;
+			strm.avail_out = CHUNK;
+			strm.next_out = out;
+			ret = inflate(&strm, Z_NO_FLUSH);
+			Q_ASSERT(ret != Z_STREAM_ERROR);
+			switch (ret) {
+				case Z_NEED_DICT:
+				case Z_DATA_ERROR:
+				case Z_MEM_ERROR:
+					(void)inflateEnd(&strm);
+					return QByteArray();
+			}
+			uba.append((char*)out, CHUNK - strm.avail_out);
+			if (limit && uba.size() >= limit) {
+				(void)inflateEnd(&strm);
+				return uba;
+			}
+		} while (!strm.avail_out);
+	} while (ret != Z_STREAM_END);
 
-	if (inflate(&stream, Z_NO_FLUSH) != Z_STREAM_END) {
+	(void)inflateEnd(&strm);
-		qCritical() << "Invalid gzip data";
+	return (ret == Z_STREAM_END) ? uba : QByteArray();
-		uba = QByteArray();
-	}
-
-	inflateEnd(&stream);
-
-	return uba;
 }

src/gzip.h

@@ -3,9 +3,11 @@
 
 #include <QByteArray>
 
+class QIODevice;
+
 namespace Gzip
 {
-	QByteArray uncompress(const QByteArray &data);
+	QByteArray uncompress(QIODevice *device, int limit = 0);
 }
 
 #endif // GZIP_H

src/pbf.cpp

@@ -100,7 +100,7 @@ PBF::Layer::Layer(const vector_tile::Tile_Layer *data) : _data(data)
 	_features.reserve(data->features_size());
 	for (int i = 0; i < data->features_size(); i++)
 		_features.append(Feature(&(data->features(i)), this));
-	qSort(_features.begin(), _features.end());
+	std::sort(_features.begin(), _features.end());
 }
 
 PBF::PBF(const vector_tile::Tile &tile)
@@ -113,7 +113,5 @@ PBF::PBF(const vector_tile::Tile &tile)
 
 PBF::~PBF()
 {
-	for (QHash<QString, Layer*>::iterator it = _layers.begin();
+	qDeleteAll(_layers);
-	  it != _layers.end(); it++)
-		delete *it;
 }

src/pbfhandler.cpp

@@ -8,24 +8,24 @@
 #include "pbfhandler.h"
 
 
-#define TILE_SIZE 256
+#define TILE_SIZE 512
 
-#define GZIP_MAGIC      0x1F8B0800
+#define GZIP_MAGIC      0x1F8B
-#define GZIP_MAGIC_MASK 0xFFFFFF00
+#define GZIP_MAGIC_MASK 0xFFFF
-#define PBF_MAGIC       0x1A000000
+#define PBF_MAGIC       0x1A00
-#define PBF_MAGIC_MASK  0xFF000000
+#define PBF_MAGIC_MASK  0xFF00
 
-static bool isMagic(quint32 magic, quint32 mask, quint32 value)
+static bool isMagic(quint16 magic, quint16 mask, quint16 value)
 {
 	return ((qFromBigEndian(value) & mask) == magic);
 }
 
-static bool isGZIPPBF(quint32 magic)
+static bool isGZIPPBF(quint16 magic)
 {
 	return isMagic(GZIP_MAGIC, GZIP_MAGIC_MASK, magic);
 }
 
-static bool isPlainPBF(quint32 magic)
+static bool isPlainPBF(quint16 magic)
 {
 	return isMagic(PBF_MAGIC, PBF_MAGIC_MASK, magic);
 }
@@ -34,7 +34,7 @@ static bool isPlainPBF(quint32 magic)
 bool PBFHandler::canRead() const
 {
 	if (canRead(device())) {
-		setFormat("pbf");
+		setFormat("mvt");
 		return true;
 	} else
 		return false;
@@ -42,27 +42,37 @@ bool PBFHandler::canRead() const
 
 bool PBFHandler::canRead(QIODevice *device)
 {
-	quint32 magic;
+	quint16 magic;
 	qint64 size = device->peek((char*)&magic, sizeof(magic));
 	if (size != sizeof(magic))
 		return false;
 
-	return (isGZIPPBF(magic) || isPlainPBF(magic));
+	if (isPlainPBF(magic))
+		return true;
+	else if (isGZIPPBF(magic)) {
+		QByteArray ba(Gzip::uncompress(device, sizeof(magic)));
+		if (ba.size() < (int)sizeof(magic))
+			return false;
+		return isPlainPBF(*((quint16*)ba.constData()));
+	} else
+		return false;
 }
 
 bool PBFHandler::read(QImage *image)
 {
-	quint32 magic;
+	quint16 magic;
 	if (device()->peek((char*)&magic, sizeof(magic)) != sizeof(magic))
 		return false;
 
 	QByteArray ba;
-	if (isGZIPPBF(magic))
+	if (isGZIPPBF(magic)) {
-		ba = Gzip::uncompress(device()->readAll());
+		ba = Gzip::uncompress(device());
-	else if (isPlainPBF(magic))
+		if (ba.isNull()) {
+			qCritical() << "Invalid gzip data";
+			return false;
+		}
+	} else if (isPlainPBF(magic))
 		ba = device()->readAll();
-	if (ba.isNull())
-		return false;
 	vector_tile::Tile data;
 	if (!data.ParseFromArray(ba.constData(), ba.size())) {
 		qCritical() << "Invalid PBF data";
@@ -75,8 +85,8 @@ bool PBFHandler::read(QImage *image)
 	QSize size = _scaledSize.isValid()
 	  ? _scaledSize : QSize(TILE_SIZE, TILE_SIZE);
 	QPointF scale = _scaledSize.isValid()
-	  ? QPointF(_scaledSize.width() / TILE_SIZE, _scaledSize.height() / TILE_SIZE)
+	  ? QPointF((qreal)_scaledSize.width() / TILE_SIZE,
-	  : QPointF(1.0, 1.0);
+		(qreal)_scaledSize.height() / TILE_SIZE) : QPointF(1.0, 1.0);
 	*image = QImage(size, QImage::Format_ARGB32_Premultiplied);
 	Tile tile(image, ok ? zoom : -1, scale);
 

src/sprites.cpp

@@ -9,9 +9,9 @@
 	Loading the sprites atlas image must be deferred until all image plugins
 	are loaded, otherwise reading the image will cause a deadlock!
 */
-static const QImage *atlas(const QString &fileName)
+static const QImage &atlas(const QString &fileName)
 {
-	static QImage *img = new QImage(fileName);
+	static QImage img(fileName);
 	return img;
 }
 
@@ -86,18 +86,18 @@ QImage Sprites::icon(const QString &name) const
 	if (_imageFile.isEmpty())
 		return QImage();
 
-	const QImage *img = atlas(_imageFile);
+	const QImage &img = atlas(_imageFile);
-	if (img->isNull())
+	if (img.isNull())
 		return QImage();
 
 	QMap<QString, Sprite>::const_iterator it = _sprites.find(name);
 	if (it == _sprites.constEnd())
 		return QImage();
 
-	if (!img->rect().contains(it->rect()))
+	if (!img.rect().contains(it->rect()))
 		return QImage();
 
-	QImage ret(img->copy(it->rect()));
+	QImage ret(img.copy(it->rect()));
 	ret.setDevicePixelRatio(it->pixelRatio());
 
 	return ret;

src/style.cpp

@@ -5,6 +5,7 @@
 #include <QJsonArray>
 #include <QFileInfo>
 #include <QDir>
+#include <QRegularExpression>
 #include <QDebug>
 #include "text.h"
 #include "color.h"
@@ -138,22 +139,46 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
 			if (!(v = feature.value(_kv.first)))
 				return false;
 			else
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 				return *v > _kv.second;
+#else // QT6
+				return (QVariant::compare(*v, _kv.second)
+				  == QPartialOrdering::Greater);
+#endif // QT6
 		case GE:
-			if (!(v = feature.value(_kv.first)))
+			{if (!(v = feature.value(_kv.first)))
 				return false;
-			else
+			else {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 				return *v >= _kv.second;
+#else // QT6
+				QPartialOrdering res = QVariant::compare(*v, _kv.second);
+				return (res == QPartialOrdering::Greater
+				  || res == QPartialOrdering::Equivalent);
+#endif // QT6
+			}}
 		case LT:
 			if (!(v = feature.value(_kv.first)))
 				return false;
 			else
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 				return *v < _kv.second;
+#else // QT6
+				return (QVariant::compare(*v, _kv.second)
+				  == QPartialOrdering::Less);
+#endif // QT6
 		case LE:
-			if (!(v = feature.value(_kv.first)))
+			{if (!(v = feature.value(_kv.first)))
 				return false;
-			else
+			else {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 				return *v <= _kv.second;
+#else // QT6
+				QPartialOrdering res = QVariant::compare(*v, _kv.second);
+				return (res == QPartialOrdering::Less
+				  || res == QPartialOrdering::Equivalent);
+#endif // QT6
+			}}
 		case In:
 			if (!(v = feature.value(_kv.first)))
 				return _not;
@@ -172,7 +197,7 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
 					return true;
 			return false;
 		case GeometryType:
-			return feature.type() == _kv.second.toUInt();
+			return feature.type() == _kv.second.toInt();
 		default:
 			return false;
 	}
@@ -180,15 +205,15 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
 
 QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const
 {
-	QRegExp rx = QRegExp("\\{[^\\}]*\\}");
+	QRegularExpression rx("\\{[^\\}]*\\}");
 	QString text(_field.value(zoom));
+	QRegularExpressionMatchIterator it = rx.globalMatch(text);
 	QStringList keys;
-	int pos = 0;
 
-	while ((pos = rx.indexIn(text, pos)) != -1) {
+	while (it.hasNext()) {
-		QString match = rx.capturedTexts().first();
+		QRegularExpressionMatch match = it.next();
-		keys.append(match.mid(1, match.size() - 2));
+		QString val = match.captured(0);
-		pos += rx.matchedLength();
+		keys.append(val.mid(1, val.size() - 2));
 	}
 	for (int i = 0; i < keys.size(); i++) {
 		const QString &key = keys.at(i);
@@ -348,6 +373,12 @@ Style::Layer::Layout::Layout(const QJsonObject &json)
 
 	// symbol
 	_symbolPlacement = FunctionS(json["symbol-placement"]);
+
+	// visibility
+	if (json.contains("visibility") && json["visibility"].isString())
+		_visible = !(json["visibility"].toString() == "none");
+	else
+		_visible = true;
 }
 
 QFont Style::Layer::Layout::font(int zoom) const
@@ -437,7 +468,7 @@ Text::RotationAlignment Style::Layer::Layout::textRotationAlignment(int zoom)
 }
 
 Style::Layer::Layer(const QJsonObject &json)
-  : _type(Unknown), _minZoom(-1), _maxZoom(-1)
+  : _type(Unknown), _minZoom(0), _maxZoom(24)
 {
 	// type
 	QString type(json["type"].toString());
@@ -475,12 +506,8 @@ Style::Layer::Layer(const QJsonObject &json)
 
 bool Style::Layer::match(int zoom, const PBF::Feature &feature) const
 {
-	if (zoom >= 0) {
+	if (zoom >= 0 && (zoom < _minZoom || zoom > _maxZoom))
-		if (_minZoom > 0 && zoom < _minZoom)
+		return false;
-			return false;
-		if (_maxZoom > 0 && zoom > _maxZoom)
-			return false;
-	}
 
 	return _filter.match(feature);
 }
@@ -573,22 +600,15 @@ bool Style::load(const QString &fileName)
 
 	QDir styleDir = QFileInfo(fileName).absoluteDir();
 	loadSprites(styleDir, "sprite.json", "sprite.png", _sprites);
-#ifdef ENABLE_HIDPI
 	loadSprites(styleDir, "sprite@2x.json", "sprite@2x.png", _sprites2x);
-#endif // ENABLE_HIDPI
 
 	return true;
 }
 
 const Sprites &Style::sprites(const QPointF &scale) const
 {
-#ifdef ENABLE_HIDPI
 	return (scale.x() > 1.0 || scale.y() > 1.0)
 	  && !_sprites2x.isNull() ? _sprites2x : _sprites;
-#else // ENABLE_HIDPI
-	Q_UNUSED(scale);
-	return _sprites;
-#endif // ENABLE_HIDPI
 }
 
 void Style::setupLayer(Tile &tile, const Layer &layer) const
@@ -601,7 +621,8 @@ void Style::setupLayer(Tile &tile, const Layer &layer) const
 
 void Style::drawBackground(Tile &tile) const
 {
-	QRectF rect(QPointF(0, 0), tile.size());
+	QRectF rect(QPointF(0, 0), QSizeF(tile.size().width() / tile.scale().x(),
+	  tile.size().height() / tile.scale().y()));
 	QPainterPath path;
 	path.addRect(rect);
 
@@ -640,6 +661,9 @@ void Style::drawLayer(const PBF::Layer &pbfLayer, const Layer &styleLayer,
 	if (pbfLayer.data()->version() > 2)
 		return;
 
+	if (!styleLayer.isVisible())
+		return;
+
 	QSizeF factor(tile.size().width() / tile.scale().x() /
 	  (qreal)pbfLayer.data()->extent(), tile.size().height() / tile.scale().y()
 	  / (qreal)pbfLayer.data()->extent());

src/style.h

@@ -12,7 +12,6 @@
 #include <QBrush>
 #include <QFont>
 #include "pbf.h"
-#include "config.h"
 #include "text.h"
 #include "function.h"
 #include "sprites.h"
@@ -35,13 +34,14 @@ public:
 private:
 	class Layer {
 	public:
-		Layer() : _type(Unknown), _minZoom(-1), _maxZoom(-1) {}
+		Layer() : _type(Unknown), _minZoom(0), _maxZoom(24) {}
 		Layer(const QJsonObject &json);
 
 		const QString &sourceLayer() const {return _sourceLayer;}
 		bool isPath() const {return (_type == Line || _type == Fill);}
 		bool isBackground() const {return (_type == Background);}
 		bool isSymbol() const {return (_type == Symbol);}
+		bool isVisible() const {return (_layout.visible());}
 
 		bool match(int zoom, const PBF::Feature &feature) const;
 		void setPathPainter(Tile &tile, const Sprites &sprites) const;
@@ -92,7 +92,7 @@ private:
 		class Layout {
 		public:
 			Layout() : _textSize(16), _textMaxWidth(10), _textMaxAngle(45),
-			  _font("Open Sans") {}
+			  _font("Open Sans"), _visible(true) {}
 			Layout(const QJsonObject &json);
 
 			qreal maxTextWidth(int zoom) const
@@ -109,6 +109,7 @@ private:
 			Text::Anchor textAnchor(int zoom) const;
 			Text::SymbolPlacement symbolPlacement(int zoom) const;
 			Text::RotationAlignment textRotationAlignment(int zoom) const;
+			bool visible() const {return _visible;}
 
 		private:
 			QFont::Capitalization textTransform(int zoom) const;
@@ -125,6 +126,7 @@ private:
 			FunctionS _symbolPlacement;
 			FunctionS _textRotationAlignment;
 			QFont _font;
+			bool _visible;
 		};
 
 		class Paint {
@@ -176,10 +178,7 @@ private:
 	  Tile &tile) const;
 
 	QVector<Layer> _layers;
-	Sprites _sprites;
+	Sprites _sprites, _sprites2x;
-#ifdef ENABLE_HIDPI
-	Sprites _sprites2x;
-#endif // QT >= 5.6
 };
 
 #endif // STYLE_H

src/text.cpp

@@ -1,6 +1,7 @@
 #include <QFontMetrics>
 #include <QPainter>
 #include <QSet>
+#include <QMap>
 #include "text.h"
 #include "textpointitem.h"
 #include "textpathitem.h"
@@ -8,8 +9,7 @@
 
 Text::~Text()
 {
-	for (int i = 0; i < _items.size(); i++)
+	qDeleteAll(_items);
-		delete _items[i];
 }
 
 void Text::render(QPainter *painter) const
@@ -31,22 +31,36 @@ void Text::addLabel(const QString &text, const QImage &icon,
 {
 	TextItem *ti;
 
-	switch (_placement) {
+	if (_alignment == Viewport) {
-		case Line:
+		QMap<qreal, int> map;
-			if (_alignment == Viewport)
+		for (int j = 0; j < path.elementCount(); j++) {
+			QLineF l(path.elementAt(j), _sceneRect.center());
+			map.insert(l.length(), j);
+		}
+		QMap<qreal, int>::const_iterator jt = map.constBegin();
+		ti = new TextPointItem(text, path.elementAt(jt.value()), _font,
+		  _maxWidth, _anchor, icon);
+		while (true) {
+			if (_sceneRect.contains(ti->boundingRect()))
+				break;
+			if (++jt == map.constEnd())
+				break;
+			static_cast<TextPointItem*>(ti)->setPos(path.elementAt(
+			  jt.value()));
+		}
+	} else {
+		switch (_placement) {
+			case Line:
+				ti = new TextPathItem(text, path, _font, _maxAngle, _sceneRect);
+				break;
+			case LineCenter:
+				ti = new TextPointItem(text, path.pointAtPercent(0.5), _font,
+				  _maxWidth, _anchor, icon);
+				break;
+			default:
 				ti = new TextPointItem(text, path.elementAt(0), _font,
 				  _maxWidth, _anchor, icon);
-			else
+		}
-				ti = new TextPathItem(text, path, _font, _maxAngle, _sceneRect);
-			break;
-		case LineCenter:
-			ti = new TextPointItem(text, path.pointAtPercent(0.5), _font,
-			  _maxWidth, _anchor, icon);
-			break;
-		default:
-			ti = new TextPointItem(text, path.elementAt(0), _font, _maxWidth,
-			  _anchor, icon);
-			break;
 	}
 
 	// Note: empty path == point geometry (single move)

src/textitem.cpp

@@ -11,7 +11,7 @@ bool TextItem::collidesWithItem(const TextItem *other) const
 	return other->shape().intersects(shape());
 }
 
-int TextItem::avgCharWidth() const
+qreal TextItem::avgCharWidth() const
 {
 	qreal ratio;
 	ushort cp = _text.at(0).unicode();
@@ -21,14 +21,18 @@ int TextItem::avgCharWidth() const
 		ratio = 1.0;
 	// Greek & Cyrilic
 	else if (cp >= 0x03FF && cp <= 0x04FF) {
-		ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.75 : 0.67;
+		ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.80 : 0.73;
 		if (_font.bold())
 			ratio *= 1.1;
+		if (_font.italic())
+			ratio *= 0.9;
 	// The rest (Latin scripts, Arabic, ...)
 	} else {
-		ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.7 : 0.58;
+		ratio = (_font.capitalization() == QFont::AllUppercase) ? 0.75 : 0.63;
 		if (_font.bold())
 			ratio *= 1.1;
+		if (_font.italic())
+			ratio *= 0.9;
 	}
 
 	return ratio * _font.pixelSize();

src/textitem.h

@@ -34,7 +34,7 @@ public:
 	bool collidesWithItem(const TextItem *other) const;
 
 protected:
-	int avgCharWidth() const;
+	qreal avgCharWidth() const;
 
 private:
 	QString _text;

src/textpathitem.cpp

@@ -3,23 +3,60 @@
 #include "textpathitem.h"
 
 
-static QPointF intersection(const QLineF &line, const QRectF &rect)
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-{
+#define INTERSECTS intersect
-	QPointF p;
+#else // QT 5.15
-	if (line.intersect(QLineF(rect.topLeft(), rect.topRight()), &p)
+#define INTERSECTS intersects
-	  == QLineF::BoundedIntersection)
+#endif // QT 5.15
-		return p;
-	if (line.intersect(QLineF(rect.topLeft(), rect.bottomLeft()), &p)
-	  == QLineF::BoundedIntersection)
-		return p;
-	if (line.intersect(QLineF(rect.bottomRight(), rect.bottomLeft()), &p)
-	  == QLineF::BoundedIntersection)
-		return p;
-	if (line.intersect(QLineF(rect.bottomRight(), rect.topRight()), &p)
-	  == QLineF::BoundedIntersection)
-		return p;
 
-	return rect.center();
+static bool intersection(const QLineF &line, const QRectF &rect,
+  QPointF *p)
+{
+	if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
+	  == QLineF::BoundedIntersection)
+		return true;
+	if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
+	  == QLineF::BoundedIntersection)
+		return true;
+	if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
+	  == QLineF::BoundedIntersection)
+		return true;
+	if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
+	  == QLineF::BoundedIntersection)
+		return true;
+
+	return false;
+}
+
+static bool intersection(const QLineF &line, const QRectF &rect, QPointF *p1,
+  QPointF *p2)
+{
+	QPointF *p = p1;
+
+	if (line.INTERSECTS(QLineF(rect.topLeft(), rect.topRight()), p)
+	  == QLineF::BoundedIntersection)
+		p = p2;
+	if (line.INTERSECTS(QLineF(rect.topLeft(), rect.bottomLeft()), p)
+	  == QLineF::BoundedIntersection) {
+		if (p == p2)
+			return true;
+		p = p2;
+	}
+	if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
+	  == QLineF::BoundedIntersection) {
+		if (p == p2)
+			return true;
+		p = p2;
+	}
+	if (line.INTERSECTS(QLineF(rect.bottomRight(), rect.topRight()), p)
+	  == QLineF::BoundedIntersection) {
+		if (p == p2)
+			return true;
+	}
+
+	Q_ASSERT(p != p2);
+
+	return false;
 }
 
 static QPainterPath subpath(const QList<QLineF> &lines, int start, int end,
@@ -62,7 +99,8 @@ static QList<QLineF> lineString(const QPainterPath &path,
   const QRectF &boundingRect)
 {
 	QList<QLineF> lines;
-	int start = 0, end = path.elementCount() - 1;
+	int start = -1, end = -1;
+
 
 	for (int i = 0; i < path.elementCount(); i++) {
 		if (boundingRect.contains(path.elementAt(i))) {
@@ -77,19 +115,31 @@ static QList<QLineF> lineString(const QPainterPath &path,
 		}
 	}
 
-	if (start > 0) {
+	if (start < 0) {
-		QLineF l(path.elementAt(start-1), path.elementAt(start));
+		QPointF p1, p2;
-		QPointF p(intersection(l, boundingRect));
+
-		if (p != boundingRect.center())
+		for (int i = 1; i < path.elementCount(); i++) {
-			lines.append(QLineF(p, path.elementAt(start)));
+			QLineF l(path.elementAt(i-1), path.elementAt(i));
-	}
+			if (intersection(l, boundingRect, &p1, &p2)) {
-	for (int i = start + 1; i <= end; i++)
+				lines.append(QLineF(p1, p2));
-		lines.append(QLineF(path.elementAt(i-1), path.elementAt(i)));
+				break;
-	if (end < path.elementCount() - 1) {
+			}
-		QLineF l(path.elementAt(end), path.elementAt(end+1));
+		}
-		QPointF p(intersection(l, boundingRect));
+	} else {
-		if (p != boundingRect.center())
+		QPointF p;
-			lines.append(QLineF(path.elementAt(end), p));
+
+		if (start > 0) {
+			QLineF l(path.elementAt(start-1), path.elementAt(start));
+			if (intersection(l, boundingRect, &p))
+				lines.append(QLineF(p, path.elementAt(start)));
+		}
+		for (int i = start + 1; i <= end; i++)
+			lines.append(QLineF(path.elementAt(i-1), path.elementAt(i)));
+		if (end < path.elementCount() - 1) {
+			QLineF l(path.elementAt(end), path.elementAt(end+1));
+			if (intersection(l, boundingRect, &p))
+				lines.append(QLineF(path.elementAt(end), p));
+		}
 	}
 
 	return lines;
@@ -99,6 +149,8 @@ static QPainterPath textPath(const QPainterPath &path, qreal textWidth,
   qreal maxAngle, qreal charWidth, const QRectF &tileRect)
 {
 	QList<QLineF> lines(lineString(path, tileRect));
+	if (lines.isEmpty())
+		return QPainterPath();
 	qreal length = 0;
 	qreal angle = lines.first().angle();
 	int last = 0;
@@ -136,7 +188,7 @@ TextPathItem::TextPathItem(const QString &text, const QPainterPath &path,
   const QFont &font, int maxAngle, const QRectF &tileRect)
   : TextItem(text, font)
 {
-	int cw = avgCharWidth();
+	qreal cw = avgCharWidth();
 	int textWidth = text.size() * cw;
 	if (textWidth > path.length())
 		return;
@@ -160,7 +212,7 @@ void TextPathItem::paint(QPainter *painter) const
 	//painter->drawPath(_shape);
 
 	QFontMetrics fm(font());
-	int textWidth = fm.width(text());
+	int textWidth = fm.boundingRect(text()).width();
 
 	qreal factor = (textWidth) / qMax(_path.length(), (qreal)textWidth);
 	qreal percent = (1.0 - factor) / 2.0;
@@ -187,7 +239,7 @@ void TextPathItem::paint(QPainter *painter) const
 			painter->drawText(QPoint(1, fm.descent()), text().at(i));
 			painter->setTransform(t);
 
-			int width = fm.charWidth(text(), i);
+			int width = fm.horizontalAdvance(text().at(i));
 			percent += ((qreal)width / (qreal)textWidth) * factor;
 		}
 
@@ -204,7 +256,7 @@ void TextPathItem::paint(QPainter *painter) const
 		painter->drawText(QPoint(0, fm.descent()), text().at(i));
 		painter->setTransform(t);
 
-		int width = fm.charWidth(text(), i);
+		int width = fm.horizontalAdvance(text().at(i));
 		percent += ((qreal)width / (qreal)textWidth) * factor;
 	}
 }

src/textpointitem.cpp

@@ -1,34 +1,19 @@
 #include <QPainter>
 #include <QtMath>
-#include "config.h"
+#include <QStaticText>
 #include "textpointitem.h"
 
 
 #define FLAGS (Qt::AlignCenter | Qt::TextWordWrap | Qt::TextDontClip)
 
-QRectF TextPointItem::exactBoundingRect() const
-{
-	QFontMetrics fm(font());
-	int limit = font().pixelSize() * _maxWidth;
-	// Italic fonts overflow the computed bounding rect, so reduce it
-	// a little bit.
-	if (font().italic())
-		limit -= font().pixelSize() / 2.0;
-
-	QRect br = fm.boundingRect(QRect(0, 0, limit, 0), FLAGS, text());
-	Q_ASSERT(br.isValid());
-	// Expand the bounding rect back to the real content size
-	if (font().italic())
-		br.adjust(-font().pixelSize() / 4.0, 0, font().pixelSize() / 4.0, 0);
-
-	return br;
-}
-
 QRectF TextPointItem::fuzzyBoundingRect() const
 {
-	int limit = font().pixelSize() * _maxWidth;
+	int fs = font().pixelSize();
+	if (text().size() <= 3)
+		return QRectF(0, 0, text().size() * fs, fs * 1.6);
+
+	int limit = fs * _maxWidth;
 	qreal cw = avgCharWidth();
-	qreal lh = font().pixelSize() * 1.25;
 	int width = 0, lines = 0;
 
 	QStringList l(text().split('\n'));
@@ -44,7 +29,7 @@ QRectF TextPointItem::fuzzyBoundingRect() const
 				if (wl + pl < limit) {
 					pl += wl + cw;
 				} else {
-					if (wl > limit) {
+					if (wl >= limit) {
 						if (pl > 0)
 							lines++;
 					} else
@@ -61,32 +46,26 @@ QRectF TextPointItem::fuzzyBoundingRect() const
 		}
 	}
 
-	return QRectF(0, 0, width, lines * lh);
+	return QRectF(0, 0, width, lines * fs * 1.6);
 }
 
-
+QRectF TextPointItem::moveTextRect(const QRectF &rect) const
-QRectF TextPointItem::computeTextRect(bool exact) const
 {
-#ifdef ENABLE_HIDPI
 	QRectF iconRect = _icon.isNull() ? QRectF()
 	  : QRectF(QPointF(0, 0), QSizeF(_icon.size()) / _icon.devicePixelRatioF());
-#else // ENABLE_HIDPI
+	QRectF textRect(rect);
-	QRectF iconRect = _icon.isNull() ? QRectF() : QRectF(QPointF(0, 0),
-	  QSizeF(_icon.size()));
-#endif // ENABLE_HIDPI
-	QRectF textRect = exact ? exactBoundingRect() : fuzzyBoundingRect();
 
 	switch (_anchor) {
 		case Text::Center:
 			textRect.moveCenter(_pos);
 			break;
 		case Text::Left:
-			textRect.moveTopLeft(_pos - QPointF(-iconRect.width() / 2,
+			textRect.moveTopLeft(_pos - QPointF(-iconRect.width() / 2
-			  textRect.height() / 2));
+			  - font().pixelSize()/4.0, textRect.height() / 2));
 			break;
 		case Text::Right:
-			textRect.moveTopRight(_pos - QPointF(iconRect.width() / 2,
+			textRect.moveTopRight(_pos - QPointF(iconRect.width() / 2
-			  textRect.height() / 2));
+			  + font().pixelSize()/4.0, textRect.height() / 2));
 			break;
 		case Text::Bottom:
 			textRect.moveTopLeft(_pos - QPointF(textRect.width() / 2,
@@ -106,15 +85,12 @@ TextPointItem::TextPointItem(const QString &text, const QPointF &pos,
   : TextItem(text, font), _pos(pos), _icon(icon), _maxWidth(maxWidth),
   _anchor(anchor)
 {
-	_boundingRect = computeTextRect(false);
+	_textRect = fuzzyBoundingRect();
+	_boundingRect = moveTextRect(_textRect);
 
 	if (!_icon.isNull()) {
-#ifdef ENABLE_HIDPI
 		QRectF iconRect(QPointF(0, 0), QSizeF(_icon.size())
 		  / _icon.devicePixelRatioF());
-#else // ENABLE_HIDPI
-		QRectF iconRect(QPointF(0, 0), QSizeF(_icon.size()));
-#endif // ENABLE_HIDPI
 		iconRect.moveCenter(pos);
 		_boundingRect |= iconRect;
 	}
@@ -122,53 +98,54 @@ TextPointItem::TextPointItem(const QString &text, const QPointF &pos,
 	_shape.addRect(_boundingRect);
 }
 
+void TextPointItem::setPos(const QPointF &pos)
+{
+	QPointF d(_boundingRect.left() - _pos.x(), _boundingRect.top() - _pos.y());
+	_boundingRect.moveTopLeft(pos + d);
+	_shape = QPainterPath();
+	_shape.addRect(_boundingRect);
+	_pos = pos;
+}
+
 void TextPointItem::paint(QPainter *painter) const
 {
-	//painter->setPen(Qt::red);
-	//painter->drawRect(_boundingRect);
-
 	QRectF textRect;
-	bool hasHalo = halo().color().isValid() && halo().width() > 0;
+
+	painter->setFont(font());
+	painter->setPen(pen());
 
 	if (!_icon.isNull()) {
-		textRect = (_anchor != Text::Center || hasHalo)
+		textRect = moveTextRect(painter->boundingRect(_textRect, FLAGS, text()));
-		  ? computeTextRect(true) : _boundingRect;
-#ifdef ENABLE_HIDPI
 		painter->drawImage(_pos - QPointF(_icon.width()
 		  / _icon.devicePixelRatioF() / 2, _icon.height()
 		  / _icon.devicePixelRatioF() / 2), _icon);
-#else // ENABLE_HIDPI
-		painter->drawImage(_pos - QPointF(_icon.width() / 2,
-		  _icon.height() / 2), _icon);
-#endif // ENABLE_HIDPI
 	} else
-		textRect = hasHalo ? computeTextRect(true) : _boundingRect;
+		textRect = _boundingRect;
 
+	if (hasHalo()) {
+		QStaticText st(text());
+		st.setTextFormat(Qt::PlainText);
+		st.setTextWidth(textRect.width());
+		st.setTextOption(QTextOption(Qt::AlignHCenter));
+		st.setPerformanceHint(QStaticText::AggressiveCaching);
 
-	if (hasHalo) {
+		painter->setPen(halo().color());
-		QRect ir(textRect.toRect());
+		painter->drawStaticText(textRect.topLeft() + QPointF(-1, -1), st);
-		QImage img(ir.size(), QImage::Format_ARGB32_Premultiplied);
+		painter->drawStaticText(textRect.topLeft() + QPointF(+1, +1), st);
-		img.fill(Qt::transparent);
+		painter->drawStaticText(textRect.topLeft() + QPointF(-1, +1), st);
-		QPainter ip(&img);
+		painter->drawStaticText(textRect.topLeft() + QPointF(+1, -1), st);
-		ip.setPen(halo().color());
+		painter->drawStaticText(textRect.topLeft() + QPointF(0, -1), st);
-		ip.setFont(font());
+		painter->drawStaticText(textRect.topLeft() + QPointF(0, +1), st);
-		ip.drawText(img.rect(), FLAGS, text());
+		painter->drawStaticText(textRect.topLeft() + QPointF(-1, 0), st);
-
+		painter->drawStaticText(textRect.topLeft() + QPointF(+1, 0), st);
-		painter->drawImage(ir.x() - 1, ir.y() - 1, img);
-		painter->drawImage(ir.x() + 1, ir.y() + 1, img);
-		painter->drawImage(ir.x() - 1, ir.y() + 1, img);
-		painter->drawImage(ir.x() + 1, ir.y() - 1, img);
-		painter->drawImage(ir.x(), ir.y() - 1, img);
-		painter->drawImage(ir.x(), ir.y() + 1, img);
-		painter->drawImage(ir.x() - 1, ir.y(), img);
-		painter->drawImage(ir.x() + 1, ir.y(), img);
-
-		painter->setFont(font());
-		painter->setPen(pen());
-		painter->drawText(ir, FLAGS, text());
-	} else {
-		painter->setFont(font());
 		painter->setPen(pen());
+		painter->drawStaticText(textRect.topLeft(), st);
+	} else
 		painter->drawText(textRect, FLAGS, text());
-	}
+
+	//painter->setBrush(Qt::NoBrush);
+	//painter->setPen(Qt::red);
+	//painter->drawRect(_boundingRect);
+	//painter->setPen(Qt::blue);
+	//painter->drawRect(textRect);
 }

src/textpointitem.h

@@ -15,14 +15,17 @@ public:
 	QPainterPath shape() const {return _shape;}
 	void paint(QPainter *painter) const;
 
+	void setPos(const QPointF &pos);
+
 private:
-	QRectF exactBoundingRect() const;
 	QRectF fuzzyBoundingRect() const;
-	QRectF computeTextRect(bool exact) const;
+	QRectF moveTextRect(const QRectF &rect) const;
+	bool hasHalo() const
+	  {return halo().color().isValid() && halo().width() > 0;}
 
 	QPointF _pos;
 	QPainterPath _shape;
-	QRectF _boundingRect;
+	QRectF _textRect, _boundingRect;
 	QImage _icon;
 	int _maxWidth;
 	Text::Anchor _anchor;