Used Map.GetWidgetsOfMapAndLayers() in ten places

pauldendulk · pauldendulk · commit ba0e1cc07d39 · 2018-12-08T13:06:56.000+01:00
diff --git a/Mapsui.UI.Android/MapControl.cs b/Mapsui.UI.Android/MapControl.cs
@@ -65,16 +65,14 @@ public void Initialize()
         private void OnDoubleTapped(object sender, GestureDetector.DoubleTapEventArgs e)
         {
             var position = GetScreenPosition(e.Event, this);
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 position, position, Renderer.SymbolCache, WidgetTouched, 2));
         }
 
         private void OnSingleTapped(object sender, GestureDetector.SingleTapConfirmedEventArgs e)
         {
             var position = GetScreenPosition(e.Event, this);
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 position, position, Renderer.SymbolCache, WidgetTouched, 1));
         }
 
diff --git a/Mapsui.UI.Forms/MapControl.cs b/Mapsui.UI.Forms/MapControl.cs
@@ -525,8 +525,8 @@ private bool OnDoubleTapped(Geometries.Point screenPosition, int numOfTaps)
             if (args.Handled)
                 return true;
 
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            var eventReturn = InvokeInfo(Map.Layers, widgets, Viewport, screenPosition, screenPosition, _renderer.SymbolCache, WidgetTouched, numOfTaps);
+            var eventReturn = InvokeInfo(Map.Layers, Map.GetWidgetsOfMapAndLayers(), Viewport, screenPosition, 
+                screenPosition, _renderer.SymbolCache, WidgetTouched, numOfTaps);
 
             if (eventReturn != null)
             {
@@ -554,8 +554,8 @@ private bool OnSingleTapped(Geometries.Point screenPosition)
             if (args.Handled)
                 return true;
 
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            var eventReturn = InvokeInfo(Map.Layers, widgets, Viewport, screenPosition, screenPosition, _renderer.SymbolCache, WidgetTouched, 1);
+            var eventReturn = InvokeInfo(Map.Layers, Map.GetWidgetsOfMapAndLayers(), Viewport, screenPosition, 
+                screenPosition, _renderer.SymbolCache, WidgetTouched, 1);
 
             if (eventReturn != null)
                 return eventReturn.Handled;
diff --git a/Mapsui.UI.Uwp/MapControl.cs b/Mapsui.UI.Uwp/MapControl.cs
@@ -74,16 +74,14 @@ public MapControl()
         private void OnDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
             var tabPosition = e.GetPosition(this).ToMapsui();
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 tabPosition, tabPosition, Renderer.SymbolCache, WidgetTouched, 2));
         }
 
         private void OnSingleTapped(object sender, TappedRoutedEventArgs e)
         {
             var tabPosition = e.GetPosition(this).ToMapsui();
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 tabPosition, tabPosition, Renderer.SymbolCache, WidgetTouched, 1));
         }
 
diff --git a/Mapsui.UI.Wpf/MapControl.cs b/Mapsui.UI.Wpf/MapControl.cs
@@ -303,8 +303,7 @@ private void MapControlMouseLeftButtonDown(object sender, MouseButtonEventArgs e
                 if (IsClick(_currentMousePosition, _downMousePosition))
                 {
                     HandleFeatureInfo(e);
-                    var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-                    OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,
+                    OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,
                         touchPosition, _downMousePosition, Renderer.SymbolCache, WidgetTouched, e.ClickCount));
                 }
             }
@@ -348,8 +347,7 @@ private void MapControlTouchUp(object sender, TouchEventArgs e)
                 // todo: Pass the touchDown position. It needs to be set at touch down.
 
                 // todo: Figure out how to do a number of taps for WPF
-                var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-                OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+                OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                     touchPosition, touchPosition, Renderer.SymbolCache, 
                     WidgetTouched, 1));
             }
diff --git a/Mapsui.UI.iOS/MapControl.cs b/Mapsui.UI.iOS/MapControl.cs
@@ -75,16 +75,14 @@ public void Initialize()
         private void OnDoubleTapped(UITapGestureRecognizer gesture)
         {
             var position = GetScreenPosition(gesture.LocationInView(this));
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 position, position, Renderer.SymbolCache, WidgetTouched, 2));
         }
         
         private void OnSingleTapped(UITapGestureRecognizer gesture)
         {
             var position = GetScreenPosition(gesture.LocationInView(this));
-            var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();
-            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport, 
+            OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport, 
                 position, position, Renderer.SymbolCache, WidgetTouched, 1));
         }
        
diff --git a/Mapsui/Map.cs b/Mapsui/Map.cs
@@ -271,5 +271,10 @@ private void OnDataChanged(object sender, DataChangedEventArgs e)
         }
 
         public Action<INavigator> Home { get; set; } = n => n.NavigateToFullEnvelope();
+
+        public IEnumerable<IWidget> GetWidgetsOfMapAndLayers()
+        {
+            return Widgets.Concat(Layers.Select(l => l.Attribution)).Where(w => w != null).ToList();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,16 +65,14 @@ public void Initialize()`
`65`	`65`	`private void OnDoubleTapped(object sender, GestureDetector.DoubleTapEventArgs e)`
`66`	`66`	`{`
`67`	`67`	`var position = GetScreenPosition(e.Event, this);`
`68`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`69`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`68`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`70`	`69`	`position, position, Renderer.SymbolCache, WidgetTouched, 2));`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`private void OnSingleTapped(object sender, GestureDetector.SingleTapConfirmedEventArgs e)`
`74`	`73`	`{`
`75`	`74`	`var position = GetScreenPosition(e.Event, this);`
`76`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`77`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`75`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`78`	`76`	`position, position, Renderer.SymbolCache, WidgetTouched, 1));`
`79`	`77`	`}`
`80`	`78`
Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,14 @@ public MapControl()`
`74`	`74`	`private void OnDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)`
`75`	`75`	`{`
`76`	`76`	`var tabPosition = e.GetPosition(this).ToMapsui();`
`77`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`78`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`77`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`79`	`78`	`tabPosition, tabPosition, Renderer.SymbolCache, WidgetTouched, 2));`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`private void OnSingleTapped(object sender, TappedRoutedEventArgs e)`
`83`	`82`	`{`
`84`	`83`	`var tabPosition = e.GetPosition(this).ToMapsui();`
`85`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`86`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`84`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`87`	`85`	`tabPosition, tabPosition, Renderer.SymbolCache, WidgetTouched, 1));`
`88`	`86`	`}`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,7 @@ private void MapControlMouseLeftButtonDown(object sender, MouseButtonEventArgs e`
`303`	`303`	`if (IsClick(_currentMousePosition, _downMousePosition))`
`304`	`304`	`{`
`305`	`305`	`HandleFeatureInfo(e);`
`306`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`307`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`306`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`308`	`307`	`touchPosition, _downMousePosition, Renderer.SymbolCache, WidgetTouched, e.ClickCount));`
`309`	`308`	`}`
`310`	`309`	`}`
`@@ -348,8 +347,7 @@ private void MapControlTouchUp(object sender, TouchEventArgs e)`
`348`	`347`	`// todo: Pass the touchDown position. It needs to be set at touch down.`
`349`	`348`
`350`	`349`	`// todo: Figure out how to do a number of taps for WPF`
`351`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`352`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`350`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`353`	`351`	`touchPosition, touchPosition, Renderer.SymbolCache,`
`354`	`352`	`WidgetTouched, 1));`
`355`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,16 +75,14 @@ public void Initialize()`
`75`	`75`	`private void OnDoubleTapped(UITapGestureRecognizer gesture)`
`76`	`76`	`{`
`77`	`77`	`var position = GetScreenPosition(gesture.LocationInView(this));`
`78`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`79`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`78`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`80`	`79`	`position, position, Renderer.SymbolCache, WidgetTouched, 2));`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`private void OnSingleTapped(UITapGestureRecognizer gesture)`
`84`	`83`	`{`
`85`	`84`	`var position = GetScreenPosition(gesture.LocationInView(this));`
`86`		`- var widgets = Map.Layers.Select(l => l.Attribution).Where(a => a != null).Concat(Map.Widgets).ToList();`
`87`		`- OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), widgets, Viewport,`
	`85`	`+ OnInfo(InvokeInfo(Map.Layers.Where(l => l.IsMapInfoLayer), Map.GetWidgetsOfMapAndLayers(), Viewport,`
`88`	`86`	`position, position, Renderer.SymbolCache, WidgetTouched, 1));`
`89`	`87`	`}`
`90`	`88`
Original file line number	Diff line number	Diff line change
`@@ -271,5 +271,10 @@ private void OnDataChanged(object sender, DataChangedEventArgs e)`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`public Action<INavigator> Home { get; set; } = n => n.NavigateToFullEnvelope();`
	`274`	`+`
	`275`	`+ public IEnumerable<IWidget> GetWidgetsOfMapAndLayers()`
	`276`	`+ {`
	`277`	`+ return Widgets.Concat(Layers.Select(l => l.Attribution)).Where(w => w != null).ToList();`
	`278`	`+ }`
`274`	`279`	`}`
`275`	`280`	`}`