Merge branch 'epic67-maps' into master (78d7045d) · Commits · e / os / GmsCore

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -20,12 +20,12 @@ apply plugin: 'kotlin-android'
		dependencies {
		implementation project(':play-services-maps')
		implementation project(':play-services-base-core')
		implementation("org.maplibre.gl:android-sdk:9.6.0") {
		exclude group: 'com.google.android.gms'
		}
		implementation("org.maplibre.gl:android-sdk:10.0.0")
		implementation("org.maplibre.gl:android-plugin-annotation-v9:1.0.0") {
		exclude group: 'com.google.android.gms'
		}
		implementation 'org.maplibre.gl:android-sdk-turf:5.9.0'

		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
		}

		@@ -39,6 +39,9 @@ def execResult(...args) {
		}

		def mapboxKey() {
		String environmentKey = System.getenv('MAPBOX_VECTOR_TILES_KEY')
		if (environmentKey != null) return environmentKey

		Properties properties = new Properties()
		try {
		properties.load(project.rootProject.file('local.properties').newDataInputStream())

play-services-maps-core-mapbox/src/main/assets/style-mapbox-outdoors-v12.json

0 → 100644

+13845 −0

File added.

Preview size limit exceeded, changes collapsed.

play-services-maps-core-mapbox/src/main/assets/style-microg-normal.json

0 → 100644

+4392 −0

File added.

Preview size limit exceeded, changes collapsed.

play-services-maps-core-mapbox/src/main/assets/style-microg-satellite.json

0 → 100644

+3489 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644

+136 −0

Original line number	Diff line number	Diff line
		package org.microg.gms.maps.mapbox

		import android.content.Context
		import android.location.Location
		import android.os.Bundle
		import android.util.DisplayMetrics
		import android.util.Log
		import com.google.android.gms.dynamic.IObjectWrapper
		import com.google.android.gms.dynamic.ObjectWrapper
		import com.google.android.gms.maps.internal.*
		import org.microg.gms.maps.MapsConstants
		import org.microg.gms.maps.mapbox.model.AbstractMarker
		import org.microg.gms.maps.mapbox.model.DefaultInfoWindowAdapter
		import org.microg.gms.maps.mapbox.model.InfoWindow
		import org.microg.gms.maps.mapbox.utils.MapContext

		abstract class AbstractGoogleMap(context: Context) : IGoogleMapDelegate.Stub() {

		internal val mapContext = MapContext(context)

		val dpiFactor: Float
		get() = mapContext.resources.displayMetrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT

		internal var currentInfoWindow: InfoWindow? = null
		internal var infoWindowAdapter: IInfoWindowAdapter = DefaultInfoWindowAdapter(mapContext)
		internal var onInfoWindowClickListener: IOnInfoWindowClickListener? = null
		internal var onInfoWindowLongClickListener: IOnInfoWindowLongClickListener? = null
		internal var onInfoWindowCloseListener: IOnInfoWindowCloseListener? = null

		internal var mapClickListener: IOnMapClickListener? = null
		internal var mapLongClickListener: IOnMapLongClickListener? = null
		internal var markerClickListener: IOnMarkerClickListener? = null
		internal var circleClickListener: IOnCircleClickListener? = null


		internal abstract fun showInfoWindow(marker: AbstractMarker): Boolean

		override fun setOnInfoWindowClickListener(listener: IOnInfoWindowClickListener?) {
		onInfoWindowClickListener = listener
		}

		override fun setInfoWindowLongClickListener(listener: IOnInfoWindowLongClickListener) {
		onInfoWindowLongClickListener = listener
		}

		override fun setInfoWindowCloseListener(listener: IOnInfoWindowCloseListener) {
		onInfoWindowCloseListener = listener
		}

		override fun setInfoWindowAdapter(adapter: IInfoWindowAdapter?) {
		infoWindowAdapter = adapter ?: DefaultInfoWindowAdapter(mapContext)
		}

		override fun setOnMapClickListener(listener: IOnMapClickListener?) {
		mapClickListener = listener
		}

		override fun setOnMapLongClickListener(listener: IOnMapLongClickListener?) {
		mapLongClickListener = listener
		}

		override fun setOnMarkerClickListener(listener: IOnMarkerClickListener?) {
		markerClickListener = listener
		}

		override fun setCircleClickListener(listener: IOnCircleClickListener?) {
		circleClickListener = listener
		}

		override fun getMyLocation(): Location? {
		Log.d(TAG, "unimplemented Method: getMyLocation")
		return null
		}

		override fun setLocationSource(locationSource: ILocationSourceDelegate?) {
		Log.d(TAG, "unimplemented Method: setLocationSource")
		}

		override fun setOnMyLocationChangeListener(listener: IOnMyLocationChangeListener?) {
		Log.d(TAG, "unimplemented Method: setOnMyLocationChangeListener")
		}

		override fun setOnMyLocationButtonClickListener(listener: IOnMyLocationButtonClickListener?) {
		Log.d(TAG, "unimplemented Method: setOnMyLocationButtonClickListener")
		}

		override fun getTestingHelper(): IObjectWrapper {
		Log.d(TAG, "unimplemented Method: getTestingHelper")
		return ObjectWrapper.wrap(null)
		}

		override fun isBuildingsEnabled(): Boolean {
		Log.d(TAG, "unimplemented Method: isBuildingsEnabled")
		return false
		}

		override fun setBuildingsEnabled(buildings: Boolean) {
		Log.d(TAG, "unimplemented Method: setBuildingsEnabled")
		}

		override fun useViewLifecycleWhenInFragment(): Boolean {
		Log.d(TAG, "unimplemented Method: useViewLifecycleWhenInFragment")
		return false
		}

		override fun onEnterAmbient(bundle: Bundle?) {
		Log.d(TAG, "unimplemented Method: onEnterAmbient")
		}

		override fun onExitAmbient() {
		Log.d(TAG, "unimplemented Method: onExitAmbient")
		}

		override fun isTrafficEnabled(): Boolean {
		Log.d(TAG, "unimplemented Method: isTrafficEnabled")
		return false
		}

		override fun setTrafficEnabled(traffic: Boolean) {
		Log.d(TAG, "unimplemented Method: setTrafficEnabled")

		}

		override fun isIndoorEnabled(): Boolean {
		Log.d(TAG, "unimplemented Method: isIndoorEnabled")
		return false
		}

		override fun setIndoorEnabled(indoor: Boolean) {
		Log.d(TAG, "unimplemented Method: setIndoorEnabled")
		}

		companion object {
		val TAG = "GmsMapAbstract"
		}
		}
		No newline at end of file