tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: add CustomVectorSource for binary tile data delivery (#4377)

Browse Source 
Co-authored-by: Vladyslav Odobesku <VladyslavOdobesku@intellias.com>
Co-authored-by: Claude Opus 4 <noreply@anthropic.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Vladyslav Odobesku
2026-08-04 19:23:41 +03:00
committed by GitHub
parent 25e4f6acbf
commit 9ef0f1c790
29 changed files with 1307 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/MapLibreAndroid/src/cpp/CMakeLists.txt
View File

@@ -177,6 +177,8 @@ add_library(maplibre SHARED
${PROJECT_SOURCE_DIR}/style/position.hpp
${PROJECT_SOURCE_DIR}/style/sources/custom_geometry_source.cpp
${PROJECT_SOURCE_DIR}/style/sources/custom_geometry_source.hpp
${PROJECT_SOURCE_DIR}/style/sources/custom_vector_source.cpp
${PROJECT_SOURCE_DIR}/style/sources/custom_vector_source.hpp
${PROJECT_SOURCE_DIR}/style/sources/geojson_source.cpp
${PROJECT_SOURCE_DIR}/style/sources/geojson_source.hpp
${PROJECT_SOURCE_DIR}/style/sources/image_source.cpp

137
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp Normal file
View File

@@ -0,0 +1,137 @@
#include "custom_vector_source.hpp"
#include "attach_env.hpp"
#include <mbgl/style/sources/custom_vector_source.hpp>
#include <string>
namespace mbgl {
namespace android {
CustomVectorSource::CustomVectorSource(jni::JNIEnv& env,
const jni::String& sourceId,
jni::jint minZoom,
jni::jint maxZoom)
: Source(env,
std::make_unique<mbgl::style::CustomVectorSource>(
jni::Make<std::string>(env, sourceId),
mbgl::style::CustomVectorSource::Options{
std::bind(&CustomVectorSource::fetchTile, this, std::placeholders::_1),
std::bind(&CustomVectorSource::cancelTile, this, std::placeholders::_1),
{static_cast<uint8_t>(minZoom), static_cast<uint8_t>(maxZoom)}})) {}
CustomVectorSource::~CustomVectorSource() {
onRemovedFromMap();
}
void CustomVectorSource::fetchTile(const mbgl::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
static auto fetchTile = javaClass.GetMethod<void(jni::jint, jni::jint, jni::jint)>(*_env, "fetchTile");
if (!javaPeer) {
return;
}
auto peer = jni::Cast(*_env, javaClass, javaPeer);
peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
}
void CustomVectorSource::cancelTile(const mbgl::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
static auto cancelTile = javaClass.GetMethod<void(jni::jint, jni::jint, jni::jint)>(*_env, "cancelTile");
if (!javaPeer) {
return;
}
auto peer = jni::Cast(*_env, javaClass, javaPeer);
peer.Call(*_env, cancelTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
}
void CustomVectorSource::onAddedToMap() {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
static auto onAddedToMap = javaClass.GetMethod<void()>(*_env, "onAddedToMap");
assert(javaPeer);
auto peer = jni::Cast(*_env, javaClass, javaPeer);
peer.Call(*_env, onAddedToMap);
}
void CustomVectorSource::onRemovedFromMap() {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
static auto onRemovedFromMap = javaClass.GetMethod<void()>(*_env, "onRemovedFromMap");
if (javaPeer) {
auto peer = jni::Cast(*_env, javaClass, javaPeer);
peer.Call(*_env, onRemovedFromMap);
}
}
void CustomVectorSource::setTileData(
jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::Array<jni::jbyte>& jData, jni::jint format) {
std::shared_ptr<std::string> data;
jsize length = jData.Length(env);
if (length > 0) {
data = std::make_shared<std::string>(length, char());
jni::GetArrayRegion(env, *jData, 0, length, reinterpret_cast<jbyte*>(&(*data)[0]));
}
source.as<mbgl::style::CustomVectorSource>()->setTileData(
CanonicalTileID(z, x, y), data, static_cast<mbgl::style::TileDataFormat>(format));
}
void CustomVectorSource::setTileError(
jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::String& message) {
auto msg = jni::Make<std::string>(env, message);
source.as<mbgl::style::CustomVectorSource>()->setTileError(CanonicalTileID(z, x, y),
std::make_exception_ptr(std::runtime_error(msg)));
}
void CustomVectorSource::invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y) {
source.as<mbgl::style::CustomVectorSource>()->invalidateTile(CanonicalTileID(z, x, y));
}
void CustomVectorSource::addToMap(JNIEnv& env,
const jni::Object<Source>& obj,
mbgl::Map& map,
AndroidRendererFrontend& frontend) {
Source::addToMap(env, obj, map, frontend);
onAddedToMap();
}
bool CustomVectorSource::removeFromMap(JNIEnv& env, const jni::Object<Source>& source, mbgl::Map& map) {
bool successfullyRemoved = Source::removeFromMap(env, source, map);
if (successfullyRemoved) {
onRemovedFromMap();
}
return successfullyRemoved;
}
void CustomVectorSource::registerNative(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(env);
#define METHOD(MethodPtr, name) jni::MakeNativePeerMethod<decltype(MethodPtr), (MethodPtr)>(name)
jni::RegisterNativePeer<CustomVectorSource>(
env,
javaClass,
"nativePtr",
jni::MakePeer<CustomVectorSource, const jni::String&, jni::jint, jni::jint>,
"initialize",
"finalize",
METHOD(&CustomVectorSource::setTileData, "nativeSetTileData"),
METHOD(&CustomVectorSource::setTileError, "nativeSetTileError"),
METHOD(&CustomVectorSource::invalidateTile, "nativeInvalidateTile"));
}
} // namespace android
} // namespace mbgl

37
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp Normal file
View File

@@ -0,0 +1,37 @@
#pragma once
#include "source.hpp"
#include <mbgl/style/sources/custom_vector_source.hpp>
#include <mbgl/tile/tile_id.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace android {
class CustomVectorSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "org/maplibre/android/style/sources/CustomVectorSource"; }
static void registerNative(jni::JNIEnv&);
CustomVectorSource(jni::JNIEnv&, const jni::String&, jni::jint minZoom, jni::jint maxZoom);
~CustomVectorSource();
bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&) override;
void addToMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&, AndroidRendererFrontend&) override;
void fetchTile(const mbgl::CanonicalTileID& tileID);
void cancelTile(const mbgl::CanonicalTileID& tileID);
void onAddedToMap();
void onRemovedFromMap();
private:
void setTileData(
jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y, const jni::Array<jni::jbyte>& data, jni::jint format);
void setTileError(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y, const jni::String& message);
void invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y);
};
} // namespace android
} // namespace mbgl

3
platform/android/MapLibreAndroid/src/cpp/style/sources/source.cpp
View File

@@ -17,6 +17,7 @@
#include <string>
// Core Sources
#include <mbgl/style/sources/custom_vector_source.hpp>
#include <mbgl/style/sources/geojson_source.hpp>
#include <mbgl/style/sources/image_source.hpp>
#include <mbgl/style/sources/raster_source.hpp>
@@ -29,6 +30,7 @@
#include "unknown_source.hpp"
#include "vector_source.hpp"
#include "custom_geometry_source.hpp"
#include "custom_vector_source.hpp"
#include "raster_dem_source.hpp"
namespace mbgl {
@@ -319,6 +321,7 @@ void Source::registerNative(jni::JNIEnv& env) {
UnknownSource::registerNative(env);
VectorSource::registerNative(env);
CustomGeometrySource::registerNative(env);
CustomVectorSource::registerNative(env);
RasterDEMSource::registerNative(env);
}
} // namespace android