[Android Maps] Make markers available to subclasses (#3751)

* Make markers available to subclasses * Fix build * Use Find instead of FirstOrDefault
xamarin · Sep 17, 2018 · bd31e1e · bd31e1e
1 parent 6aa844b
commit bd31e1e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms.Maps.Android/MapRenderer.cs
@@ -250,7 +250,7 @@ void AddPins(IList pins)
 		void PinOnPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			Pin pin = (Pin)sender;
-			Marker marker = _markers.FirstOrDefault(m => m.Id == (string)pin.Id);
+			Marker marker = GetMarkerForPin(pin);
 
 			if (marker == null)
 			{
@@ -271,6 +271,11 @@ void PinOnPropertyChanged(object sender, PropertyChangedEventArgs e)
 			}
 		}
 
+		protected Marker GetMarkerForPin(Pin pin)
+		{
+			return _markers?.Find(m => m.Id == (string)pin.Id);
+		}
+
 		void MapOnMarkerClick(object sender, GoogleMap.InfoWindowClickEventArgs eventArgs)
 		{
 			// clicked marker
@@ -373,7 +378,7 @@ void RemovePins(IList pins)
 			foreach (Pin p in pins)
 			{
 				p.PropertyChanged -= PinOnPropertyChanged;
-				var marker = _markers.FirstOrDefault(m => m.Id == (string)p.Id);
+				var marker = GetMarkerForPin(p);
 
 				if (marker == null)
 				{