From f2d09e0ccce4c52f32c52f3153703dfdbb8d174e Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 21 Dec 2025 08:45:26 +0000 Subject: [PATCH] chore(android): remove V10 compat layer Remove the mapbox-v11-compat/v10 directory and associated build.gradle conditionals. V10 support was already dropped in 10.3.0; this cleanup removes the remaining V10 compatibility code to simplify the codebase for V11-only support going forward. The version validation is kept to error out if someone sets RNMapboxMapsVersion to < 11. --- android/build.gradle | 28 +- .../layers/generated/RasterParticleLayer.kt | 58 -- .../sources/generated/RasterArraySource.kt | 20 - .../styles/layers/RNMBXRasterParticleLayer.kt | 22 - .../layers/RNMBXRasterParticleLayerManager.kt | 59 -- .../styles/sources/RNMBXRasterArraySource.kt | 16 - .../sources/RNMBXRasterArraySourceManager.kt | 59 -- .../rnmapbox/rnmbx/v11compat/Annotation.kt | 40 - .../rnmapbox/rnmbx/v11compat/Cancelable.kt | 15 - .../v10/com/rnmapbox/rnmbx/v11compat/Event.kt | 17 - .../com/rnmapbox/rnmbx/v11compat/Feature.kt | 10 - .../rnmbx/v11compat/HttpInterceptor.kt | 22 - .../v10/com/rnmapbox/rnmbx/v11compat/Image.kt | 69 -- .../v10/com/rnmapbox/rnmbx/v11compat/Layer.kt | 7 - .../v10/com/rnmapbox/rnmbx/v11compat/Light.kt | 15 - .../com/rnmapbox/rnmbx/v11compat/Location.kt | 62 -- .../com/rnmapbox/rnmbx/v11compat/MapboxMap.kt | 67 -- .../rnmbx/v11compat/OfflineManager.kt | 51 -- .../rnmbx/v11compat/OrnamentSettings.kt | 96 --- .../rnmbx/v11compat/ResourceOption.kt | 12 - .../com/rnmapbox/rnmbx/v11compat/Snapshot.kt | 28 - .../rnmapbox/rnmbx/v11compat/StyleFactory.kt | 809 ------------------ .../v10/com/rnmapbox/rnmbx/v11compat/style.kt | 9 - 23 files changed, 13 insertions(+), 1578 deletions(-) delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/layers/generated/RasterParticleLayer.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/sources/generated/RasterArraySource.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Cancelable.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Event.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Feature.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/HttpInterceptor.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layer.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Light.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OrnamentSettings.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/ResourceOption.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Snapshot.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt delete mode 100644 android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/style.kt diff --git a/android/build.gradle b/android/build.gradle index 65eeced410..a60d2e6b83 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -76,21 +76,22 @@ android { throw new GradleException(msg) } else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") { - sourceSets { - main { - java.srcDirs = ['src/main/java'] - def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion) - def majorMapboxVersion = mapboxVersion.split("\\.")[0] as Integer - if (majorMapboxVersion >= 11) { - java.srcDirs += 'src/main/mapbox-v11-compat/v11' - } else { - def msg = """ + // Validate Mapbox version is v11+ + def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion) + def majorMapboxVersion = mapboxVersion.split("\\.")[0] as Integer + if (majorMapboxVersion < 11) { + def msg = """ ❌ ERROR: Mapbox v10 is no longer supported as of @rnmapbox/maps 10.3.0 Please upgrade to Mapbox v11.x or use @rnmapbox/maps 10.2.x """ - logger.error(msg) - throw new GradleException(msg) - } + logger.error(msg) + throw new GradleException(msg) + } + + sourceSets { + main { + java.srcDirs = ['src/main/java'] + java.srcDirs += 'src/main/mapbox-v11-compat/v11' java.srcDirs += 'src/main/rn-compat/rn75' // Adapted from react-native-screens for consistency @@ -219,9 +220,6 @@ Please upgrade to Mapbox v11.x or use @rnmapbox/maps 10.2.x } } - if (safeExtGet("RNMapboxMapsUseV11", false)) { - logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*") - } } } diff --git a/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/layers/generated/RasterParticleLayer.kt b/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/layers/generated/RasterParticleLayer.kt deleted file mode 100644 index 85a03badb2..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/layers/generated/RasterParticleLayer.kt +++ /dev/null @@ -1,58 +0,0 @@ -// Dummy RasterParticleLayer for v10 compatibility -// RasterParticleLayer is only available in Mapbox SDK v11+ -package com.mapbox.maps.extension.style.layers.generated - -import com.mapbox.maps.extension.style.expressions.generated.Expression -import com.mapbox.maps.extension.style.layers.properties.generated.Visibility -import com.mapbox.maps.extension.style.types.StyleTransition - -/** - * Dummy implementation of RasterParticleLayer for v10 compatibility. - * This class should never be instantiated in v10 builds. - * Note: Does not extend Layer to avoid abstract method issues in v10. - */ -class RasterParticleLayer(private val id: String, private val sourceId: String) { - - val layerId: String - get() = id - - var minZoom: Double? = null - private set - - var maxZoom: Double? = null - private set - - var visibility: Visibility? = null - private set - - fun minZoom(minZoom: Double): RasterParticleLayer { - this.minZoom = minZoom - return this - } - - fun maxZoom(maxZoom: Double): RasterParticleLayer { - this.maxZoom = maxZoom - return this - } - - fun getType(): String = "raster-particle" - - fun rasterParticleArrayBand(value: String) {} - fun rasterParticleArrayBand(expression: Expression) {} - fun rasterParticleCount(value: Long) {} - fun rasterParticleCount(expression: Expression) {} - fun rasterParticleColor(expression: Expression) {} - fun rasterParticleMaxSpeed(value: Double) {} - fun rasterParticleMaxSpeed(expression: Expression) {} - fun rasterParticleSpeedFactor(value: Double) {} - fun rasterParticleSpeedFactor(expression: Expression) {} - fun rasterParticleSpeedFactorTransition(transition: StyleTransition) {} - fun rasterParticleFadeOpacityFactor(value: Double) {} - fun rasterParticleFadeOpacityFactor(expression: Expression) {} - fun rasterParticleFadeOpacityFactorTransition(transition: StyleTransition) {} - fun rasterParticleResetRateFactor(value: Double) {} - fun rasterParticleResetRateFactor(expression: Expression) {} - fun visibility(visibility: Visibility) { - this.visibility = visibility - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/sources/generated/RasterArraySource.kt b/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/sources/generated/RasterArraySource.kt deleted file mode 100644 index f94922c6f7..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/mapbox/maps/extension/style/sources/generated/RasterArraySource.kt +++ /dev/null @@ -1,20 +0,0 @@ -// Dummy RasterArraySource for v10 compatibility -// RasterArraySource is only available in Mapbox SDK v11+ -package com.mapbox.maps.extension.style.sources.generated - -/** - * Dummy implementation of RasterArraySource for v10 compatibility. - * This class should never be instantiated in v10 builds. - * Note: Does not extend Source to avoid abstract method issues in v10. - */ -class RasterArraySource private constructor( - builder: Builder -) { - val sourceId: String = builder.sourceId - - class Builder(val sourceId: String) { - fun url(url: String): Builder = this - fun tileSize(tileSize: Long): Builder = this - fun build(): RasterArraySource = RasterArraySource(this) - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt deleted file mode 100644 index 2ff3d2025c..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayer.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.rnmapbox.rnmbx.components.styles.layers - -import android.content.Context -import android.view.ViewGroup - -/** - * Dummy implementation of RNMBXRasterParticleLayer for v10 compatibility. - * This class extends ViewGroup directly (instead of RNMBXLayer) to avoid - * inheriting from Layer which has internal abstract methods in v10. - * This class should never be instantiated in v10 builds. - */ -class RNMBXRasterParticleLayer(context: Context) : ViewGroup(context) { - var mSourceLayerID: String? = null - - override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) { - // Stub - never called - } - - fun setSourceLayerID(sourceLayer: String?) { - mSourceLayerID = sourceLayer - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt deleted file mode 100644 index 76bdc5eaca..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/layers/RNMBXRasterParticleLayerManager.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.rnmapbox.rnmbx.components.styles.layers - -import com.facebook.react.bridge.Dynamic -import com.facebook.react.uimanager.ThemedReactContext -import com.facebook.react.uimanager.ViewGroupManager -import com.facebook.react.uimanager.annotations.ReactProp -import com.facebook.react.viewmanagers.RNMBXRasterParticleLayerManagerInterface - -class RNMBXRasterParticleLayerManager : ViewGroupManager(), - RNMBXRasterParticleLayerManagerInterface { - override fun getName(): String { - return REACT_CLASS - } - - override fun createViewInstance(reactContext: ThemedReactContext): RNMBXRasterParticleLayer { - throw UnsupportedOperationException("RasterParticleLayer is only supported in Mapbox v11+") - } - - @ReactProp(name = "id") - override fun setId(layer: RNMBXRasterParticleLayer, id: Dynamic) {} - - @ReactProp(name = "existing") - override fun setExisting(layer: RNMBXRasterParticleLayer, existing: Dynamic) {} - - @ReactProp(name = "sourceID") - override fun setSourceID(layer: RNMBXRasterParticleLayer, sourceID: Dynamic) {} - - @ReactProp(name = "aboveLayerID") - override fun setAboveLayerID(layer: RNMBXRasterParticleLayer, aboveLayerID: Dynamic) {} - - @ReactProp(name = "belowLayerID") - override fun setBelowLayerID(layer: RNMBXRasterParticleLayer, belowLayerID: Dynamic) {} - - @ReactProp(name = "layerIndex") - override fun setLayerIndex(layer: RNMBXRasterParticleLayer, layerIndex: Dynamic) {} - - @ReactProp(name = "minZoomLevel") - override fun setMinZoomLevel(layer: RNMBXRasterParticleLayer, minZoomLevel: Dynamic) {} - - @ReactProp(name = "maxZoomLevel") - override fun setMaxZoomLevel(layer: RNMBXRasterParticleLayer, maxZoomLevel: Dynamic) {} - - @ReactProp(name = "reactStyle") - override fun setReactStyle(layer: RNMBXRasterParticleLayer, style: Dynamic) {} - - @ReactProp(name = "sourceLayerID") - override fun setSourceLayerID(layer: RNMBXRasterParticleLayer, sourceLayerID: Dynamic) {} - - @ReactProp(name = "filter") - override fun setFilter(layer: RNMBXRasterParticleLayer, filterList: Dynamic) {} - - @ReactProp(name = "slot") - override fun setSlot(layer: RNMBXRasterParticleLayer, slot: Dynamic) {} - - companion object { - const val REACT_CLASS = "RNMBXRasterParticleLayer" - const val isImplemented = false - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt deleted file mode 100644 index fc536d74f7..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySource.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.rnmapbox.rnmbx.components.styles.sources - -import android.content.Context -import android.view.ViewGroup - -/** - * Dummy implementation of RNMBXRasterArraySource for v10 compatibility. - * This class extends ViewGroup directly (instead of RNMBXTileSource) to avoid - * inheriting from Source which has internal abstract methods in v10. - * This class should never be instantiated in v10 builds. - */ -class RNMBXRasterArraySource(context: Context) : ViewGroup(context) { - override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) { - // Stub - never called - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt deleted file mode 100644 index e6d11ccc1e..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.rnmapbox.rnmbx.components.styles.sources - -import com.facebook.react.bridge.Dynamic -import com.facebook.react.bridge.ReactApplicationContext -import com.facebook.react.uimanager.ThemedReactContext -import com.facebook.react.uimanager.ViewGroupManager -import com.facebook.react.uimanager.annotations.ReactProp -import com.facebook.react.viewmanagers.RNMBXRasterArraySourceManagerInterface -import javax.annotation.Nonnull - -class RNMBXRasterArraySourceManager(reactApplicationContext: ReactApplicationContext) : - ViewGroupManager(), - RNMBXRasterArraySourceManagerInterface { - @Nonnull - override fun getName(): String { - return REACT_CLASS - } - - @Nonnull - override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXRasterArraySource { - throw UnsupportedOperationException("RasterArraySource is only supported in Mapbox v11+") - } - - @ReactProp(name = "id") - override fun setId(source: RNMBXRasterArraySource, id: Dynamic) {} - - @ReactProp(name = "url") - override fun setUrl(source: RNMBXRasterArraySource, url: Dynamic) {} - - @ReactProp(name = "tileUrlTemplates") - override fun setTileUrlTemplates(source: RNMBXRasterArraySource, tileUrlTemplates: Dynamic) {} - - @ReactProp(name = "tileSize") - override fun setTileSize(source: RNMBXRasterArraySource, tileSize: Dynamic) {} - - @ReactProp(name = "minZoomLevel") - override fun setMinZoomLevel(source: RNMBXRasterArraySource, minZoomLevel: Dynamic) {} - - @ReactProp(name = "maxZoomLevel") - override fun setMaxZoomLevel(source: RNMBXRasterArraySource, maxZoomLevel: Dynamic) {} - - @ReactProp(name = "attribution") - fun setAttribution(source: RNMBXRasterArraySource, attribution: Dynamic) {} - - fun customEvents(): Map? { - return null - } - - companion object { - const val REACT_CLASS = "RNMBXRasterArraySource" - const val isImplemented = false - } - - @ReactProp(name = "existing") - override fun setExisting(source: RNMBXRasterArraySource, value: Dynamic) {} - - @ReactProp(name = "sourceBounds") - override fun setSourceBounds(source: RNMBXRasterArraySource, value: Dynamic) {} -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt deleted file mode 100644 index 0216489c6e..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.annotation; - -import android.view.View -import com.mapbox.maps.ScreenCoordinate -import com.mapbox.maps.ViewAnnotationOptions -import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener as _OnViewAnnotationUpdatedListener - - -public const val INVALID_ANNOTATION_ID: Long = -1 -typealias AnnotationID = Long - -fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double): ViewAnnotationOptions.Builder { - return offsetX(x.toInt()).offsetY(y.toInt()) -} - -fun ViewAnnotationOptions.Builder.width(value: Double): ViewAnnotationOptions.Builder { - return this.width(value.toInt()) -} - -fun ViewAnnotationOptions.Builder.height(value: Double): ViewAnnotationOptions.Builder { - return this.height(value.toInt()) -} - -fun ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder { - return this; -} - -fun ViewAnnotationOptions.Builder.ignoreCameraPadding(value: Boolean): ViewAnnotationOptions.Builder { - return this; -} - -abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener { - override fun onViewAnnotationPositionUpdated( - view: View, - leftTopCoordinate: ScreenCoordinate, - width: Int, - height: Int - ) { - } -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Cancelable.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Cancelable.kt deleted file mode 100644 index 79f5434b69..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Cancelable.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat -/** - * Allows to cancel the associated asynchronous operation - * - * The associated asynchronous operation is not automatically canceled if this - * object goes out of scope. - */ -interface Cancelable { - /** - * Cancels the associated asynchronous operation - * - * If the associated asynchronous operation has already finished, this call is ignored. - */ - fun cancel() -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Event.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Event.kt deleted file mode 100644 index bdcef861af..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Event.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.event; - -//import com.mapbox.maps.MapboxMap -//import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData - -//fun MapboxMap.subscribe(callback: (Any?)->Void) { -// -//} - -import com.mapbox.maps.Event -import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData -import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData as _getMapLoadingErrorEventData - -fun Event.getMapLoadingErrorEventData() : MapLoadingErrorEventData { - return _getMapLoadingErrorEventData() -}; - diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Feature.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Feature.kt deleted file mode 100644 index ba32e1b8c5..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Feature.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.feature; - -import com.mapbox.geojson.Feature; - -import com.mapbox.maps.QueriedFeature as _QueriedFeature; - -typealias QueriedRenderedFeature = _QueriedFeature; - -typealias QueriedSourceFeature = _QueriedFeature; - diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/HttpInterceptor.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/HttpInterceptor.kt deleted file mode 100644 index 3f4b23b629..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/HttpInterceptor.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.httpinterceptor; - -import com.mapbox.common.* - -open class HttpServiceBase : HttpServiceInterceptorInterface { - override fun onRequest(request: HttpRequest): HttpRequest { - return request - } - - override fun onDownload(download: DownloadOptions): DownloadOptions { - return download - } - - override fun onResponse(response: HttpResponse): HttpResponse { - return response - } - -/* override fun onUpload(options: UploadOptions): UploadOptions { - return options - } -*/ -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt deleted file mode 100644 index 09dc68adb0..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt +++ /dev/null @@ -1,69 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.image; - -import android.content.Context -import android.content.res.Resources -import android.graphics.Bitmap -import android.graphics.drawable.BitmapDrawable -import android.graphics.drawable.Drawable -import android.graphics.drawable.VectorDrawable -import androidx.annotation.DrawableRes -import androidx.appcompat.content.res.AppCompatResources -import com.mapbox.maps.Image -import com.mapbox.maps.Style -import com.rnmapbox.rnmbx.components.images.ImageInfo -import java.nio.ByteBuffer - -typealias ImageHolder = Drawable; - -fun ByteArray.toByteArray(): ByteArray { - return this -} - -fun ByteArray.toImageData() : ByteArray { - return this -} - -fun VectorDrawable.toBitmapImageHolder(): Drawable { - return this -} - -fun BitmapDrawable.toBitmapImageHolder(): ImageHolder { - return this -} - -fun emptyImage(width: Int, height: Int): Image { - return Image(width, height, ByteArray(width * height * 4) /* ByteBuffer.allocateDirect(width * height * 4).array()*/) -} - -fun Bitmap.toMapboxImage(): Image { - val byteBuffer = ByteBuffer.allocate(byteCount) - copyPixelsToBuffer(byteBuffer) - return Image(width, height, byteBuffer.array()) -} - -fun Style.addStyleImage(imageId: String, image: Image, info: ImageInfo, scale: Double = 1.0) { - addStyleImage(imageId, (info.getScaleOr(1.0) * scale).toFloat(), image, info.sdf, info.stretchX, info.stretchY, info.content) -} - -fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, info: ImageInfo, scale: Double = 1.0) { - addStyleImage(imageId, bitmap.toMapboxImage(), info, scale) -} - -class AppCompatResourcesV11 { - companion object { - fun getDrawableImageHolder(context: Context, @DrawableRes resId: Int) : ImageHolder? { - return AppCompatResources.getDrawable(context, resId) - } - } -} - -fun Image.toDrawable(): Drawable { - val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888) - bitmap.copyPixelsFromBuffer(ByteBuffer.wrap(data)) - - return BitmapDrawable(Resources.getSystem(), bitmap) -} - -fun Image.toImageHolder(): ImageHolder { - return toDrawable() -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layer.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layer.kt deleted file mode 100644 index f2ac4bf369..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Layer.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.layer; - -import com.mapbox.maps.extension.style.layers.Layer - -fun Layer.slot(slot: String) { - // V11 only -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Light.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Light.kt deleted file mode 100644 index e3a3446432..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Light.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.light; - -import com.mapbox.maps.Style -import com.mapbox.maps.extension.style.light.generated.Light as _Light; -import com.mapbox.maps.extension.style.light.generated.setLight as _setLight - -typealias Light = _Light - -fun Style.setLight(light: Light) { - this._setLight(light) -} - -fun createLight(): Light { - return Light() -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt deleted file mode 100644 index ad24cab5ad..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.location; - -import android.Manifest.permission.ACCESS_COARSE_LOCATION -import android.Manifest.permission.ACCESS_FINE_LOCATION -import android.content.Context -import android.os.Looper -import androidx.annotation.RequiresPermission -import com.mapbox.maps.MapView -import com.mapbox.maps.plugin.PuckBearingSource -import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin2 -import com.mapbox.maps.plugin.locationcomponent.location2 as _location2 -import com.mapbox.android.core.location.LocationEngineResult as _LocationEngineResult -import com.mapbox.android.core.location.LocationEngine as _LocationEngine -import com.mapbox.android.core.location.LocationEngineCallback as _LocationEngineCallback -import com.mapbox.android.core.location.LocationEngineRequest -import com.mapbox.android.core.location.LocationEngineProvider - - -import android.location.Location as _Location - -typealias Location = _Location; -typealias PuckBearing = PuckBearingSource - -val MapView.location2 : LocationComponentPlugin2 - get() = _location2 - - -var LocationComponentPlugin2.puckBearing: PuckBearingSource - get() = this.puckBearingSource - set(value) { puckBearingSource = value } - -typealias LocationEngine = _LocationEngine -typealias LocationEngineResult = _LocationEngineResult -typealias LocationEngineCallback = _LocationEngineCallback - -const val DEFAULT_FASTEST_INTERVAL_MILLIS: Long = 1000 -const val DEFAULT_INTERVAL_MILLIS: Long = 1000 - -@RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION]) -fun LocationEngine.requestLocationUpdatesV11(callback: LocationEngineCallback, looper: Looper?, minDisplacement: Float?) { - val builder = LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS) - .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS) - .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY) - if (minDisplacement != null && minDisplacement > 0.0) { - builder.setDisplacement(minDisplacement) - } - val request = builder - .build(); - - this.requestLocationUpdates( - request, - callback, - looper - ) -} - -val Location.timestamp: Long - get() = this.time - -fun createLocationEngine(context: Context): LocationEngine { - return LocationEngineProvider.getBestLocationEngine(context) -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt deleted file mode 100644 index 08b1cec359..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt +++ /dev/null @@ -1,67 +0,0 @@ - -package com.rnmapbox.rnmbx.v11compat.mapboxmap - -import android.animation.Animator -import android.app.Activity -import android.content.Context -import android.content.ContextWrapper -import androidx.activity.result.contract.ActivityResultContracts -import com.mapbox.bindgen.Expected -import com.mapbox.bindgen.ExpectedFactory -import com.mapbox.bindgen.None -import com.mapbox.bindgen.Value -import com.mapbox.maps.CameraOptions -import com.mapbox.maps.MapView -import com.mapbox.maps.MapboxMap -import com.mapbox.maps.plugin.animation.MapAnimationOptions -import com.mapbox.maps.plugin.animation.easeTo -import com.mapbox.maps.plugin.animation.flyTo - -fun MapboxMap.setFeatureStateCompat( - sourceId: String, - sourceLayerId: String?, - featureId: String, - state: Value, - callback: (Expected) -> Unit -) { - this.setFeatureState(sourceId, sourceLayerId, featureId, state) - callback(ExpectedFactory.createNone()) -} - -fun MapboxMap.removeFeatureStateCompat( - sourceId: String, - sourceLayerId: String?, - featureId: String, - stateKey: String?, - callback: (Expected) -> Unit -) { - this.removeFeatureState(sourceId, sourceLayerId, featureId, stateKey) - callback(ExpectedFactory.createNone()) -} - -fun MapboxMap.flyToV11( - cameraOptions: CameraOptions, - animationOptions: MapAnimationOptions.Builder, - callback: Animator.AnimatorListener -) { - this.flyTo( - cameraOptions, - animationOptions.apply { animatorListener(callback) }.build(), - ) -} - -fun MapboxMap.easeToV11( - cameraOptions: CameraOptions, - animationOptions: MapAnimationOptions.Builder, - callback: Animator.AnimatorListener -) { - this.easeTo( - cameraOptions, - animationOptions.apply { animatorListener(callback) }.build(), - - ) -} - -fun MapboxMap.Companion.clearData(context: Context, callback: (result: Expected) -> Unit) { - MapView(context).getMapboxMap().clearData(callback) -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt deleted file mode 100644 index 788fbeed84..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.offlinemanager; - -import com.mapbox.common.TileStore -import com.mapbox.common.TileStoreOptions -import com.mapbox.common.toValue -import com.mapbox.maps.OfflineManager -import com.mapbox.maps.OfflineRegionManager -import com.mapbox.maps.ResourceOptions -import com.mapbox.maps.StylePackLoadOptions -import com.mapbox.maps.TilesetDescriptorOptions -import com.mapbox.maps.TilesetDescriptorOptionsForTilesets -import com.mapbox.common.TilesetDescriptor - -fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager { - return OfflineRegionManager(ResourceOptions.Builder().accessToken(getAccessToken()).build()) -} - -fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager { - return OfflineManager( - ResourceOptions.Builder() - .accessToken(getAccessToken()).tileStore( - tileStore - ).build() - ) -} - -fun getTilesetDescriptors(offlineManager: OfflineManager, styleURI: String, minZoom: Byte, maxZoom: Byte, stylePackOptions: StylePackLoadOptions, tilesets: List): ArrayList{ - val descriptorOptions = TilesetDescriptorOptions.Builder() - .styleURI(styleURI) - .minZoom(minZoom) - .maxZoom(maxZoom) - .stylePackOptions(stylePackOptions) - .pixelRatio(2.0f) - .build() - val descriptor = offlineManager.createTilesetDescriptor(descriptorOptions) - val descriptors = arrayListOf(descriptor) - if (tilesets.isNotEmpty()) { - val tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets.Builder() - .tilesets(tilesets) - .minZoom(minZoom) - .maxZoom(maxZoom) - .build() - val tilesetDescriptor = offlineManager.createTilesetDescriptor(tilesetDescriptorOptions) - descriptors.add(tilesetDescriptor) - } - return descriptors -} - -fun TileStore.setAccessToken(token: String) { - this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue()); -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OrnamentSettings.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OrnamentSettings.kt deleted file mode 100644 index 383fe2ccce..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OrnamentSettings.kt +++ /dev/null @@ -1,96 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.ornamentsettings - -import com.mapbox.maps.plugin.attribution.generated.AttributionSettings -import com.mapbox.maps.plugin.compass.generated.CompassSettings -import com.mapbox.maps.plugin.logo.generated.LogoSettings -import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings -import com.rnmapbox.rnmbx.components.mapview.OrnamentSettings - -fun getAttributionSettings(): AttributionSettings { - return AttributionSettings() -} - -interface GenericOrnamentSettings { - fun setHMargins(left: Float?, right: Float?) - fun setVMargins(top: Float?, bottom: Float?) - var enabled: Boolean - var position: Int -} - -fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings { - private val settings = this@toGenericOrnamentSettings - override fun setHMargins(left: Float?, right: Float?) { - left?.let { settings.marginLeft = it } - right?.let { settings.marginRight = it } - } - override fun setVMargins(top: Float?, bottom: Float?) { - top?.let { settings.marginTop = it } - bottom?.let { settings.marginBottom = it } - } - override var enabled: Boolean - get() = settings.enabled - set(value) { settings.enabled = value } - override var position: Int - get() = settings.position - set(value) { settings.position = value } -} - -fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings { - private var settings = this@toGenericOrnamentSettings - override fun setHMargins(left: Float?, right: Float?) { - left?.let { settings.marginLeft = it } - right?.let { settings.marginRight = it } - } - override fun setVMargins(top: Float?, bottom: Float?) { - top?.let { settings.marginTop = it } - bottom?.let { settings.marginBottom = it } - } - override var enabled: Boolean - get() = settings.enabled - set(value) { settings.enabled = value } - override var position: Int - get() = settings.position - set(value) { - settings.position = value - } -} - -fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings { - private var settings = this@toGenericOrnamentSettings - override fun setHMargins(left: Float?, right: Float?) { - left?.let { settings.marginLeft = it } - right?.let { settings.marginRight = it } - } - override fun setVMargins(top: Float?, bottom: Float?) { - top?.let { settings.marginTop = it } - bottom?.let { settings.marginBottom = it } - } - override var enabled: Boolean - get() = settings.enabled - set(value) { settings.enabled = value } - override var position: Int - get() = settings.position - set(value) { - settings.position = value - } -} - -fun AttributionSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings { - private var settings = this@toGenericOrnamentSettings; - override fun setHMargins(left: Float?, right: Float?) { - left?.let { settings.marginLeft = it } - right?.let { settings.marginRight = it } - } - override fun setVMargins(top: Float?, bottom: Float?) { - top?.let { settings.marginTop = it } - bottom?.let { settings.marginBottom = it } - } - override var enabled: Boolean - get() = settings.enabled - set(value) { settings.enabled = value } - override var position: Int - get() = settings.position - set(value) { - settings.position = value - } -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/ResourceOption.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/ResourceOption.kt deleted file mode 100644 index 5e326bab6c..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/ResourceOption.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.resourceoption; - -import android.content.Context -import com.mapbox.maps.ResourceOptionsManager.Companion.getDefault - -fun setMapboxAccessToken(context: Context, accessToken: String?) { - getDefault(context, accessToken) -} - -fun getMapboxAccessToken(context: Context?): String { - return getDefault((context)!!, null).resourceOptions.accessToken -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Snapshot.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Snapshot.kt deleted file mode 100644 index d2bf973ae6..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Snapshot.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.snapshot; - -import com.mapbox.maps.Image -import com.mapbox.maps.MapSnapshotInterface; -import com.mapbox.maps.MapSnapshotOptions -import com.mapbox.maps.ResourceOptions; -import com.mapbox.maps.Snapshotter -import com.mapbox.maps.bitmap - - -fun MapSnapshotOptions.Builder.accessToken(accessToken: String?) { - if (accessToken != null) { - this.resourceOptions( - ResourceOptions.Builder().accessToken(accessToken).build() - ) - } -} - - -fun MapSnapshotInterface.toMapboxImage(): Image { - return this.image() -} - -fun Snapshotter.startV11(callback: (MapSnapshotInterface?, String?) -> Unit) { - this.start { image -> - callback(image, if (image == null) "Snapshot error" else null) - } -} \ No newline at end of file diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt deleted file mode 100644 index 0896fe363f..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/StyleFactory.kt +++ /dev/null @@ -1,809 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.stylefactory; - -import com.mapbox.maps.extension.style.atmosphere.generated.Atmosphere -import com.mapbox.maps.extension.style.expressions.generated.Expression -import com.mapbox.maps.extension.style.layers.generated.BackgroundLayer -import com.mapbox.maps.extension.style.layers.generated.CircleLayer -import com.mapbox.maps.extension.style.layers.generated.FillExtrusionLayer -import com.mapbox.maps.extension.style.layers.generated.FillLayer -import com.mapbox.maps.extension.style.layers.generated.LineLayer -import com.mapbox.maps.extension.style.layers.generated.ModelLayer -import com.mapbox.maps.extension.style.layers.generated.RasterLayer -import com.mapbox.maps.extension.style.layers.generated.SymbolLayer -import com.mapbox.maps.extension.style.types.StyleTransition - -internal fun RasterLayer.rasterColor(rasterColor: Int) { - this.rasterColor(Expression.color(rasterColor)) -} - -internal fun ModelLayer.modelOpacity(expression: Expression) { - TODO("v11 only") -} - -internal fun SymbolLayer.symbolZElevate(expression: Expression) { - TODO("v11 only") -} - -internal fun LineLayer.lineEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun LineLayer.lineEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun Atmosphere.verticalRangeTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillLayer.fillEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillLayer.fillEmissiveStrength(expression: Double) { - TODO("v11 only") -} - -internal fun FillLayer.fillEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelHeightBasedEmissiveStrengthMultiplier(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelCutoffFadeRange(value: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelCutoffFadeRange(value: Double) { - TODO("v11 only") -} - -internal fun BackgroundLayer.backgroundEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun Atmosphere.verticalRange(value: Expression) { - TODO("v11 only") -} - -internal fun Atmosphere.verticalRange(value: kotlin.collections.List) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightIntensity(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionWallRadius(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionRoundedRoof(value: Expression?) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconImageCrossFade(expression: Expression) { - TODO("v11 only") -} - -internal fun SymbolLayer.textEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun SymbolLayer.textEmissiveStrength(value: Double) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun SymbolLayer.symbolZElevate(expression: Boolean) { - TODO("v11 only") -} - -internal fun LineLayer.lineEmissiveStrength(value: Double) { - TODO("v11 only") -} - -internal fun BackgroundLayer.backgroundEmissiveStrength(expression: Double) { - TODO("v11 only") -} - -internal fun BackgroundLayer.backgroundEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelHeightBasedEmissiveStrengthMultiplierTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelHeightBasedEmissiveStrengthMultiplier(expression: List) { - TODO("v11 only") -} - -internal fun ModelLayer.modelRoughnessTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelRoughness(expression: Double) { - TODO("v11 only") -} - -internal fun ModelLayer.modelRoughness(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelEmissiveStrength(expression: Double) { - TODO("v11 only") -} - -internal fun ModelLayer.modelEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelAmbientOcclusionIntensityTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelAmbientOcclusionIntensity(expression: Double) { - TODO("v11 only") -} - -internal fun ModelLayer.modelAmbientOcclusionIntensity(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelReceiveShadows(expression: Boolean) { - TODO("v11 only") -} - -internal fun ModelLayer.modelReceiveShadows(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelCastShadows(expression: Boolean) { - TODO("v11 only") -} - -internal fun ModelLayer.modelCastShadows(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColorMixIntensityTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColorMixIntensity(expression: Double) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColorMixIntensity(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColorTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColor(expression: Int) { - TODO("v11 only") -} - -internal fun ModelLayer.modelColor(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelTranslationTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelTranslation(expression: List) { - TODO("v11 only") -} - -internal fun ModelLayer.modelTranslation(expression: Expression) { - TODO("v11 only") -} - -internal fun ModelLayer.modelOpacityTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun ModelLayer.modelOpacity(expression: Double) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorRangeTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorRange(expression: List) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorRange(expression: Expression) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorMixTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorMix(expression: List) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColorMix(expression: Expression) { - TODO("v11 only") -} - -internal fun RasterLayer.rasterColor(rasterColor: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionCutoffFadeRange(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionCutoffFadeRange(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionVerticalScaleTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightIntensity(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundAttenuation(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundAttenuationTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionWallRadius(expression: Double) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconImageCrossFade(expression: Double) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconEmissiveStrength(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionVerticalScale(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionVerticalScale(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundAttenuationTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundAttenuation(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundRadiusTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundRadius(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightGroundRadius(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightWallRadiusTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightWallRadius(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightWallRadius(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightIntensityTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightColorTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightColor(expression: Int) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionFloodLightColor(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundAttenuation(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundAttenuation(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundRadiusTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundRadius(expression: Double) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionGroundRadius(expression: Expression) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionAmbientOcclusionWallRadiusTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun FillExtrusionLayer.fillExtrusionRoundedRoof(value: Boolean) { - TODO("v11 only") -} - -internal fun CircleLayer.circleEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun CircleLayer.circleEmissiveStrength(expression: Double) { - TODO("v11 only") -} - -internal fun CircleLayer.circleEmissiveStrength(expression: Expression) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconImageCrossFadeTransition(transition: StyleTransition) { - TODO("v11 only") -} - -internal fun SymbolLayer.textEmissiveStrength(value: Expression) { - TODO("v11 only") -} - -internal fun SymbolLayer.iconEmissiveStrengthTransition(transition: StyleTransition) { - TODO("v11 only") -} - - - -class FillExtrusionBaseAlignment(valueOf: Any) { - companion object -} - -internal fun FillExtrusionBaseAlignment.Companion.valueOf(enumName: String) : String { - return enumName -} - -internal fun LineElevationReference.Companion.valueOf(enumName: String) : String { - return enumName -} - -class LineElevationReference { - companion object -} - -internal fun SymbolLayer.textOcclusionOpacityTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.textOcclusionOpacity( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.textOcclusionOpacity( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.iconOcclusionOpacity( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.iconOcclusionOpacity( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineTrimColorTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionBaseAlignment( - valueOf: Any -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionLineWidthTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterElevationTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun BackgroundLayer.backgroundPitchAlignment( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterElevation(value: Double) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterElevation(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterArrayBand(value: String) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterArrayBand(expression: Expression) { - TODO("Not yet implemented") -} - - - -internal fun RasterLayer.rasterEmissiveStrengthTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterEmissiveStrength( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterEmissiveStrength( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionLineWidth( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionLineWidth( - value: Expression -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionHeightAlignment( - valueOf: String -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionHeightAlignment( - valueOf: Expression -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionPatternCrossFade( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun FillExtrusionLayer.fillExtrusionPatternCrossFade( - value: Expression -) { - TODO("Not yet implemented") -} - -internal fun CircleLayer.circleElevationReference( - valueOf: Any -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.symbolZOffsetTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.symbolZOffset(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.symbolZOffset(value: Double) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.iconColorSaturation( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.iconColorSaturation( - value: Double -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.iconOcclusionOpacityTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.symbolElevationReference( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.symbolElevationReference( - value: String -) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineOcclusionOpacityTransition( - transition: StyleTransition -) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineOcclusionOpacity( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineOcclusionOpacity( - value: Double -) { - TODO("Not yet implemented") -} - - - -internal fun LineLayer.lineTrimColor(value: Int) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineTrimFadeRange(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun LineLayer.linePatternCrossFade(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun LineLayer.linePatternCrossFade(value: Double) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineCrossSlope(value: Double) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineCrossSlope(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineElevationReference( - expression: Expression -) { -} - -internal fun LineLayer.lineElevationReference( - value: Double -) { -} - -internal fun LineLayer.lineElevationReference( - value: String -) { -} - -internal fun LineLayer.lineZOffset(expression: Expression) {} - -internal fun LineLayer.lineZOffset(value: Double) {} - -internal fun FillLayer.fillPatternCrossFade( - expression: Expression -) { - TODO("Not yet implemented") -} - -internal fun FillLayer.fillPatternCrossFade( - value: Double -) { - TODO("Not yet implemented") -} - -// Missing v10 dummy functions for compilation errors -internal fun LineLayer.lineTrimFadeRange(value: Any) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineTrimColor(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun RasterLayer.rasterBrightness(value: Double) { - TODO("Not yet implemented") -} - -internal fun LineLayer.lineDasharray(value: FloatArray) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.textField(expression: Expression) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.textField(value: String) { - TODO("Not yet implemented") -} - -internal fun SymbolLayer.textVariableAnchor(value: Double) { - TODO("Not yet implemented") -} - -internal fun BackgroundLayer.backgroundPitchAlignment(value: Any) { - TODO("Not yet implemented") -} - -// Missing enum classes for v10 compatibility (dummy implementations) -internal fun SymbolElevationReference.Companion.valueOf(enumName: String) : String { - return enumName -} - -class SymbolElevationReference { - companion object -} - -internal fun CircleElevationReference.Companion.valueOf(enumName: String) : String { - return enumName -} - -class CircleElevationReference { - companion object -} - -internal fun FillExtrusionHeightAlignment.Companion.valueOf(enumName: String) : String { - return enumName -} - -class FillExtrusionHeightAlignment { - companion object -} - -internal fun BackgroundPitchAlignment.Companion.valueOf(enumName: String) : String { - return enumName -} - -class BackgroundPitchAlignment { - companion object -} - -fun FillExtrusionLayer.fillExtrusionEdgeRadius( - expression: Expression -) { - // V11 only -} - -fun FillExtrusionLayer.fillExtrusionEdgeRadius( - value: Double -) { - // V11 only -} - -fun FillExtrusionLayer.fillExtrusionEmissiveStrength( - expression: Expression -) { - // V11 only -} - -fun FillExtrusionLayer.fillExtrusionEmissiveStrength( - value: Double -) { - // V11 only -} - -fun FillExtrusionLayer.fillExtrusionEmissiveStrengthTransition( - transition: StyleTransition -) { - // V11 only -} - -// RasterParticleLayer - v11 only -internal fun setRasterParticleLayerStyle(layer: Any, style: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setVisibility(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleArrayBand(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleCount(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleColor(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleMaxSpeed(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleSpeedFactor(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleSpeedFactorTransition(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleFadeOpacityFactor(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleFadeOpacityFactorTransition(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} - -internal fun setRasterParticleResetRateFactor(layer: Any, styleValue: Any) { - TODO("RasterParticleLayer is v11 only") -} diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/style.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/style.kt deleted file mode 100644 index 5e9e088835..0000000000 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/style.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.rnmapbox.rnmbx.v11compat.style; - -import com.mapbox.bindgen.Value -import com.mapbox.maps.Style -import com.rnmapbox.rnmbx.utils.Logger - -fun Style?.setStyleImportConfigProperties(id: String, config: HashMap) { - Logger.w("RNBMXStyleImport", "Style imports only supported on mapbox v11") -}