diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 676e0131..b37f805f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
- name: Build and check
run: |
cd ApiDemos
- for dir in ./*/ ; do ( cd "$dir" && ./gradlew assemble lint ); done
+ for dir in ./*/ ; do ( cd "$dir" && ./gradlew buildGmsDebugPreBundle ); done
build-WearOS:
runs-on: ubuntu-latest
@@ -65,7 +65,7 @@ jobs:
java-version: '11'
- name: Build and check
- run: cd WearOS && ./gradlew assembleDebug lintDebug
+ run: cd WearOS && ./gradlew build
build-Snippets:
runs-on: ubuntu-latest
@@ -110,7 +110,7 @@ jobs:
cd "$dir"
for tutorial in ./*/
do
- cd "$tutorial" && ./gradlew assembleDebug lintDebug
+ cd "$tutorial" && ./gradlew buildDebug
cd ..
done
cd ..
diff --git a/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java b/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java
new file mode 100644
index 00000000..bd4b7f91
--- /dev/null
+++ b/ApiDemos/java/app/src/v3/java/com/example/mapdemo/CloudBasedMapStylingDemoActivity.java
@@ -0,0 +1,73 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.example.mapdemo;
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.libraries.maps.GoogleMap;
+import com.google.android.libraries.maps.OnMapReadyCallback;
+import com.google.android.libraries.maps.SupportMapFragment;
+
+/**
+ * This shows how to use Cloud-based Map Styling in a simple Activity. For more information on how
+ * to style a map using this method, see:
+ * https://developers.google.com/maps/documentation/android-sdk/cloud-based-map-styling
+ **/
+public class CloudBasedMapStylingDemoActivity extends AppCompatActivity implements
+ OnMapReadyCallback {
+
+ private static final String MAP_TYPE_KEY = "map_type";
+ private GoogleMap map;
+ private int currentMapType = GoogleMap.MAP_TYPE_NORMAL;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (savedInstanceState != null) {
+ currentMapType = savedInstanceState.getInt(MAP_TYPE_KEY);
+ }
+
+ // The underlying style the map will use has been set in the layout
+ // `cloud_styling_basic_demo` under the SupportMapFragment's `map:mapId` attribute.
+ setContentView(R.layout.cloud_styling_basic_demo);
+ SupportMapFragment mapFragment =
+ (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
+ mapFragment.getMapAsync(this);
+
+ setUpButtonListeners();
+ }
+
+ @Override
+ public void onMapReady(GoogleMap map) {
+ this.map = map;
+ map.setMapType(currentMapType);
+ }
+
+ private void setUpButtonListeners() {
+ findViewById(R.id.styling_normal_mode).setOnClickListener(
+ v -> setMapType(GoogleMap.MAP_TYPE_NORMAL));
+ findViewById(R.id.styling_satellite_mode).setOnClickListener(
+ v -> setMapType(GoogleMap.MAP_TYPE_SATELLITE));
+ findViewById(R.id.styling_hybrid_mode).setOnClickListener(
+ v -> setMapType(GoogleMap.MAP_TYPE_HYBRID));
+ findViewById(R.id.styling_terrain_mode).setOnClickListener(
+ v -> setMapType(GoogleMap.MAP_TYPE_TERRAIN));
+ }
+
+ private void setMapType(int mapType) {
+ currentMapType = mapType;
+ map.setMapType(mapType);
+ }
+}
\ No newline at end of file
diff --git a/ApiDemos/java/app/src/v3/res/layout/cloud_styling_basic_demo.xml b/ApiDemos/java/app/src/v3/res/layout/cloud_styling_basic_demo.xml
new file mode 100644
index 00000000..d9da142a
--- /dev/null
+++ b/ApiDemos/java/app/src/v3/res/layout/cloud_styling_basic_demo.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt
index 1d4ce6cd..aea0570f 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/BasicMapDemoActivity.kt
@@ -28,9 +28,7 @@ import com.google.android.gms.maps.model.MarkerOptions
/**
* This shows how to create a simple activity with a map and a marker on the map.
*/
-class BasicMapDemoActivity :
- AppCompatActivity(),
- OnMapReadyCallback {
+class BasicMapDemoActivity : AppCompatActivity(), OnMapReadyCallback {
val SYDNEY = LatLng(-33.862, 151.21)
val ZOOM_LEVEL = 13f
@@ -47,8 +45,7 @@ class BasicMapDemoActivity :
* This is where we can add markers or lines, add listeners or move the camera. In this case,
* we just move the camera to Sydney and add a marker in Sydney.
*/
- override fun onMapReady(googleMap: GoogleMap?) {
- googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
with(googleMap) {
moveCamera(CameraUpdateFactory.newLatLngZoom(SYDNEY, ZOOM_LEVEL))
addMarker(MarkerOptions().position(SYDNEY))
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt
index c9e88034..b81e053a 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CameraDemoActivity.kt
@@ -103,10 +103,8 @@ class CameraDemoActivity :
}
// [END_EXCLUDE]
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
// return early if the map was not initialised properly
- map = googleMap ?: return
-
with(googleMap) {
setOnCameraIdleListener(this@CameraDemoActivity)
setOnCameraMoveStartedListener(this@CameraDemoActivity)
@@ -352,7 +350,7 @@ class CameraDemoActivity :
// When the camera stops moving, add its target to the current path, and draw it on the map.
checkPolylineThen {
addCameraTargetToPath()
- map.addPolyline(currPolylineOptions)
+ map.addPolyline(currPolylineOptions!!)
}
isCanceled = true // Set to clear the map when dragging starts again.
@@ -365,7 +363,7 @@ class CameraDemoActivity :
// [START_EXCLUDE silent]
checkPolylineThen {
addCameraTargetToPath()
- map.addPolyline(currPolylineOptions)
+ map.addPolyline(currPolylineOptions!!)
}
currPolylineOptions = null
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt
index 1f1e3011..59eb3c42 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/CircleDemoActivity.kt
@@ -101,12 +101,12 @@ class CircleDemoActivity :
* This class contains information about a circle, including its markers
*/
private inner class DraggableCircle(center: LatLng, private var radiusMeters: Double) {
- private val centerMarker: Marker = map.addMarker(MarkerOptions().apply {
+ private val centerMarker: Marker? = map.addMarker(MarkerOptions().apply {
position(center)
draggable(true)
})
- private val radiusMarker: Marker = map.addMarker(
+ private val radiusMarker: Marker? = map.addMarker(
MarkerOptions().apply {
position(center.getPointAtDistance(radiusMeters))
icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_AZURE))
@@ -128,10 +128,10 @@ class CircleDemoActivity :
when (marker) {
centerMarker -> {
circle.center = marker.position
- radiusMarker.position = marker.position.getPointAtDistance(radiusMeters)
+ radiusMarker?.position = marker.position.getPointAtDistance(radiusMeters)
}
radiusMarker -> {
- radiusMeters = centerMarker.position.distanceFrom(radiusMarker.position)
+ radiusMeters = centerMarker?.position?.distanceFrom(radiusMarker.position)!!
circle.radius = radiusMeters
}
else -> return false
@@ -205,8 +205,8 @@ class CircleDemoActivity :
* When the map is ready, move the camera to put the Circle in the middle of the screen,
* create a circle in Sydney, and set the listeners for the map, circles, and SeekBars.
*/
- override fun onMapReady(googleMap: GoogleMap?) {
- map = googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
+ map = googleMap
// we need to initialise map before creating a circle
with(map) {
moveCamera(CameraUpdateFactory.newLatLngZoom(sydney, 4.0f))
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt
index 1996cd3b..55755e6b 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt
@@ -41,9 +41,9 @@ class EventsDemoActivity : AppCompatActivity(), OnMapClickListener,
mapFragment?.getMapAsync(this)
}
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
// return early if the map was not initialised properly
- map = googleMap ?: return
+ map = googleMap
map.setOnMapClickListener(this)
map.setOnMapLongClickListener(this)
map.setOnCameraIdleListener(this)
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt
index 5cf419a4..371b812e 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/GroundOverlayDemoActivity.kt
@@ -50,8 +50,8 @@ class GroundOverlayDemoActivity : AppCompatActivity(), OnSeekBarChangeListener,
mapFragment?.getMapAsync(this)
}
- override fun onMapReady(map: GoogleMap?) {
- map ?: return
+ override fun onMapReady(map: GoogleMap) {
+ map
// Register a listener to respond to clicks on GroundOverlays.
map.setOnGroundOverlayClickListener(this)
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt
index 0ab752a4..43d5c686 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/IndoorDemoActivity.kt
@@ -39,8 +39,8 @@ class IndoorDemoActivity : AppCompatActivity(), OnMapReadyCallback {
mapFragment?.getMapAsync(this)
}
- override fun onMapReady(googleMap: GoogleMap?) {
- map = googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
+ map = googleMap
googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(LatLng(37.614631, -122.385153), 18f))
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt
index b16e926b..0b40641f 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LayersDemoActivity.kt
@@ -104,10 +104,8 @@ class LayersDemoActivity :
}
@SuppressLint("MissingPermission")
- override fun onMapReady(googleMap: GoogleMap?) {
-
- // exit early if the map was not initialised properly
- map = googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
+ map = googleMap
updateMapType()
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt
index 97321ec1..549ff534 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LiteListDemoActivity.kt
@@ -148,10 +148,10 @@ class LiteListDemoActivity : AppCompatActivity() {
}
}
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
MapsInitializer.initialize(applicationContext)
// If map is not initialised properly
- map = googleMap ?: return
+ map = googleMap
setMapLocation()
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt
index b017209c..0d669f6a 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/LocationSourceDemoActivity.kt
@@ -14,6 +14,7 @@
package com.example.kotlindemos
import android.Manifest.permission
+import android.annotation.SuppressLint
import android.content.pm.PackageManager
import android.location.Location
import android.os.Bundle
@@ -50,6 +51,7 @@ class LocationSourceDemoActivity : AppCompatActivity() {
lifecycle.addObserver(locationSource)
}
+ @SuppressLint("MissingPermission")
private fun init(map: GoogleMap) {
map.setLocationSource(locationSource)
map.setOnMapLongClickListener(locationSource)
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt
index 17ce2c8d..0fa9400d 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MainActivity.kt
@@ -98,10 +98,10 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener, OnMap
}
}
- override fun onMapsSdkInitialized(renderer: MapsInitializer.Renderer) {
+ override fun onMapsSdkInitialized(renderer: Renderer) {
Toast.makeText(
this,
- "All demo activities will use the ${renderer.toString()} renderer.",
+ "All demo activities will use the $renderer renderer.",
Toast.LENGTH_LONG
).show()
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt
index b20d1e17..0c3320e7 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerCloseInfoWindowOnRetapDemoActivity.kt
@@ -45,7 +45,7 @@ class MarkerCloseInfoWindowOnRetapDemoActivity :
* the showing info window will be closed. Otherwise will show a different window.
*/
private val markerClickListener = object : GoogleMap.OnMarkerClickListener {
- override fun onMarkerClick(marker: Marker?): Boolean {
+ override fun onMarkerClick(marker: Marker): Boolean {
if (marker == selectedMarker) {
selectedMarker = null
// Return true to indicate we have consumed the event and that we do not
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt
index 5d643cde..fd6394e1 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt
@@ -131,7 +131,7 @@ class MarkerDemoActivity :
}
private fun render(marker: Marker, view: View) {
- val badge = when (marker.title) {
+ val badge = when (marker.title!!) {
"Brisbane" -> R.drawable.badge_qld
"Adelaide" -> R.drawable.badge_sa
"Sydney" -> R.drawable.badge_nsw
@@ -343,14 +343,14 @@ class MarkerDemoActivity :
(0 until numMarkersInRainbow).mapTo(markerRainbow) {
map.addMarker(MarkerOptions().apply{
position(LatLng(
- -30 + 10 * Math.sin(it * Math.PI / (numMarkersInRainbow - 1)),
- 135 - 10 * Math.cos(it * Math.PI / (numMarkersInRainbow - 1))))
+ -30 + 10 * Math.sin(it * Math.PI / (numMarkersInRainbow - 1)),
+ 135 - 10 * Math.cos(it * Math.PI / (numMarkersInRainbow - 1))))
title("Marker $it")
icon(BitmapDescriptorFactory.defaultMarker((it * 360 / numMarkersInRainbow)
- .toFloat()))
+ .toFloat()))
flat(flatBox.isChecked)
rotation(rotationBar.progress.toFloat())
- })
+ })!!
}
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt
index 811e7e56..9b6afded 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt
@@ -52,8 +52,8 @@ class MyLocationDemoActivity : AppCompatActivity(), OnMyLocationButtonClickListe
mapFragment?.getMapAsync(this)
}
- override fun onMapReady(googleMap: GoogleMap?) {
- map = googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
+ map = googleMap
googleMap.setOnMyLocationButtonClickListener(this)
googleMap.setOnMyLocationClickListener(this)
enableMyLocation()
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt
index 314f46c5..bd6cf07c 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/OnMapAndViewReadyListener.kt
@@ -65,7 +65,7 @@ class OnMapAndViewReadyListener(
mapFragment.getMapAsync(this)
}
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
// NOTE: The GoogleMap API specifies the listener is removed just prior to invocation.
map = googleMap ?: return
isMapReady = true
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt
index bfe95c27..5d98e9fc 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt
@@ -133,7 +133,7 @@ class PolygonDemoActivity :
return resourceIds.map { getString(it) }
}
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
// return early if the map was not initialised properly
googleMap ?: return
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt
index 8ffbe645..ce3d7966 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TagsDemoActivity.kt
@@ -149,7 +149,7 @@ class TagsDemoActivity : AppCompatActivity(),
image(BitmapDescriptorFactory.fromResource(R.drawable.harbour_bridge))
position(places.getValue("SYDNEY"), 700000f)
clickable(true)
- }).run {
+ })?.run {
// add a tag to the overlay to count clicks
tag = CustomTag("Sydney ground overlay")
}
@@ -157,7 +157,7 @@ class TagsDemoActivity : AppCompatActivity(),
// A marker at Hobart.
addMarker(MarkerOptions().apply {
position(places.getValue("HOBART"))
- }).run {
+ })?.run {
// add a tag to the marker to count clicks
tag = CustomTag("Hobart marker")
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt
index a5b81ddf..db9ddc64 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/TileOverlayDemoActivity.kt
@@ -67,7 +67,7 @@ class TileOverlayDemoActivity : AppCompatActivity(), OnSeekBarChangeListener, On
return url
}
}
- mMoonTiles = map.addTileOverlay(TileOverlayOptions().tileProvider(tileProvider))
+ mMoonTiles = map.addTileOverlay(TileOverlayOptions().tileProvider(tileProvider))!!
mTransparencyBar.setOnSeekBarChangeListener(this)
}
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt
index 52b8dcba..3190b17c 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/UiSettingsDemoActivity.kt
@@ -44,7 +44,7 @@ class UiSettingsDemoActivity :
mapFragment.getMapAsync(this)
}
- override fun onMapReady(googleMap: GoogleMap?) {
+ override fun onMapReady(googleMap: GoogleMap) {
// Return early if map is not initialised properly
map = googleMap ?: return
enableMyLocation()
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt
index cac314e4..d424b568 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt
@@ -161,10 +161,8 @@ class PolylineDemoActivity :
return resourceIds.map { getString(it) }
}
- override fun onMapReady(googleMap: GoogleMap?) {
-
- // exit early if the map was not initialised properly
- googleMap ?: return
+ override fun onMapReady(googleMap: GoogleMap) {
+ googleMap
with(googleMap) {
// Override the default content description on the view, for accessibility mode.
diff --git a/snippets/app/src/gms/java/com/google/maps/example/kotlin/MapRendererOptInApplication.kt b/snippets/app/src/gms/java/com/google/maps/example/kotlin/MapRendererOptInApplication.kt
index cc7b5ca4..f9c6795f 100644
--- a/snippets/app/src/gms/java/com/google/maps/example/kotlin/MapRendererOptInApplication.kt
+++ b/snippets/app/src/gms/java/com/google/maps/example/kotlin/MapRendererOptInApplication.kt
@@ -29,8 +29,8 @@ internal class MapRendererOptInApplication : Application(), OnMapsSdkInitialized
override fun onMapsSdkInitialized(renderer: MapsInitializer.Renderer) {
when (renderer) {
- LATEST -> Log.d("MapsDemo", "The latest version of the renderer is used.")
- LEGACY -> Log.d("MapsDemo", "The legacy version of the renderer is used.")
+ Renderer.LATEST -> Log.d("MapsDemo", "The latest version of the renderer is used.")
+ Renderer.LEGACY -> Log.d("MapsDemo", "The legacy version of the renderer is used.")
}
}
}
diff --git a/snippets/app/src/gms/java/com/google/maps/example/kotlin/Markers.kt b/snippets/app/src/gms/java/com/google/maps/example/kotlin/Markers.kt
index 4fdd78f9..53c241bb 100644
--- a/snippets/app/src/gms/java/com/google/maps/example/kotlin/Markers.kt
+++ b/snippets/app/src/gms/java/com/google/maps/example/kotlin/Markers.kt
@@ -144,9 +144,9 @@ class MarkerDemoActivity : AppCompatActivity(),
private val SYDNEY = LatLng(-33.87365, 151.20689)
private val BRISBANE = LatLng(-27.47093, 153.0235)
- private lateinit var markerPerth: Marker
- private lateinit var markerSydney: Marker
- private lateinit var markerBrisbane: Marker
+ private var markerPerth: Marker? = null
+ private var markerSydney: Marker? = null
+ private var markerBrisbane: Marker? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -164,19 +164,19 @@ class MarkerDemoActivity : AppCompatActivity(),
.position(PERTH)
.title("Perth")
)
- markerPerth.tag = 0
+ markerPerth?.tag = 0
markerSydney = map.addMarker(
MarkerOptions()
.position(SYDNEY)
.title("Sydney")
)
- markerSydney.tag = 0
+ markerSydney?.tag = 0
markerBrisbane = map.addMarker(
MarkerOptions()
.position(BRISBANE)
.title("Brisbane")
)
- markerBrisbane.tag = 0
+ markerBrisbane?.tag = 0
// Set a listener for marker click.
map.setOnMarkerClickListener(this)
diff --git a/snippets/app/src/gms/java/com/google/maps/example/kotlin/TileOverlays.kt b/snippets/app/src/gms/java/com/google/maps/example/kotlin/TileOverlays.kt
index 706a9c9e..ce568539 100644
--- a/snippets/app/src/gms/java/com/google/maps/example/kotlin/TileOverlays.kt
+++ b/snippets/app/src/gms/java/com/google/maps/example/kotlin/TileOverlays.kt
@@ -84,14 +84,13 @@ internal class TileOverlays : OnMapReadyCallback {
}
// [END maps_android_tile_overlays_transparency]
- // [END maps_android_tile_overlays_transparency]
private fun removeAndClearCache() {
// [START maps_android_tile_overlays_remove]
- tileOverlay.remove()
+ tileOverlay?.remove()
// [END maps_android_tile_overlays_remove]
// [START maps_android_tile_overlays_clear_tile_cache]
- tileOverlay.clearTileCache()
+ tileOverlay?.clearTileCache()
// [END maps_android_tile_overlays_clear_tile_cache]
}
}
diff --git a/snippets/app/src/gms/java/com/google/maps/utils/kotlin/Heatmaps.kt b/snippets/app/src/gms/java/com/google/maps/utils/kotlin/Heatmaps.kt
index a25109d0..b10d3a4c 100644
--- a/snippets/app/src/gms/java/com/google/maps/utils/kotlin/Heatmaps.kt
+++ b/snippets/app/src/gms/java/com/google/maps/utils/kotlin/Heatmaps.kt
@@ -97,17 +97,17 @@ internal class Heatmaps {
// [START maps_android_utils_heatmap_customize_opacity]
provider.setOpacity(0.7)
- tileOverlay.clearTileCache()
+ tileOverlay?.clearTileCache()
// [END maps_android_utils_heatmap_customize_opacity]
// [START maps_android_utils_heatmap_customize_dataset]
val data: List = ArrayList()
provider.setWeightedData(data)
- tileOverlay.clearTileCache()
+ tileOverlay?.clearTileCache()
// [END maps_android_utils_heatmap_customize_dataset]
// [START maps_android_utils_heatmap_remove]
- tileOverlay.remove()
+ tileOverlay?.remove()
// [END maps_android_utils_heatmap_remove]
}
}