Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Vector tile layer - part 1 #35341

Merged
merged 27 commits into from
Apr 2, 2020
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8105ad1
Initial work on vector tile layer support
wonder-sk Mar 25, 2020
da57d93
Added two new forgotten files with QgsTileXYZ, QgsTileMatrx, QgsTileR…
wonder-sk Mar 26, 2020
bbc6af5
Fixes to python bindings + some bits from code review
wonder-sk Mar 26, 2020
617db59
Doxygen, spelling, sip fixes
wonder-sk Mar 26, 2020
f43bd8c
Move the generated code for MVT to a directory in external/
wonder-sk Mar 26, 2020
976c0e0
Do not mix class and struct
wonder-sk Mar 26, 2020
4b362b3
Silence warning, avoid indentation on generated MVT files
wonder-sk Mar 26, 2020
5ec1890
Moved to proper QgsMapLayer subclass + icon + optional tile borders
wonder-sk Mar 27, 2020
b590aae
Added forgotten icon for vector tile layer
wonder-sk Mar 27, 2020
8d24e17
Added zmin/zmax parameters to limit usable zoom levels
wonder-sk Mar 27, 2020
6a107c8
Added initial unit test + test data
wonder-sk Mar 27, 2020
3c33bf7
Added a basic rendering test
wonder-sk Mar 27, 2020
9e80f59
Use random colors, fix sip includes, fix warnings in server
wonder-sk Mar 27, 2020
4744777
Handle on-the-fly reprojection correctly
wonder-sk Mar 27, 2020
804ac87
Get rid of qDebug(), wrap strings in QStringLiteral
wonder-sk Mar 27, 2020
81a7af7
Updates from review (debug msg level 2, qBound, wider lines for test)
wonder-sk Mar 28, 2020
4e7809c
Update src/gui/qgsbrowserdockwidget_p.cpp
wonder-sk Mar 28, 2020
8c90de9
Dummy commit to trigger new azure build (PR reopen does nothing)
wonder-sk Mar 30, 2020
93715f7
Do not use pre-generated files from protoc
wonder-sk Mar 30, 2020
7749e75
Addressed review comments for Even
wonder-sk Mar 30, 2020
2cfd699
Make sure that "protoc" tool is available
wonder-sk Mar 31, 2020
a475af2
Force protobuf package installation while it is not in qgis-dev-deps
wonder-sk Mar 31, 2020
c9f519a
Revert last commit: qgis-dev-deps now includes protobuf (thanks Jürgen!)
wonder-sk Apr 1, 2020
43415ee
Actually try to include protobuf-devel
wonder-sk Apr 1, 2020
7e71b23
Hopefully this fixes the win build
wonder-sk Apr 2, 2020
1c4042b
More windows build fixes
wonder-sk Apr 2, 2020
18bd8ab
Fix the fix on windows
wonder-sk Apr 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/scalebar
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/validity
${CMAKE_SOURCE_DIR}/src/core/vectortile
${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/attributetable
Expand Down
15 changes: 15 additions & 0 deletions external/mapbox-vector-tile/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

The .pb.cc and .pb.h are generated by 'protoc' tool and got copied here from https://github.com/TimSC/mbtiles-cpp


Update pbf files
----------------

To update the protobuf files, get vector_tile.proto from https://github.com/mapbox/vector-tile-spec, remove the line "option optimize_for = LITE_RUNTIME;", then

mkdir vector_tile21

protoc vector_tile.proto --cpp_out vector_tile21

protobuf lite is avoided because it doesn't contain SerializeToOstream functionality.

Loading