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

Change Android package and class names away from mapbox (#1201)

Browse Source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
fynngodau
2023-06-12 14:04:25 +02:00
committed by GitHub
parent 26094930e9
commit c75e3596da
731 changed files with 9473 additions and 9669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/MapboxGLAndroidSDK/src/cpp/CMakeLists.txt
View File

@@ -96,8 +96,8 @@ add_library(mapbox-gl SHARED
${PROJECT_SOURCE_DIR}/java/util.hpp
${PROJECT_SOURCE_DIR}/java_types.cpp
${PROJECT_SOURCE_DIR}/java_types.hpp
${PROJECT_SOURCE_DIR}/mapbox.cpp
${PROJECT_SOURCE_DIR}/mapbox.hpp
${PROJECT_SOURCE_DIR}/maplibre.cpp
${PROJECT_SOURCE_DIR}/maplibre.hpp
${PROJECT_SOURCE_DIR}/map/camera_position.cpp
${PROJECT_SOURCE_DIR}/map/camera_position.hpp
${PROJECT_SOURCE_DIR}/map/image.cpp

2
platform/android/MapboxGLAndroidSDK/src/cpp/annotation/marker.hpp
View File

@@ -12,7 +12,7 @@ namespace android {
class Marker : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Marker"; };
static constexpr auto Name() { return "org/maplibre/android/annotations/Marker"; };
static mbgl::Point<double> getPosition(jni::JNIEnv&, const jni::Object<Marker>&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polygon.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class Polygon : private MultiPoint {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polygon"; };
static constexpr auto Name() { return "org/maplibre/android/annotations/Polygon"; };
static mbgl::FillAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polygon>&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/annotation/polyline.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class Polyline : private MultiPoint {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/annotations/Polyline"; };
static constexpr auto Name() { return "org/maplibre/android/annotations/Polyline"; };
static mbgl::LineAnnotation toAnnotation(jni::JNIEnv&, const jni::Object<Polyline>&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/connectivity_listener.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class ConnectivityListener : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/net/NativeConnectivityListener"; };
static constexpr auto Name() { return "org/maplibre/android/net/NativeConnectivityListener"; };
static void registerNative(jni::JNIEnv&);

6
platform/android/MapboxGLAndroidSDK/src/cpp/file_source.cpp
View File

@@ -1,7 +1,7 @@
#include "file_source.hpp"
#include "attach_env.hpp"
#include "mapbox.hpp"
#include "maplibre.hpp"
#include <mbgl/actor/actor.hpp>
#include <mbgl/actor/scheduler.hpp>
@@ -33,8 +33,8 @@ FileSource::FileSource(jni::JNIEnv& _env,
[](const mbgl::ResourceOptions& resourceOptions, const mbgl::ClientOptions& clientOptions) {
auto env{android::AttachEnv()};
std::unique_ptr<mbgl::FileSource> assetFileSource;
if (android::Mapbox::hasInstance(*env)) {
auto assetManager = android::Mapbox::getAssetManager(*env);
if (android::MapLibre::hasInstance(*env)) {
auto assetManager = android::MapLibre::getAssetManager(*env);
assetFileSource = std::make_unique<AssetManagerFileSource>(
*env, assetManager, resourceOptions.clone(), clientOptions.clone());
}

6
platform/android/MapboxGLAndroidSDK/src/cpp/file_source.hpp
View File

@@ -24,11 +24,11 @@ namespace android {
*/
class FileSource {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/FileSource"; };
static constexpr auto Name() { return "org/maplibre/android/storage/FileSource"; };
struct ResourceTransformCallback {
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/storage/"
return "org/maplibre/android/storage/"
"FileSource$ResourceTransformCallback";
}
@@ -40,7 +40,7 @@ public:
struct ResourcesCachePathChangeCallback {
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/storage/"
return "org/maplibre/android/storage/"
"FileSource$ResourcesCachePathChangeCallback";
}

2
platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng.hpp
View File

@@ -11,7 +11,7 @@ namespace android {
class LatLng : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLng"; };
static constexpr auto Name() { return "org/maplibre/android/geometry/LatLng"; };
static jni::Local<jni::Object<LatLng>> New(jni::JNIEnv&, const mbgl::LatLng&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_bounds.hpp
View File

@@ -11,7 +11,7 @@ namespace android {
class LatLngBounds : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngBounds"; };
static constexpr auto Name() { return "org/maplibre/android/geometry/LatLngBounds"; };
static jni::Local<jni::Object<LatLngBounds>> New(jni::JNIEnv&, mbgl::LatLngBounds);

2
platform/android/MapboxGLAndroidSDK/src/cpp/geometry/lat_lng_quad.hpp
View File

@@ -12,7 +12,7 @@ namespace android {
class LatLngQuad : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngQuad"; };
static constexpr auto Name() { return "org/maplibre/android/geometry/LatLngQuad"; };
static jni::Local<jni::Object<LatLngQuad>> New(jni::JNIEnv&, std::array<mbgl::LatLng, 4>);

2
platform/android/MapboxGLAndroidSDK/src/cpp/geometry/projected_meters.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class ProjectedMeters : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/ProjectedMeters"; };
static constexpr auto Name() { return "org/maplibre/android/geometry/ProjectedMeters"; };
static jni::Local<jni::Object<ProjectedMeters>> New(jni::JNIEnv&, double, double);

2
platform/android/MapboxGLAndroidSDK/src/cpp/http_file_source.cpp
View File

@@ -37,7 +37,7 @@ private:
class HTTPRequest : public AsyncRequest {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/http/NativeHttpRequest"; };
static constexpr auto Name() { return "org/maplibre/android/http/NativeHttpRequest"; };
HTTPRequest(jni::JNIEnv&, const Resource&, FileSource::Callback);
~HTTPRequest();

2
platform/android/MapboxGLAndroidSDK/src/cpp/i18n/collator_jni.hpp
View File

@@ -47,7 +47,7 @@ public:
class StringUtils {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/utils/StringUtils"; };
static constexpr auto Name() { return "org/maplibre/android/utils/StringUtils"; };
static jni::Local<jni::String> unaccent(jni::JNIEnv&, const jni::String&);

4
platform/android/MapboxGLAndroidSDK/src/cpp/jni_native.cpp
View File

@@ -32,7 +32,7 @@
#include "java_types.hpp"
#include "map_renderer.hpp"
#include "map_renderer_runnable.hpp"
#include "mapbox.hpp"
#include "maplibre.hpp"
#include "native_map_view.hpp"
#include "util/tile_server_options.hpp"
#ifndef MBGL_MODULE_OFFLINE_DISABLE
@@ -162,7 +162,7 @@ void registerNatives(JavaVM* vm) {
Logger::registerNative(env);
// AssetManager
Mapbox::registerNative(env);
MapLibre::registerNative(env);
// Util
DefaultStyle::registerNative(env);

2
platform/android/MapboxGLAndroidSDK/src/cpp/logger.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class Logger {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/log/Logger"; };
static constexpr auto Name() { return "org/maplibre/android/log/Logger"; };
static void registerNative(jni::JNIEnv &);
static void log(jni::JNIEnv &, EventSeverity severity, const std::string &msg);

2
platform/android/MapboxGLAndroidSDK/src/cpp/map/camera_position.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class CameraPosition : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/camera/CameraPosition"; };
static constexpr auto Name() { return "org/maplibre/android/camera/CameraPosition"; };
static jni::Local<jni::Object<CameraPosition>> New(jni::JNIEnv&, mbgl::CameraOptions, float pixelRatio);

2
platform/android/MapboxGLAndroidSDK/src/cpp/map/image.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class Image : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/Image"; };
static constexpr auto Name() { return "org/maplibre/android/maps/Image"; };
static mbgl::style::Image getImage(jni::JNIEnv&, const jni::Object<Image>&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer.hpp
View File

@@ -34,7 +34,7 @@ class AndroidRendererBackend;
*/
class MapRenderer : public Scheduler {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/renderer/MapRenderer"; };
static constexpr auto Name() { return "org/maplibre/android/maps/renderer/MapRenderer"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/map_renderer_runnable.hpp
View File

@@ -19,7 +19,7 @@ namespace android {
*/
class MapRendererRunnable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/renderer/MapRendererRunnable"; };
static constexpr auto Name() { return "org/maplibre/android/maps/renderer/MapRendererRunnable"; };
static void registerNative(jni::JNIEnv&);

23
platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.cpp
View File

@@ -1,23 +0,0 @@
#include "mapbox.hpp"
namespace mbgl {
namespace android {
jni::Local<jni::Object<AssetManager>> Mapbox::getAssetManager(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<Mapbox>::Singleton(env);
auto method = javaClass.GetStaticMethod<jni::Object<AssetManager>()>(env, "getAssetManager");
return javaClass.Call(env, method);
}
jboolean Mapbox::hasInstance(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<Mapbox>::Singleton(env);
auto method = javaClass.GetStaticMethod<jboolean()>(env, "hasInstance");
return javaClass.Call(env, method);
}
void Mapbox::registerNative(jni::JNIEnv& env) {
jni::Class<Mapbox>::Singleton(env);
}
} // namespace android
} // namespace mbgl

23
platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.cpp Normal file
View File

@@ -0,0 +1,23 @@
#include "maplibre.hpp"
namespace mbgl {
namespace android {
jni::Local<jni::Object<AssetManager>> MapLibre::getAssetManager(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<MapLibre>::Singleton(env);
auto method = javaClass.GetStaticMethod<jni::Object<AssetManager>()>(env, "getAssetManager");
return javaClass.Call(env, method);
}
jboolean MapLibre::hasInstance(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<MapLibre>::Singleton(env);
auto method = javaClass.GetStaticMethod<jboolean()>(env, "hasInstance");
return javaClass.Call(env, method);
}
void MapLibre::registerNative(jni::JNIEnv& env) {
jni::Class<MapLibre>::Singleton(env);
}
} // namespace android
} // namespace mbgl

4
platform/android/MapboxGLAndroidSDK/src/cpp/mapbox.hpp → platform/android/MapboxGLAndroidSDK/src/cpp/maplibre.hpp
View File

@@ -7,9 +7,9 @@
namespace mbgl {
namespace android {
class Mapbox {
class MapLibre {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/Mapbox"; };
static constexpr auto Name() { return "org/maplibre/android/MapLibre"; };
static jboolean hasInstance(jni::JNIEnv&);
static jni::Local<jni::Object<AssetManager>> getAssetManager(jni::JNIEnv&);
static void registerNative(jni::JNIEnv&);

12
platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.cpp
View File

@@ -1005,7 +1005,7 @@ void NativeMapView::addLayer(JNIEnv& env, jlong nativeLayerPtr, const jni::Strin
before ? std::optional<std::string>(jni::Make<std::string>(env, before)) : std::optional<std::string>());
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -1031,7 +1031,7 @@ void NativeMapView::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni::
if (index + 1 > layers.size()) {
// Not found
jni::ThrowNew(env,
jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"),
std::string("Could not find layer: ").append(siblingId).c_str());
return;
} else if (index + 1 < layers.size()) {
@@ -1044,7 +1044,7 @@ void NativeMapView::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni::
layer->addToStyle(map->getStyle(), before);
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -1059,7 +1059,7 @@ void NativeMapView::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint inde
if (index > numLayers || index < 0) {
Log::Error(Event::JNI, "Index out of range: " + std::to_string(index));
jni::ThrowNew(env,
jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"),
std::string("Invalid index").c_str());
return;
}
@@ -1069,7 +1069,7 @@ void NativeMapView::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint inde
layer->addToStyle(map->getStyle(), layers.at(index)->getID());
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -1145,7 +1145,7 @@ void NativeMapView::addSource(JNIEnv& env, const jni::Object<Source>& obj, jlong
source->addToMap(env, obj, *map, *rendererFrontend);
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/sources/CannotAddSourceException"), error.what());
}
}

2
platform/android/MapboxGLAndroidSDK/src/cpp/native_map_view.hpp
View File

@@ -40,7 +40,7 @@ class MapRenderer;
class NativeMapView : public MapObserver {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/maps/NativeMapView"; };
static constexpr auto Name() { return "org/maplibre/android/maps/NativeMapView"; };
static void registerNative(jni::JNIEnv&);

10
platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_manager.hpp
View File

@@ -19,7 +19,7 @@ public:
class ListOfflineRegionsCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineManager$ListOfflineRegionsCallback";
}
@@ -36,7 +36,7 @@ public:
class CreateOfflineRegionCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineManager$CreateOfflineRegionCallback";
}
@@ -53,7 +53,7 @@ public:
class MergeOfflineRegionsCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineManager$MergeOfflineRegionsCallback";
}
@@ -69,7 +69,7 @@ public:
struct FileSourceCallback {
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineManager$FileSourceCallback";
}
@@ -78,7 +78,7 @@ public:
static void onError(jni::JNIEnv&, const jni::Object<OfflineManager::FileSourceCallback>&, const jni::String&);
};
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineManager"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineManager"; };
static void registerNative(jni::JNIEnv&);

12
platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region.hpp
View File

@@ -15,7 +15,7 @@ public:
class OfflineRegionObserver {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineRegion$OfflineRegionObserver";
};
};
@@ -23,7 +23,7 @@ public:
class OfflineRegionStatusCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineRegion$OfflineRegionStatusCallback";
};
@@ -37,7 +37,7 @@ public:
class OfflineRegionDeleteCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineRegion$OfflineRegionDeleteCallback";
};
@@ -49,7 +49,7 @@ public:
class OfflineRegionInvalidateCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineRegion$OfflineRegionInvalidateCallback";
};
@@ -61,7 +61,7 @@ public:
class OfflineRegionUpdateMetadataCallback {
public:
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineRegion$OfflineRegionUpdateMetadataCallback";
};
@@ -72,7 +72,7 @@ public:
std::optional<mbgl::OfflineRegionMetadata>);
};
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegion"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegion"; };
OfflineRegion(jni::JNIEnv&, jni::jlong, const jni::Object<FileSource>&);

6
platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_definition.hpp
View File

@@ -8,7 +8,7 @@ namespace android {
class OfflineRegionDefinition {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionDefinition"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegionDefinition"; };
static void registerNative(jni::JNIEnv&);
@@ -20,7 +20,7 @@ class OfflineTilePyramidRegionDefinition {
public:
using SuperTag = OfflineRegionDefinition;
static constexpr auto Name() {
return "com/mapbox/mapboxsdk/offline/"
return "org/maplibre/android/offline/"
"OfflineTilePyramidRegionDefinition";
};
@@ -36,7 +36,7 @@ public:
class OfflineGeometryRegionDefinition {
public:
using SuperTag = OfflineRegionDefinition;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineGeometryRegionDefinition"; };
static jni::Local<jni::Object<OfflineRegionDefinition>> New(jni::JNIEnv&,
const mbgl::OfflineGeometryRegionDefinition&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_error.hpp
View File

@@ -8,7 +8,7 @@ namespace android {
class OfflineRegionError {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionError"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegionError"; };
static jni::Local<jni::Object<OfflineRegionError>> New(jni::JNIEnv&, mbgl::Response::Error);

2
platform/android/MapboxGLAndroidSDK/src/cpp/offline/offline_region_status.hpp
View File

@@ -8,7 +8,7 @@ namespace android {
class OfflineRegionStatus {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/offline/OfflineRegionStatus"; };
static constexpr auto Name() { return "org/maplibre/android/offline/OfflineRegionStatus"; };
static jni::Local<jni::Object<OfflineRegionStatus>> New(jni::JNIEnv&, mbgl::OfflineRegionStatus status);

2
platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshot.hpp
View File

@@ -18,7 +18,7 @@ public:
using PointForFn = mbgl::MapSnapshotter::PointForFn;
using LatLngForFn = mbgl::MapSnapshotter::LatLngForFn;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/snapshotter/MapSnapshot"; };
static constexpr auto Name() { return "org/maplibre/android/snapshotter/MapSnapshot"; };
static void registerNative(jni::JNIEnv&);

12
platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.cpp
View File

@@ -200,7 +200,7 @@ void MapSnapshotter::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint ind
if (index > numLayers || index < 0) {
Log::Error(Event::JNI, "Index out of range: " + std::to_string(index));
jni::ThrowNew(env,
jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"),
std::string("Invalid index").c_str());
}
// Insert it below the current at that index
@@ -208,7 +208,7 @@ void MapSnapshotter::addLayerAt(JNIEnv& env, jlong nativeLayerPtr, jni::jint ind
layer->addToStyle(snapshotter->getStyle(), layers.at(index)->getID());
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -222,7 +222,7 @@ void MapSnapshotter::addLayerBelow(JNIEnv& env, jlong nativeLayerPtr, const jni:
below ? std::optional<std::string>(jni::Make<std::string>(env, below)) : std::optional<std::string>());
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -247,7 +247,7 @@ void MapSnapshotter::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni:
if (index > snapshotterLayers.size()) {
// Not found
jni::ThrowNew(env,
jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"),
jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"),
std::string("Could not find layer: ").append(siblingId).c_str());
} else if (index < snapshotterLayers.size()) {
// Place before the sibling
@@ -259,7 +259,7 @@ void MapSnapshotter::addLayerAbove(JNIEnv& env, jlong nativeLayerPtr, const jni:
newLayer->addToStyle(snapshotter->getStyle(), before);
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/layers/CannotAddLayerException"), error.what());
}
}
@@ -271,7 +271,7 @@ void MapSnapshotter::addSource(JNIEnv& env, const jni::Object<Source>& obj, jlon
source->addToStyle(env, obj, snapshotter->getStyle());
} catch (const std::runtime_error& error) {
jni::ThrowNew(
env, jni::FindClass(env, "com/mapbox/mapboxsdk/style/sources/CannotAddSourceException"), error.what());
env, jni::FindClass(env, "org/maplibre/android/style/sources/CannotAddSourceException"), error.what());
}
}

2
platform/android/MapboxGLAndroidSDK/src/cpp/snapshotter/map_snapshotter.hpp
View File

@@ -19,7 +19,7 @@ namespace android {
class MapSnapshotter final : public mbgl::MapSnapshotterObserver {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/snapshotter/MapSnapshotter"; };
static constexpr auto Name() { return "org/maplibre/android/snapshotter/MapSnapshotter"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted.hpp
View File

@@ -11,7 +11,7 @@ namespace android {
using SuperTag = jni::ObjectTag;
class Formatted : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/types/Formatted"; };
static constexpr auto Name() { return "org/maplibre/android/style/types/Formatted"; };
static jni::Local<jni::Object<Formatted>> New(jni::JNIEnv &, const style::expression::Formatted &value);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/formatted_section.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class FormattedSection : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/types/FormattedSection"; };
static constexpr auto Name() { return "org/maplibre/android/style/types/FormattedSection"; };
static void registerNative(jni::JNIEnv&);
};

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/background_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class BackgroundLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/BackgroundLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/BackgroundLayer"; };
BackgroundLayer(jni::JNIEnv&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/circle_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class CircleLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/CircleLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/CircleLayer"; };
CircleLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/custom_layer.hpp
View File

@@ -11,7 +11,7 @@ namespace android {
class CustomLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/CustomLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/CustomLayer"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_extrusion_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class FillExtrusionLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/FillExtrusionLayer"; };
FillExtrusionLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/fill_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class FillLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/FillLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/FillLayer"; };
FillLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/heatmap_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class HeatmapLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/HeatmapLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/HeatmapLayer"; };
HeatmapLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/hillshade_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class HillshadeLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/HillshadeLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/HillshadeLayer"; };
HillshadeLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp
View File

@@ -15,7 +15,7 @@ namespace android {
class Layer {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/Layer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/Layer"; };
static void registerNative(jni::JNIEnv&);

4
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/layer.hpp.ejs
View File

@@ -19,9 +19,9 @@ class <%- camelize(type) %>Layer : public Layer {
public:
using SuperTag = Layer;
<% if (type === 'location-indicator') { -%>
static constexpr auto Name() { return "com/mapbox/mapboxsdk/location/<%- camelize(type) %>Layer"; };
static constexpr auto Name() { return "org/maplibre/android/location/<%- camelize(type) %>Layer"; };
<% } else { -%>
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/<%- camelize(type) %>Layer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/<%- camelize(type) %>Layer"; };
<% } -%>
<% if (type === 'background' || type === 'location-indicator') { -%>

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/line_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class LineLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/LineLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/LineLayer"; };
LineLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/location_indicator_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class LocationIndicatorLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/location/LocationIndicatorLayer"; };
static constexpr auto Name() { return "org/maplibre/android/location/LocationIndicatorLayer"; };
LocationIndicatorLayer(jni::JNIEnv&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/raster_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class RasterLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/RasterLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/RasterLayer"; };
RasterLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/layers/symbol_layer.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class SymbolLayer : public Layer {
public:
using SuperTag = Layer;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/SymbolLayer"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/SymbolLayer"; };
SymbolLayer(jni::JNIEnv&, jni::String&, jni::String&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/light.hpp
View File

@@ -16,7 +16,7 @@ using namespace style;
class Light : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/light/Light"; };
static constexpr auto Name() { return "org/maplibre/android/style/light/Light"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/position.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class Position : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/light/Position"; };
static constexpr auto Name() { return "org/maplibre/android/style/light/Position"; };
static jni::Local<jni::Object<Position>> fromPosition(jni::JNIEnv&, jfloat, jfloat, jfloat);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/custom_geometry_source.hpp
View File

@@ -16,7 +16,7 @@ namespace android {
class CustomGeometrySource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/CustomGeometrySource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/CustomGeometrySource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/geojson_source.hpp
View File

@@ -39,7 +39,7 @@ struct Update {
class GeoJSONSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/GeoJsonSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/GeoJsonSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/image_source.hpp
View File

@@ -13,7 +13,7 @@ class Bitmap;
class ImageSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/ImageSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/ImageSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_dem_source.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class RasterDEMSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/RasterDemSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/RasterDemSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/raster_source.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class RasterSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/RasterSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/RasterSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/source.hpp
View File

@@ -14,7 +14,7 @@ namespace android {
class Source : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/Source"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/Source"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/unknown_source.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class UnknownSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/UnknownSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/UnknownSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/sources/vector_source.hpp
View File

@@ -11,7 +11,7 @@ namespace android {
class VectorSource : public Source {
public:
using SuperTag = Source;
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/sources/VectorSource"; };
static constexpr auto Name() { return "org/maplibre/android/style/sources/VectorSource"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/style/transition_options.hpp
View File

@@ -9,7 +9,7 @@ namespace android {
class TransitionOptions : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/TransitionOptions"; };
static constexpr auto Name() { return "org/maplibre/android/style/layers/TransitionOptions"; };
static jni::Local<jni::Object<TransitionOptions>> fromTransitionOptions(jni::JNIEnv&,
jlong duration,

4
platform/android/MapboxGLAndroidSDK/src/cpp/text/local_glyph_rasterizer_jni.hpp
View File

@@ -6,7 +6,7 @@
/*
android::LocalGlyphRasterizer is the JNI wrapper of
com/mapbox/mapboxsdk/text/LocalGlyphRasterizer
org/maplibre/android/text/LocalGlyphRasterizer
mbgl::LocalGlyphRasterizer is the portable interface
Both implementations are in local_glyph_rasterizer.cpp
@@ -17,7 +17,7 @@ namespace android {
class LocalGlyphRasterizer {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/text/LocalGlyphRasterizer"; };
static constexpr auto Name() { return "org/maplibre/android/text/LocalGlyphRasterizer"; };
static void registerNative(jni::JNIEnv&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/util/default_style.hpp
View File

@@ -10,7 +10,7 @@ namespace android {
class DefaultStyle : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/util/DefaultStyle"; };
static constexpr auto Name() { return "org/maplibre/android/util/DefaultStyle"; };
static jni::Local<jni::Object<DefaultStyle>> New(jni::JNIEnv&, const mbgl::util::DefaultStyle&);
static mbgl::util::DefaultStyle getDefaultStyle(jni::JNIEnv&, const jni::Object<DefaultStyle>&);

2
platform/android/MapboxGLAndroidSDK/src/cpp/util/tile_server_options.hpp
View File

@@ -13,7 +13,7 @@ namespace android {
class TileServerOptions : private mbgl::util::noncopyable {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/util/TileServerOptions"; };
static constexpr auto Name() { return "org/maplibre/android/util/TileServerOptions"; };
static jni::Local<jni::Object<TileServerOptions>> New(jni::JNIEnv&, const mbgl::TileServerOptions&);