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

core: rename mbgl namespace to mln (#4487)

Browse Source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Bart Louwers
2026-08-14 23:25:20 +02:00
committed by GitHub
parent 836b862984
commit 550f64be22
1970 changed files with 8931 additions and 8967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
platform/android/MapLibreAndroid/src/cpp/style/android_conversion.hpp
View File

@@ -10,28 +10,28 @@
#include <jni/jni.hpp>
#include <optional>
namespace mbgl {
namespace mln {
namespace style {
namespace conversion {
template <>
class ConversionTraits<mbgl::android::Value> {
class ConversionTraits<mln::android::Value> {
public:
static bool isUndefined(const mbgl::android::Value& value) { return value.isNull(); }
static bool isUndefined(const mln::android::Value& value) { return value.isNull(); }
static bool isArray(const mbgl::android::Value& value) { return value.isArray(); }
static bool isArray(const mln::android::Value& value) { return value.isArray(); }
static bool isObject(const mbgl::android::Value& value) { return value.isObject(); }
static bool isObject(const mln::android::Value& value) { return value.isObject(); }
static std::size_t arrayLength(const mbgl::android::Value& value) {
static std::size_t arrayLength(const mln::android::Value& value) {
return value.getLength();
;
}
static mbgl::android::Value arrayMember(const mbgl::android::Value& value, std::size_t i) { return value.get(i); }
static mln::android::Value arrayMember(const mln::android::Value& value, std::size_t i) { return value.get(i); }
static std::optional<mbgl::android::Value> objectMember(const mbgl::android::Value& value, const char* key) {
mbgl::android::Value member = value.get(key);
static std::optional<mln::android::Value> objectMember(const mln::android::Value& value, const char* key) {
mln::android::Value member = value.get(key);
if (!member.isNull()) {
return member;
} else {
@@ -40,9 +40,9 @@ public:
}
template <class Fn>
static std::optional<Error> eachMember(const mbgl::android::Value& value, Fn&& fn) {
static std::optional<Error> eachMember(const mln::android::Value& value, Fn&& fn) {
assert(value.isObject());
mbgl::android::Value keys = value.keyArray();
mln::android::Value keys = value.keyArray();
std::size_t length = arrayLength(keys);
for (std::size_t i = 0; i < length; ++i) {
const auto k = keys.get(i).toString();
@@ -55,7 +55,7 @@ public:
return {};
}
static std::optional<bool> toBool(const mbgl::android::Value& value) {
static std::optional<bool> toBool(const mln::android::Value& value) {
if (value.isBool()) {
return value.toBool();
} else {
@@ -63,7 +63,7 @@ public:
}
}
static std::optional<float> toNumber(const mbgl::android::Value& value) {
static std::optional<float> toNumber(const mln::android::Value& value) {
if (value.isNumber()) {
auto num = value.toFloat();
return num;
@@ -72,7 +72,7 @@ public:
}
}
static std::optional<double> toDouble(const mbgl::android::Value& value) {
static std::optional<double> toDouble(const mln::android::Value& value) {
if (value.isNumber()) {
return value.toDouble();
} else {
@@ -80,7 +80,7 @@ public:
}
}
static std::optional<std::string> toString(const mbgl::android::Value& value) {
static std::optional<std::string> toString(const mln::android::Value& value) {
if (value.isString()) {
return value.toString();
} else {
@@ -88,7 +88,7 @@ public:
}
}
static std::optional<Value> toValue(const mbgl::android::Value& value) {
static std::optional<Value> toValue(const mln::android::Value& value) {
if (value.isNull()) {
return {};
} else if (value.isBool()) {
@@ -102,7 +102,7 @@ public:
}
}
static std::optional<GeoJSON> toGeoJSON(const mbgl::android::Value& value, Error& error) {
static std::optional<GeoJSON> toGeoJSON(const mln::android::Value& value, Error& error) {
if (value.isNull()) {
error = {"no json data found"};
return {};
@@ -113,7 +113,7 @@ public:
}
if (value.isObject()) {
mbgl::android::Value keys = value.keyArray();
mln::android::Value keys = value.keyArray();
std::size_t length = arrayLength(keys);
for (std::size_t i = 0; i < length; ++i) {
if (keys.get(i).toString() == "json") {
@@ -132,10 +132,10 @@ public:
};
template <class T, class... Args>
std::optional<T> convert(mbgl::android::Value&& value, Error& error, Args&&... args) {
std::optional<T> convert(mln::android::Value&& value, Error& error, Args&&... args) {
return convert<T>(Convertible(std::move(value)), error, std::forward<Args>(args)...);
}
} // namespace conversion
} // namespace style
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.cpp
View File

@@ -4,17 +4,17 @@
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/conversion/filter.hpp>
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
std::optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
std::optional<mbgl::style::Filter> filter;
std::optional<mln::style::Filter> toFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
std::optional<mln::style::Filter> filter;
if (jfilter) {
mbgl::style::conversion::Error error;
auto converted = mbgl::style::conversion::convert<mbgl::style::Filter>(Value(env, jfilter), error);
mln::style::conversion::Error error;
auto converted = mln::style::conversion::convert<mln::style::Filter>(Value(env, jfilter), error);
if (!converted) {
mbgl::Log::Error(mbgl::Event::JNI, "Error converting filter: " + error.message);
mln::Log::Error(mln::Event::JNI, "Error converting filter: " + error.message);
}
filter = std::move(*converted);
}
@@ -23,4 +23,4 @@ std::optional<mbgl::style::Filter> toFilter(jni::JNIEnv& env, const jni::Array<j
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/conversion/filter.hpp
View File

@@ -4,12 +4,12 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
std::optional<mbgl::style::Filter> toFilter(jni::JNIEnv&, const jni::Array<jni::Object<>>&);
std::optional<mln::style::Filter> toFilter(jni::JNIEnv&, const jni::Array<jni::Object<>>&);
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

12
platform/android/MapLibreAndroid/src/cpp/style/conversion/position.cpp
View File

@@ -1,27 +1,27 @@
#include "position.hpp"
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
Result<jni::Local<jni::Object<Position>>>
Converter<jni::Local<jni::Object<Position>>, mbgl::style::Position>::operator()(
jni::JNIEnv &env, const mbgl::style::Position &value) const {
Converter<jni::Local<jni::Object<Position>>, mln::style::Position>::operator()(
jni::JNIEnv &env, const mln::style::Position &value) const {
std::array<float, 3> cartPosition = value.getSpherical();
return Position::fromPosition(env, cartPosition[0], cartPosition[1], cartPosition[2]);
}
Result<mbgl::style::Position> Converter<mbgl::style::Position, jni::Object<Position>>::operator()(
Result<mln::style::Position> Converter<mln::style::Position, jni::Object<Position>>::operator()(
jni::JNIEnv &env, const jni::Object<Position> &value) const {
float radialCoordinate = Position::getRadialCoordinate(env, value);
float azimuthalAngle = Position::getAzimuthalAngle(env, value);
float polarAngle = Position::getPolarAngle(env, value);
std::array<float, 3> cartPosition{{radialCoordinate, azimuthalAngle, polarAngle}};
mbgl::style::Position position{};
mln::style::Position position{};
position.set(cartPosition);
return position;
}
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

12
platform/android/MapLibreAndroid/src/cpp/style/conversion/position.hpp
View File

@@ -6,20 +6,20 @@
#include <mbgl/style/position.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
template <>
struct Converter<jni::Local<jni::Object<Position>>, mbgl::style::Position> {
Result<jni::Local<jni::Object<Position>>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const;
struct Converter<jni::Local<jni::Object<Position>>, mln::style::Position> {
Result<jni::Local<jni::Object<Position>>> operator()(jni::JNIEnv &env, const mln::style::Position &value) const;
};
template <>
struct Converter<mbgl::style::Position, jni::Object<Position>> {
Result<mbgl::style::Position> operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const;
struct Converter<mln::style::Position, jni::Object<Position>> {
Result<mln::style::Position> operator()(jni::JNIEnv &env, const jni::Object<Position> &value) const;
};
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

8
platform/android/MapLibreAndroid/src/cpp/style/conversion/property_expression.hpp
View File

@@ -7,18 +7,18 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
template <class T>
struct Converter<jni::Local<jni::Object<android::gson::JsonElement>>, mbgl::style::PropertyExpression<T>> {
struct Converter<jni::Local<jni::Object<android::gson::JsonElement>>, mln::style::PropertyExpression<T>> {
Result<jni::Local<jni::Object<android::gson::JsonElement>>> operator()(
jni::JNIEnv& env, const mbgl::style::PropertyExpression<T>& value) const {
jni::JNIEnv& env, const mln::style::PropertyExpression<T>& value) const {
return gson::JsonElement::New(env, value.getExpression().serialize());
}
};
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

18
platform/android/MapLibreAndroid/src/cpp/style/conversion/property_value.hpp
View File

@@ -7,7 +7,7 @@
#include "../../conversion/constant.hpp"
#include "property_expression.hpp"
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
@@ -20,7 +20,7 @@ public:
PropertyValueEvaluator(jni::JNIEnv& _env)
: env(_env) {}
jni::Local<jni::Object<>> operator()(const mbgl::style::Undefined) const {
jni::Local<jni::Object<>> operator()(const mln::style::Undefined) const {
return jni::Local<jni::Object<>>(env, nullptr);
}
@@ -28,7 +28,7 @@ public:
return std::move(*convert<jni::Local<jni::Object<>>>(env, value));
}
jni::Local<jni::Object<>> operator()(const mbgl::style::PropertyExpression<T>& value) const {
jni::Local<jni::Object<>> operator()(const mln::style::PropertyExpression<T>& value) const {
return std::move(*convert<jni::Local<jni::Object<android::gson::JsonElement>>>(env, value));
}
@@ -40,8 +40,8 @@ private:
* Convert core property values to java
*/
template <class T>
struct Converter<jni::Local<jni::Object<>>, mbgl::style::PropertyValue<T>> {
Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const mbgl::style::PropertyValue<T>& value) const {
struct Converter<jni::Local<jni::Object<>>, mln::style::PropertyValue<T>> {
Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const mln::style::PropertyValue<T>& value) const {
PropertyValueEvaluator<T> evaluator(env);
return value.evaluate(evaluator);
}
@@ -51,14 +51,14 @@ struct Converter<jni::Local<jni::Object<>>, mbgl::style::PropertyValue<T>> {
* Convert core heat map color property value to java
*/
template <>
struct Converter<jni::Local<jni::Object<>>, mbgl::style::ColorRampPropertyValue> {
struct Converter<jni::Local<jni::Object<>>, mln::style::ColorRampPropertyValue> {
Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env,
const mbgl::style::ColorRampPropertyValue& value) const {
PropertyValueEvaluator<mbgl::style::ColorRampPropertyValue> evaluator(env);
const mln::style::ColorRampPropertyValue& value) const {
PropertyValueEvaluator<mln::style::ColorRampPropertyValue> evaluator(env);
return std::move(*convert<jni::Local<jni::Object<>>>(env, value.evaluate(evaluator)));
}
};
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

12
platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.cpp
View File

@@ -1,19 +1,19 @@
#include "transition_options.hpp"
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
Result<jni::Local<jni::Object<TransitionOptions>>>
Converter<jni::Local<jni::Object<TransitionOptions>>, mbgl::style::TransitionOptions>::operator()(
jni::JNIEnv& env, const mbgl::style::TransitionOptions& value) const {
Converter<jni::Local<jni::Object<TransitionOptions>>, mln::style::TransitionOptions>::operator()(
jni::JNIEnv& env, const mln::style::TransitionOptions& value) const {
return TransitionOptions::fromTransitionOptions(
env,
std::chrono::duration_cast<std::chrono::milliseconds>(value.duration.value_or(mbgl::Duration::zero())).count(),
std::chrono::duration_cast<std::chrono::milliseconds>(value.delay.value_or(mbgl::Duration::zero())).count(),
std::chrono::duration_cast<std::chrono::milliseconds>(value.duration.value_or(mln::Duration::zero())).count(),
std::chrono::duration_cast<std::chrono::milliseconds>(value.delay.value_or(mln::Duration::zero())).count(),
(jboolean)value.enablePlacementTransitions);
}
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

8
platform/android/MapLibreAndroid/src/cpp/style/conversion/transition_options.hpp
View File

@@ -7,16 +7,16 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
namespace conversion {
template <>
struct Converter<jni::Local<jni::Object<TransitionOptions>>, mbgl::style::TransitionOptions> {
struct Converter<jni::Local<jni::Object<TransitionOptions>>, mln::style::TransitionOptions> {
Result<jni::Local<jni::Object<TransitionOptions>>> operator()(jni::JNIEnv&,
const mbgl::style::TransitionOptions&) const;
const mln::style::TransitionOptions&) const;
};
} // namespace conversion
} // namespace android
} // namespace mbgl
} // namespace mln

8
platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.cpp
View File

@@ -4,14 +4,14 @@
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/conversion/tileset.hpp>
namespace mbgl {
namespace mln {
namespace android {
// This conversion is expected not to fail because it's used only in contexts where
// the value was originally a String or TileSet object on the Java side. If it fails
// to convert, it's a bug in our serialization or Java-side static typing.
variant<std::string, Tileset> convertURLOrTileset(mbgl::android::Value&& value) {
using namespace mbgl::style::conversion;
variant<std::string, Tileset> convertURLOrTileset(mln::android::Value&& value) {
using namespace mln::style::conversion;
const Convertible convertible(std::move(value));
if (isObject(convertible)) {
@@ -27,4 +27,4 @@ variant<std::string, Tileset> convertURLOrTileset(mbgl::android::Value&& value)
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/conversion/url_or_tileset.hpp
View File

@@ -7,10 +7,10 @@
#include "../value.hpp"
namespace mbgl {
namespace mln {
namespace android {
variant<std::string, Tileset> convertURLOrTileset(mbgl::android::Value&& value);
variant<std::string, Tileset> convertURLOrTileset(mln::android::Value&& value);
}
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/formatted.cpp
View File

@@ -3,7 +3,7 @@
#include "../conversion/conversion.hpp"
#include "../conversion/constant.hpp"
namespace mbgl {
namespace mln {
namespace android {
void Formatted::registerNative(jni::JNIEnv& env) {
@@ -38,7 +38,7 @@ jni::Local<jni::Object<Formatted>> Formatted::New(jni::JNIEnv& env, const style:
}
if (section.textColor) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto textColor = std::move(*convert<jni::Local<jni::Object<>>>(env, *section.textColor));
static auto method = formattedSectionClass.GetMethod<void(jni::Object<>)>(env, "setTextColor");
formattedSection.Call(env, method, textColor);
@@ -51,4 +51,4 @@ jni::Local<jni::Object<Formatted>> Formatted::New(jni::JNIEnv& env, const style:
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/formatted.hpp
View File

@@ -5,11 +5,11 @@
#include <jni/jni.hpp>
#include <mbgl/style/expression/formatted.hpp>
namespace mbgl {
namespace mln {
namespace android {
using SuperTag = jni::ObjectTag;
class Formatted : private mbgl::util::noncopyable {
class Formatted : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/types/Formatted"; };
@@ -19,4 +19,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln

4
platform/android/MapLibreAndroid/src/cpp/style/formatted_section.cpp
View File

@@ -1,6 +1,6 @@
#include "formatted_section.hpp"
namespace mbgl {
namespace mln {
namespace android {
void FormattedSection::registerNative(jni::JNIEnv& env) {
@@ -8,4 +8,4 @@ void FormattedSection::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/formatted_section.hpp
View File

@@ -4,10 +4,10 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class FormattedSection : private mbgl::util::noncopyable {
class FormattedSection : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/types/FormattedSection"; };
@@ -15,4 +15,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln

64
platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.cpp
View File

@@ -9,29 +9,29 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::BackgroundLayer& toBackgroundLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::BackgroundLayer&>(layer);
inline mln::style::BackgroundLayer& toBackgroundLayer(mln::style::Layer& layer) {
return static_cast<mln::style::BackgroundLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
BackgroundLayer::BackgroundLayer(jni::JNIEnv& env, jni::String& layerId)
: Layer(std::make_unique<mbgl::style::BackgroundLayer>(jni::Make<std::string>(env, layerId))) {}
: Layer(std::make_unique<mln::style::BackgroundLayer>(jni::Make<std::string>(env, layerId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
BackgroundLayer::BackgroundLayer(mbgl::style::BackgroundLayer& coreLayer)
BackgroundLayer::BackgroundLayer(mln::style::BackgroundLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
BackgroundLayer::BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer> coreLayer)
BackgroundLayer::BackgroundLayer(std::unique_ptr<mln::style::BackgroundLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
BackgroundLayer::~BackgroundLayer() = default;
@@ -39,7 +39,7 @@ BackgroundLayer::~BackgroundLayer() = default;
// Property getters
jni::Local<jni::Object<>> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::BackgroundLayer::getDefaultBackgroundColor()));
@@ -48,12 +48,12 @@ jni::Local<jni::Object<>> BackgroundLayer::getBackgroundColor(jni::JNIEnv& env)
}
jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundColorTransition();
mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -62,14 +62,14 @@ void BackgroundLayer::setBackgroundColorTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toBackgroundLayer(*layer).setBackgroundColorTransition(options);
}
jni::Local<jni::Object<>> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -79,12 +79,12 @@ jni::Local<jni::Object<>> BackgroundLayer::getBackgroundPattern(jni::JNIEnv& env
}
jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundPatternTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundPatternTransition();
mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundPatternTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -93,14 +93,14 @@ void BackgroundLayer::setBackgroundPatternTransition(jni::JNIEnv&, jlong duratio
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toBackgroundLayer(*layer).setBackgroundPatternTransition(options);
}
jni::Local<jni::Object<>> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -110,12 +110,12 @@ jni::Local<jni::Object<>> BackgroundLayer::getBackgroundOpacity(jni::JNIEnv& env
}
jni::Local<jni::Object<TransitionOptions>> BackgroundLayer::getBackgroundOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundOpacityTransition();
mln::style::TransitionOptions options = toBackgroundLayer(*layer).getBackgroundOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -124,9 +124,9 @@ void BackgroundLayer::setBackgroundOpacityTransition(jni::JNIEnv&, jlong duratio
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toBackgroundLayer(*layer).setBackgroundOpacityTransition(options);
}
@@ -143,17 +143,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new BackgroundLayer(toBackgroundLayer(layer)));
}
jni::Local<jni::Object<Layer>> BackgroundJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>(
static_cast<mbgl::style::BackgroundLayer*>(layer.release()))));
new BackgroundLayer(std::unique_ptr<mln::style::BackgroundLayer>(
static_cast<mln::style::BackgroundLayer*>(layer.release()))));
}
void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -182,4 +182,4 @@ void BackgroundJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/background_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/background_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class BackgroundLayer : public Layer {
@@ -18,9 +18,9 @@ public:
BackgroundLayer(jni::JNIEnv&, jni::String&);
BackgroundLayer(mbgl::style::BackgroundLayer&);
BackgroundLayer(mln::style::BackgroundLayer&);
BackgroundLayer(std::unique_ptr<mbgl::style::BackgroundLayer>);
BackgroundLayer(std::unique_ptr<mln::style::BackgroundLayer>);
~BackgroundLayer();
@@ -40,13 +40,13 @@ public:
}; // class BackgroundLayer
class BackgroundJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::BackgroundLayerFactory {
class BackgroundJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::BackgroundLayerFactory {
public:
~BackgroundJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -55,4 +55,4 @@ public:
}; // class BackgroundJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

144
platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::CircleLayer& toCircleLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::CircleLayer&>(layer);
inline mln::style::CircleLayer& toCircleLayer(mln::style::Layer& layer) {
return static_cast<mln::style::CircleLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
CircleLayer::CircleLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::CircleLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::CircleLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
CircleLayer::CircleLayer(mbgl::style::CircleLayer& coreLayer)
CircleLayer::CircleLayer(mln::style::CircleLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
CircleLayer::CircleLayer(std::unique_ptr<mbgl::style::CircleLayer> coreLayer)
CircleLayer::CircleLayer(std::unique_ptr<mln::style::CircleLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
CircleLayer::~CircleLayer() = default;
@@ -40,7 +40,7 @@ CircleLayer::~CircleLayer() = default;
// Property getters
jni::Local<jni::Object<>> CircleLayer::getCircleSortKey(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleSortKey()));
@@ -49,7 +49,7 @@ jni::Local<jni::Object<>> CircleLayer::getCircleSortKey(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> CircleLayer::getCircleRadius(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleRadius()));
@@ -58,12 +58,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleRadius(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleRadiusTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleRadiusTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleRadiusTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -72,14 +72,14 @@ void CircleLayer::setCircleRadiusTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleRadiusTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleColor()));
@@ -88,12 +88,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleColorTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -102,14 +102,14 @@ void CircleLayer::setCircleColorTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleColorTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleBlur(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleBlur()));
@@ -118,12 +118,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleBlur(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleBlurTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleBlurTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleBlurTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -132,14 +132,14 @@ void CircleLayer::setCircleBlurTransition(jni::JNIEnv&, jlong duration, jlong de
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleBlurTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleOpacity()));
@@ -148,12 +148,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleOpacityTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -162,14 +162,14 @@ void CircleLayer::setCircleOpacityTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleOpacityTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleTranslate()));
@@ -178,12 +178,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleTranslate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleTranslateTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -192,14 +192,14 @@ void CircleLayer::setCircleTranslateTransition(jni::JNIEnv&, jlong duration, jlo
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleTranslateTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -209,7 +209,7 @@ jni::Local<jni::Object<>> CircleLayer::getCircleTranslateAnchor(jni::JNIEnv& env
}
jni::Local<jni::Object<>> CircleLayer::getCirclePitchScale(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCirclePitchScale()));
@@ -218,7 +218,7 @@ jni::Local<jni::Object<>> CircleLayer::getCirclePitchScale(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> CircleLayer::getCirclePitchAlignment(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -228,7 +228,7 @@ jni::Local<jni::Object<>> CircleLayer::getCirclePitchAlignment(jni::JNIEnv& env)
}
jni::Local<jni::Object<>> CircleLayer::getCircleStrokeWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleStrokeWidth()));
@@ -237,12 +237,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleStrokeWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeWidthTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeWidthTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeWidthTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -251,14 +251,14 @@ void CircleLayer::setCircleStrokeWidthTransition(jni::JNIEnv&, jlong duration, j
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleStrokeWidthTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleStrokeColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleStrokeColor()));
@@ -267,12 +267,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleStrokeColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeColorTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -281,14 +281,14 @@ void CircleLayer::setCircleStrokeColorTransition(jni::JNIEnv&, jlong duration, j
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleStrokeColorTransition(options);
}
jni::Local<jni::Object<>> CircleLayer::getCircleStrokeOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::CircleLayer::getDefaultCircleStrokeOpacity()));
@@ -297,12 +297,12 @@ jni::Local<jni::Object<>> CircleLayer::getCircleStrokeOpacity(jni::JNIEnv& env)
}
jni::Local<jni::Object<TransitionOptions>> CircleLayer::getCircleStrokeOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeOpacityTransition();
mln::style::TransitionOptions options = toCircleLayer(*layer).getCircleStrokeOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -311,9 +311,9 @@ void CircleLayer::setCircleStrokeOpacityTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toCircleLayer(*layer).setCircleStrokeOpacityTransition(options);
}
@@ -330,17 +330,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new CircleLayer(toCircleLayer(layer)));
}
jni::Local<jni::Object<Layer>> CircleJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>(
static_cast<mbgl::style::CircleLayer*>(layer.release()))));
new CircleLayer(std::unique_ptr<mln::style::CircleLayer>(
static_cast<mln::style::CircleLayer*>(layer.release()))));
}
void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -388,4 +388,4 @@ void CircleJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/circle_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/circle_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class CircleLayer : public Layer {
@@ -18,9 +18,9 @@ public:
CircleLayer(jni::JNIEnv&, jni::String&, jni::String&);
CircleLayer(mbgl::style::CircleLayer&);
CircleLayer(mln::style::CircleLayer&);
CircleLayer(std::unique_ptr<mbgl::style::CircleLayer>);
CircleLayer(std::unique_ptr<mln::style::CircleLayer>);
~CircleLayer();
@@ -68,13 +68,13 @@ public:
}; // class CircleLayer
class CircleJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::CircleLayerFactory {
class CircleJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::CircleLayerFactory {
public:
~CircleJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -83,4 +83,4 @@ public:
}; // class CircleJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

40
platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::ColorReliefLayer& toColorReliefLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::ColorReliefLayer&>(layer);
inline mln::style::ColorReliefLayer& toColorReliefLayer(mln::style::Layer& layer) {
return static_cast<mln::style::ColorReliefLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
ColorReliefLayer::ColorReliefLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::ColorReliefLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::ColorReliefLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
ColorReliefLayer::ColorReliefLayer(mbgl::style::ColorReliefLayer& coreLayer)
ColorReliefLayer::ColorReliefLayer(mln::style::ColorReliefLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
ColorReliefLayer::ColorReliefLayer(std::unique_ptr<mbgl::style::ColorReliefLayer> coreLayer)
ColorReliefLayer::ColorReliefLayer(std::unique_ptr<mln::style::ColorReliefLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
ColorReliefLayer::~ColorReliefLayer() = default;
@@ -40,7 +40,7 @@ ColorReliefLayer::~ColorReliefLayer() = default;
// Property getters
jni::Local<jni::Object<>> ColorReliefLayer::getColorReliefOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -50,12 +50,12 @@ jni::Local<jni::Object<>> ColorReliefLayer::getColorReliefOpacity(jni::JNIEnv& e
}
jni::Local<jni::Object<TransitionOptions>> ColorReliefLayer::getColorReliefOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toColorReliefLayer(*layer).getColorReliefOpacityTransition();
mln::style::TransitionOptions options = toColorReliefLayer(*layer).getColorReliefOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -64,14 +64,14 @@ void ColorReliefLayer::setColorReliefOpacityTransition(jni::JNIEnv&, jlong durat
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toColorReliefLayer(*layer).setColorReliefOpacityTransition(options);
}
jni::Local<jni::Object<>> ColorReliefLayer::getColorReliefColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -93,17 +93,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> ColorReliefJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new ColorReliefLayer(toColorReliefLayer(layer)));
}
jni::Local<jni::Object<Layer>> ColorReliefJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new ColorReliefLayer(std::unique_ptr<mbgl::style::ColorReliefLayer>(
static_cast<mbgl::style::ColorReliefLayer*>(layer.release()))));
new ColorReliefLayer(std::unique_ptr<mln::style::ColorReliefLayer>(
static_cast<mln::style::ColorReliefLayer*>(layer.release()))));
}
void ColorReliefJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -127,4 +127,4 @@ void ColorReliefJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/color_relief_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/color_relief_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class ColorReliefLayer : public Layer {
@@ -18,9 +18,9 @@ public:
ColorReliefLayer(jni::JNIEnv&, jni::String&, jni::String&);
ColorReliefLayer(mbgl::style::ColorReliefLayer&);
ColorReliefLayer(mln::style::ColorReliefLayer&);
ColorReliefLayer(std::unique_ptr<mbgl::style::ColorReliefLayer>);
ColorReliefLayer(std::unique_ptr<mln::style::ColorReliefLayer>);
~ColorReliefLayer();
@@ -34,13 +34,13 @@ public:
}; // class ColorReliefLayer
class ColorReliefJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::ColorReliefLayerFactory {
class ColorReliefJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::ColorReliefLayerFactory {
public:
~ColorReliefJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -49,4 +49,4 @@ public:
}; // class ColorReliefJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

22
platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.cpp
View File

@@ -4,18 +4,18 @@
#include <mbgl/util/logging.hpp>
namespace mbgl {
namespace mln {
namespace android {
CustomLayer::CustomLayer(jni::JNIEnv& env, const jni::String& layerId, jni::jlong host)
: Layer(std::make_unique<mbgl::style::CustomLayer>(
: Layer(std::make_unique<mln::style::CustomLayer>(
jni::Make<std::string>(env, layerId),
std::unique_ptr<mbgl::style::CustomLayerHost>(reinterpret_cast<mbgl::style::CustomLayerHost*>(host)))) {}
std::unique_ptr<mln::style::CustomLayerHost>(reinterpret_cast<mln::style::CustomLayerHost*>(host)))) {}
CustomLayer::CustomLayer(mbgl::style::CustomLayer& coreLayer)
CustomLayer::CustomLayer(mln::style::CustomLayer& coreLayer)
: Layer(coreLayer) {}
CustomLayer::CustomLayer(std::unique_ptr<mbgl::style::CustomLayer> coreLayer)
CustomLayer::CustomLayer(std::unique_ptr<mln::style::CustomLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
CustomLayer::~CustomLayer() = default;
@@ -31,15 +31,15 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
CustomJavaLayerPeerFactory::~CustomJavaLayerPeerFactory() = default;
jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
return createJavaPeer(env, new CustomLayer(static_cast<mbgl::style::CustomLayer&>(layer)));
mln::style::Layer& layer) {
return createJavaPeer(env, new CustomLayer(static_cast<mln::style::CustomLayer&>(layer)));
}
jni::Local<jni::Object<Layer>> CustomJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
return createJavaPeer(env,
new CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>(
static_cast<mbgl::style::CustomLayer*>(layer.release()))));
new CustomLayer(std::unique_ptr<mln::style::CustomLayer>(
static_cast<mln::style::CustomLayer*>(layer.release()))));
}
void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -58,4 +58,4 @@ void CustomJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/custom_layer.hpp
View File

@@ -5,7 +5,7 @@
#include <mbgl/layermanager/custom_layer_factory.hpp>
#include "layer.hpp"
namespace mbgl {
namespace mln {
namespace android {
class CustomLayer : public Layer {
@@ -16,20 +16,20 @@ public:
static void registerNative(jni::JNIEnv&);
CustomLayer(jni::JNIEnv&, const jni::String&, jni::jlong);
CustomLayer(mbgl::style::CustomLayer&);
CustomLayer(std::unique_ptr<mbgl::style::CustomLayer>);
CustomLayer(mln::style::CustomLayer&);
CustomLayer(std::unique_ptr<mln::style::CustomLayer>);
~CustomLayer();
jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&);
}; // class CustomLayer
class CustomJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::CustomLayerFactory {
class CustomJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::CustomLayerFactory {
public:
~CustomJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -38,4 +38,4 @@ public:
}; // class CustomJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

114
platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::FillExtrusionLayer& toFillExtrusionLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::FillExtrusionLayer&>(layer);
inline mln::style::FillExtrusionLayer& toFillExtrusionLayer(mln::style::Layer& layer) {
return static_cast<mln::style::FillExtrusionLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
FillExtrusionLayer::FillExtrusionLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::FillExtrusionLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::FillExtrusionLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
FillExtrusionLayer::FillExtrusionLayer(mbgl::style::FillExtrusionLayer& coreLayer)
FillExtrusionLayer::FillExtrusionLayer(mln::style::FillExtrusionLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer> coreLayer)
FillExtrusionLayer::FillExtrusionLayer(std::unique_ptr<mln::style::FillExtrusionLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
FillExtrusionLayer::~FillExtrusionLayer() = default;
@@ -40,7 +40,7 @@ FillExtrusionLayer::~FillExtrusionLayer() = default;
// Property getters
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionRoundedCornerDistance(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -51,7 +51,7 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionRoundedCornerDista
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -61,12 +61,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionOpacity(jni::JNIEn
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionOpacityTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -75,14 +75,14 @@ void FillExtrusionLayer::setFillExtrusionOpacityTransition(jni::JNIEnv&, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionOpacityTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -92,12 +92,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionColor(jni::JNIEnv&
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionColorTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -106,14 +106,14 @@ void FillExtrusionLayer::setFillExtrusionColorTransition(jni::JNIEnv&, jlong dur
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionColorTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -124,12 +124,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslate(jni::JNI
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionTranslateTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -138,14 +138,14 @@ void FillExtrusionLayer::setFillExtrusionTranslateTransition(jni::JNIEnv&, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionTranslateTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -156,7 +156,7 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionTranslateAnchor(jn
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -166,12 +166,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionPattern(jni::JNIEn
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionPatternTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionPatternTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionPatternTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -180,14 +180,14 @@ void FillExtrusionLayer::setFillExtrusionPatternTransition(jni::JNIEnv&, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionPatternTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -197,12 +197,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionHeight(jni::JNIEnv
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionHeightTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionHeightTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionHeightTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -211,14 +211,14 @@ void FillExtrusionLayer::setFillExtrusionHeightTransition(jni::JNIEnv&, jlong du
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionHeightTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -228,12 +228,12 @@ jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionBase(jni::JNIEnv&
}
jni::Local<jni::Object<TransitionOptions>> FillExtrusionLayer::getFillExtrusionBaseTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionBaseTransition();
mln::style::TransitionOptions options = toFillExtrusionLayer(*layer).getFillExtrusionBaseTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -242,14 +242,14 @@ void FillExtrusionLayer::setFillExtrusionBaseTransition(jni::JNIEnv&, jlong dura
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillExtrusionLayer(*layer).setFillExtrusionBaseTransition(options);
}
jni::Local<jni::Object<>> FillExtrusionLayer::getFillExtrusionVerticalGradient(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -272,17 +272,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new FillExtrusionLayer(toFillExtrusionLayer(layer)));
}
jni::Local<jni::Object<Layer>> FillExtrusionJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>(
static_cast<mbgl::style::FillExtrusionLayer*>(layer.release()))));
new FillExtrusionLayer(std::unique_ptr<mln::style::FillExtrusionLayer>(
static_cast<mln::style::FillExtrusionLayer*>(layer.release()))));
}
void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -324,4 +324,4 @@ void FillExtrusionJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/fill_extrusion_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/fill_extrusion_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class FillExtrusionLayer : public Layer {
@@ -18,9 +18,9 @@ public:
FillExtrusionLayer(jni::JNIEnv&, jni::String&, jni::String&);
FillExtrusionLayer(mbgl::style::FillExtrusionLayer&);
FillExtrusionLayer(mln::style::FillExtrusionLayer&);
FillExtrusionLayer(std::unique_ptr<mbgl::style::FillExtrusionLayer>);
FillExtrusionLayer(std::unique_ptr<mln::style::FillExtrusionLayer>);
~FillExtrusionLayer();
@@ -58,13 +58,13 @@ public:
}; // class FillExtrusionLayer
class FillExtrusionJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::FillExtrusionLayerFactory {
class FillExtrusionJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::FillExtrusionLayerFactory {
public:
~FillExtrusionJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -73,4 +73,4 @@ public:
}; // class FillExtrusionJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

100
platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::FillLayer& toFillLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::FillLayer&>(layer);
inline mln::style::FillLayer& toFillLayer(mln::style::Layer& layer) {
return static_cast<mln::style::FillLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
FillLayer::FillLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::FillLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::FillLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
FillLayer::FillLayer(mbgl::style::FillLayer& coreLayer)
FillLayer::FillLayer(mln::style::FillLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
FillLayer::FillLayer(std::unique_ptr<mbgl::style::FillLayer> coreLayer)
FillLayer::FillLayer(std::unique_ptr<mln::style::FillLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
FillLayer::~FillLayer() = default;
@@ -40,7 +40,7 @@ FillLayer::~FillLayer() = default;
// Property getters
jni::Local<jni::Object<>> FillLayer::getFillSortKey(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillSortKey()));
@@ -49,7 +49,7 @@ jni::Local<jni::Object<>> FillLayer::getFillSortKey(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> FillLayer::getFillAntialias(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillAntialias()));
@@ -58,7 +58,7 @@ jni::Local<jni::Object<>> FillLayer::getFillAntialias(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> FillLayer::getFillOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillOpacity()));
@@ -67,12 +67,12 @@ jni::Local<jni::Object<>> FillLayer::getFillOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillOpacityTransition();
mln::style::TransitionOptions options = toFillLayer(*layer).getFillOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -81,14 +81,14 @@ void FillLayer::setFillOpacityTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillLayer(*layer).setFillOpacityTransition(options);
}
jni::Local<jni::Object<>> FillLayer::getFillColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillColor()));
@@ -97,12 +97,12 @@ jni::Local<jni::Object<>> FillLayer::getFillColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillColorTransition();
mln::style::TransitionOptions options = toFillLayer(*layer).getFillColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -111,14 +111,14 @@ void FillLayer::setFillColorTransition(jni::JNIEnv&, jlong duration, jlong delay
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillLayer(*layer).setFillColorTransition(options);
}
jni::Local<jni::Object<>> FillLayer::getFillOutlineColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillOutlineColor()));
@@ -127,12 +127,12 @@ jni::Local<jni::Object<>> FillLayer::getFillOutlineColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillOutlineColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillOutlineColorTransition();
mln::style::TransitionOptions options = toFillLayer(*layer).getFillOutlineColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -141,14 +141,14 @@ void FillLayer::setFillOutlineColorTransition(jni::JNIEnv&, jlong duration, jlon
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillLayer(*layer).setFillOutlineColorTransition(options);
}
jni::Local<jni::Object<>> FillLayer::getFillTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillTranslate()));
@@ -157,12 +157,12 @@ jni::Local<jni::Object<>> FillLayer::getFillTranslate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillTranslateTransition();
mln::style::TransitionOptions options = toFillLayer(*layer).getFillTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -171,14 +171,14 @@ void FillLayer::setFillTranslateTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillLayer(*layer).setFillTranslateTransition(options);
}
jni::Local<jni::Object<>> FillLayer::getFillTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillTranslateAnchor()));
@@ -187,7 +187,7 @@ jni::Local<jni::Object<>> FillLayer::getFillTranslateAnchor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> FillLayer::getFillPattern(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::FillLayer::getDefaultFillPattern()));
@@ -196,12 +196,12 @@ jni::Local<jni::Object<>> FillLayer::getFillPattern(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> FillLayer::getFillPatternTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toFillLayer(*layer).getFillPatternTransition();
mln::style::TransitionOptions options = toFillLayer(*layer).getFillPatternTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -210,9 +210,9 @@ void FillLayer::setFillPatternTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toFillLayer(*layer).setFillPatternTransition(options);
}
@@ -229,17 +229,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new FillLayer(toFillLayer(layer)));
}
jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::Local<jni::Object<Layer>> FillJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(
env,
new FillLayer(std::unique_ptr<mbgl::style::FillLayer>(static_cast<mbgl::style::FillLayer*>(layer.release()))));
new FillLayer(std::unique_ptr<mln::style::FillLayer>(static_cast<mln::style::FillLayer*>(layer.release()))));
}
void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -277,4 +277,4 @@ void FillJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/fill_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/fill_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class FillLayer : public Layer {
@@ -18,9 +18,9 @@ public:
FillLayer(jni::JNIEnv&, jni::String&, jni::String&);
FillLayer(mbgl::style::FillLayer&);
FillLayer(mln::style::FillLayer&);
FillLayer(std::unique_ptr<mbgl::style::FillLayer>);
FillLayer(std::unique_ptr<mln::style::FillLayer>);
~FillLayer();
@@ -54,13 +54,13 @@ public:
}; // class FillLayer
class FillJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::FillLayerFactory {
class FillJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::FillLayerFactory {
public:
~FillJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -69,4 +69,4 @@ public:
}; // class FillJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

70
platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::HeatmapLayer& toHeatmapLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::HeatmapLayer&>(layer);
inline mln::style::HeatmapLayer& toHeatmapLayer(mln::style::Layer& layer) {
return static_cast<mln::style::HeatmapLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
HeatmapLayer::HeatmapLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::HeatmapLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::HeatmapLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
HeatmapLayer::HeatmapLayer(mbgl::style::HeatmapLayer& coreLayer)
HeatmapLayer::HeatmapLayer(mln::style::HeatmapLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
HeatmapLayer::HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer> coreLayer)
HeatmapLayer::HeatmapLayer(std::unique_ptr<mln::style::HeatmapLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
HeatmapLayer::~HeatmapLayer() = default;
@@ -40,7 +40,7 @@ HeatmapLayer::~HeatmapLayer() = default;
// Property getters
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapRadius(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HeatmapLayer::getDefaultHeatmapRadius()));
@@ -49,12 +49,12 @@ jni::Local<jni::Object<>> HeatmapLayer::getHeatmapRadius(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapRadiusTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapRadiusTransition();
mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapRadiusTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -63,14 +63,14 @@ void HeatmapLayer::setHeatmapRadiusTransition(jni::JNIEnv&, jlong duration, jlon
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHeatmapLayer(*layer).setHeatmapRadiusTransition(options);
}
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapWeight(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HeatmapLayer::getDefaultHeatmapWeight()));
@@ -79,7 +79,7 @@ jni::Local<jni::Object<>> HeatmapLayer::getHeatmapWeight(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapIntensity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HeatmapLayer::getDefaultHeatmapIntensity()));
@@ -88,12 +88,12 @@ jni::Local<jni::Object<>> HeatmapLayer::getHeatmapIntensity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapIntensityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapIntensityTransition();
mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapIntensityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -102,14 +102,14 @@ void HeatmapLayer::setHeatmapIntensityTransition(jni::JNIEnv&, jlong duration, j
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHeatmapLayer(*layer).setHeatmapIntensityTransition(options);
}
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HeatmapLayer::getDefaultHeatmapColor()));
@@ -123,7 +123,7 @@ jni::Local<jni::Object<>> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HeatmapLayer::getDefaultHeatmapOpacity()));
@@ -132,12 +132,12 @@ jni::Local<jni::Object<>> HeatmapLayer::getHeatmapOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> HeatmapLayer::getHeatmapOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapOpacityTransition();
mln::style::TransitionOptions options = toHeatmapLayer(*layer).getHeatmapOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -146,9 +146,9 @@ void HeatmapLayer::setHeatmapOpacityTransition(jni::JNIEnv&, jlong duration, jlo
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHeatmapLayer(*layer).setHeatmapOpacityTransition(options);
}
@@ -165,17 +165,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new HeatmapLayer(toHeatmapLayer(layer)));
}
jni::Local<jni::Object<Layer>> HeatmapJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>(
static_cast<mbgl::style::HeatmapLayer*>(layer.release()))));
new HeatmapLayer(std::unique_ptr<mln::style::HeatmapLayer>(
static_cast<mln::style::HeatmapLayer*>(layer.release()))));
}
void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -206,4 +206,4 @@ void HeatmapJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/heatmap_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/heatmap_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class HeatmapLayer : public Layer {
@@ -18,9 +18,9 @@ public:
HeatmapLayer(jni::JNIEnv&, jni::String&, jni::String&);
HeatmapLayer(mbgl::style::HeatmapLayer&);
HeatmapLayer(mln::style::HeatmapLayer&);
HeatmapLayer(std::unique_ptr<mbgl::style::HeatmapLayer>);
HeatmapLayer(std::unique_ptr<mln::style::HeatmapLayer>);
~HeatmapLayer();
@@ -44,13 +44,13 @@ public:
}; // class HeatmapLayer
class HeatmapJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::HeatmapLayerFactory {
class HeatmapJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::HeatmapLayerFactory {
public:
~HeatmapJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -59,4 +59,4 @@ public:
}; // class HeatmapJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

88
platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::HillshadeLayer& toHillshadeLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::HillshadeLayer&>(layer);
inline mln::style::HillshadeLayer& toHillshadeLayer(mln::style::Layer& layer) {
return static_cast<mln::style::HillshadeLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
HillshadeLayer::HillshadeLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::HillshadeLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::HillshadeLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
HillshadeLayer::HillshadeLayer(mbgl::style::HillshadeLayer& coreLayer)
HillshadeLayer::HillshadeLayer(mln::style::HillshadeLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
HillshadeLayer::HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer> coreLayer)
HillshadeLayer::HillshadeLayer(std::unique_ptr<mln::style::HillshadeLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
HillshadeLayer::~HillshadeLayer() = default;
@@ -40,7 +40,7 @@ HillshadeLayer::~HillshadeLayer() = default;
// Property getters
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationDirection(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -51,7 +51,7 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationDirection(jni:
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationAltitude(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -62,7 +62,7 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationAltitude(jni::
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -73,7 +73,7 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeIlluminationAnchor(jni::JN
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeExaggeration(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -83,12 +83,12 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeExaggeration(jni::JNIEnv&
}
jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeExaggerationTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeExaggerationTransition();
mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeExaggerationTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -97,14 +97,14 @@ void HillshadeLayer::setHillshadeExaggerationTransition(jni::JNIEnv&, jlong dura
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHillshadeLayer(*layer).setHillshadeExaggerationTransition(options);
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeShadowColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -114,12 +114,12 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeShadowColor(jni::JNIEnv& e
}
jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeShadowColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeShadowColorTransition();
mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeShadowColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -128,14 +128,14 @@ void HillshadeLayer::setHillshadeShadowColorTransition(jni::JNIEnv&, jlong durat
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHillshadeLayer(*layer).setHillshadeShadowColorTransition(options);
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeHighlightColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -145,12 +145,12 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeHighlightColor(jni::JNIEnv
}
jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeHighlightColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeHighlightColorTransition();
mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeHighlightColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -159,14 +159,14 @@ void HillshadeLayer::setHillshadeHighlightColorTransition(jni::JNIEnv&, jlong du
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHillshadeLayer(*layer).setHillshadeHighlightColorTransition(options);
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeAccentColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -176,12 +176,12 @@ jni::Local<jni::Object<>> HillshadeLayer::getHillshadeAccentColor(jni::JNIEnv& e
}
jni::Local<jni::Object<TransitionOptions>> HillshadeLayer::getHillshadeAccentColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeAccentColorTransition();
mln::style::TransitionOptions options = toHillshadeLayer(*layer).getHillshadeAccentColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -190,14 +190,14 @@ void HillshadeLayer::setHillshadeAccentColorTransition(jni::JNIEnv&, jlong durat
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toHillshadeLayer(*layer).setHillshadeAccentColorTransition(options);
}
jni::Local<jni::Object<>> HillshadeLayer::getHillshadeMethod(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::HillshadeLayer::getDefaultHillshadeMethod()));
@@ -218,17 +218,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new HillshadeLayer(toHillshadeLayer(layer)));
}
jni::Local<jni::Object<Layer>> HillshadeJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>(
static_cast<mbgl::style::HillshadeLayer*>(layer.release()))));
new HillshadeLayer(std::unique_ptr<mln::style::HillshadeLayer>(
static_cast<mln::style::HillshadeLayer*>(layer.release()))));
}
void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -264,4 +264,4 @@ void HillshadeJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/hillshade_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/hillshade_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class HillshadeLayer : public Layer {
@@ -18,9 +18,9 @@ public:
HillshadeLayer(jni::JNIEnv&, jni::String&, jni::String&);
HillshadeLayer(mbgl::style::HillshadeLayer&);
HillshadeLayer(mln::style::HillshadeLayer&);
HillshadeLayer(std::unique_ptr<mbgl::style::HillshadeLayer>);
HillshadeLayer(std::unique_ptr<mln::style::HillshadeLayer>);
~HillshadeLayer();
@@ -52,13 +52,13 @@ public:
}; // class HillshadeLayer
class HillshadeJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::HillshadeLayerFactory {
class HillshadeJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::HillshadeLayerFactory {
public:
~HillshadeJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -67,4 +67,4 @@ public:
}; // class HillshadeJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

36
platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp
View File

@@ -21,25 +21,25 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
/**
* Invoked when the construction is initiated from the jvm through a subclass
*/
Layer::Layer(std::unique_ptr<mbgl::style::Layer> coreLayer)
Layer::Layer(std::unique_ptr<mln::style::Layer> coreLayer)
: ownedLayer(std::move(coreLayer)),
layerPtr(ownedLayer->makeWeakPtr()) {}
/**
* Takes a non-owning reference. For lookup methods
*/
Layer::Layer(mbgl::style::Layer& coreLayer)
Layer::Layer(mln::style::Layer& coreLayer)
: layerPtr(coreLayer.makeWeakPtr()) {}
Layer::~Layer() {}
void Layer::addToStyle(mbgl::style::Style& style, std::optional<std::string> before) {
void Layer::addToStyle(mln::style::Style& style, std::optional<std::string> before) {
// Check to see if we own the layer first
if (!ownedLayer) {
throw std::runtime_error("Cannot add layer twice");
@@ -49,11 +49,11 @@ void Layer::addToStyle(mbgl::style::Style& style, std::optional<std::string> bef
style.addLayer(releaseCoreLayer(), before);
}
void Layer::setLayer(std::unique_ptr<mbgl::style::Layer> sourceLayer) {
void Layer::setLayer(std::unique_ptr<mln::style::Layer> sourceLayer) {
this->ownedLayer = std::move(sourceLayer);
}
std::unique_ptr<mbgl::style::Layer> Layer::releaseCoreLayer() {
std::unique_ptr<mln::style::Layer> Layer::releaseCoreLayer() {
assert(ownedLayer != nullptr);
return std::move(ownedLayer);
}
@@ -78,18 +78,18 @@ void Layer::setProperty(jni::JNIEnv& env, const jni::String& jname, const jni::O
}
// Convert and set property
std::optional<mbgl::style::conversion::Error> error = layer->setProperty(jni::Make<std::string>(env, jname),
Value(env, jvalue));
std::optional<mln::style::conversion::Error> error = layer->setProperty(jni::Make<std::string>(env, jname),
Value(env, jvalue));
if (error) {
mbgl::Log::Error(mbgl::Event::JNI,
"Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
mln::Log::Error(mln::Event::JNI,
"Error setting property: " + jni::Make<std::string>(env, jname) + " " + error->message);
return;
}
}
void Layer::setFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln::style;
using namespace mln::style::conversion;
auto layer = layerPtr.get();
if (!layer) {
@@ -99,7 +99,7 @@ void Layer::setFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter
Error error;
std::optional<Filter> converted = convert<Filter>(Value(env, jfilter), error);
if (!converted) {
mbgl::Log::Error(mbgl::Event::JNI, "Error setting filter: " + error.message);
mln::Log::Error(mln::Event::JNI, "Error setting filter: " + error.message);
return;
}
@@ -107,8 +107,8 @@ void Layer::setFilter(jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter
}
jni::Local<jni::Object<gson::JsonElement>> Layer::getFilter(jni::JNIEnv& env) {
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln::style;
using namespace mln::style::conversion;
auto layer = layerPtr.get();
if (!layer) {
@@ -117,7 +117,7 @@ jni::Local<jni::Object<gson::JsonElement>> Layer::getFilter(jni::JNIEnv& env) {
Filter filter = layer->getFilter();
if (filter.expression) {
mbgl::Value expressionValue = (*filter.expression)->serialize();
mln::Value expressionValue = (*filter.expression)->serialize();
return gson::JsonElement::New(env, expressionValue);
} else {
return jni::Local<jni::Object<gson::JsonElement>>(env, nullptr);
@@ -188,7 +188,7 @@ void Layer::setMaxZoom(jni::JNIEnv&, jni::jfloat zoom) {
}
jni::Local<jni::Object<>> Layer::getVisibility(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
@@ -226,4 +226,4 @@ void Layer::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

38
platform/android/MapLibreAndroid/src/cpp/style/layers/layer.cpp.ejs
View File

@@ -13,11 +13,11 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::<%- camelize(type) %>Layer& to<%- camelize(type) %>Layer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::<%- camelize(type) %>Layer&>(layer);
inline mln::style::<%- camelize(type) %>Layer& to<%- camelize(type) %>Layer(mln::style::Layer& layer) {
return static_cast<mln::style::<%- camelize(type) %>Layer&>(layer);
}
<% if (type === 'background' || type === 'location-indicator') { -%>
@@ -25,27 +25,27 @@ namespace android {
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId)
: Layer(std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId))) {
: Layer(std::make_unique<mln::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId))) {
<% } else { -%>
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
: Layer(std::make_unique<mln::style::<%- camelize(type) %>Layer>(jni::Make<std::string>(env, layerId), jni::Make<std::string>(env, sourceId))) {
<% } -%>
}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer& coreLayer)
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(mln::style::<%- camelize(type) %>Layer& coreLayer)
: Layer(coreLayer) {
}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer> coreLayer)
<%- camelize(type) %>Layer::<%- camelize(type) %>Layer(std::unique_ptr<mln::style::<%- camelize(type) %>Layer> coreLayer)
: Layer(std::move(coreLayer)) {
}
@@ -56,7 +56,7 @@ namespace android {
<% for (const property of properties) { -%>
<% if (property.name != 'heatmap-color') { -%>
jni::Local<jni::Object<>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::<%- camelize(type) %>Layer::getDefault<%- camelize(property.name) %>()));
@@ -66,7 +66,7 @@ namespace android {
<% } else { -%>
jni::Local<jni::Object<>> HeatmapLayer::getHeatmapColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::<%- camelize(type) %>Layer::getDefaultHeatmapColor()));
@@ -82,12 +82,12 @@ namespace android {
<% } -%>
<% if (property.transition) { -%>
jni::Local<jni::Object<TransitionOptions>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>Transition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = to<%- camelize(type) %>Layer(*layer).get<%- camelize(property.name) %>Transition();
mln::style::TransitionOptions options = to<%- camelize(type) %>Layer(*layer).get<%- camelize(property.name) %>Transition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -96,9 +96,9 @@ namespace android {
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
to<%- camelize(type) %>Layer(*layer).set<%- camelize(property.name) %>Transition(options);
}
@@ -117,14 +117,14 @@ namespace android {
}
} // namespace
jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new <%- camelize(type) %>Layer(to<%- camelize(type) %>Layer(layer)));
}
jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::Local<jni::Object<Layer>> <%- camelize(type) %>JavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new <%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer>(static_cast<mbgl::style::<%- camelize(type) %>Layer*>(layer.release()))));
return createJavaPeer(env, new <%- camelize(type) %>Layer(std::unique_ptr<mln::style::<%- camelize(type) %>Layer>(static_cast<mln::style::<%- camelize(type) %>Layer*>(layer.release()))));
}
void <%- camelize(type) %>JavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -153,4 +153,4 @@ namespace android {
}
} // namespace android
} // namespace mbgl
} // namespace mln

22
platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp
View File

@@ -9,7 +9,7 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
@@ -24,12 +24,12 @@ public:
/**
* Set core layer (ie return ownership after remove)
*/
void setLayer(std::unique_ptr<mbgl::style::Layer>);
void setLayer(std::unique_ptr<mln::style::Layer>);
void addToStyle(mbgl::style::Style&, std::optional<std::string>);
void addToStyle(mln::style::Style&, std::optional<std::string>);
// Release the owned view and return it
std::unique_ptr<mbgl::style::Layer> releaseCoreLayer();
std::unique_ptr<mln::style::Layer> releaseCoreLayer();
jni::Local<jni::String> getId(jni::JNIEnv&);
@@ -67,18 +67,18 @@ protected:
/*
* Called when a non-owning peer object is created on the c++ side
*/
Layer(mbgl::style::Layer&);
Layer(mln::style::Layer&);
/*
* Called when a owning peer object is created on the c++ side
*/
Layer(std::unique_ptr<mbgl::style::Layer>);
Layer(std::unique_ptr<mln::style::Layer>);
// Owned layer is set when creating a new layer, before adding it to the map
std::unique_ptr<mbgl::style::Layer> ownedLayer;
std::unique_ptr<mln::style::Layer> ownedLayer;
// Raw reference to the layer
mapbox::base::WeakPtr<mbgl::style::Layer> layerPtr;
mapbox::base::WeakPtr<mln::style::Layer> layerPtr;
};
/**
@@ -90,13 +90,13 @@ public:
/**
* @brief Create a non-owning peer.
*/
virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) = 0;
virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) = 0;
/**
* @brief Create an owning peer.
*/
virtual jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env,
std::unique_ptr<mbgl::style::Layer>) = 0;
std::unique_ptr<mln::style::Layer>) = 0;
/**
* @brief Register peer methods.
@@ -112,4 +112,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/layer.hpp.ejs
View File

@@ -12,7 +12,7 @@
#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class <%- camelize(type) %>Layer : public Layer {
@@ -30,9 +30,9 @@ public:
<%- camelize(type) %>Layer(jni::JNIEnv&, jni::String&, jni::String&);
<% } -%>
<%- camelize(type) %>Layer(mbgl::style::<%- camelize(type) %>Layer&);
<%- camelize(type) %>Layer(mln::style::<%- camelize(type) %>Layer&);
<%- camelize(type) %>Layer(std::unique_ptr<mbgl::style::<%- camelize(type) %>Layer>);
<%- camelize(type) %>Layer(std::unique_ptr<mln::style::<%- camelize(type) %>Layer>);
~<%- camelize(type) %>Layer();
@@ -48,13 +48,13 @@ public:
}; // class <%- camelize(type) %>Layer
class <%- camelize(type) %>JavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::<%- camelize(type) %>LayerFactory {
class <%- camelize(type) %>JavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::<%- camelize(type) %>LayerFactory {
public:
~<%- camelize(type) %>JavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -63,4 +63,4 @@ public:
}; // class <%- camelize(type) %>JavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.cpp
View File

@@ -20,7 +20,7 @@
#include "fill_extrusion_layer.hpp"
#include "location_indicator_layer.hpp"
namespace mbgl {
namespace mln {
namespace android {
@@ -87,7 +87,7 @@ LayerManagerAndroid::LayerManagerAndroid() {
LayerManagerAndroid::~LayerManagerAndroid() = default;
jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, mbgl::style::Layer& layer) {
jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env, mln::style::Layer& layer) {
if (JavaLayerPeerFactory* factory = getPeerFactory(layer.getTypeInfo())) {
return factory->createJavaLayerPeer(env, layer);
}
@@ -95,7 +95,7 @@ jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNI
}
jni::Local<jni::Object<Layer>> LayerManagerAndroid::createJavaLayerPeer(jni::JNIEnv& env,
std::unique_ptr<mbgl::style::Layer> layer) {
std::unique_ptr<mln::style::Layer> layer) {
if (JavaLayerPeerFactory* factory = getPeerFactory(layer->getTypeInfo())) {
return factory->createJavaLayerPeer(env, std::move(layer));
}
@@ -125,7 +125,7 @@ void LayerManagerAndroid::addLayerTypeCoreOnly(std::unique_ptr<LayerFactory> fac
coreFactories.emplace_back(std::move(factory));
}
void LayerManagerAndroid::registerCoreFactory(mbgl::LayerFactory* factory) {
void LayerManagerAndroid::registerCoreFactory(mln::LayerFactory* factory) {
std::string type{factory->getTypeInfo()->type};
if (!type.empty()) {
assert(typeToFactory.find(type) == typeToFactory.end());
@@ -133,7 +133,7 @@ void LayerManagerAndroid::registerCoreFactory(mbgl::LayerFactory* factory) {
}
}
JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(const mbgl::style::LayerTypeInfo* typeInfo) {
JavaLayerPeerFactory* LayerManagerAndroid::getPeerFactory(const mln::style::LayerTypeInfo* typeInfo) {
assert(typeInfo);
for (const auto& factory : peerFactories) {
if (factory->getLayerFactory()->getTypeInfo() == typeInfo) {
@@ -148,7 +148,7 @@ LayerFactory* LayerManagerAndroid::getFactory(const std::string& type) noexcept
return (search != typeToFactory.end()) ? search->second : nullptr;
}
LayerFactory* LayerManagerAndroid::getFactory(const mbgl::style::LayerTypeInfo* info) noexcept {
LayerFactory* LayerManagerAndroid::getFactory(const mln::style::LayerTypeInfo* info) noexcept {
if (JavaLayerPeerFactory* peerFactory = getPeerFactory(info)) {
return peerFactory->getLayerFactory();
}
@@ -181,4 +181,4 @@ const bool LayerManager::annotationsEnabled = false;
const bool LayerManager::annotationsEnabled = true;
#endif
} // namespace mbgl
} // namespace mln

24
platform/android/MapLibreAndroid/src/cpp/style/layers/layer_manager.hpp
View File

@@ -11,20 +11,20 @@
#include <memory>
#include <vector>
namespace mbgl {
namespace mln {
namespace android {
/**
* @brief A singleton class forwarding calls to the corresponding \c
* JavaLayerPeerFactory instance.
*/
class LayerManagerAndroid final : public mbgl::LayerManager {
class LayerManagerAndroid final : public mln::LayerManager {
public:
~LayerManagerAndroid() final;
static LayerManagerAndroid* get() noexcept;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&);
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>);
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&);
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>);
void registerNative(jni::JNIEnv&);
@@ -41,18 +41,18 @@ private:
* in order to save binary size - JNI glue code for these layer types
* won't be added to the binary.
*/
void addLayerTypeCoreOnly(std::unique_ptr<mbgl::LayerFactory>);
void addLayerTypeCoreOnly(std::unique_ptr<mln::LayerFactory>);
void registerCoreFactory(mbgl::LayerFactory*);
JavaLayerPeerFactory* getPeerFactory(const mbgl::style::LayerTypeInfo*);
// mbgl::LayerManager overrides.
void registerCoreFactory(mln::LayerFactory*);
JavaLayerPeerFactory* getPeerFactory(const mln::style::LayerTypeInfo*);
// mln::LayerManager overrides.
LayerFactory* getFactory(const std::string& type) noexcept final;
LayerFactory* getFactory(const mbgl::style::LayerTypeInfo* info) noexcept final;
LayerFactory* getFactory(const mln::style::LayerTypeInfo* info) noexcept final;
std::vector<std::unique_ptr<JavaLayerPeerFactory>> peerFactories;
std::vector<std::unique_ptr<mbgl::LayerFactory>> coreFactories;
std::map<std::string, mbgl::LayerFactory*> typeToFactory;
std::vector<std::unique_ptr<mln::LayerFactory>> coreFactories;
std::map<std::string, mln::LayerFactory*> typeToFactory;
};
} // namespace android
} // namespace mbgl
} // namespace mln

164
platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::LineLayer& toLineLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::LineLayer&>(layer);
inline mln::style::LineLayer& toLineLayer(mln::style::Layer& layer) {
return static_cast<mln::style::LineLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
LineLayer::LineLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::LineLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::LineLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
LineLayer::LineLayer(mbgl::style::LineLayer& coreLayer)
LineLayer::LineLayer(mln::style::LineLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
LineLayer::LineLayer(std::unique_ptr<mbgl::style::LineLayer> coreLayer)
LineLayer::LineLayer(std::unique_ptr<mln::style::LineLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
LineLayer::~LineLayer() = default;
@@ -40,7 +40,7 @@ LineLayer::~LineLayer() = default;
// Property getters
jni::Local<jni::Object<>> LineLayer::getLineCap(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineCap()));
@@ -49,7 +49,7 @@ jni::Local<jni::Object<>> LineLayer::getLineCap(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineJoin(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineJoin()));
@@ -58,7 +58,7 @@ jni::Local<jni::Object<>> LineLayer::getLineJoin(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineMiterLimit(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineMiterLimit()));
@@ -67,7 +67,7 @@ jni::Local<jni::Object<>> LineLayer::getLineMiterLimit(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineRoundLimit(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineRoundLimit()));
@@ -76,7 +76,7 @@ jni::Local<jni::Object<>> LineLayer::getLineRoundLimit(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineSortKey(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineSortKey()));
@@ -85,7 +85,7 @@ jni::Local<jni::Object<>> LineLayer::getLineSortKey(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineOpacity()));
@@ -94,12 +94,12 @@ jni::Local<jni::Object<>> LineLayer::getLineOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineOpacityTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -108,14 +108,14 @@ void LineLayer::setLineOpacityTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineOpacityTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineColor()));
@@ -124,12 +124,12 @@ jni::Local<jni::Object<>> LineLayer::getLineColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineColorTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -138,14 +138,14 @@ void LineLayer::setLineColorTransition(jni::JNIEnv&, jlong duration, jlong delay
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineColorTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineTranslate()));
@@ -154,12 +154,12 @@ jni::Local<jni::Object<>> LineLayer::getLineTranslate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineTranslateTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -168,14 +168,14 @@ void LineLayer::setLineTranslateTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineTranslateTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineTranslateAnchor()));
@@ -184,7 +184,7 @@ jni::Local<jni::Object<>> LineLayer::getLineTranslateAnchor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> LineLayer::getLineWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineWidth()));
@@ -193,12 +193,12 @@ jni::Local<jni::Object<>> LineLayer::getLineWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineWidthTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineWidthTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineWidthTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -207,14 +207,14 @@ void LineLayer::setLineWidthTransition(jni::JNIEnv&, jlong duration, jlong delay
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineWidthTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineGapWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineGapWidth()));
@@ -223,12 +223,12 @@ jni::Local<jni::Object<>> LineLayer::getLineGapWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineGapWidthTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineGapWidthTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineGapWidthTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -237,14 +237,14 @@ void LineLayer::setLineGapWidthTransition(jni::JNIEnv&, jlong duration, jlong de
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineGapWidthTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineOffset(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineOffset()));
@@ -253,12 +253,12 @@ jni::Local<jni::Object<>> LineLayer::getLineOffset(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineOffsetTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineOffsetTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineOffsetTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -267,14 +267,14 @@ void LineLayer::setLineOffsetTransition(jni::JNIEnv&, jlong duration, jlong dela
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineOffsetTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineBlur(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineBlur()));
@@ -283,12 +283,12 @@ jni::Local<jni::Object<>> LineLayer::getLineBlur(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineBlurTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineBlurTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineBlurTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -297,14 +297,14 @@ void LineLayer::setLineBlurTransition(jni::JNIEnv&, jlong duration, jlong delay)
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineBlurTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineDasharray(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineDasharray()));
@@ -313,12 +313,12 @@ jni::Local<jni::Object<>> LineLayer::getLineDasharray(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLineDasharrayTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLineDasharrayTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLineDasharrayTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -327,14 +327,14 @@ void LineLayer::setLineDasharrayTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLineDasharrayTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLinePattern(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLinePattern()));
@@ -343,12 +343,12 @@ jni::Local<jni::Object<>> LineLayer::getLinePattern(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LineLayer::getLinePatternTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLineLayer(*layer).getLinePatternTransition();
mln::style::TransitionOptions options = toLineLayer(*layer).getLinePatternTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -357,14 +357,14 @@ void LineLayer::setLinePatternTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLineLayer(*layer).setLinePatternTransition(options);
}
jni::Local<jni::Object<>> LineLayer::getLineGradient(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LineLayer::getDefaultLineGradient()));
@@ -385,17 +385,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new LineLayer(toLineLayer(layer)));
}
jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::Local<jni::Object<Layer>> LineJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(
env,
new LineLayer(std::unique_ptr<mbgl::style::LineLayer>(static_cast<mbgl::style::LineLayer*>(layer.release()))));
new LineLayer(std::unique_ptr<mln::style::LineLayer>(static_cast<mln::style::LineLayer*>(layer.release()))));
}
void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -449,4 +449,4 @@ void LineJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/line_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/line_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class LineLayer : public Layer {
@@ -18,9 +18,9 @@ public:
LineLayer(jni::JNIEnv&, jni::String&, jni::String&);
LineLayer(mbgl::style::LineLayer&);
LineLayer(mln::style::LineLayer&);
LineLayer(std::unique_ptr<mbgl::style::LineLayer>);
LineLayer(std::unique_ptr<mln::style::LineLayer>);
~LineLayer();
@@ -78,13 +78,13 @@ public:
}; // class LineLayer
class LineJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::LineLayerFactory {
class LineJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::LineLayerFactory {
public:
~LineJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -93,4 +93,4 @@ public:
}; // class LineJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

144
platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.cpp
View File

@@ -9,29 +9,29 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::LocationIndicatorLayer& toLocationIndicatorLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::LocationIndicatorLayer&>(layer);
inline mln::style::LocationIndicatorLayer& toLocationIndicatorLayer(mln::style::Layer& layer) {
return static_cast<mln::style::LocationIndicatorLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
LocationIndicatorLayer::LocationIndicatorLayer(jni::JNIEnv& env, jni::String& layerId)
: Layer(std::make_unique<mbgl::style::LocationIndicatorLayer>(jni::Make<std::string>(env, layerId))) {}
: Layer(std::make_unique<mln::style::LocationIndicatorLayer>(jni::Make<std::string>(env, layerId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
LocationIndicatorLayer::LocationIndicatorLayer(mbgl::style::LocationIndicatorLayer& coreLayer)
LocationIndicatorLayer::LocationIndicatorLayer(mln::style::LocationIndicatorLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
LocationIndicatorLayer::LocationIndicatorLayer(std::unique_ptr<mbgl::style::LocationIndicatorLayer> coreLayer)
LocationIndicatorLayer::LocationIndicatorLayer(std::unique_ptr<mln::style::LocationIndicatorLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
LocationIndicatorLayer::~LocationIndicatorLayer() = default;
@@ -39,7 +39,7 @@ LocationIndicatorLayer::~LocationIndicatorLayer() = default;
// Property getters
jni::Local<jni::Object<>> LocationIndicatorLayer::getTopImage(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LocationIndicatorLayer::getDefaultTopImage()));
@@ -48,7 +48,7 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getTopImage(jni::JNIEnv& env)
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getBearingImage(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -58,7 +58,7 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getBearingImage(jni::JNIEnv& e
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getShadowImage(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -68,7 +68,7 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getShadowImage(jni::JNIEnv& en
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getPerspectiveCompensation(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -79,7 +79,7 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getPerspectiveCompensation(jni
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getImageTiltDisplacement(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -90,7 +90,7 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getImageTiltDisplacement(jni::
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getBearing(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LocationIndicatorLayer::getDefaultBearing()));
@@ -99,12 +99,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getBearing(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getBearingTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -113,14 +113,14 @@ void LocationIndicatorLayer::setBearingTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setBearingTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getLocation(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::LocationIndicatorLayer::getDefaultLocation()));
@@ -129,12 +129,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getLocation(jni::JNIEnv& env)
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getLocationTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getLocationTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getLocationTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -143,14 +143,14 @@ void LocationIndicatorLayer::setLocationTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setLocationTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadius(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -160,12 +160,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadius(jni::JNIEnv&
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getAccuracyRadiusTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -174,14 +174,14 @@ void LocationIndicatorLayer::setAccuracyRadiusTransition(jni::JNIEnv&, jlong dur
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setAccuracyRadiusTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getTopImageSize(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -191,12 +191,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getTopImageSize(jni::JNIEnv& e
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getTopImageSizeTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getTopImageSizeTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getTopImageSizeTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -205,14 +205,14 @@ void LocationIndicatorLayer::setTopImageSizeTransition(jni::JNIEnv&, jlong durat
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setTopImageSizeTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getBearingImageSize(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -222,12 +222,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getBearingImageSize(jni::JNIEn
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getBearingImageSizeTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingImageSizeTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getBearingImageSizeTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -236,14 +236,14 @@ void LocationIndicatorLayer::setBearingImageSizeTransition(jni::JNIEnv&, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setBearingImageSizeTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getShadowImageSize(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -253,12 +253,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getShadowImageSize(jni::JNIEnv
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getShadowImageSizeTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getShadowImageSizeTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getShadowImageSizeTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -267,14 +267,14 @@ void LocationIndicatorLayer::setShadowImageSizeTransition(jni::JNIEnv&, jlong du
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setShadowImageSizeTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadiusColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -285,12 +285,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadiusColor(jni::JN
}
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getAccuracyRadiusColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusColorTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -299,14 +299,14 @@ void LocationIndicatorLayer::setAccuracyRadiusColorTransition(jni::JNIEnv&, jlon
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setAccuracyRadiusColorTransition(options);
}
jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadiusBorderColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(
@@ -318,12 +318,12 @@ jni::Local<jni::Object<>> LocationIndicatorLayer::getAccuracyRadiusBorderColor(j
jni::Local<jni::Object<TransitionOptions>> LocationIndicatorLayer::getAccuracyRadiusBorderColorTransition(
jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusBorderColorTransition();
mln::style::TransitionOptions options = toLocationIndicatorLayer(*layer).getAccuracyRadiusBorderColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -332,9 +332,9 @@ void LocationIndicatorLayer::setAccuracyRadiusBorderColorTransition(jni::JNIEnv&
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toLocationIndicatorLayer(*layer).setAccuracyRadiusBorderColorTransition(options);
}
@@ -351,17 +351,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> LocationIndicatorJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new LocationIndicatorLayer(toLocationIndicatorLayer(layer)));
}
jni::Local<jni::Object<Layer>> LocationIndicatorJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new LocationIndicatorLayer(std::unique_ptr<mbgl::style::LocationIndicatorLayer>(
static_cast<mbgl::style::LocationIndicatorLayer*>(layer.release()))));
new LocationIndicatorLayer(std::unique_ptr<mln::style::LocationIndicatorLayer>(
static_cast<mln::style::LocationIndicatorLayer*>(layer.release()))));
}
void LocationIndicatorJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -412,4 +412,4 @@ void LocationIndicatorJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/location_indicator_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/location_indicator_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class LocationIndicatorLayer : public Layer {
@@ -18,9 +18,9 @@ public:
LocationIndicatorLayer(jni::JNIEnv&, jni::String&);
LocationIndicatorLayer(mbgl::style::LocationIndicatorLayer&);
LocationIndicatorLayer(mln::style::LocationIndicatorLayer&);
LocationIndicatorLayer(std::unique_ptr<mbgl::style::LocationIndicatorLayer>);
LocationIndicatorLayer(std::unique_ptr<mln::style::LocationIndicatorLayer>);
~LocationIndicatorLayer();
@@ -71,13 +71,13 @@ public:
}; // class LocationIndicatorLayer
class LocationIndicatorJavaLayerPeerFactory final : public JavaLayerPeerFactory,
public mbgl::LocationIndicatorLayerFactory {
public mln::LocationIndicatorLayerFactory {
public:
~LocationIndicatorJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -86,4 +86,4 @@ public:
}; // class LocationIndicatorJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

112
platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::RasterLayer& toRasterLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::RasterLayer&>(layer);
inline mln::style::RasterLayer& toRasterLayer(mln::style::Layer& layer) {
return static_cast<mln::style::RasterLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
RasterLayer::RasterLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::RasterLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::RasterLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
RasterLayer::RasterLayer(mbgl::style::RasterLayer& coreLayer)
RasterLayer::RasterLayer(mln::style::RasterLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
RasterLayer::RasterLayer(std::unique_ptr<mbgl::style::RasterLayer> coreLayer)
RasterLayer::RasterLayer(std::unique_ptr<mln::style::RasterLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
RasterLayer::~RasterLayer() = default;
@@ -40,7 +40,7 @@ RasterLayer::~RasterLayer() = default;
// Property getters
jni::Local<jni::Object<>> RasterLayer::getRasterOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterOpacity()));
@@ -49,12 +49,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterOpacityTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -63,14 +63,14 @@ void RasterLayer::setRasterOpacityTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterOpacityTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterHueRotate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterHueRotate()));
@@ -79,12 +79,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterHueRotate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterHueRotateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterHueRotateTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterHueRotateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -93,14 +93,14 @@ void RasterLayer::setRasterHueRotateTransition(jni::JNIEnv&, jlong duration, jlo
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterHueRotateTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMin(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterBrightnessMin()));
@@ -109,12 +109,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMin(jni::JNIEnv& env)
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterBrightnessMinTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMinTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMinTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -123,14 +123,14 @@ void RasterLayer::setRasterBrightnessMinTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterBrightnessMinTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMax(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterBrightnessMax()));
@@ -139,12 +139,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterBrightnessMax(jni::JNIEnv& env)
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterBrightnessMaxTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMaxTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterBrightnessMaxTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -153,14 +153,14 @@ void RasterLayer::setRasterBrightnessMaxTransition(jni::JNIEnv&, jlong duration,
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterBrightnessMaxTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterSaturation(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterSaturation()));
@@ -169,12 +169,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterSaturation(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterSaturationTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterSaturationTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterSaturationTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -183,14 +183,14 @@ void RasterLayer::setRasterSaturationTransition(jni::JNIEnv&, jlong duration, jl
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterSaturationTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterContrast(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterContrast()));
@@ -199,12 +199,12 @@ jni::Local<jni::Object<>> RasterLayer::getRasterContrast(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> RasterLayer::getRasterContrastTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toRasterLayer(*layer).getRasterContrastTransition();
mln::style::TransitionOptions options = toRasterLayer(*layer).getRasterContrastTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -213,14 +213,14 @@ void RasterLayer::setRasterContrastTransition(jni::JNIEnv&, jlong duration, jlon
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toRasterLayer(*layer).setRasterContrastTransition(options);
}
jni::Local<jni::Object<>> RasterLayer::getRasterResampling(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterResampling()));
@@ -229,7 +229,7 @@ jni::Local<jni::Object<>> RasterLayer::getRasterResampling(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> RasterLayer::getRasterFadeDuration(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::RasterLayer::getDefaultRasterFadeDuration()));
@@ -250,17 +250,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new RasterLayer(toRasterLayer(layer)));
}
jni::Local<jni::Object<Layer>> RasterJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>(
static_cast<mbgl::style::RasterLayer*>(layer.release()))));
new RasterLayer(std::unique_ptr<mln::style::RasterLayer>(
static_cast<mln::style::RasterLayer*>(layer.release()))));
}
void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -300,4 +300,4 @@ void RasterJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/raster_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/raster_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class RasterLayer : public Layer {
@@ -18,9 +18,9 @@ public:
RasterLayer(jni::JNIEnv&, jni::String&, jni::String&);
RasterLayer(mbgl::style::RasterLayer&);
RasterLayer(mln::style::RasterLayer&);
RasterLayer(std::unique_ptr<mbgl::style::RasterLayer>);
RasterLayer(std::unique_ptr<mln::style::RasterLayer>);
~RasterLayer();
@@ -56,13 +56,13 @@ public:
}; // class RasterLayer
class RasterJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::RasterLayerFactory {
class RasterJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::RasterLayerFactory {
public:
~RasterJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -71,4 +71,4 @@ public:
}; // class RasterJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

282
platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.cpp
View File

@@ -9,30 +9,30 @@
#include <mbgl/style/layer_impl.hpp>
namespace mbgl {
namespace mln {
namespace android {
inline mbgl::style::SymbolLayer& toSymbolLayer(mbgl::style::Layer& layer) {
return static_cast<mbgl::style::SymbolLayer&>(layer);
inline mln::style::SymbolLayer& toSymbolLayer(mln::style::Layer& layer) {
return static_cast<mln::style::SymbolLayer&>(layer);
}
/**
* Creates an owning peer object (for layers not attached to the map) from the JVM side
*/
SymbolLayer::SymbolLayer(jni::JNIEnv& env, jni::String& layerId, jni::String& sourceId)
: Layer(std::make_unique<mbgl::style::SymbolLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
: Layer(std::make_unique<mln::style::SymbolLayer>(jni::Make<std::string>(env, layerId),
jni::Make<std::string>(env, sourceId))) {}
/**
* Creates a non-owning peer object (for layers currently attached to the map)
*/
SymbolLayer::SymbolLayer(mbgl::style::SymbolLayer& coreLayer)
SymbolLayer::SymbolLayer(mln::style::SymbolLayer& coreLayer)
: Layer(coreLayer) {}
/**
* Creates an owning peer object (for layers not attached to the map)
*/
SymbolLayer::SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer> coreLayer)
SymbolLayer::SymbolLayer(std::unique_ptr<mln::style::SymbolLayer> coreLayer)
: Layer(std::move(coreLayer)) {}
SymbolLayer::~SymbolLayer() = default;
@@ -40,7 +40,7 @@ SymbolLayer::~SymbolLayer() = default;
// Property getters
jni::Local<jni::Object<>> SymbolLayer::getSymbolPlacement(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolPlacement()));
@@ -49,7 +49,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolPlacement(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolSpacing(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolSpacing()));
@@ -58,7 +58,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolSpacing(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolAvoidEdges(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolAvoidEdges()));
@@ -67,7 +67,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolAvoidEdges(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolSortKey(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolSortKey()));
@@ -76,7 +76,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolSortKey(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolZOrder(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolZOrder()));
@@ -85,7 +85,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolZOrder(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconAllowOverlap(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconAllowOverlap()));
@@ -94,7 +94,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconAllowOverlap(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconIgnorePlacement(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconIgnorePlacement()));
@@ -103,7 +103,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconIgnorePlacement(jni::JNIEnv& env)
}
jni::Local<jni::Object<>> SymbolLayer::getIconOptional(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconOptional()));
@@ -112,7 +112,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconOptional(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconRotationAlignment(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -122,7 +122,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconRotationAlignment(jni::JNIEnv& env
}
jni::Local<jni::Object<>> SymbolLayer::getIconSize(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconSize()));
@@ -131,7 +131,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconSize(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconTextFit(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconTextFit()));
@@ -140,7 +140,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconTextFit(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconTextFitPadding(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconTextFitPadding()));
@@ -149,7 +149,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconTextFitPadding(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconImage(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconImage()));
@@ -158,7 +158,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconImage(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconRotate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconRotate()));
@@ -167,7 +167,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconRotate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconPadding(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconPadding()));
@@ -176,7 +176,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconPadding(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconKeepUpright(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconKeepUpright()));
@@ -185,7 +185,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconKeepUpright(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconOffset(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconOffset()));
@@ -194,7 +194,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconOffset(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconAnchor()));
@@ -203,7 +203,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconAnchor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconPitchAlignment()));
@@ -212,7 +212,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextPitchAlignment(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextPitchAlignment()));
@@ -221,7 +221,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextPitchAlignment(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextRotationAlignment(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -231,7 +231,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextRotationAlignment(jni::JNIEnv& env
}
jni::Local<jni::Object<>> SymbolLayer::getTextField(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextField()));
@@ -240,7 +240,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextField(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextFont(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextFont()));
@@ -249,7 +249,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextFont(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextSize(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextSize()));
@@ -258,7 +258,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextSize(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextMaxWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextMaxWidth()));
@@ -267,7 +267,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextMaxWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextLineHeight(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextLineHeight()));
@@ -276,7 +276,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextLineHeight(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextLetterSpacing(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextLetterSpacing()));
@@ -285,7 +285,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextLetterSpacing(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextJustify(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextJustify()));
@@ -294,7 +294,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextJustify(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextRadialOffset(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextRadialOffset()));
@@ -303,7 +303,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextRadialOffset(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextVariableAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextVariableAnchor()));
@@ -312,7 +312,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextVariableAnchor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextVariableAnchorOffset(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(
@@ -322,7 +322,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextVariableAnchorOffset(jni::JNIEnv&
}
jni::Local<jni::Object<>> SymbolLayer::getTextAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextAnchor()));
@@ -331,7 +331,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextAnchor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextMaxAngle(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextMaxAngle()));
@@ -340,7 +340,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextMaxAngle(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextWritingMode(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextWritingMode()));
@@ -349,7 +349,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextWritingMode(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextRotate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextRotate()));
@@ -358,7 +358,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextRotate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextPadding(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextPadding()));
@@ -367,7 +367,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextPadding(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextKeepUpright(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextKeepUpright()));
@@ -376,7 +376,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextKeepUpright(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextTransform(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextTransform()));
@@ -385,7 +385,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextTransform(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextOffset(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextOffset()));
@@ -394,7 +394,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextOffset(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextAllowOverlap(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextAllowOverlap()));
@@ -403,7 +403,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextAllowOverlap(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getTextIgnorePlacement(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextIgnorePlacement()));
@@ -412,7 +412,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextIgnorePlacement(jni::JNIEnv& env)
}
jni::Local<jni::Object<>> SymbolLayer::getTextOptional(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextOptional()));
@@ -421,7 +421,7 @@ jni::Local<jni::Object<>> SymbolLayer::getTextOptional(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getSymbolScreenSpace(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultSymbolScreenSpace()));
@@ -430,7 +430,7 @@ jni::Local<jni::Object<>> SymbolLayer::getSymbolScreenSpace(jni::JNIEnv& env) {
}
jni::Local<jni::Object<>> SymbolLayer::getIconOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconOpacity()));
@@ -439,12 +439,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconOpacityTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -453,14 +453,14 @@ void SymbolLayer::setIconOpacityTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconOpacityTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconColor()));
@@ -469,12 +469,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconColorTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -483,14 +483,14 @@ void SymbolLayer::setIconColorTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconColorTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconHaloColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconHaloColor()));
@@ -499,12 +499,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconHaloColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloColorTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -513,14 +513,14 @@ void SymbolLayer::setIconHaloColorTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconHaloColorTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconHaloWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconHaloWidth()));
@@ -529,12 +529,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconHaloWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloWidthTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloWidthTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloWidthTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -543,14 +543,14 @@ void SymbolLayer::setIconHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconHaloWidthTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconHaloBlur(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconHaloBlur()));
@@ -559,12 +559,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconHaloBlur(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconHaloBlurTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloBlurTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconHaloBlurTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -573,14 +573,14 @@ void SymbolLayer::setIconHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconHaloBlurTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconTranslate()));
@@ -589,12 +589,12 @@ jni::Local<jni::Object<>> SymbolLayer::getIconTranslate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getIconTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getIconTranslateTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getIconTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -603,14 +603,14 @@ void SymbolLayer::setIconTranslateTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setIconTranslateTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getIconTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultIconTranslateAnchor()));
@@ -619,7 +619,7 @@ jni::Local<jni::Object<>> SymbolLayer::getIconTranslateAnchor(jni::JNIEnv& env)
}
jni::Local<jni::Object<>> SymbolLayer::getTextOpacity(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextOpacity()));
@@ -628,12 +628,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextOpacity(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextOpacityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextOpacityTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextOpacityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -642,14 +642,14 @@ void SymbolLayer::setTextOpacityTransition(jni::JNIEnv&, jlong duration, jlong d
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextOpacityTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextColor()));
@@ -658,12 +658,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextColorTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -672,14 +672,14 @@ void SymbolLayer::setTextColorTransition(jni::JNIEnv&, jlong duration, jlong del
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextColorTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextHaloColor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextHaloColor()));
@@ -688,12 +688,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextHaloColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloColorTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -702,14 +702,14 @@ void SymbolLayer::setTextHaloColorTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextHaloColorTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextHaloWidth(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextHaloWidth()));
@@ -718,12 +718,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextHaloWidth(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloWidthTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloWidthTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloWidthTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -732,14 +732,14 @@ void SymbolLayer::setTextHaloWidthTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextHaloWidthTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextHaloBlur(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextHaloBlur()));
@@ -748,12 +748,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextHaloBlur(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextHaloBlurTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloBlurTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextHaloBlurTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -762,14 +762,14 @@ void SymbolLayer::setTextHaloBlurTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextHaloBlurTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextTranslate(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextTranslate()));
@@ -778,12 +778,12 @@ jni::Local<jni::Object<>> SymbolLayer::getTextTranslate(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> SymbolLayer::getTextTranslateTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mbgl::style::TransitionOptions()));
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, mln::style::TransitionOptions()));
}
mbgl::style::TransitionOptions options = toSymbolLayer(*layer).getTextTranslateTransition();
mln::style::TransitionOptions options = toSymbolLayer(*layer).getTextTranslateTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
@@ -792,14 +792,14 @@ void SymbolLayer::setTextTranslateTransition(jni::JNIEnv&, jlong duration, jlong
if (!layer) {
return;
}
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
toSymbolLayer(*layer).setTextTranslateTransition(options);
}
jni::Local<jni::Object<>> SymbolLayer::getTextTranslateAnchor(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
using namespace mln::android::conversion;
auto layer = layerPtr.get();
if (!layer) {
return std::move(*convert<jni::Local<jni::Object<>>>(env, style::SymbolLayer::getDefaultTextTranslateAnchor()));
@@ -820,17 +820,17 @@ jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv& env, Layer* layer) {
} // namespace
jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(jni::JNIEnv& env,
mbgl::style::Layer& layer) {
mln::style::Layer& layer) {
assert(layer.baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env, new SymbolLayer(toSymbolLayer(layer)));
}
jni::Local<jni::Object<Layer>> SymbolJavaLayerPeerFactory::createJavaLayerPeer(
jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer> layer) {
jni::JNIEnv& env, std::unique_ptr<mln::style::Layer> layer) {
assert(layer->baseImpl->getTypeInfo() == getTypeInfo());
return createJavaPeer(env,
new SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>(
static_cast<mbgl::style::SymbolLayer*>(layer.release()))));
new SymbolLayer(std::unique_ptr<mln::style::SymbolLayer>(
static_cast<mln::style::SymbolLayer*>(layer.release()))));
}
void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
@@ -931,4 +931,4 @@ void SymbolJavaLayerPeerFactory::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/layers/symbol_layer.hpp
View File

@@ -8,7 +8,7 @@
#include <mbgl/style/layers/symbol_layer.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class SymbolLayer : public Layer {
@@ -18,9 +18,9 @@ public:
SymbolLayer(jni::JNIEnv&, jni::String&, jni::String&);
SymbolLayer(mbgl::style::SymbolLayer&);
SymbolLayer(mln::style::SymbolLayer&);
SymbolLayer(std::unique_ptr<mbgl::style::SymbolLayer>);
SymbolLayer(std::unique_ptr<mln::style::SymbolLayer>);
~SymbolLayer();
@@ -166,13 +166,13 @@ public:
}; // class SymbolLayer
class SymbolJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mbgl::SymbolLayerFactory {
class SymbolJavaLayerPeerFactory final : public JavaLayerPeerFactory, public mln::SymbolLayerFactory {
public:
~SymbolJavaLayerPeerFactory() override;
// JavaLayerPeerFactory overrides.
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mbgl::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mbgl::style::Layer>) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv&, mln::style::Layer&) final;
jni::Local<jni::Object<Layer>> createJavaLayerPeer(jni::JNIEnv& env, std::unique_ptr<mln::style::Layer>) final;
void registerNative(jni::JNIEnv&) final;
@@ -181,4 +181,4 @@ public:
}; // class SymbolJavaLayerPeerFactory
} // namespace android
} // namespace mbgl
} // namespace mln

48
platform/android/MapLibreAndroid/src/cpp/style/light.cpp
View File

@@ -3,18 +3,18 @@
#include "conversion/transition_options.hpp"
#include "conversion/position.hpp"
namespace mbgl {
namespace mln {
namespace android {
Light::Light(mbgl::Map& coreMap, mbgl::style::Light& coreLight)
Light::Light(mln::Map& coreMap, mln::style::Light& coreLight)
: light(coreLight),
map(&coreMap) {}
static Light* initializeLightPeer(mbgl::Map& map, mbgl::style::Light& coreLight) {
static Light* initializeLightPeer(mln::Map& map, mln::style::Light& coreLight) {
return new Light(map, coreLight);
}
jni::Local<jni::Object<Light>> Light::createJavaLightPeer(jni::JNIEnv& env, Map& map, mbgl::style::Light& coreLight) {
jni::Local<jni::Object<Light>> Light::createJavaLightPeer(jni::JNIEnv& env, Map& map, mln::style::Light& coreLight) {
std::unique_ptr<Light> peerLight = std::unique_ptr<Light>(initializeLightPeer(map, coreLight));
auto result = peerLight->createJavaPeer(env);
peerLight.release();
@@ -46,27 +46,27 @@ jni::Local<jni::String> Light::getAnchor(jni::JNIEnv& env) {
}
void Light::setPosition(jni::JNIEnv& env, const jni::Object<Position>& jposition) {
using namespace mbgl::android::conversion;
auto position = *convert<mbgl::style::Position>(env, jposition);
using namespace mln::android::conversion;
auto position = *convert<mln::style::Position>(env, jposition);
light.setPosition(position);
}
jni::Local<jni::Object<Position>> Light::getPosition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
mbgl::style::Position position = light.getPosition().asConstant();
using namespace mln::android::conversion;
mln::style::Position position = light.getPosition().asConstant();
return std::move(*convert<jni::Local<jni::Object<Position>>>(env, position));
}
jni::Local<jni::Object<TransitionOptions>> Light::getPositionTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
mbgl::style::TransitionOptions options = light.getPositionTransition();
using namespace mln::android::conversion;
mln::style::TransitionOptions options = light.getPositionTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
void Light::setPositionTransition(jni::JNIEnv&, jlong duration, jlong delay) {
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
light.setPositionTransition(options);
}
@@ -83,15 +83,15 @@ jni::Local<jni::String> Light::getColor(jni::JNIEnv& env) {
}
jni::Local<jni::Object<TransitionOptions>> Light::getColorTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
mbgl::style::TransitionOptions options = light.getColorTransition();
using namespace mln::android::conversion;
mln::style::TransitionOptions options = light.getColorTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
void Light::setColorTransition(jni::JNIEnv&, jlong duration, jlong delay) {
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
light.setColorTransition(options);
}
@@ -104,15 +104,15 @@ jni::jfloat Light::getIntensity(jni::JNIEnv&) {
}
jni::Local<jni::Object<TransitionOptions>> Light::getIntensityTransition(jni::JNIEnv& env) {
using namespace mbgl::android::conversion;
mbgl::style::TransitionOptions options = light.getIntensityTransition();
using namespace mln::android::conversion;
mln::style::TransitionOptions options = light.getIntensityTransition();
return std::move(*convert<jni::Local<jni::Object<TransitionOptions>>>(env, options));
}
void Light::setIntensityTransition(jni::JNIEnv&, jlong duration, jlong delay) {
mbgl::style::TransitionOptions options;
options.duration.emplace(mbgl::Milliseconds(duration));
options.delay.emplace(mbgl::Milliseconds(delay));
mln::style::TransitionOptions options;
options.duration.emplace(mln::Milliseconds(duration));
options.delay.emplace(mln::Milliseconds(delay));
light.setIntensityTransition(options);
}
@@ -142,4 +142,4 @@ void Light::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/light.hpp
View File

@@ -9,20 +9,20 @@
#include <mbgl/style/types.hpp>
#include <mbgl/style/property_value.hpp>
namespace mbgl {
namespace mln {
namespace android {
using namespace style;
class Light : private mbgl::util::noncopyable {
class Light : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/light/Light"; };
static void registerNative(jni::JNIEnv&);
static jni::Local<jni::Object<Light>> createJavaLightPeer(jni::JNIEnv&, mbgl::Map&, mbgl::style::Light&);
static jni::Local<jni::Object<Light>> createJavaLightPeer(jni::JNIEnv&, mln::Map&, mln::style::Light&);
Light(mbgl::Map&, mbgl::style::Light&);
Light(mln::Map&, mln::style::Light&);
void setAnchor(jni::JNIEnv&, const jni::String&);
jni::Local<jni::String> getAnchor(jni::JNIEnv&);
@@ -42,10 +42,10 @@ public:
protected:
// Raw reference to the light
mbgl::style::Light& light;
mln::style::Light& light;
// Map is set when the light is retrieved
mbgl::Map* map;
mln::Map* map;
};
} // namespace android
} // namespace mbgl
} // namespace mln

4
platform/android/MapLibreAndroid/src/cpp/style/position.cpp
View File

@@ -1,6 +1,6 @@
#include "position.hpp"
namespace mbgl {
namespace mln {
namespace android {
jni::Local<jni::Object<Position>> Position::fromPosition(jni::JNIEnv& env,
@@ -35,4 +35,4 @@ float Position::getPolarAngle(jni::JNIEnv& env, const jni::Object<Position>& pos
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/position.hpp
View File

@@ -4,10 +4,10 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class Position : private mbgl::util::noncopyable {
class Position : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/light/Position"; };
@@ -21,4 +21,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln

34
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.cpp
View File

@@ -15,7 +15,7 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
// This conversion is expected not to fail because it's used only in contexts
@@ -26,7 +26,7 @@ static style::CustomGeometrySource::Options convertCustomGeometrySourceOptions(j
const jni::Object<>& options,
style::TileFunction fetchFn,
style::TileFunction cancelFn) {
using namespace mbgl::style::conversion;
using namespace mln::style::conversion;
if (!options) {
return style::CustomGeometrySource::Options();
}
@@ -43,7 +43,7 @@ static style::CustomGeometrySource::Options convertCustomGeometrySourceOptions(j
CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& options)
: Source(env,
std::make_unique<mbgl::style::CustomGeometrySource>(
std::make_unique<mln::style::CustomGeometrySource>(
jni::Make<std::string>(env, sourceId),
convertCustomGeometrySourceOptions(
env,
@@ -52,7 +52,7 @@ CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env, const jni::String&
std::bind(&CustomGeometrySource::cancelTile, this, std::placeholders::_1)))) {}
CustomGeometrySource::CustomGeometrySource(jni::JNIEnv& env,
mbgl::style::Source& coreSource,
mln::style::Source& coreSource,
AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
@@ -60,7 +60,7 @@ CustomGeometrySource::~CustomGeometrySource() {
releaseThreads();
}
void CustomGeometrySource::fetchTile(const mbgl::CanonicalTileID& tileID) {
void CustomGeometrySource::fetchTile(const mln::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
@@ -78,7 +78,7 @@ void CustomGeometrySource::fetchTile(const mbgl::CanonicalTileID& tileID) {
peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
};
void CustomGeometrySource::cancelTile(const mbgl::CanonicalTileID& tileID) {
void CustomGeometrySource::cancelTile(const mln::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomGeometrySource>::Singleton(*_env);
@@ -136,33 +136,33 @@ bool CustomGeometrySource::isCancelled(jni::jint z, jni::jint x, jni::jint y) {
void CustomGeometrySource::setTileData(
jni::JNIEnv& env, jni::jint z, jni::jint x, jni::jint y, const jni::Object<geojson::FeatureCollection>& jFeatures) {
using namespace mbgl::android::geojson;
using namespace mln::android::geojson;
// Convert the jni object
auto geometry = geojson::FeatureCollection::convert(env, jFeatures);
// Update the core source if not cancelled
if (!isCancelled(z, x, y)) {
source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::setTileData(CanonicalTileID(z, x, y),
GeoJSON(geometry));
source.as<mln::style::CustomGeometrySource>()->CustomGeometrySource::setTileData(CanonicalTileID(z, x, y),
GeoJSON(geometry));
}
}
void CustomGeometrySource::invalidateTile(jni::JNIEnv&, jni::jint z, jni::jint x, jni::jint y) {
source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::invalidateTile(CanonicalTileID(z, x, y));
source.as<mln::style::CustomGeometrySource>()->CustomGeometrySource::invalidateTile(CanonicalTileID(z, x, y));
}
void CustomGeometrySource::invalidateBounds(jni::JNIEnv& env, const jni::Object<LatLngBounds>& jBounds) {
auto bounds = LatLngBounds::getLatLngBounds(env, jBounds);
source.as<mbgl::style::CustomGeometrySource>()->CustomGeometrySource::invalidateRegion(bounds);
source.as<mln::style::CustomGeometrySource>()->CustomGeometrySource::invalidateRegion(bounds);
}
jni::Local<jni::Array<jni::Object<geojson::Feature>>> CustomGeometrySource::querySourceFeatures(
jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
std::vector<mbgl::Feature> features;
std::vector<mln::Feature> features;
if (rendererFrontend) {
features = rendererFrontend->querySourceFeatures(source.getID(), {{}, toFilter(env, jfilter)});
}
@@ -177,13 +177,13 @@ jni::Local<jni::Object<Source>> CustomGeometrySource::createJavaPeer(jni::JNIEnv
void CustomGeometrySource::addToMap(JNIEnv& env,
const jni::Object<Source>& obj,
mbgl::Map& map,
mln::Map& map,
AndroidRendererFrontend& frontend) {
Source::addToMap(env, obj, map, frontend);
startThreads();
}
bool CustomGeometrySource::removeFromMap(JNIEnv& env, const jni::Object<Source>& source, mbgl::Map& map) {
bool CustomGeometrySource::removeFromMap(JNIEnv& env, const jni::Object<Source>& source, mln::Map& map) {
bool successfullyRemoved = Source::removeFromMap(env, source, map);
if (successfullyRemoved) {
releaseThreads();
@@ -212,4 +212,4 @@ void CustomGeometrySource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

14
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_geometry_source.hpp
View File

@@ -10,7 +10,7 @@
#include "../../geometry/lat_lng_bounds.hpp"
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class CustomGeometrySource : public Source {
@@ -21,14 +21,14 @@ public:
static void registerNative(jni::JNIEnv&);
CustomGeometrySource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
CustomGeometrySource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
CustomGeometrySource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~CustomGeometrySource();
bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&) override;
void addToMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&, AndroidRendererFrontend&) override;
bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mln::Map&) override;
void addToMap(JNIEnv&, const jni::Object<Source>&, mln::Map&, AndroidRendererFrontend&) override;
void fetchTile(const mbgl::CanonicalTileID& tileID);
void cancelTile(const mbgl::CanonicalTileID& tileID);
void fetchTile(const mln::CanonicalTileID& tileID);
void cancelTile(const mln::CanonicalTileID& tileID);
bool isCancelled(jni::jint z, jni::jint x, jni::jint y);
void startThreads();
void releaseThreads();
@@ -48,4 +48,4 @@ private:
}; // class CustomGeometrySource
} // namespace android
} // namespace mbgl
} // namespace mln

26
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.cpp
View File

@@ -5,7 +5,7 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
CustomVectorSource::CustomVectorSource(jni::JNIEnv& env,
@@ -13,9 +13,9 @@ CustomVectorSource::CustomVectorSource(jni::JNIEnv& env,
jni::jint minZoom,
jni::jint maxZoom)
: Source(env,
std::make_unique<mbgl::style::CustomVectorSource>(
std::make_unique<mln::style::CustomVectorSource>(
jni::Make<std::string>(env, sourceId),
mbgl::style::CustomVectorSource::Options{
mln::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)}})) {}
@@ -24,7 +24,7 @@ CustomVectorSource::~CustomVectorSource() {
onRemovedFromMap();
}
void CustomVectorSource::fetchTile(const mbgl::CanonicalTileID& tileID) {
void CustomVectorSource::fetchTile(const mln::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
@@ -38,7 +38,7 @@ void CustomVectorSource::fetchTile(const mbgl::CanonicalTileID& tileID) {
peer.Call(*_env, fetchTile, (int)tileID.z, (int)tileID.x, (int)tileID.y);
}
void CustomVectorSource::cancelTile(const mbgl::CanonicalTileID& tileID) {
void CustomVectorSource::cancelTile(const mln::CanonicalTileID& tileID) {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<CustomVectorSource>::Singleton(*_env);
@@ -85,30 +85,30 @@ void CustomVectorSource::setTileData(
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));
source.as<mln::style::CustomVectorSource>()->setTileData(
CanonicalTileID(z, x, y), data, static_cast<mln::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)));
source.as<mln::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));
source.as<mln::style::CustomVectorSource>()->invalidateTile(CanonicalTileID(z, x, y));
}
void CustomVectorSource::addToMap(JNIEnv& env,
const jni::Object<Source>& obj,
mbgl::Map& map,
mln::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 CustomVectorSource::removeFromMap(JNIEnv& env, const jni::Object<Source>& source, mln::Map& map) {
bool successfullyRemoved = Source::removeFromMap(env, source, map);
if (successfullyRemoved) {
onRemovedFromMap();
@@ -134,4 +134,4 @@ void CustomVectorSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

12
platform/android/MapLibreAndroid/src/cpp/style/sources/custom_vector_source.hpp
View File

@@ -5,7 +5,7 @@
#include <mbgl/tile/tile_id.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class CustomVectorSource : public Source {
@@ -18,11 +18,11 @@ public:
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;
bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mln::Map&) override;
void addToMap(JNIEnv&, const jni::Object<Source>&, mln::Map&, AndroidRendererFrontend&) override;
void fetchTile(const mbgl::CanonicalTileID& tileID);
void cancelTile(const mbgl::CanonicalTileID& tileID);
void fetchTile(const mln::CanonicalTileID& tileID);
void cancelTile(const mln::CanonicalTileID& tileID);
void onAddedToMap();
void onRemovedFromMap();
@@ -34,4 +34,4 @@ private:
};
} // namespace android
} // namespace mbgl
} // namespace mln

62
platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp
View File

@@ -25,19 +25,19 @@
// finish as well. Any updates scheduled during processing can be canceled. Conversion
// from Java features to core ones is done on a worker thread and once finished,
// the ownership of the converted features is returned to the calling thread.
namespace mbgl {
namespace mln {
namespace android {
// This conversion is expected not to fail because it's used only in contexts where
// the value was originally a GeoJsonOptions object on the Java side. If it fails
// to convert, it's a bug in our serialization or Java-side static typing.
static Immutable<style::GeoJSONOptions> convertGeoJSONOptions(jni::JNIEnv& env, const jni::Object<>& options) {
using namespace mbgl::style::conversion;
using namespace mln::style::conversion;
if (!options) {
return style::GeoJSONOptions::defaultOptions();
}
Error error;
std::optional<style::GeoJSONOptions> result = convert<style::GeoJSONOptions>(mbgl::android::Value(env, options),
std::optional<style::GeoJSONOptions> result = convert<style::GeoJSONOptions>(mln::android::Value(env, options),
error);
if (!result) {
throw std::logic_error(error.message);
@@ -47,14 +47,14 @@ static Immutable<style::GeoJSONOptions> convertGeoJSONOptions(jni::JNIEnv& env,
GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& options)
: Source(env,
std::make_unique<mbgl::style::GeoJSONSource>(jni::Make<std::string>(env, sourceId),
convertGeoJSONOptions(env, options))),
std::make_unique<mln::style::GeoJSONSource>(jni::Make<std::string>(env, sourceId),
convertGeoJSONOptions(env, options))),
converter(
std::make_unique<OptionalActor<FeatureConverter>>(source.as<style::GeoJSONSource>()->isUpdateSynchronous(),
Scheduler::GetBackground(),
source.as<style::GeoJSONSource>()->impl().getOptions())) {}
GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
GeoJSONSource::GeoJSONSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend),
converter(
std::make_unique<OptionalActor<FeatureConverter>>(source.as<style::GeoJSONSource>()->isUpdateSynchronous(),
@@ -98,10 +98,10 @@ jni::Local<jni::String> GeoJSONSource::getURL(jni::JNIEnv& env) {
jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::querySourceFeatures(
jni::JNIEnv& env, const jni::Array<jni::Object<>>& jfilter) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
std::vector<mbgl::Feature> features;
std::vector<mln::Feature> features;
if (rendererFrontend) {
features = rendererFrontend->querySourceFeatures(source.getID(), {{}, toFilter(env, jfilter)});
}
@@ -110,16 +110,16 @@ jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::querySource
jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterChildren(
jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
if (rendererFrontend) {
mbgl::Feature _feature = Feature::convert(env, feature);
mln::Feature _feature = Feature::convert(env, feature);
_feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
const auto featureExtension = rendererFrontend->queryFeatureExtensions(
source.getID(), _feature, "supercluster", "children", {});
if (featureExtension.is<mbgl::FeatureCollection>()) {
return Feature::convert(env, featureExtension.get<mbgl::FeatureCollection>());
if (featureExtension.is<mln::FeatureCollection>()) {
return Feature::convert(env, featureExtension.get<mln::FeatureCollection>());
}
}
return jni::Array<jni::Object<Feature>>::New(env, 0);
@@ -127,18 +127,18 @@ jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterC
jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterLeaves(
jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature, jni::jlong limit, jni::jlong offset) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
if (rendererFrontend) {
mbgl::Feature _feature = Feature::convert(env, feature);
mln::Feature _feature = Feature::convert(env, feature);
_feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
const std::map<std::string, mbgl::Value> options = {{"limit", static_cast<uint64_t>(limit)},
{"offset", static_cast<uint64_t>(offset)}};
const std::map<std::string, mln::Value> options = {{"limit", static_cast<uint64_t>(limit)},
{"offset", static_cast<uint64_t>(offset)}};
auto featureExtension = rendererFrontend->queryFeatureExtensions(
source.getID(), _feature, "supercluster", "leaves", options);
if (featureExtension.is<mbgl::FeatureCollection>()) {
return Feature::convert(env, featureExtension.get<mbgl::FeatureCollection>());
if (featureExtension.is<mln::FeatureCollection>()) {
return Feature::convert(env, featureExtension.get<mln::FeatureCollection>());
}
}
return jni::Array<jni::Object<Feature>>::New(env, 0);
@@ -146,16 +146,16 @@ jni::Local<jni::Array<jni::Object<geojson::Feature>>> GeoJSONSource::getClusterL
}
jint GeoJSONSource::getClusterExpansionZoom(jni::JNIEnv& env, const jni::Object<geojson::Feature>& feature) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
if (rendererFrontend) {
mbgl::Feature _feature = Feature::convert(env, feature);
mln::Feature _feature = Feature::convert(env, feature);
_feature.properties["cluster_id"] = static_cast<uint64_t>(_feature.properties["cluster_id"].get<double>());
auto featureExtension = rendererFrontend->queryFeatureExtensions(
source.getID(), _feature, "supercluster", "expansion-zoom", {});
if (featureExtension.is<mbgl::Value>()) {
auto value = featureExtension.get<mbgl::Value>();
if (featureExtension.is<mln::Value>()) {
auto value = featureExtension.get<mln::Value>();
if (value.is<uint64_t>()) {
return value.get<uint64_t>();
}
@@ -192,7 +192,7 @@ void GeoJSONSource::setAsync(Update::Converter converterFn) {
android::UniqueEnv _env = android::AttachEnv();
// Update the core source
source.as<mbgl::style::GeoJSONSource>()->setGeoJSONData(std::move(geoJSONData));
source.as<mln::style::GeoJSONSource>()->setGeoJSONData(std::move(geoJSONData));
// if there is an awaiting update, execute it, otherwise, release resources
if (awaitingUpdate) {
@@ -250,14 +250,14 @@ void GeoJSONSource::registerNative(jni::JNIEnv& env) {
}
void FeatureConverter::convertJson(std::shared_ptr<std::string> json, ActorRef<GeoJSONDataCallback> callback) {
using namespace mbgl::style::conversion;
using namespace mln::style::conversion;
android::UniqueEnv _env = android::AttachEnv();
// Convert the jni object
Error error;
std::optional<GeoJSON> converted = parseGeoJSON(*json, error);
if (!converted) {
mbgl::Log::Error(mbgl::Event::JNI, "Error setting geo json: " + error.message);
mln::Log::Error(mln::Event::JNI, "Error setting geo json: " + error.message);
return;
}
@@ -269,7 +269,7 @@ template <class JNIType>
void FeatureConverter::convertObject(
std::shared_ptr<jni::Global<jni::Object<JNIType>, jni::EnvAttachingDeleter>> jObject,
ActorRef<GeoJSONDataCallback> callback) {
using namespace mbgl::android::geojson;
using namespace mln::android::geojson;
android::UniqueEnv _env = android::AttachEnv();
// Convert the jni object
@@ -283,4 +283,4 @@ Update::Update(Converter _converterFn, std::unique_ptr<Actor<GeoJSONDataCallback
callback(std::move(_callback)) {}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.hpp
View File

@@ -9,7 +9,7 @@
#include "../../android_renderer_frontend.hpp"
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
using GeoJSONDataCallback = std::function<void(std::shared_ptr<style::GeoJSONData>)>;
@@ -47,7 +47,7 @@ public:
static void registerNative(jni::JNIEnv&);
GeoJSONSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
GeoJSONSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
GeoJSONSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~GeoJSONSource();
private:
@@ -91,4 +91,4 @@ private:
}; // class GeoJSONSource
} // namespace android
} // namespace mbgl
} // namespace mln

18
platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.cpp
View File

@@ -12,37 +12,37 @@
#include <string>
#include <array>
namespace mbgl {
namespace mln {
namespace android {
ImageSource::ImageSource(jni::JNIEnv& env,
const jni::String& sourceId,
const jni::Object<LatLngQuad>& coordinatesObject)
: Source(env,
std::make_unique<mbgl::style::ImageSource>(jni::Make<std::string>(env, sourceId),
LatLngQuad::getLatLngArray(env, coordinatesObject))) {}
std::make_unique<mln::style::ImageSource>(jni::Make<std::string>(env, sourceId),
LatLngQuad::getLatLngArray(env, coordinatesObject))) {}
ImageSource::ImageSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
ImageSource::ImageSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
ImageSource::~ImageSource() = default;
void ImageSource::setURL(jni::JNIEnv& env, const jni::String& url) {
// Update the core source
source.as<mbgl::style::ImageSource>()->ImageSource::setURL(jni::Make<std::string>(env, url));
source.as<mln::style::ImageSource>()->ImageSource::setURL(jni::Make<std::string>(env, url));
}
jni::Local<jni::String> ImageSource::getURL(jni::JNIEnv& env) {
std::optional<std::string> url = source.as<mbgl::style::ImageSource>()->ImageSource::getURL();
std::optional<std::string> url = source.as<mln::style::ImageSource>()->ImageSource::getURL();
return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
}
void ImageSource::setImage(jni::JNIEnv& env, const jni::Object<Bitmap>& bitmap) {
source.as<mbgl::style::ImageSource>()->setImage(Bitmap::GetImage(env, bitmap));
source.as<mln::style::ImageSource>()->setImage(Bitmap::GetImage(env, bitmap));
}
void ImageSource::setCoordinates(jni::JNIEnv& env, const jni::Object<LatLngQuad>& coordinatesObject) {
source.as<mbgl::style::ImageSource>()->setCoordinates(LatLngQuad::getLatLngArray(env, coordinatesObject));
source.as<mln::style::ImageSource>()->setCoordinates(LatLngQuad::getLatLngArray(env, coordinatesObject));
}
jni::Local<jni::Object<Source>> ImageSource::createJavaPeer(jni::JNIEnv& env) {
@@ -71,4 +71,4 @@ void ImageSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/image_source.hpp
View File

@@ -5,7 +5,7 @@
#include <mbgl/style/sources/image_source.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class Bitmap;
@@ -19,7 +19,7 @@ public:
ImageSource(jni::JNIEnv&, const jni::String&, const jni::Object<LatLngQuad>&);
ImageSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
ImageSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~ImageSource();
@@ -36,4 +36,4 @@ private:
}; // class ImageSource
} // namespace android
} // namespace mbgl
} // namespace mln

10
platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.cpp
View File

@@ -9,7 +9,7 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
RasterDEMSource::RasterDEMSource(jni::JNIEnv& env,
@@ -17,16 +17,16 @@ RasterDEMSource::RasterDEMSource(jni::JNIEnv& env,
const jni::Object<>& urlOrTileSet,
jni::jint tileSize)
: Source(env,
std::make_unique<mbgl::style::RasterDEMSource>(
std::make_unique<mln::style::RasterDEMSource>(
jni::Make<std::string>(env, sourceId), convertURLOrTileset(Value(env, urlOrTileSet)), tileSize)) {}
RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
RasterDEMSource::RasterDEMSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
RasterDEMSource::~RasterDEMSource() = default;
jni::Local<jni::String> RasterDEMSource::getURL(jni::JNIEnv& env) {
std::optional<std::string> url = source.as<mbgl::style::RasterDEMSource>()->RasterDEMSource::getURL();
std::optional<std::string> url = source.as<mln::style::RasterDEMSource>()->RasterDEMSource::getURL();
return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
}
@@ -54,4 +54,4 @@ void RasterDEMSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/raster_dem_source.hpp
View File

@@ -4,7 +4,7 @@
#include <mbgl/style/sources/raster_dem_source.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class RasterDEMSource : public Source {
@@ -15,7 +15,7 @@ public:
static void registerNative(jni::JNIEnv&);
RasterDEMSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint);
RasterDEMSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
RasterDEMSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~RasterDEMSource();
jni::Local<jni::String> getURL(jni::JNIEnv&);
@@ -26,4 +26,4 @@ private:
}; // class RasterDEMSource
} // namespace android
} // namespace mbgl
} // namespace mln

10
platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.cpp
View File

@@ -8,7 +8,7 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
RasterSource::RasterSource(jni::JNIEnv& env,
@@ -16,16 +16,16 @@ RasterSource::RasterSource(jni::JNIEnv& env,
const jni::Object<>& urlOrTileSet,
jni::jint tileSize)
: Source(env,
std::make_unique<mbgl::style::RasterSource>(
std::make_unique<mln::style::RasterSource>(
jni::Make<std::string>(env, sourceId), convertURLOrTileset(Value(env, urlOrTileSet)), tileSize)) {}
RasterSource::RasterSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
RasterSource::RasterSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
RasterSource::~RasterSource() = default;
jni::Local<jni::String> RasterSource::getURL(jni::JNIEnv& env) {
std::optional<std::string> url = source.as<mbgl::style::RasterSource>()->RasterSource::getURL();
std::optional<std::string> url = source.as<mln::style::RasterSource>()->RasterSource::getURL();
return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
}
@@ -53,4 +53,4 @@ void RasterSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/raster_source.hpp
View File

@@ -4,7 +4,7 @@
#include <mbgl/style/sources/raster_source.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class RasterSource : public Source {
@@ -15,7 +15,7 @@ public:
static void registerNative(jni::JNIEnv&);
RasterSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&, jni::jint);
RasterSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
RasterSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~RasterSource();
jni::Local<jni::String> getURL(jni::JNIEnv&);
@@ -26,4 +26,4 @@ private:
}; // class RasterSource
} // namespace android
} // namespace mbgl
} // namespace mln

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

@@ -33,29 +33,29 @@
#include "custom_vector_source.hpp"
#include "raster_dem_source.hpp"
namespace mbgl {
namespace mln {
namespace android {
static std::unique_ptr<Source> createSourcePeer(jni::JNIEnv& env,
mbgl::style::Source& coreSource,
mln::style::Source& coreSource,
AndroidRendererFrontend* frontend) {
if (coreSource.is<mbgl::style::VectorSource>()) {
return std::make_unique<VectorSource>(env, *coreSource.as<mbgl::style::VectorSource>(), frontend);
} else if (coreSource.is<mbgl::style::RasterSource>()) {
return std::make_unique<RasterSource>(env, *coreSource.as<mbgl::style::RasterSource>(), frontend);
} else if (coreSource.is<mbgl::style::GeoJSONSource>()) {
return std::make_unique<GeoJSONSource>(env, *coreSource.as<mbgl::style::GeoJSONSource>(), frontend);
} else if (coreSource.is<mbgl::style::ImageSource>()) {
return std::make_unique<ImageSource>(env, *coreSource.as<mbgl::style::ImageSource>(), frontend);
if (coreSource.is<mln::style::VectorSource>()) {
return std::make_unique<VectorSource>(env, *coreSource.as<mln::style::VectorSource>(), frontend);
} else if (coreSource.is<mln::style::RasterSource>()) {
return std::make_unique<RasterSource>(env, *coreSource.as<mln::style::RasterSource>(), frontend);
} else if (coreSource.is<mln::style::GeoJSONSource>()) {
return std::make_unique<GeoJSONSource>(env, *coreSource.as<mln::style::GeoJSONSource>(), frontend);
} else if (coreSource.is<mln::style::ImageSource>()) {
return std::make_unique<ImageSource>(env, *coreSource.as<mln::style::ImageSource>(), frontend);
} else {
return std::make_unique<UnknownSource>(env, coreSource, frontend);
}
}
const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env,
mbgl::style::Source& coreSource,
mln::style::Source& coreSource,
AndroidRendererFrontend& frontend,
mbgl::Map& map) {
mln::Map& map) {
if (!coreSource.peer.has_value()) {
coreSource.peer = createSourcePeer(env, coreSource, &frontend);
}
@@ -64,7 +64,7 @@ const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env,
return peer->javaPeer;
}
const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::style::Source& coreSource) {
const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env, mln::style::Source& coreSource) {
if (!coreSource.peer.has_value()) {
coreSource.peer = createSourcePeer(env, coreSource, nullptr);
}
@@ -72,14 +72,14 @@ const jni::Object<Source>& Source::peerForCoreSource(jni::JNIEnv& env, mbgl::sty
}
Source::Source(jni::JNIEnv& env,
mbgl::style::Source& coreSource,
mln::style::Source& coreSource,
const jni::Object<Source>& obj,
AndroidRendererFrontend* frontend)
: source(coreSource),
javaPeer(jni::NewGlobal(env, obj)),
rendererFrontend(frontend) {}
Source::Source(jni::JNIEnv&, std::unique_ptr<mbgl::style::Source> coreSource)
Source::Source(jni::JNIEnv&, std::unique_ptr<mln::style::Source> coreSource)
: ownedSource(std::move(coreSource)),
source(*ownedSource) {}
@@ -147,7 +147,7 @@ jni::Local<jni::Integer> Source::getMaxOverscaleFactorForParentTiles(jni::JNIEnv
return jni::Local<jni::Integer>(env, nullptr);
}
void Source::addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style) {
void Source::addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mln::style::Style& style) {
if (!ownedSource) {
throw std::runtime_error("Cannot add source twice");
}
@@ -162,7 +162,7 @@ void Source::addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style
javaPeer = jni::NewGlobal(env, obj);
}
void Source::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mbgl::Map& map, AndroidRendererFrontend& frontend) {
void Source::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mln::Map& map, AndroidRendererFrontend& frontend) {
// Check to see if we own the source first
if (!ownedSource) {
throw std::runtime_error("Cannot add source twice");
@@ -180,7 +180,7 @@ void Source::addToMap(JNIEnv& env, const jni::Object<Source>& obj, mbgl::Map& ma
bindToMap(frontend, map);
}
bool Source::removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map& map) {
bool Source::removeFromMap(JNIEnv&, const jni::Object<Source>&, mln::Map& map) {
// Cannot remove if not attached yet
if (ownedSource) {
throw std::runtime_error("Cannot remove detached source");
@@ -265,7 +265,7 @@ jni::jboolean Source::removeFeatureState(JNIEnv& env,
return jni::jni_true;
}
void Source::bindToMap(AndroidRendererFrontend& frontend, mbgl::Map& map) {
void Source::bindToMap(AndroidRendererFrontend& frontend, mln::Map& map) {
rendererFrontend = &frontend;
this->map = &map;
}
@@ -325,4 +325,4 @@ void Source::registerNative(jni::JNIEnv& env) {
RasterDEMSource::registerNative(env);
}
} // namespace android
} // namespace mbgl
} // namespace mln

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

@@ -10,37 +10,37 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class Source : private mbgl::util::noncopyable {
class Source : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/sources/Source"; };
static void registerNative(jni::JNIEnv&);
static const jni::Object<Source>& peerForCoreSource(jni::JNIEnv&, mbgl::style::Source&);
static const jni::Object<Source>& peerForCoreSource(jni::JNIEnv&, mln::style::Source&);
static const jni::Object<Source>& peerForCoreSource(jni::JNIEnv&,
mbgl::style::Source&,
mln::style::Source&,
AndroidRendererFrontend&,
mbgl::Map&);
mln::Map&);
/*
* Called when a Java object is created for a core source that belongs to a map.
*/
Source(jni::JNIEnv&, mbgl::style::Source&, const jni::Object<Source>&, AndroidRendererFrontend*);
Source(jni::JNIEnv&, mln::style::Source&, const jni::Object<Source>&, AndroidRendererFrontend*);
/*
* Called when a Java object is created for a new core source that does not
* belong to a map.
*/
Source(jni::JNIEnv&, std::unique_ptr<mbgl::style::Source>);
Source(jni::JNIEnv&, std::unique_ptr<mln::style::Source>);
virtual ~Source();
virtual void addToMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&, AndroidRendererFrontend&);
virtual void addToMap(JNIEnv&, const jni::Object<Source>&, mln::Map&, AndroidRendererFrontend&);
virtual bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mbgl::Map&);
virtual bool removeFromMap(JNIEnv&, const jni::Object<Source>&, mln::Map&);
void releaseJavaPeer();
@@ -56,7 +56,7 @@ public:
jni::Local<jni::Integer> getMaxOverscaleFactorForParentTiles(jni::JNIEnv&);
void addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mbgl::style::Style& style);
void addToStyle(JNIEnv& env, const jni::Object<Source>& obj, mln::style::Style& style);
jni::Local<jni::Boolean> isVolatile(JNIEnv&);
@@ -80,14 +80,14 @@ public:
const jni::String& featureId,
const jni::String& stateKey);
void bindToMap(AndroidRendererFrontend&, mbgl::Map&);
void bindToMap(AndroidRendererFrontend&, mln::Map&);
protected:
// Set on newly created sources until added to the map.
std::unique_ptr<mbgl::style::Source> ownedSource;
std::unique_ptr<mln::style::Source> ownedSource;
// Raw pointer that is valid at all times.
mbgl::style::Source& source;
mln::style::Source& source;
// Set when the source is added to a map.
jni::Global<jni::Object<Source>> javaPeer;
@@ -96,8 +96,8 @@ protected:
AndroidRendererFrontend* rendererFrontend{nullptr};
// Map pointer is valid only when added to the map.
mbgl::Map* map{nullptr};
mln::Map* map{nullptr};
};
} // namespace android
} // namespace mbgl
} // namespace mln

8
platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.cpp
View File

@@ -3,16 +3,16 @@
namespace {
// Dummy initializer (We don't support initializing this from the JVM)
std::unique_ptr<mbgl::android::UnknownSource> init(jni::JNIEnv&) {
std::unique_ptr<mln::android::UnknownSource> init(jni::JNIEnv&) {
throw std::runtime_error("UnknownSource should not be initialized from the JVM");
}
} // namespace
namespace mbgl {
namespace mln {
namespace android {
UnknownSource::UnknownSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
UnknownSource::UnknownSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
jni::Local<jni::Object<Source>> UnknownSource::createJavaPeer(jni::JNIEnv& env) {
@@ -32,4 +32,4 @@ void UnknownSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/unknown_source.hpp
View File

@@ -4,7 +4,7 @@
#include <mbgl/style/source.hpp>
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class UnknownSource : public Source {
@@ -14,7 +14,7 @@ public:
static void registerNative(jni::JNIEnv&);
UnknownSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
UnknownSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~UnknownSource() = default;
@@ -24,4 +24,4 @@ private:
}; // class UnknownSource
} // namespace android
} // namespace mbgl
} // namespace mln

18
platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.cpp
View File

@@ -17,30 +17,30 @@
#include <string>
#include <vector>
namespace mbgl {
namespace mln {
namespace android {
VectorSource::VectorSource(jni::JNIEnv& env, const jni::String& sourceId, const jni::Object<>& urlOrTileSet)
: Source(env,
std::make_unique<mbgl::style::VectorSource>(jni::Make<std::string>(env, sourceId),
convertURLOrTileset(Value(env, urlOrTileSet)))) {}
std::make_unique<mln::style::VectorSource>(jni::Make<std::string>(env, sourceId),
convertURLOrTileset(Value(env, urlOrTileSet)))) {}
VectorSource::VectorSource(jni::JNIEnv& env, mbgl::style::Source& coreSource, AndroidRendererFrontend* frontend)
VectorSource::VectorSource(jni::JNIEnv& env, mln::style::Source& coreSource, AndroidRendererFrontend* frontend)
: Source(env, coreSource, createJavaPeer(env), frontend) {}
VectorSource::~VectorSource() = default;
jni::Local<jni::String> VectorSource::getURL(jni::JNIEnv& env) {
std::optional<std::string> url = source.as<mbgl::style::VectorSource>()->VectorSource::getURL();
std::optional<std::string> url = source.as<mln::style::VectorSource>()->VectorSource::getURL();
return url ? jni::Make<jni::String>(env, *url) : jni::Local<jni::String>();
}
jni::Local<jni::Array<jni::Object<geojson::Feature>>> VectorSource::querySourceFeatures(
jni::JNIEnv& env, const jni::Array<jni::String>& jSourceLayerIds, const jni::Array<jni::Object<>>& jfilter) {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
using namespace mln::android::conversion;
using namespace mln::android::geojson;
std::vector<mbgl::Feature> features;
std::vector<mln::Feature> features;
if (rendererFrontend) {
features = rendererFrontend->querySourceFeatures(source.getID(),
{toVector(env, jSourceLayerIds), toFilter(env, jfilter)});
@@ -72,4 +72,4 @@ void VectorSource::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/sources/vector_source.hpp
View File

@@ -5,7 +5,7 @@
#include "../../geojson/feature.hpp"
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class VectorSource : public Source {
@@ -16,7 +16,7 @@ public:
static void registerNative(jni::JNIEnv&);
VectorSource(jni::JNIEnv&, const jni::String&, const jni::Object<>&);
VectorSource(jni::JNIEnv&, mbgl::style::Source&, AndroidRendererFrontend*);
VectorSource(jni::JNIEnv&, mln::style::Source&, AndroidRendererFrontend*);
~VectorSource();
private:
@@ -31,4 +31,4 @@ private:
}; // class VectorSource
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/transition_options.cpp
View File

@@ -1,6 +1,6 @@
#include "transition_options.hpp"
namespace mbgl {
namespace mln {
namespace android {
jni::Local<jni::Object<TransitionOptions>> TransitionOptions::fromTransitionOptions(
@@ -24,7 +24,7 @@ long TransitionOptions::getDelay(jni::JNIEnv& env, const jni::Object<TransitionO
}
bool TransitionOptions::isEnablePlacementTransitions(
jni::JNIEnv& env, const jni::Object<mbgl::android::TransitionOptions>& transitionOptions) {
jni::JNIEnv& env, const jni::Object<mln::android::TransitionOptions>& transitionOptions) {
static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
static auto field = javaClass.GetField<jboolean>(env, "enablePlacementTransitions");
return transitionOptions.Get(env, field);
@@ -35,4 +35,4 @@ void TransitionOptions::registerNative(jni::JNIEnv& env) {
}
} // namespace android
} // namespace mbgl
} // namespace mln

6
platform/android/MapLibreAndroid/src/cpp/style/transition_options.hpp
View File

@@ -4,10 +4,10 @@
#include <jni/jni.hpp>
namespace mbgl {
namespace mln {
namespace android {
class TransitionOptions : private mbgl::util::noncopyable {
class TransitionOptions : private mln::util::noncopyable {
public:
static constexpr auto Name() { return "org/maplibre/android/style/layers/TransitionOptions"; };
@@ -26,4 +26,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln

4
platform/android/MapLibreAndroid/src/cpp/style/value.cpp
View File

@@ -2,7 +2,7 @@
#include "../java_types.hpp"
namespace mbgl {
namespace mln {
namespace android {
// Instance
@@ -80,4 +80,4 @@ Value Value::get(const int index) const {
return Value(env, jni::Local<jni::Object<>>(env, jni::GetObjectArrayElement(env, *array, index)));
}
} // namespace android
} // namespace mbgl
} // namespace mln

4
platform/android/MapLibreAndroid/src/cpp/style/value.hpp
View File

@@ -4,7 +4,7 @@
#include <string>
namespace mbgl {
namespace mln {
namespace android {
class Value {
@@ -40,4 +40,4 @@ public:
};
} // namespace android
} // namespace mbgl
} // namespace mln