Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions demo/res/raw/radar_search.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[
{ "lat" : 51.5145160, "lng" : -0.1270060 },
{ "lat" : 51.5064490, "lng" : -0.1244260 },
{ "lat" : 51.5097080, "lng" : -0.1200450 },
{ "lat" : 51.5090680, "lng" : -0.1421420 },
{ "lat" : 51.4976080, "lng" : -0.1456320 },
{ "lat" : 51.5046150, "lng" : -0.1473780 },
{ "lat" : 51.5077540, "lng" : -0.1378760 },
{ "lat" : 51.5074250, "lng" : -0.1323230 },
{ "lat" : 51.5064490, "lng" : -0.1244260, "title" : "Corinthia Hotel London", "snippet": "Whitehall Pl"},
{ "lat" : 51.5097080, "lng" : -0.1200450, "title" : "Savoy Place", "snippet" : "Covent Garden"},
{ "lat" : 51.5090680, "lng" : -0.1421420, "title" : "Albemarle St", "snippet": "Mayfair"},
{ "lat" : 51.4976080, "lng" : -0.1456320, "title" : " Victoria Square", "snippet": " Belgravia" },
{ "lat" : 51.5046150, "lng" : -0.1473780},
{ "lat" : 51.5077540, "lng" : -0.1378760, "title" : "Jermyn Street", "snippet": "St. James's" },
{ "lat" : 51.5074250, "lng" : -0.1323230 , "title" : "Pall Mall", "snippet": "Westminster"},
{ "lat" : 51.5070030, "lng" : -0.125560 },
{ "lat" : 51.5061590, "lng" : -0.140280 },
{ "lat" : 51.5047420, "lng" : -0.1470490 },
Expand Down
11 changes: 10 additions & 1 deletion demo/src/com/google/maps/android/utils/demo/MyItemReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,20 @@ public List<MyItem> read(InputStream inputStream) throws JSONException {
String json = new Scanner(inputStream).useDelimiter(REGEX_INPUT_BOUNDARY_BEGINNING).next();
JSONArray array = new JSONArray(json);
for (int i = 0; i < array.length(); i++) {
String title = null;
String snippet = null;
JSONObject object = array.getJSONObject(i);
double lat = object.getDouble("lat");
double lng = object.getDouble("lng");
items.add(new MyItem(lat, lng));
if (!object.isNull("title")) {
title = object.getString("title");
}
if (!object.isNull("snippet")) {
snippet = object.getString("snippet");
}
items.add(new MyItem(lat, lng, title, snippet));
}
return items;
}

}
17 changes: 17 additions & 0 deletions demo/src/com/google/maps/android/utils/demo/model/MyItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,30 @@

public class MyItem implements ClusterItem {
private final LatLng mPosition;
private final String mTitle;
private final String mSnippet;

public MyItem(double lat, double lng) {
mPosition = new LatLng(lat, lng);
mTitle = null;
mSnippet = null;
}

public MyItem(double lat, double lng, String title, String snippet) {
mPosition = new LatLng(lat, lng);
mTitle = title;
mSnippet = snippet;
}

@Override
public LatLng getPosition() {
return mPosition;
}

@Override
public String getTitle() { return mTitle; }

@Override
public String getSnippet() { return mSnippet; }

}
10 changes: 10 additions & 0 deletions demo/src/com/google/maps/android/utils/demo/model/Person.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,14 @@ public Person(LatLng position, String name, int pictureResource) {
public LatLng getPosition() {
return mPosition;
}

@Override
public String getTitle() {
return null;
}

@Override
public String getSnippet() {
return null;
}
}
10 changes: 10 additions & 0 deletions library/src/com/google/maps/android/clustering/ClusterItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,14 @@ public interface ClusterItem {
* The position of this marker. This must always return the same value.
*/
LatLng getPosition();

/**
* The title of this marker.
*/
String getTitle();

/**
* The description of this marker.
*/
String getSnippet();
}
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,14 @@ private void perform(MarkerModifier markerModifier) {
} else {
markerOptions.position(item.getPosition());
}
if (!(item.getTitle()== null) && !(item.getSnippet() == null)) {
markerOptions.title(item.getTitle());
markerOptions.snippet(item.getSnippet());
} else if (!(item.getSnippet() == null)) {
markerOptions.title(item.getSnippet());
} else if (!(item.getTitle() == null)) {
markerOptions.title(item.getTitle());
}
onBeforeClusterItemRendered(item, markerOptions);
marker = mClusterManager.getMarkerCollection().addMarker(markerOptions);
markerWithPosition = new MarkerWithPosition(marker);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ public TestingItem(double lat, double lng) {
public LatLng getPosition() {
return mPosition;
}

@Override
public String getTitle() {
return null;
}

@Override
public String getSnippet() {
return null;
}
}

public void setUp() {
Expand Down