From 48fed59549c8378a877d4eedbff5d40025c0f0b3 Mon Sep 17 00:00:00 2001 From: Matvei Stefarov Date: Mon, 24 Apr 2023 11:56:15 -0700 Subject: [PATCH] Reduce diff --- .../Samples/PopupViewer/PopupViewerSample.xaml.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs index c822ad107..54ac420df 100644 --- a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs +++ b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs @@ -48,7 +48,10 @@ private async void mapView_GeoViewTapped(object sender, GeoViewInputEventArgs e) private Popup GetPopup(IdentifyLayerResult result) { if (result == null) + { return null; + } + var popup = result.Popups.FirstOrDefault(); if (popup != null) { @@ -93,6 +96,7 @@ private Popup BuildPopupFromGeoElement(IdentifyLayerResult result) return new Popup(geoElement, popupDefinition); } } + return Popup.FromGeoElement(geoElement); } return BuildPopupFromGeoElement(result.SublayerResults); @@ -101,12 +105,16 @@ private Popup BuildPopupFromGeoElement(IdentifyLayerResult result) private Popup BuildPopupFromGeoElement(IEnumerable results) { if (results == null) + { return null; + } foreach (var result in results) { var popup = BuildPopupFromGeoElement(result); if (popup != null) + { return popup; + } } return null; }