d62ff400c6
* Refactoring online file source so that tile server configuration is not hardcoded - part 1 * Added default templates * Update from master * Renaming MGLAccountManager to MGLSettings. Passing ResourceOptions and TileServerOptions to relevant classes and method in order to remove mapbox hardocded configuration * Fixing build * Addedm missing theme * Unit tests fixes * Fixing unit tests, adding factory methods for creating predefined configuration. * Fixing mapbox unit tests * Additional unit test fixes * Making MapboxConfiguration default * Making get/set resource options available in all classes that inherits from FileSource * Making get/set resource options available in all classes that inherits from FileSource - part 2 * Fixes for Android * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Disable test coverage reports * Removing hardcoded configuration in iOS project - part 1 * Fixing wrong file extension, making use of tile server options. * Use apiKey and MGL_API_KEY everywhere * Just a rename * Re-enabling tests and improving MGLSettings init * Removing mapbox hardcoded configuration, using api key everywhere, implementing JNI conversion for TileServerOptions * Lint issues. * Integrating configurable tile server properties into Android SDK - part 2 * Removing mabox accounts * Exposing multiple configurations to Android SDK - bug fixes * Removing TileServerOptions from public interface - native methods dont work before mapbox-gl library is loaded * Adding support for configurable predefined styles * Migrating predefined styles in test app + cleanup * Parameter fix * Bug fixes * Fixing render test build * Fixing offline tester * Fixing benchmark tool * Fix: typo in method name * Adding code for public access to TileServerOptions * Bug fixes and debug code removal * Fixes for macOS, adding unit tests from MapLibre, removing redundant members from OnlineFileSource * Unit test fixes * MacOS test app - migrating to configurable tile server options, part 1 * Fixing offline maps * Migrating macOS test app to MapTiler * Minor improvements * Putting back apiKey test * Added unit tests for MapTiler configuration * Migrating test resources to MapTiler * minor fix * A few fixes * Fixing macOS tests, removing feedback functionality * Migrating ios test app to MapTiler * Migrating ui tests * UI tests fix * Benchmarking app fix * Cleanup and strings updates * Migrating benchmark app to maptiler * API key injection in benchmark app * Putting back release configuration * Additional tests and fixing issues identified by thread sanitizer. * Removing test filters * Fixes and addressing lint issues * More Maptiler tests + minro fix * Android instrumentation test migration to MapTiler. Exposing missing TileServerOptions in Android SDK. Minor fixes. * No requirements on API key format. * Fixing offline cache test tool * Adding configurable domain name for sources, adding source domain int MapTiler configuration, cleanup * Migrating tests to MapTiler, adding code for canonicalizing URLs, removing mapbox stuff from comments, cleanup * More tests * Updated database size * Lint issues * Fixed test * Updating developer config API key * Fixes for Android, propagaing updated tileServerOptions to native file sources, more tests * Just a few more fixes * Propagating updated settings to file sources + additional unit test * Lint issues * Removing test filter and fixing incorrect uri * Release preparation * macos release notes
174 lines
4.9 KiB
C++
174 lines
4.9 KiB
C++
#include "jni_native.hpp"
|
|
|
|
#include "annotation/marker.hpp"
|
|
#include "annotation/polygon.hpp"
|
|
#include "annotation/polyline.hpp"
|
|
#include "bitmap.hpp"
|
|
#include "bitmap_factory.hpp"
|
|
#include "connectivity_listener.hpp"
|
|
#include "conversion/collection.hpp"
|
|
#include "conversion/conversion.hpp"
|
|
#include "file_source.hpp"
|
|
#include "geojson/feature.hpp"
|
|
#include "geojson/feature_collection.hpp"
|
|
#include "geojson/geometry.hpp"
|
|
#include "geojson/geometry_collection.hpp"
|
|
#include "geojson/line_string.hpp"
|
|
#include "geojson/multi_line_string.hpp"
|
|
#include "geojson/multi_point.hpp"
|
|
#include "geojson/multi_polygon.hpp"
|
|
#include "geojson/point.hpp"
|
|
#include "geojson/polygon.hpp"
|
|
#include "geometry/lat_lng.hpp"
|
|
#include "geometry/lat_lng_bounds.hpp"
|
|
#include "geometry/lat_lng_quad.hpp"
|
|
#include "geometry/projected_meters.hpp"
|
|
#include "graphics/pointf.hpp"
|
|
#include "graphics/rectf.hpp"
|
|
#include "gson/json_array.hpp"
|
|
#include "gson/json_element.hpp"
|
|
#include "gson/json_object.hpp"
|
|
#include "gson/json_primitive.hpp"
|
|
#include "java_types.hpp"
|
|
#include "map_renderer.hpp"
|
|
#include "map_renderer_runnable.hpp"
|
|
#include "mapbox.hpp"
|
|
#include "native_map_view.hpp"
|
|
#include "util/tile_server_options.hpp"
|
|
#ifndef MBGL_MODULE_OFFLINE_DISABLE
|
|
#include "offline/offline_manager.hpp"
|
|
#include "offline/offline_region.hpp"
|
|
#include "offline/offline_region_definition.hpp"
|
|
#include "offline/offline_region_error.hpp"
|
|
#include "offline/offline_region_status.hpp"
|
|
#endif
|
|
#include "style/transition_options.hpp"
|
|
#include "style/layers/layer_manager.hpp"
|
|
#include "style/sources/source.hpp"
|
|
#include "style/light.hpp"
|
|
#include "style/formatted.hpp"
|
|
#include "style/formatted_section.hpp"
|
|
#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
|
|
#include "snapshotter/map_snapshotter.hpp"
|
|
#include "snapshotter/map_snapshot.hpp"
|
|
#endif
|
|
#include "i18n/collator_jni.hpp"
|
|
#include "i18n/number_format_jni.hpp"
|
|
#include "logger.hpp"
|
|
#include "text/local_glyph_rasterizer_jni.hpp"
|
|
|
|
namespace mbgl {
|
|
namespace android {
|
|
|
|
void RegisterNativeHTTPRequest(JNIEnv&);
|
|
|
|
void registerNatives(JavaVM *vm) {
|
|
theJVM = vm;
|
|
|
|
jni::JNIEnv& env = jni::GetEnv(*vm, jni::jni_version_1_6);
|
|
|
|
// For the FileSource
|
|
static mbgl::util::RunLoop mainRunLoop;
|
|
FileSource::registerNative(env);
|
|
|
|
// Basic types
|
|
java::registerNatives(env);
|
|
java::util::registerNative(env);
|
|
PointF::registerNative(env);
|
|
RectF::registerNative(env);
|
|
|
|
// GeoJSON
|
|
geojson::Feature::registerNative(env);
|
|
geojson::FeatureCollection::registerNative(env);
|
|
geojson::Geometry::registerNative(env);
|
|
geojson::GeometryCollection::registerNative(env);
|
|
geojson::LineString::registerNative(env);
|
|
geojson::MultiLineString::registerNative(env);
|
|
geojson::MultiPoint::registerNative(env);
|
|
geojson::MultiPolygon::registerNative(env);
|
|
geojson::Point::registerNative(env);
|
|
geojson::Polygon::registerNative(env);
|
|
|
|
// Geometry
|
|
LatLng::registerNative(env);
|
|
LatLngBounds::registerNative(env);
|
|
LatLngQuad::registerNative(env);
|
|
ProjectedMeters::registerNative(env);
|
|
|
|
// GSon
|
|
gson::JsonArray::registerNative(env);
|
|
gson::JsonElement::registerNative(env);
|
|
gson::JsonObject::registerNative(env);
|
|
gson::JsonPrimitive::registerNative(env);
|
|
|
|
//Annotation
|
|
Marker::registerNative(env);
|
|
Polygon::registerNative(env);
|
|
Polyline::registerNative(env);
|
|
|
|
// Map
|
|
MapRenderer::registerNative(env);
|
|
MapRendererRunnable::registerNative(env);
|
|
NativeMapView::registerNative(env);
|
|
|
|
// Http
|
|
RegisterNativeHTTPRequest(env);
|
|
|
|
// Bitmap
|
|
Bitmap::registerNative(env);
|
|
BitmapFactory::registerNative(env);
|
|
|
|
// Style
|
|
TransitionOptions::registerNative(env);
|
|
LayerManagerAndroid::get()->registerNative(env);
|
|
Source::registerNative(env);
|
|
Light::registerNative(env);
|
|
Position::registerNative(env);
|
|
Formatted::registerNative(env);
|
|
FormattedSection::registerNative(env);
|
|
|
|
// Map
|
|
CameraPosition::registerNative(env);
|
|
Image::registerNative(env);
|
|
|
|
// Connectivity
|
|
ConnectivityListener::registerNative(env);
|
|
|
|
// Offline
|
|
#ifndef MBGL_MODULE_OFFLINE_DISABLE
|
|
OfflineManager::registerNative(env);
|
|
OfflineRegion::registerNative(env);
|
|
OfflineRegionDefinition::registerNative(env);
|
|
OfflineTilePyramidRegionDefinition::registerNative(env);
|
|
OfflineGeometryRegionDefinition::registerNative(env);
|
|
OfflineRegionError::registerNative(env);
|
|
OfflineRegionStatus::registerNative(env);
|
|
#endif
|
|
|
|
// Snapshotter
|
|
#ifndef MBGL_MODULE_SNAPSHOT_DISABLE
|
|
MapSnapshotter::registerNative(env);
|
|
MapSnapshot::registerNative(env);
|
|
#endif
|
|
|
|
// text
|
|
LocalGlyphRasterizer::registerNative(env);
|
|
Locale::registerNative(env);
|
|
Collator::registerNative(env);
|
|
StringUtils::registerNative(env);
|
|
NumberFormat::registerNative(env);
|
|
|
|
// Logger
|
|
Logger::registerNative(env);
|
|
|
|
// AssetManager
|
|
Mapbox::registerNative(env);
|
|
|
|
// Util
|
|
DefaultStyle::registerNative(env);
|
|
TileServerOptions::registerNative(env);
|
|
}
|
|
|
|
} // namespace android
|
|
} // namespace mbgl
|