[FEATURE] Vector tile layer - part 1

CMakeLists.txt

@@ -331,6 +331,11 @@ IF(WITH_CORE)
     MESSAGE (SEND_ERROR "sqlite3 dependency was not found!")
   ENDIF (NOT SQLITE3_FOUND)
 
+  FIND_PACKAGE(Protobuf REQUIRED)   # for decoding of vector tiles in MVT format
+  MESSAGE(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
+  FIND_PACKAGE(ZLIB REQUIRED)       # for decompression of vector tiles in MBTiles file
+  MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARIES}")
+
   # optional
   IF (WITH_POSTGRESQL)
     FIND_PACKAGE(Postgres) # PostgreSQL provider

python/CMakeLists.txt

@@ -123,6 +123,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/symbology
   ${CMAKE_SOURCE_DIR}/src/core/classification
   ${CMAKE_SOURCE_DIR}/src/core/validity
+  ${CMAKE_SOURCE_DIR}/src/core/vectortile
   ${CMAKE_SOURCE_DIR}/src/plugins
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/nlohmann

python/core/core_auto.sip

@@ -534,3 +534,4 @@
 %Include auto_generated/gps/qgsgpsconnectionregistry.sip
 %Include auto_generated/symbology/qgsmasksymbollayer.sip
 %Include auto_generated/qgsuserprofile.sip
+%Include auto_generated/vectortile/qgsvectortilelayer.sip

scripts/astyle.sh

@@ -105,7 +105,7 @@ astyleit() {
 
 for f in "$@"; do
 	case "$f" in
-                src/plugins/grass/qtermwidget/*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
+                src/plugins/grass/qtermwidget/*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*|src/core/vectortile/*.pb.*)
 			echo -ne "$f skipped $elcr"
 			continue
 			;;

src/core/CMakeLists.txt

@@ -312,6 +312,7 @@ SET(QGIS_CORE_SRCS
   qgsmapunitscale.cpp
   qgsmargins.cpp
   qgsmaskidprovider.cpp
+  qgsmbtilesreader.cpp
   qgsmessagelog.cpp
   qgsmessageoutput.cpp
   qgsmimedatautils.cpp
@@ -395,6 +396,7 @@ SET(QGIS_CORE_SRCS
   qgstessellator.cpp
   qgstextrenderer.cpp
   qgstilecache.cpp
+  qgstiles.cpp
   qgstolerance.cpp
   qgstracer.cpp
   qgstranslationcontext.cpp
@@ -635,6 +637,14 @@ SET(QGIS_CORE_SRCS
   validity/qgsvaliditycheckcontext.cpp
   validity/qgsvaliditycheckregistry.cpp
 
+  vectortile/qgsvectortilebasicrenderer.cpp
+  vectortile/qgsvectortilelayer.cpp
+  vectortile/qgsvectortilelayerrenderer.cpp
+  vectortile/qgsvectortileloader.cpp
+  vectortile/qgsvectortilemvtdecoder.cpp
+  vectortile/qgsvectortileutils.cpp
+  vectortile/vector_tile.pb.cc
+
   ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp
 
   qgsuserprofile.cpp
@@ -833,6 +843,7 @@ SET(QGIS_CORE_HDRS
   qgsmapunitscale.h
   qgsmargins.h
   qgsmaskidprovider.h
+  qgsmbtilesreader.h
   qgsmessagelog.h
   qgsmessageoutput.h
   qgsmimedatautils.h
@@ -924,6 +935,7 @@ SET(QGIS_CORE_HDRS
   qgstextrenderer.h
   qgsthreadingutils.h
   qgstilecache.h
+  qgstiles.h
   qgstolerance.h
   qgstracer.h
   qgstrackedvectorlayertools.h
@@ -1319,6 +1331,14 @@ SET(QGIS_CORE_HDRS
   validity/qgsabstractvaliditycheck.h
   validity/qgsvaliditycheckcontext.h
   validity/qgsvaliditycheckregistry.h
+
+  vectortile/qgsvectortilebasicrenderer.h
+  vectortile/qgsvectortilelayer.h
+  vectortile/qgsvectortilelayerrenderer.h
+  vectortile/qgsvectortileloader.h
+  vectortile/qgsvectortilemvtdecoder.h
+  vectortile/qgsvectortilerenderer.h
+  vectortile/qgsvectortileutils.h
 )
 
 SET(QGIS_CORE_PRIVATE_HDRS
@@ -1408,6 +1428,7 @@ INCLUDE_DIRECTORIES(
   symbology
   mesh
   validity
+  vectortile
   ${CMAKE_SOURCE_DIR}/external
   ${CMAKE_SOURCE_DIR}/external/nlohmann
   ${CMAKE_SOURCE_DIR}/external/kdbush/include
@@ -1429,6 +1450,8 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QCA_INCLUDE_DIR}
   ${QTKEYCHAIN_INCLUDE_DIR}
   ${Qt5SerialPort_INCLUDE_DIRS}
+  ${Protobuf_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
 )
 
 
@@ -1563,6 +1586,8 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${SQLITE3_LIBRARY}
   ${SPATIALITE_LIBRARY}
   ${LIBZIP_LIBRARY}
+  ${Protobuf_LIBRARIES}
+  ${ZLIB_LIBRARIES}
 )
 
 IF (FORCE_STATIC_PROVIDERS)

src/providers/wms/qgsmbtilesreader.h → src/core/qgsmbtilesreader.h

@@ -16,14 +16,15 @@
 #ifndef QGSMBTILESREADER_H
 #define QGSMBTILESREADER_H
 
+#include "qgis_core.h"
 
 #include "sqlite3.h"
 #include "qgssqliteutils.h"
 
 class QImage;
 class QgsRectangle;
 
-class QgsMBTilesReader
+class CORE_EXPORT QgsMBTilesReader
 {
   public:
     explicit QgsMBTilesReader( const QString &filename );

src/core/vectortile/qgsvectortilebasicrenderer.cpp

@@ -0,0 +1,259 @@
+/***************************************************************************
+  qgsvectortilebasicrenderer.cpp
+  --------------------------------------
+  Date                 : March 2020
+  Copyright            : (C) 2020 by Martin Dobias
+  Email                : wonder dot sk at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsvectortilebasicrenderer.h"
+
+#include "qgslinesymbollayer.h"
+#include "qgssymbollayerutils.h"
+#include "qgsvectortileutils.h"
+
+
+QgsVectorTileBasicRendererStyle::QgsVectorTileBasicRendererStyle( const QString &stName, const QString &laName, QgsWkbTypes::GeometryType geomType )
+  : mStyleName( stName )
+  , mLayerName( laName )
+  , mGeometryType( geomType )
+{
+}
+
+QgsVectorTileBasicRendererStyle::QgsVectorTileBasicRendererStyle( const QgsVectorTileBasicRendererStyle &other )
+{
+  operator=( other );
+}
+
+QgsVectorTileBasicRendererStyle &QgsVectorTileBasicRendererStyle::operator=( const QgsVectorTileBasicRendererStyle &other )
+{
+  mStyleName = other.mStyleName;
+  mLayerName = other.mLayerName;
+  mGeometryType = other.mGeometryType;
+  mSymbol.reset( other.mSymbol ? other.mSymbol->clone() : nullptr );
+  mEnabled = other.mEnabled;
+  mExpression = other.mExpression;
+  mMinZoomLevel = other.mMinZoomLevel;
+  mMaxZoomLevel = other.mMaxZoomLevel;
+  return *this;
+}
+
+void QgsVectorTileBasicRendererStyle::setSymbol( QgsSymbol *sym )
+{
+  mSymbol.reset( sym );
+}
+
+void QgsVectorTileBasicRendererStyle::writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const
+{
+  elem.setAttribute( "name", mStyleName );
+  elem.setAttribute( "layer", mLayerName );
+  elem.setAttribute( "geometry", mGeometryType );
+  elem.setAttribute( "enabled", mEnabled ? "1" : "0" );
+  elem.setAttribute( "expression", mExpression );
+  elem.setAttribute( "min-zoom", mMinZoomLevel );
+  elem.setAttribute( "max-zoom", mMaxZoomLevel );
+
+  QDomDocument doc = elem.ownerDocument();
+  QgsSymbolMap symbols;
+  symbols[QStringLiteral( "0" )] = mSymbol.get();
+  QDomElement symbolsElem = QgsSymbolLayerUtils::saveSymbols( symbols, QStringLiteral( "symbols" ), doc, context );
+  elem.appendChild( symbolsElem );
+}
+
+void QgsVectorTileBasicRendererStyle::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
+{
+  mStyleName = elem.attribute( "name" );
+  mLayerName = elem.attribute( "layer" );
+  mGeometryType = static_cast<QgsWkbTypes::GeometryType>( elem.attribute( "geometry" ).toInt() );
+  mEnabled = elem.attribute( "enabled" ).toInt();
+  mExpression = elem.attribute( "expression" );
+  mMinZoomLevel = elem.attribute( "min-zoom" ).toInt();
+  mMaxZoomLevel = elem.attribute( "max-zoom" ).toInt();
+
+  mSymbol.reset();
+  QDomElement symbolsElem = elem.firstChildElement( QStringLiteral( "symbols" ) );
+  if ( !symbolsElem.isNull() )
+  {
+    QgsSymbolMap symbolMap = QgsSymbolLayerUtils::loadSymbols( symbolsElem, context );
+    if ( !symbolMap.contains( QStringLiteral( "0" ) ) )
+    {
+      mSymbol.reset( symbolMap.take( QStringLiteral( "0" ) ) );
+    }
+  }
+}
+
+////////
+
+
+QgsVectorTileBasicRenderer::QgsVectorTileBasicRenderer()
+{
+  setDefaultStyle();
+}
+
+QString QgsVectorTileBasicRenderer::type() const
+{
+  return "basic";
+}
+
+QgsVectorTileBasicRenderer *QgsVectorTileBasicRenderer::clone() const
+{
+  QgsVectorTileBasicRenderer *r = new QgsVectorTileBasicRenderer;
+  r->mStyles = mStyles;
+  r->mStyles.detach();  // make a deep copy to make sure symbols get cloned
+  return r;
+}
+
+void QgsVectorTileBasicRenderer::startRender( QgsRenderContext &context, int tileZoom, const QgsTileRange &tileRange )
+{
+  Q_UNUSED( context )
+  Q_UNUSED( tileRange )
+  // figure out required fields for different layers
+  for ( const QgsVectorTileBasicRendererStyle &layerStyle : qgis::as_const( mStyles ) )
+  {
+    if ( layerStyle.isActive( tileZoom ) && !layerStyle.filterExpression().isEmpty() )
+    {
+      QgsExpression expr( layerStyle.filterExpression() );
+      mRequiredFields[layerStyle.layerName()].unite( expr.referencedColumns() );
+    }
+  }
+}
+
+QMap<QString, QSet<QString> > QgsVectorTileBasicRenderer::usedAttributes( const QgsRenderContext & )
+{
+  return mRequiredFields;
+}
+
+void QgsVectorTileBasicRenderer::stopRender( QgsRenderContext &context )
+{
+  Q_UNUSED( context )
+}
+
+void QgsVectorTileBasicRenderer::renderTile( const QgsVectorTileRendererData &tile, QgsRenderContext &context )
+{
+  const QgsVectorTileFeatures tileData = tile.features;
+  int zoomLevel = tile.id.zoomLevel();
+
+  for ( const QgsVectorTileBasicRendererStyle &layerStyle : qgis::as_const( mStyles ) )
+  {
+    if ( !layerStyle.isActive( zoomLevel ) )
+      continue;
+
+    QgsFields fields = QgsVectorTileUtils::makeQgisFields( mRequiredFields[layerStyle.layerName()] );
+
+    QgsExpressionContextScope *scope = new QgsExpressionContextScope( QObject::tr( "Layer" ) );
+    scope->setFields( fields );
+    context.expressionContext().appendScope( scope );
+
+    QgsExpression filterExpression( layerStyle.filterExpression() );
+    filterExpression.prepare( &context.expressionContext() );
+
+    QgsSymbol *sym = layerStyle.symbol();
+    sym->startRender( context, QgsFields() );
+    if ( layerStyle.layerName().isEmpty() )
+    {
+      // matching all layers
+      for ( QString layerName : tileData.keys() )
+      {
+        for ( const QgsFeature &f : tileData[layerName] )
+        {
+          scope->setFeature( f );
+          if ( filterExpression.isValid() && !filterExpression.evaluate( &context.expressionContext() ).toBool() )
+            continue;
+
+          if ( QgsWkbTypes::geometryType( f.geometry().wkbType() ) == layerStyle.geometryType() )
+            sym->renderFeature( f, context );
+        }
+      }
+    }
+    else if ( tileData.contains( layerStyle.layerName() ) )
+    {
+      // matching one particular layer
+      for ( const QgsFeature &f : tileData[layerStyle.layerName()] )
+      {
+        scope->setFeature( f );
+        if ( filterExpression.isValid() && !filterExpression.evaluate( &context.expressionContext() ).toBool() )
+          continue;
+
+        if ( QgsWkbTypes::geometryType( f.geometry().wkbType() ) == layerStyle.geometryType() )
+          sym->renderFeature( f, context );
+      }
+    }
+    sym->stopRender( context );
+
+    delete context.expressionContext().popScope();
+  }
+}
+
+void QgsVectorTileBasicRenderer::writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const
+{
+  QDomDocument doc = elem.ownerDocument();
+  QDomElement elemStyles = doc.createElement( "styles" );
+  for ( const QgsVectorTileBasicRendererStyle &layerStyle : mStyles )
+  {
+    QDomElement elemStyle = doc.createElement( "style" );
+    layerStyle.writeXml( elemStyle, context );
+    elemStyles.appendChild( elemStyle );
+  }
+  elem.appendChild( elemStyles );
+}
+
+void QgsVectorTileBasicRenderer::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
+{
+  mStyles.clear();
+
+  QDomElement elemStyles = elem.firstChildElement( "styles" );
+  QDomElement elemStyle = elemStyles.firstChildElement( "style" );
+  while ( !elemStyle.isNull() )
+  {
+    QgsVectorTileBasicRendererStyle layerStyle;
+    layerStyle.readXml( elemStyle, context );
+    mStyles.append( layerStyle );
+  }
+}
+
+void QgsVectorTileBasicRenderer::setStyles( const QList<QgsVectorTileBasicRendererStyle> &styles )
+{
+  mStyles = styles;
+}
+
+QList<QgsVectorTileBasicRendererStyle> QgsVectorTileBasicRenderer::styles() const
+{
+  return mStyles;
+}
+
+void QgsVectorTileBasicRenderer::setDefaultStyle()
+{
+  QColor color = Qt::blue;
+  QColor polygonColor = color;
+  polygonColor.setAlpha( 100 );
+  QColor pointColor = Qt::red;
+
+  QgsFillSymbol *polygonSymbol = static_cast<QgsFillSymbol *>( QgsLineSymbol::defaultSymbol( QgsWkbTypes::PolygonGeometry ) );
+  polygonSymbol->setColor( polygonColor );
+
+  QgsLineSymbol *lineSymbol = static_cast<QgsLineSymbol *>( QgsLineSymbol::defaultSymbol( QgsWkbTypes::LineGeometry ) );
+  lineSymbol->setColor( color );
+
+  QgsMarkerSymbol *pointSymbol = static_cast<QgsMarkerSymbol *>( QgsLineSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) );
+  pointSymbol->setColor( pointColor );
+
+  QgsVectorTileBasicRendererStyle st1( "polygons", QString(), QgsWkbTypes::PolygonGeometry );
+  st1.setSymbol( polygonSymbol );
+
+  QgsVectorTileBasicRendererStyle st2( "lines", QString(), QgsWkbTypes::LineGeometry );
+  st2.setSymbol( lineSymbol );
+
+  QgsVectorTileBasicRendererStyle st3( "points", QString(), QgsWkbTypes::PointGeometry );
+  st3.setSymbol( pointSymbol );
+
+  QList<QgsVectorTileBasicRendererStyle> lst;
+  lst << st1 << st2 << st3;
+  setStyles( lst );
+}