root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-11-24 03:35:54 +01:00
Code Issues Projects Releases Wiki Activity

Properly decode the zigzag encoded parameters

Browse Source
This commit is contained in:
Martin Tůma 2018-11-07 19:48:40 +01:00
parent 632535709b
commit b1ed5b3a21
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pbf.cpp
View File

@ -16,6 +16,7 @@
#define LINESTRING vector_tile::Tile_GeomType::Tile_GeomType_LINESTRING #define LINESTRING vector_tile::Tile_GeomType::Tile_GeomType_LINESTRING
#define POINT vector_tile::Tile_GeomType::Tile_GeomType_POINT #define POINT vector_tile::Tile_GeomType::Tile_GeomType_POINT
static QVariant value(const vector_tile::Tile_Value &val) static QVariant value(const vector_tile::Tile_Value &val)
{ {
if (val.has_bool_value()) if (val.has_bool_value())
@ -93,9 +94,15 @@ private:
QList<Feature> _features; QList<Feature> _features;
}; };
static QPoint parameters(quint32 v1, quint32 v2) static inline qint32 zigzag32decode(quint32 value)
{ {
return QPoint((v1 >> 1) ^ (-(v1 & 1)), ((v2 >> 1) ^ (-(v2 & 1)))); return static_cast<qint32>((value >> 1u) ^ static_cast<quint32>(
-static_cast<qint32>(value & 1u)));
}
static inline QPoint parameters(quint32 v1, quint32 v2)
{
return QPoint(zigzag32decode(v1), zigzag32decode(v2));
} }
static void drawFeature(const Feature &feature, Style *style, int styleLayer, static void drawFeature(const Feature &feature, Style *style, int styleLayer,
@ -162,6 +169,7 @@ QImage PBF::image(const QByteArray &data, int zoom, Style *style, int size)
style->setZoom(zoom); style->setZoom(zoom);
style->drawBackground(t); style->drawBackground(t);
// Prepare source layers
QMap<QString, Layer> layers; QMap<QString, Layer> layers;
for (int i = 0; i < tile.layers_size(); i++) { for (int i = 0; i < tile.layers_size(); i++) {
const vector_tile::Tile_Layer &layer = tile.layers(i); const vector_tile::Tile_Layer &layer = tile.layers(i);
@ -170,7 +178,7 @@ QImage PBF::image(const QByteArray &data, int zoom, Style *style, int size)
layers.insert(name, Layer(&layer)); layers.insert(name, Layer(&layer));
} }
// Process data in order of style layers // Process source layers in order of style layers
for (int i = 0; i < style->sourceLayers().size(); i++) { for (int i = 0; i < style->sourceLayers().size(); i++) {
QMap<QString, Layer>::const_iterator it = layers.find( QMap<QString, Layer>::const_iterator it = layers.find(
style->sourceLayers().at(i)); style->sourceLayers().at(i));