mirror of
https://github.com/tumic0/QtPBFImagePlugin.git
synced 2025-07-01 05:29:15 +02:00
Compare commits
21 Commits
2.6
...
cb86e30fab
Author | SHA1 | Date | |
---|---|---|---|
cb86e30fab | |||
407f543039 | |||
f24a8a47a9 | |||
ce7b3d9158 | |||
f064148a0f | |||
733375fb74 | |||
440f7f91a4 | |||
dbcfd9b9d3 | |||
672de3919b | |||
0a696a6ab8 | |||
d8a521623a | |||
f5f006dc7b | |||
c86eb7bac2 | |||
3ef6c55d20 | |||
98933deb0e | |||
6e1bc09d62 | |||
ea98da4a74 | |||
8261ee2e79 | |||
d5c315efbe | |||
39ffdaf616 | |||
38b6e2320b |
@ -1,4 +1,4 @@
|
||||
version: 2.6.{build}
|
||||
version: 3.0.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
@ -26,7 +26,7 @@ build_script:
|
||||
nmake release
|
||||
|
||||
artifacts:
|
||||
- path: release\pbf2.dll
|
||||
- path: release\pbf3.dll
|
||||
|
||||
cache:
|
||||
- C:\tools\vcpkg\installed\
|
||||
|
54
.github/workflows/android.yml
vendored
Normal file
54
.github/workflows/android.yml
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
name: Android
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: QtPBFImagePlugin
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install protobuf compiler
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install protobuf-compiler
|
||||
- name: set up JDK 11
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '11'
|
||||
- name: Setup Android SDK
|
||||
uses: android-actions/setup-android@v2
|
||||
- name: Run sdkmanager update
|
||||
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
|
||||
- name: Install android platform, platform-tools, build-tools and ndk
|
||||
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
|
||||
- name: Setup NDK path
|
||||
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
|
||||
- name: Install Qt (Desktop)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==3.1.*'
|
||||
version: '6.4.0'
|
||||
- name: Install Qt (Android)
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==3.1.*'
|
||||
version: '6.4.0'
|
||||
target: 'android'
|
||||
arch: 'android_arm64_v8a'
|
||||
- name: Install Android Google Protocol Buffers
|
||||
run: git clone https://github.com/tumic0/android_protobuf.git
|
||||
- name: Configure build
|
||||
run: qmake pbfplugin.pro PROTOBUF=android_protobuf
|
||||
- name: Build project
|
||||
run: make -j2
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: libplugins_imageformats_libpbf_arm64-v8a.so
|
||||
path: plugins/libpbf/libplugins_imageformats_libpbf_arm64-v8a.so
|
33
README.md
33
README.md
@ -18,24 +18,39 @@ to fit the styles and available data (OpenMapTiles, Mapbox tiles).
|
||||
Due to a major design flaw in the Mapbox vector tiles specification - the zoom
|
||||
is not part of the PBF data - the plugin can not be used "as is", but passing
|
||||
the zoom level is necessary. This is done by exploiting the optional *format*
|
||||
parameter of the QImage constructor or the QImage::fromData() or
|
||||
QPixmap::loadFromData() functions. The zoom number is passed as ASCII string
|
||||
parameter of the QImage constructor or the *QImage::loadFromData()* or
|
||||
*QPixmap::loadFromData()* functions. The zoom number is passed as ASCII string
|
||||
to the functions:
|
||||
```cpp
|
||||
QPixmap pm;
|
||||
pm.loadFromData(tileData, QString::number(zoom).toLatin1());
|
||||
QImage img;
|
||||
img.loadFromData(data, QByteArray::number(zoom));
|
||||
```
|
||||
The plugin supports vector scaling using QImageReader's setScaledSize() method,
|
||||
|
||||
For a complete code sample see the [pbf2png](https://github.com/tumic0/pbf2png)
|
||||
conversion utility.
|
||||
|
||||
### HiDPI
|
||||
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());
|
||||
QImage img;
|
||||
QImageReader reader(file, QByteArray::number(zoom));
|
||||
reader.setScaledSize(QSize(1024, 1024));
|
||||
reader.read(&image);
|
||||
reader.read(&img);
|
||||
```
|
||||
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.
|
||||
### Overzoom
|
||||
Since version 3 of the plugin tile overzoom is supported. If you set *format*
|
||||
to `$zoom;$overzoom`:
|
||||
```cpp
|
||||
QImage img;
|
||||
QByteArray fmt(QByteArray::number(zoom) + ';' + QByteArray::number(overzoom));
|
||||
img.loadFromData(data, fmt);
|
||||
```
|
||||
you will get (512<<overzoom)x(512<<overzoom)px tiles with a pixel ratio of 1.
|
||||
When overzoom is combined with setScaledSize(), the base size is the overzoomed
|
||||
tile size.
|
||||
|
||||
## Styles
|
||||
The map style is loaded from the
|
||||
|
@ -2,7 +2,7 @@ TARGET = pbf
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin
|
||||
QT += gui
|
||||
VERSION = 2.6
|
||||
VERSION = 3.0
|
||||
|
||||
PROTOS = protobuf/vector_tile.proto
|
||||
include(protobuf/vector_tile.pri)
|
||||
@ -39,9 +39,12 @@ RESOURCES += pbfplugin.qrc
|
||||
|
||||
DEFINES += QT_NO_DEPRECATED_WARNINGS
|
||||
|
||||
unix:!macx{
|
||||
unix:!macx:!android {
|
||||
LIBS += -lprotobuf-lite \
|
||||
-lz
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
||||
INSTALLS += target
|
||||
}
|
||||
win32 {
|
||||
INCLUDEPATH += $$PROTOBUF/include \
|
||||
@ -58,6 +61,12 @@ macx {
|
||||
LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \
|
||||
-lz
|
||||
}
|
||||
android {
|
||||
INCLUDEPATH += $$PROTOBUF/include
|
||||
LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \
|
||||
-lz
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
|
||||
INSTALLS += target
|
||||
top_builddir=$$shadowed($$PWD)
|
||||
DESTDIR = $$top_builddir/plugins/libpbf
|
||||
TARGET = $$qt5LibraryTarget(libpbf, "plugins/imageformats/")
|
||||
}
|
||||
|
@ -79,16 +79,19 @@ bool PBFHandler::read(QImage *image)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool ok;
|
||||
int zoom = format().toInt(&ok);
|
||||
QList<QByteArray> list(format().split(';'));
|
||||
int zoom = list.size() ? list.first().toInt() : 0;
|
||||
int overzoom = (list.size() > 1) ? list.at(1).toInt() : 0;
|
||||
|
||||
QSize scaledSize(_scaledSize.isValid()
|
||||
? _scaledSize : QSize(TILE_SIZE, TILE_SIZE));
|
||||
QSize size(scaledSize.width()<<overzoom,
|
||||
scaledSize.height()<<overzoom);
|
||||
QPointF scale((qreal)scaledSize.width() / TILE_SIZE,
|
||||
(qreal)scaledSize.height() / TILE_SIZE);
|
||||
|
||||
QSize size = _scaledSize.isValid()
|
||||
? _scaledSize : QSize(TILE_SIZE, TILE_SIZE);
|
||||
QPointF scale = _scaledSize.isValid()
|
||||
? QPointF((qreal)_scaledSize.width() / TILE_SIZE,
|
||||
(qreal)_scaledSize.height() / TILE_SIZE) : QPointF(1.0, 1.0);
|
||||
*image = QImage(size, QImage::Format_ARGB32_Premultiplied);
|
||||
Tile tile(image, ok ? zoom : -1, scale);
|
||||
Tile tile(image, zoom, scale);
|
||||
|
||||
_style->render(data, tile);
|
||||
|
||||
|
@ -2265,7 +2265,6 @@
|
||||
"source": "openmaptiles",
|
||||
"source-layer": "building",
|
||||
"minzoom": 13,
|
||||
"maxzoom": 14,
|
||||
"layout": {
|
||||
"visibility": "visible"
|
||||
},
|
||||
@ -4059,4 +4058,4 @@
|
||||
}
|
||||
],
|
||||
"id": "osm-liberty"
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user