Skip to content

Commit c4cd47c

Browse files
kikosowangela
kikoso
and
wangela
authoredOct 27, 2023
feat: add support for Advanced Markers (#1243)
Upgrading the Maps SDK for Android dependency to v18.2.0 switches to the upgraded renderer as default renderer. See release notes at https://developers.google.com/maps/documentation/android-sdk/release-notes#October_18_2023 The upgraded renderer is required for Advanced Markers. * feat: add support for Advanced Markers * feat: add api() for Play Services and removed dependency from the app-level module --------- Co-authored-by: Angela Yu <5506675+wangela@users.noreply.github.com>
·
v3.11.2v3.7.0
1 parent 4e17637 commit c4cd47c

File tree

8 files changed

+1426
-2
lines changed

8 files changed

+1426
-2
lines changed
 

‎demo/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ android {
4848
dependencies {
4949

5050
// [START_EXCLUDE silent]
51-
implementation 'com.google.android.gms:play-services-maps:18.1.0'
5251
implementation project(':library')
5352

5453
implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'

‎demo/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<activity android:name=".BigClusteringDemoActivity" />
6060
<activity android:name=".VisibleClusteringDemoActivity" />
6161
<activity android:name=".CustomMarkerClusteringDemoActivity" />
62+
<activity android:name=".CustomAdvancedMarkerClusteringDemoActivity" />
6263
<activity android:name=".ZoomClusteringDemoActivity" />
6364
<activity android:name=".ClusteringViewModelDemoActivity"/>
6465
<activity android:name=".TileProviderAndProjectionDemo" />

‎demo/src/main/java/com/google/maps/android/utils/demo/CustomAdvancedMarkerClusteringDemoActivity.java

+227
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
/*
2+
* Copyright 2023 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.maps.android.utils.demo;
18+
19+
import java.util.Random;
20+
21+
import android.graphics.Color;
22+
import android.util.Log;
23+
import android.view.View;
24+
import android.widget.TextView;
25+
import android.widget.Toast;
26+
27+
import com.google.android.gms.maps.CameraUpdateFactory;
28+
import com.google.android.gms.maps.MapsInitializer;
29+
import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
30+
import com.google.android.gms.maps.model.AdvancedMarker;
31+
import com.google.android.gms.maps.model.AdvancedMarkerOptions;
32+
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
33+
import com.google.android.gms.maps.model.LatLng;
34+
import com.google.android.gms.maps.model.LatLngBounds;
35+
import com.google.android.gms.maps.model.Marker;
36+
import com.google.android.gms.maps.model.PinConfig;
37+
import com.google.maps.android.clustering.Cluster;
38+
import com.google.maps.android.clustering.ClusterItem;
39+
import com.google.maps.android.clustering.ClusterManager;
40+
import com.google.maps.android.clustering.view.DefaultAdvancedMarkersClusterRenderer;
41+
import com.google.maps.android.utils.demo.model.Person;
42+
43+
import androidx.annotation.NonNull;
44+
45+
/**
46+
* This sample demonstrates how to make use of the new Advanced Markers.
47+
*/
48+
public class CustomAdvancedMarkerClusteringDemoActivity extends BaseDemoActivity implements
49+
ClusterManager.OnClusterClickListener<Person>, ClusterManager.OnClusterInfoWindowClickListener<Person>,
50+
ClusterManager.OnClusterItemClickListener<Person>, ClusterManager.OnClusterItemInfoWindowClickListener<Person>,
51+
OnMapsSdkInitializedCallback {
52+
private ClusterManager<Person> mClusterManager;
53+
private final Random mRandom = new Random(1984);
54+
55+
@Override
56+
public void onMapsSdkInitialized(@NonNull MapsInitializer.Renderer renderer) {
57+
switch (renderer) {
58+
case LATEST:
59+
Log.d("MapsDemo", "The latest version of the renderer is used.");
60+
break;
61+
case LEGACY:
62+
Log.d("MapsDemo", "The legacy version of the renderer is used.");
63+
break;
64+
default:
65+
break;
66+
}
67+
}
68+
69+
private class AdvancedMarkerRenderer extends DefaultAdvancedMarkersClusterRenderer<Person> {
70+
71+
public AdvancedMarkerRenderer() {
72+
super(getApplicationContext(), getMap(), mClusterManager);
73+
}
74+
75+
@Override
76+
protected void onBeforeClusterItemRendered(@NonNull Person person,
77+
@NonNull AdvancedMarkerOptions markerOptions) {
78+
markerOptions
79+
.icon(BitmapDescriptorFactory.fromPinConfig(getPinConfig().build()))
80+
.title(person.name);
81+
}
82+
83+
@Override
84+
protected void onClusterItemUpdated(@NonNull Person person, @NonNull Marker marker) {
85+
// Same implementation as onBeforeClusterItemRendered() (to update cached markers)
86+
marker.setIcon(BitmapDescriptorFactory.fromPinConfig(getPinConfig().build()));
87+
marker.setTitle(person.name);
88+
}
89+
90+
private PinConfig.Builder getPinConfig() {
91+
PinConfig.Builder pinConfigBuilder = PinConfig.builder();
92+
pinConfigBuilder.setBackgroundColor(Color.MAGENTA);
93+
pinConfigBuilder.setBorderColor(getResources().getColor(R.color.colorPrimaryDark));
94+
return pinConfigBuilder;
95+
}
96+
97+
private View addTextAsMarker(int size) {
98+
TextView textView = new TextView(getApplicationContext());
99+
textView.setText("I am a cluster of size " + size);
100+
textView.setBackgroundColor(Color.BLACK);
101+
textView.setTextColor(Color.YELLOW);
102+
return textView;
103+
}
104+
105+
@Override
106+
protected void onBeforeClusterRendered(@NonNull Cluster<Person> cluster,
107+
@NonNull AdvancedMarkerOptions markerOptions) {
108+
markerOptions.iconView(addTextAsMarker(cluster.getSize()));
109+
}
110+
111+
@Override
112+
protected void onClusterUpdated(@NonNull Cluster<Person> cluster, AdvancedMarker marker) {
113+
marker.setIconView(addTextAsMarker(cluster.getSize()));
114+
}
115+
116+
117+
@Override
118+
protected boolean shouldRenderAsCluster(@NonNull Cluster<Person> cluster) {
119+
// Always render clusters.
120+
return cluster.getSize() > 1;
121+
}
122+
}
123+
124+
125+
@Override
126+
public boolean onClusterClick(Cluster<Person> cluster) {
127+
// Show a toast with some info when the cluster is clicked.
128+
String firstName = cluster.getItems().iterator().next().name;
129+
Toast.makeText(this, cluster.getSize() + " (including " + firstName + ")", Toast.LENGTH_SHORT).show();
130+
131+
// Zoom in the cluster. Need to create LatLngBounds and including all the cluster items
132+
// inside of bounds, then animate to center of the bounds.
133+
134+
// Create the builder to collect all essential cluster items for the bounds.
135+
LatLngBounds.Builder builder = LatLngBounds.builder();
136+
for (ClusterItem item : cluster.getItems()) {
137+
builder.include(item.getPosition());
138+
}
139+
// Get the LatLngBounds
140+
final LatLngBounds bounds = builder.build();
141+
142+
// Animate camera to the bounds
143+
try {
144+
getMap().animateCamera(CameraUpdateFactory.newLatLngBounds(bounds, 100));
145+
} catch (Exception e) {
146+
e.printStackTrace();
147+
}
148+
149+
return true;
150+
}
151+
152+
@Override
153+
public void onClusterInfoWindowClick(Cluster<Person> cluster) {
154+
// Does nothing, but you could go to a list of the users.
155+
}
156+
157+
@Override
158+
public boolean onClusterItemClick(Person item) {
159+
// Does nothing, but you could go into the user's profile page, for example.
160+
return false;
161+
}
162+
163+
@Override
164+
public void onClusterItemInfoWindowClick(Person item) {
165+
// Does nothing, but you could go into the user's profile page, for example.
166+
}
167+
168+
@Override
169+
protected void startDemo(boolean isRestore) {
170+
if (!isRestore) {
171+
getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(51.503186, -0.126446), 9.5f));
172+
}
173+
174+
// This line is extremely important to initialise the advanced markers. Without it, advanced markers will not work.
175+
MapsInitializer.initialize(getApplicationContext(), MapsInitializer.Renderer.LATEST, this);
176+
177+
mClusterManager = new ClusterManager<>(this, getMap());
178+
mClusterManager.setRenderer(new AdvancedMarkerRenderer());
179+
getMap().setOnCameraIdleListener(mClusterManager);
180+
getMap().setOnMarkerClickListener(mClusterManager);
181+
getMap().setOnInfoWindowClickListener(mClusterManager);
182+
mClusterManager.setOnClusterClickListener(this);
183+
mClusterManager.setOnClusterInfoWindowClickListener(this);
184+
mClusterManager.setOnClusterItemClickListener(this);
185+
mClusterManager.setOnClusterItemInfoWindowClickListener(this);
186+
187+
addItems();
188+
mClusterManager.cluster();
189+
}
190+
191+
private void addItems() {
192+
// http://www.flickr.com/photos/sdasmarchives/5036248203/
193+
mClusterManager.addItem(new Person(position(), "Walter", R.drawable.walter));
194+
195+
// http://www.flickr.com/photos/usnationalarchives/4726917149/
196+
mClusterManager.addItem(new Person(position(), "Gran", R.drawable.gran));
197+
198+
// http://www.flickr.com/photos/nypl/3111525394/
199+
mClusterManager.addItem(new Person(position(), "Ruth", R.drawable.ruth));
200+
201+
// http://www.flickr.com/photos/smithsonian/2887433330/
202+
mClusterManager.addItem(new Person(position(), "Stefan", R.drawable.stefan));
203+
204+
// http://www.flickr.com/photos/library_of_congress/2179915182/
205+
mClusterManager.addItem(new Person(position(), "Mechanic", R.drawable.mechanic));
206+
207+
// http://www.flickr.com/photos/nationalmediamuseum/7893552556/
208+
mClusterManager.addItem(new Person(position(), "Yeats", R.drawable.yeats));
209+
210+
// http://www.flickr.com/photos/sdasmarchives/5036231225/
211+
mClusterManager.addItem(new Person(position(), "John", R.drawable.john));
212+
213+
// http://www.flickr.com/photos/anmm_thecommons/7694202096/
214+
mClusterManager.addItem(new Person(position(), "Trevor the Turtle", R.drawable.turtle));
215+
216+
// http://www.flickr.com/photos/usnationalarchives/4726892651/
217+
mClusterManager.addItem(new Person(position(), "Teach", R.drawable.teacher));
218+
}
219+
220+
private LatLng position() {
221+
return new LatLng(random(51.6723432, 51.38494009999999), random(0.148271, -0.3514683));
222+
}
223+
224+
private double random(double min, double max) {
225+
return mRandom.nextDouble() * (max - min) + min;
226+
}
227+
}

‎demo/src/main/java/com/google/maps/android/utils/demo/MainActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
4141
mListView = findViewById(R.id.list);
4242

4343
addDemo("Clustering", ClusteringDemoActivity.class);
44+
addDemo("Advanced Markers Clustering Example", CustomAdvancedMarkerClusteringDemoActivity.class);
4445
addDemo("Clustering: Custom Look", CustomMarkerClusteringDemoActivity.class);
4546
addDemo("Clustering: 2K markers", BigClusteringDemoActivity.class);
4647
addDemo("Clustering: 20K only visible markers", VisibleClusteringDemoActivity.class);

‎demo/src/main/res/layout/map.xml

+3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
~ limitations under the License.
1616
-->
1717

18+
<!-- Note that the item mapId is required for Advanced Markers to work -->
1819
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
20+
xmlns:map="http://schemas.android.com/apk/res-auto"
1921
android:id="@+id/map"
22+
map:mapId="mapId"
2023
android:layout_width="match_parent"
2124
android:layout_height="match_parent"
2225
android:name="com.google.android.gms.maps.SupportMapFragment" />

‎library/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ android {
6060
}
6161

6262
dependencies {
63-
implementation 'com.google.android.gms:play-services-maps:18.1.0'
63+
// We are adding api() for the Maps SDK for Android, so it propagates to the app-level modules.
64+
api 'com.google.android.gms:play-services-maps:18.2.0'
6465
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
6566
implementation 'androidx.appcompat:appcompat:1.6.1'
6667
implementation 'androidx.core:core-ktx:1.12.0'

‎library/src/main/java/com/google/maps/android/clustering/view/DefaultAdvancedMarkersClusterRenderer.java

+1,185
Large diffs are not rendered by default.

‎library/src/main/java/com/google/maps/android/collections/MarkerManager.java

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import android.view.View;
2020

2121
import com.google.android.gms.maps.GoogleMap;
22+
import com.google.android.gms.maps.model.AdvancedMarker;
23+
import com.google.android.gms.maps.model.AdvancedMarkerOptions;
2224
import com.google.android.gms.maps.model.Marker;
2325
import com.google.android.gms.maps.model.MarkerOptions;
2426

@@ -145,6 +147,11 @@ public Marker addMarker(MarkerOptions opts) {
145147
return marker;
146148
}
147149

150+
public Marker addMarker(AdvancedMarkerOptions opts) {
151+
Marker marker = mMap.addMarker(opts);
152+
super.add(marker);
153+
return marker;
154+
}
148155
public void addAll(java.util.Collection<MarkerOptions> opts) {
149156
for (MarkerOptions opt : opts) {
150157
addMarker(opt);

0 commit comments

Comments
 (0)
Please sign in to comment.