@acalcutt/maplibre-gl-native-test 5.0.1-pre.16 → 5.0.2-pre.1

package/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.kt

@@ -1,175 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.camera
-
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.mapbox.geojson.FeatureCollection
-import com.mapbox.geojson.FeatureCollection.fromJson
-import com.mapbox.geojson.Point
-import com.mapbox.mapboxsdk.geometry.LatLng
-import com.mapbox.mapboxsdk.geometry.LatLngBounds
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.style.layers.Property.ICON_ANCHOR_CENTER
-import com.mapbox.mapboxsdk.style.layers.PropertyFactory.*
-import com.mapbox.mapboxsdk.style.layers.SymbolLayer
-import com.mapbox.mapboxsdk.style.sources.GeoJsonSource
-import com.mapbox.mapboxsdk.testapp.R
-import com.mapbox.mapboxsdk.testapp.utils.GeoParseUtil.loadStringFromAssets
-import com.mapbox.mapboxsdk.utils.BitmapUtils
-import kotlinx.android.synthetic.main.activity_latlngbounds.*
-import java.net.URISyntaxException
-
-/** Test activity showcasing using the LatLngBounds camera API. */
-class LatLngBoundsActivity : AppCompatActivity() {
-
-    private lateinit var mapboxMap: MapboxMap
-    private lateinit var bottomSheetBehavior: BottomSheetBehavior<*>
-    private lateinit var bounds: LatLngBounds
-
-    private val peekHeight by lazy {
-        375.toPx(this) // 375dp
-    }
-
-    private val additionalPadding by lazy {
-        32.toPx(this) // 32dp
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_latlngbounds)
-        initMapView(savedInstanceState)
-    }
-
-    private fun initMapView(savedInstanceState: Bundle?) {
-        mapView.onCreate(savedInstanceState)
-        mapView.getMapAsync { map ->
-            mapboxMap = map
-
-            val featureCollection: FeatureCollection =
-                fromJson(loadStringFromAssets(this, "points-sf.geojson"))
-            bounds = createBounds(featureCollection)
-
-            map.getCameraForLatLngBounds(bounds, createPadding(peekHeight))?.let {
-                map.cameraPosition = it
-            }
-
-            try {
-                loadStyle(featureCollection)
-            } catch (e: URISyntaxException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    private fun loadStyle(featureCollection: FeatureCollection) {
-        mapboxMap.setStyle(
-            Style.Builder()
-                .fromUri(Style.getPredefinedStyle("Streets"))
-                .withLayer(
-                    SymbolLayer("symbol", "symbol")
-                        .withProperties(
-                            iconAllowOverlap(true),
-                            iconIgnorePlacement(true),
-                            iconImage("icon"),
-                            iconAnchor(ICON_ANCHOR_CENTER)
-                        )
-                )
-                .withSource(GeoJsonSource("symbol", featureCollection))
-                .withImage(
-                    "icon",
-                    BitmapUtils.getDrawableFromRes(
-                        this@LatLngBoundsActivity,
-                        R.drawable.ic_android
-                    )!!
-                )
-        ) {
-            initBottomSheet()
-            fab.setOnClickListener {
-                bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
-            }
-        }
-    }
-
-    private fun initBottomSheet() {
-        bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet)
-        bottomSheetBehavior.setBottomSheetCallback(
-            object : BottomSheetBehavior.BottomSheetCallback() {
-                override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                    val offset = convertSlideOffset(slideOffset)
-                    val bottomPadding = (peekHeight * offset).toInt()
-
-                    mapboxMap.getCameraForLatLngBounds(bounds, createPadding(bottomPadding))
-                        ?.let { mapboxMap.cameraPosition = it }
-                }
-
-                override fun onStateChanged(bottomSheet: View, newState: Int) {
-                    // no-op
-                }
-            }
-        )
-    }
-
-    // slideOffset ranges from NaN to -1.0, range from 1.0 to 0 instead
-    fun convertSlideOffset(slideOffset: Float): Float {
-        return if (slideOffset.equals(Float.NaN)) {
-            1.0f
-        } else {
-            1 + slideOffset
-        }
-    }
-
-    fun createPadding(bottomPadding: Int): IntArray {
-        return intArrayOf(additionalPadding, additionalPadding, additionalPadding, bottomPadding)
-    }
-
-    private fun createBounds(featureCollection: FeatureCollection): LatLngBounds {
-        val boundsBuilder = LatLngBounds.Builder()
-        featureCollection.features()?.let {
-            for (feature in it) {
-                val point = feature.geometry() as Point
-                boundsBuilder.include(LatLng(point.latitude(), point.longitude()))
-            }
-        }
-        return boundsBuilder.build()
-    }
-
-    override fun onStart() {
-        super.onStart()
-        mapView.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapView.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapView.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        mapView.onStop()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapView.onLowMemory()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mapView.onDestroy()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapView.onSaveInstanceState(outState)
-    }
-}
-
-fun Int.toPx(context: Context): Int = (this * context.resources.displayMetrics.density).toInt()

package/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ManualZoomActivity.kt

@@ -1,109 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.camera
-
-import android.graphics.Point
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
-import com.mapbox.mapboxsdk.maps.MapView
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.testapp.R
-
-/**
- * Test activity showcasing the zoom Camera API.
- *
- * This includes zoomIn, zoomOut, zoomTo, zoomBy (center and custom focal point).
- */
-class ManualZoomActivity : AppCompatActivity() {
-    private lateinit var mapboxMap: MapboxMap
-    private lateinit var mapView: MapView
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_manual_zoom)
-        mapView = findViewById<View>(R.id.mapView) as MapView
-        mapView!!.onCreate(savedInstanceState)
-        mapView!!.getMapAsync { mapboxMap: MapboxMap ->
-            this@ManualZoomActivity.mapboxMap = mapboxMap
-            mapboxMap.setStyle(
-                Style.Builder().fromUri(Style.getPredefinedStyle("Satellite Hybrid"))
-            )
-            val uiSettings = this@ManualZoomActivity.mapboxMap!!.uiSettings
-            uiSettings.setAllGesturesEnabled(false)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_zoom, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.action_zoom_in -> {
-                mapboxMap!!.animateCamera(CameraUpdateFactory.zoomIn())
-                true
-            }
-            R.id.action_zoom_out -> {
-                mapboxMap!!.animateCamera(CameraUpdateFactory.zoomOut())
-                true
-            }
-            R.id.action_zoom_by -> {
-                mapboxMap!!.animateCamera(CameraUpdateFactory.zoomBy(2.0))
-                true
-            }
-            R.id.action_zoom_to -> {
-                mapboxMap!!.animateCamera(CameraUpdateFactory.zoomTo(2.0))
-                true
-            }
-            R.id.action_zoom_to_point -> {
-                val view = window.decorView
-                mapboxMap!!.animateCamera(
-                    CameraUpdateFactory.zoomBy(
-                        1.0,
-                        Point(view.measuredWidth / 4, view.measuredHeight / 4)
-                    )
-                )
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        mapView!!.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapView!!.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapView!!.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        mapView!!.onStop()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mapView!!.onDestroy()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapView!!.onLowMemory()
-    }
-}

package/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/MaxMinZoomActivity.kt

@@ -1,81 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.camera
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.mapbox.mapboxsdk.maps.MapView
-import com.mapbox.mapboxsdk.maps.MapView.OnDidFinishLoadingStyleListener
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.MapboxMap.OnMapClickListener
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.testapp.R
-import timber.log.Timber
-
-/** Test activity showcasing using maximum and minimum zoom levels to restrict camera movement. */
-class MaxMinZoomActivity : AppCompatActivity(), OnMapReadyCallback {
-    private lateinit var mapView: MapView
-    private lateinit var mapboxMap: MapboxMap
-    private val clickListener = OnMapClickListener {
-        if (mapboxMap != null) {
-            mapboxMap!!.setStyle(Style.Builder().fromUri(Style.getPredefinedStyle("Outdoor")))
-        }
-        true
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_maxmin_zoom)
-        mapView = findViewById<MapView>(R.id.mapView)
-        mapView.onCreate(savedInstanceState)
-        mapView.getMapAsync(this)
-        mapView.addOnDidFinishLoadingStyleListener(
-            OnDidFinishLoadingStyleListener { Timber.d("Style Loaded") }
-        )
-    }
-
-    override fun onMapReady(map: MapboxMap) {
-        mapboxMap = map
-        mapboxMap!!.setStyle(Style.getPredefinedStyle("Streets"))
-        mapboxMap!!.setMinZoomPreference(3.0)
-        mapboxMap!!.setMaxZoomPreference(5.0)
-        mapboxMap!!.addOnMapClickListener(clickListener)
-    }
-
-    override fun onStart() {
-        super.onStart()
-        mapView!!.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapView!!.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapView!!.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        mapView!!.onStop()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (mapboxMap != null) {
-            mapboxMap!!.removeOnMapClickListener(clickListener)
-        }
-        mapView!!.onDestroy()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapView!!.onLowMemory()
-    }
-}

package/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/ScrollByActivity.kt

@@ -1,133 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.camera
-
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import android.widget.SeekBar
-import android.widget.SeekBar.OnSeekBarChangeListener
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.mapbox.mapboxsdk.maps.MapView
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.testapp.R
-
-/**
- * Test activity showcasing using the scrollBy Camera API by moving x,y pixels above Grenada, Spain.
- */
-class ScrollByActivity : AppCompatActivity(), OnMapReadyCallback {
-    private lateinit var mapView: MapView
-    private lateinit var mapboxMap: MapboxMap
-    private lateinit var seekBarX: SeekBar
-    private lateinit var seekBarY: SeekBar
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_scroll_by)
-        val toolbar = findViewById<Toolbar>(R.id.toolbar)
-        setSupportActionBar(toolbar)
-        val actionBar = supportActionBar
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.setDisplayShowHomeEnabled(true)
-        }
-        seekBarX = findViewById(R.id.seekbar_move_x)
-        val textViewX = findViewById<TextView>(R.id.textview_x)
-        seekBarX.setOnSeekBarChangeListener(
-            PixelBarChangeListener(textViewX, R.string.scrollby_x_value)
-        )
-        seekBarY = findViewById(R.id.seekbar_move_y)
-        val textViewY = findViewById<TextView>(R.id.textview_y)
-        seekBarY.setOnSeekBarChangeListener(
-            PixelBarChangeListener(textViewY, R.string.scrollby_y_value)
-        )
-        mapView = findViewById(R.id.mapView)
-        mapView.setTag(true)
-        mapView.onCreate(savedInstanceState)
-        mapView.getMapAsync(this)
-    }
-
-    override fun onMapReady(map: MapboxMap) {
-        mapboxMap = map
-        mapboxMap!!.setStyle(Style.getPredefinedStyle("Pastel"))
-        val uiSettings = mapboxMap!!.uiSettings
-        uiSettings.isLogoEnabled = false
-        uiSettings.isAttributionEnabled = false
-        val fab = findViewById<FloatingActionButton>(R.id.fab)
-        fab.setColorFilter(ContextCompat.getColor(this@ScrollByActivity, R.color.primary))
-        fab.setOnClickListener { view: View? ->
-            mapboxMap!!.scrollBy(
-                (seekBarX!!.progress * MULTIPLIER_PER_PIXEL).toFloat(),
-                (seekBarY!!.progress * MULTIPLIER_PER_PIXEL).toFloat()
-            )
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        mapView!!.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapView!!.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapView!!.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        mapView!!.onStop()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mapView!!.onDestroy()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapView!!.onLowMemory()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    private class PixelBarChangeListener
-    internal constructor(
-        private val valueView: TextView,
-        @field:StringRes @param:StringRes
-        private val prefixTextResource: Int
-    ) : OnSeekBarChangeListener {
-        override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-            val value = progress * MULTIPLIER_PER_PIXEL
-            valueView.text = String.format(seekBar.resources.getString(prefixTextResource), value)
-        }
-
-        override fun onStartTrackingTouch(seekBar: SeekBar) {}
-        override fun onStopTrackingTouch(seekBar: SeekBar) {}
-    }
-
-    companion object {
-        const val MULTIPLIER_PER_PIXEL = 50
-    }
-}

package/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/customlayer/CustomLayerActivity.kt

@@ -1,146 +0,0 @@
-package com.mapbox.mapboxsdk.testapp.activity.customlayer
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
-import com.mapbox.mapboxsdk.geometry.LatLng
-import com.mapbox.mapboxsdk.maps.MapView
-import com.mapbox.mapboxsdk.maps.MapboxMap
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
-import com.mapbox.mapboxsdk.maps.Style
-import com.mapbox.mapboxsdk.style.layers.CustomLayer
-import com.mapbox.mapboxsdk.testapp.R
-import com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer
-
-/**
- * Test activity showcasing the Custom Layer API
- *
- *
- * Note: experimental API, do not use.
- *
- */
-class CustomLayerActivity : AppCompatActivity() {
-    private lateinit var mapboxMap: MapboxMap
-    private lateinit var mapView: MapView
-    private var customLayer: CustomLayer? = null
-    private lateinit var fab: FloatingActionButton
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_custom_layer)
-        mapView = findViewById(R.id.mapView)
-        mapView.onCreate(savedInstanceState)
-        mapView.getMapAsync(
-            OnMapReadyCallback { map: MapboxMap? ->
-                mapboxMap = map!!
-                mapboxMap!!.moveCamera(
-                    CameraUpdateFactory.newLatLngZoom(
-                        LatLng(39.91448, -243.60947),
-                        10.0
-                    )
-                )
-                mapboxMap!!.setStyle(Style.getPredefinedStyle("Streets")) { style: Style? -> initFab() }
-            }
-        )
-    }
-
-    private fun initFab() {
-        fab = findViewById(R.id.fab)
-        fab.setColorFilter(ContextCompat.getColor(this, R.color.primary))
-        fab.setOnClickListener(
-            View.OnClickListener { view: View? ->
-                if (mapboxMap != null) {
-                    swapCustomLayer()
-                }
-            }
-        )
-    }
-
-    private fun swapCustomLayer() {
-        val style = mapboxMap!!.style
-        if (customLayer != null) {
-            style!!.removeLayer(customLayer!!)
-            customLayer = null
-            fab!!.setImageResource(R.drawable.ic_layers)
-        } else {
-            customLayer = CustomLayer(
-                "custom",
-                ExampleCustomLayer.createContext()
-            )
-            style!!.addLayerBelow(customLayer!!, "building")
-            fab!!.setImageResource(R.drawable.ic_layers_clear)
-        }
-    }
-
-    private fun updateLayer() {
-        if (mapboxMap != null) {
-            mapboxMap!!.triggerRepaint()
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        mapView!!.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        mapView!!.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        mapView!!.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        mapView!!.onStop()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        mapView!!.onSaveInstanceState(outState)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        mapView!!.onDestroy()
-    }
-
-    override fun onLowMemory() {
-        super.onLowMemory()
-        mapView!!.onLowMemory()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_custom_layer, menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.action_update_layer -> {
-                updateLayer()
-                true
-            }
-            R.id.action_set_color_red -> {
-                ExampleCustomLayer.setColor(1f, 0f, 0f, 1f)
-                true
-            }
-            R.id.action_set_color_green -> {
-                ExampleCustomLayer.setColor(0f, 1f, 0f, 1f)
-                true
-            }
-            R.id.action_set_color_blue -> {
-                ExampleCustomLayer.setColor(0f, 0f, 1f, 1f)
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-}