Merge branch '907-maplibre' into 'master' (4bdbc20f) · Commits · e / os / GmsCore

play-services-maps-core-mapbox/build.gradle

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@ apply plugin: 'kotlin-android'
		dependencies {
		implementation project(':play-services-api')
		implementation project(':play-services-base-core')
		implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1") {
		exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
		implementation("org.maplibre.gl:android-sdk:9.6.0") {
		exclude group: 'com.google.android.gms'
		}
		implementation("com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0") {
		exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
		implementation("org.maplibre.gl:android-plugin-annotation-v9:1.0.0") {
		exclude group: 'com.google.android.gms'
		}
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
		}

play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt

+7 −5

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.mapbox.mapboxsdk.plugins.annotation.*
		import com.mapbox.mapboxsdk.plugins.annotation.Annotation
		import com.mapbox.mapboxsdk.style.layers.Property.LINE_CAP_ROUND
		import com.google.android.gms.dynamic.unwrap
		import com.mapbox.mapboxsdk.WellKnownTileServer
		import org.microg.gms.maps.MapsConstants.*
		import org.microg.gms.maps.mapbox.model.*
		import org.microg.gms.maps.mapbox.utils.MapContext
		@@ -125,7 +126,7 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
		BitmapDescriptorFactoryImpl.initialize(mapContext.resources, context.resources)
		LibraryLoader.setLibraryLoader(MultiArchLoader(mapContext, context))
		runOnMainLooper {
		Mapbox.getInstance(mapContext, BuildConfig.MAPBOX_KEY)
		Mapbox.getInstance(mapContext, BuildConfig.MAPBOX_KEY, WellKnownTileServer.Mapbox)
		}


		@@ -354,9 +355,9 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)

		// TODO: Serve map styles locally
		when (storedMapType) {
		MAP_TYPE_SATELLITE -> map?.setStyle(Style.Builder().fromUrl("mapbox://styles/microg/cjxgloted25ap1ct4uex7m6hi"), update)
		MAP_TYPE_TERRAIN -> map?.setStyle(Style.OUTDOORS, update)
		MAP_TYPE_HYBRID -> map?.setStyle(Style.Builder().fromUrl("mapbox://styles/microg/cjxgloted25ap1ct4uex7m6hi"), update)
		MAP_TYPE_SATELLITE -> map?.setStyle(Style.Builder().fromUri("mapbox://styles/microg/cjxgloted25ap1ct4uex7m6hi"), update)
		MAP_TYPE_TERRAIN -> map?.setStyle(Style.Builder().fromUri("mapbox://styles/mapbox/outdoors-v12"), update)
		MAP_TYPE_HYBRID -> map?.setStyle(Style.Builder().fromUri("mapbox://styles/microg/cjxgloted25ap1ct4uex7m6hi"), update)
		//MAP_TYPE_NONE, MAP_TYPE_NORMAL,
		else -> map?.setStyle(Style.Builder().fromUrl("mapbox://styles/microg/cjui4020201oo1fmca7yuwbor"), update)
		}
		@@ -666,9 +667,10 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
		symbolManager.iconAllowOverlap = true
		symbolManager.addClickListener {
		try {
		markers[it.id]?.let { markerClickListener?.onMarkerClick(it) }
		markers[it.id]?.let { markerClickListener?.onMarkerClick(it) } == true
		} catch (e: Exception) {
		Log.w(TAG, e)
		false
		}
		}
		symbolManager.addDragListener(object : OnSymbolDragListener {