From 7e343372c4edcb5b3053e40a4e8bf511d73e100f Mon Sep 17 00:00:00 2001
From: "Michael Lacher (RDV)" <milacher@microsoft.com>
Date: Tue, 23 Jul 2019 18:10:03 -0700
Subject: [PATCH 1/4] Picker starts in Seattle Picker uses GPS location or
 address hint Picker allows selection of desired result

---
 .../WlihaInputUI.Android/MainActivity.cs      |  8 +-
 .../WlihaInputUI.Android.csproj               |  9 +++
 .../WlihaInputUI/AddressPicker.xaml           |  3 +-
 .../WlihaInputUI/AddressPicker.xaml.cs        | 73 +++++++++++++++++--
 .../WlihaInputUI/MainPage.xaml.cs             |  2 +-
 .../WlihaInputUI/WlihaInputUI.csproj          |  2 +
 6 files changed, 83 insertions(+), 14 deletions(-)

diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/MainActivity.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/MainActivity.cs
index ebced1a..c4ecef9 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/MainActivity.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/MainActivity.cs
@@ -6,6 +6,7 @@
 using Android.Views;
 using Android.Widget;
 using Android.OS;
+using Plugin.CurrentActivity;
 
 namespace WlihaInputUI.Droid
 {
@@ -21,13 +22,14 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
+            CrossCurrentActivity.Current.Init(this, savedInstanceState);
             Xamarin.FormsMaps.Init(this, savedInstanceState);
             LoadApplication(new App());
         }
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
-        {
-            Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
 
+        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
+        {
+            Plugin.Permissions.PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
             base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
         }
     }
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/WlihaInputUI.Android.csproj b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/WlihaInputUI.Android.csproj
index e753088..f851d5c 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/WlihaInputUI.Android.csproj
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/WlihaInputUI.Android.csproj
@@ -61,6 +61,15 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Plugin.CurrentActivity">
+      <Version>2.1.0.4</Version>
+    </PackageReference>
+    <PackageReference Include="Plugin.Permissions">
+      <Version>3.0.0.12</Version>
+    </PackageReference>
+    <PackageReference Include="Xam.Plugin.Geolocator">
+      <Version>4.5.0.6</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
index 6080044..53573d2 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
@@ -8,9 +8,8 @@
              x:Class="WlihaInputUI.AddressPicker"
              >
   <ContentPage.Content>
-        <StackLayout VerticalOptions="FillAndExpand">
+        <StackLayout x:Name="layout" VerticalOptions="FillAndExpand">
             <Label x:Name="prompt" Text="Pick address on map" />
-            <local:ExtendedMap x:Name="map" MapType="Street" IsShowingUser="True"/>
             <Picker x:Name="alternativePicker" Title="Pick address" IsVisible="True" />
             <Button x:Name="accept" Text="Accept" IsEnabled="False" Clicked="Accept_Clicked"/>
       </StackLayout>
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
index 0fc78e7..107d446 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
@@ -1,11 +1,12 @@
-using System;
+using Plugin.Geolocator;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-
+using Xamarin.Essentials;
 using Xamarin.Forms;
 using Xamarin.Forms.Maps;
 using Xamarin.Forms.Xaml;
@@ -15,13 +16,14 @@ namespace WlihaInputUI
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class AddressPicker : ContentPage
     {
+        private ExtendedMap map;
         private Pin activePin;
         private Geocoder geocoder;
         private TaskCompletionSource<string> pickResult;
 
-        public static async Task<string> ModalPickAddressFromGPS(INavigation where)
+        public static async Task<string> ModalPickAddress(INavigation where, String hint)
         {
-            var picker = new AddressPicker();
+            var picker = new AddressPicker(hint);
 
             await where.PushModalAsync(picker, true);
             var result = await picker.pickResult.Task;
@@ -29,21 +31,73 @@ public static async Task<string> ModalPickAddressFromGPS(INavigation where)
             return result;
         }
 
-        public AddressPicker()
+        public AddressPicker(String hint)
         {
             InitializeComponent();
 
+            map = new ExtendedMap(
+                MapSpan.FromCenterAndRadius(
+                    new Position(47.60357, -122.32945),
+                    new Distance(3000)
+                )
+            )
+            {
+                MapType = MapType.Street,
+                IsShowingUser = true
+            };
+            map.Tap += Map_Tap;
+            layout.Children.Insert(1, map);
+
             activePin = new Pin();
             geocoder = new Geocoder();
             pickResult = new TaskCompletionSource<string>();
 
-            map.Tap += Map_Tap;
+            if ((hint!=null) && (hint != ""))
+            {
+                CrossGeolocator.Current.GetPositionsForAddressAsync(hint).ContinueWith(
+                    (result) => Device.BeginInvokeOnMainThread(
+                            () =>
+                            {
+                                var location = result.Result.FirstOrDefault();
+                                if (location != null)
+                                {
+                                    UpdatePosition(
+                                        new Position(location.Latitude, location.Longitude),
+                                        new Distance(Math.Max(location.Accuracy, 100))
+                                        );
+                                }
+                            }
+                        )
+                    );
 
+            }
+            else
+            {
+                CrossGeolocator.Current.GetPositionAsync().ContinueWith(
+                    (result) => Device.BeginInvokeOnMainThread(
+                            () =>
+                            {
+                                if (result.Result != null)
+                                {
+                                    UpdatePosition(
+                                        new Position(result.Result.Latitude, result.Result.Longitude),
+                                        new Distance(Math.Max(result.Result.Accuracy, 100))
+                                        );
+                                }
+                            }
+                        )
+                    );
+            }
         }
 
         private void Map_Tap(object sender, TapEventArgs e)
         {
-            activePin.Position = e.Position;
+            UpdatePosition(e.Position, map.VisibleRegion.Radius);
+        }
+
+        private void UpdatePosition(Position position, Distance radius)
+        {
+            activePin.Position = position;
             activePin.Label = "Fetching address ...";
             activePin.Type = PinType.Place;
 
@@ -51,7 +105,9 @@ private void Map_Tap(object sender, TapEventArgs e)
             {
                 map.Pins.Add(activePin);
             }
-            geocoder.GetAddressesForPositionAsync(e.Position).ContinueWith(
+            map.MoveToRegion(MapSpan.FromCenterAndRadius(position,radius));
+
+            geocoder.GetAddressesForPositionAsync(position).ContinueWith(
                 (result) => Device.BeginInvokeOnMainThread(
                         () => ResolveComplete(result.Result)
                     )
@@ -76,6 +132,7 @@ private void ResolveComplete(IEnumerable<String> addresses)
                 activePin.Label = addresses.First();
                 accept.IsEnabled = true;
             }
+            alternativePicker.SelectedIndex = 0;
         }
 
         private void Accept_Clicked(object sender, EventArgs e)
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
index 0493015..06ca5f7 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
@@ -38,7 +38,7 @@ void OnDeleteButtonClicked(object sender, EventArgs e)
 
         async void OnMapTestClicked(object sender, EventArgs e)
         {
-            String result = await AddressPicker.ModalPickAddressFromGPS(Navigation);
+            String result = await AddressPicker.ModalPickAddress(Navigation, editor.Text);
             await DisplayAlert("Picked Address", result, "OK");
         }
     }
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/WlihaInputUI.csproj b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/WlihaInputUI.csproj
index b4d6306..fa2c9f5 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/WlihaInputUI.csproj
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/WlihaInputUI.csproj
@@ -11,6 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Plugin.Permissions" Version="3.0.0.12" />
+    <PackageReference Include="Xam.Plugin.Geolocator" Version="4.5.0.6" />
     <PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
     <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
     <PackageReference Include="Xamarin.Forms.Maps" Version="4.1.0.581479" />

From 49e0312763ffcc98d461c301d6f0ef7e9ecb5236 Mon Sep 17 00:00:00 2001
From: "Michael Lacher (RDV)" <milacher@microsoft.com>
Date: Wed, 24 Jul 2019 13:59:19 -0700
Subject: [PATCH 2/4] better address format

---
 .../WlihaInputUI/AddressPicker.xaml.cs        | 47 +++++++++++++++++--
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
index 107d446..6c5f6c7 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
@@ -95,7 +95,7 @@ private void Map_Tap(object sender, TapEventArgs e)
             UpdatePosition(e.Position, map.VisibleRegion.Radius);
         }
 
-        private void UpdatePosition(Position position, Distance radius)
+        private void UpdatePosition(Xamarin.Forms.Maps.Position position, Distance radius)
         {
             activePin.Position = position;
             activePin.Label = "Fetching address ...";
@@ -107,19 +107,21 @@ private void UpdatePosition(Position position, Distance radius)
             }
             map.MoveToRegion(MapSpan.FromCenterAndRadius(position,radius));
 
-            geocoder.GetAddressesForPositionAsync(position).ContinueWith(
+            var geoPos = new Plugin.Geolocator.Abstractions.Position(position.Latitude, position.Longitude);
+
+            CrossGeolocator.Current.GetAddressesForPositionAsync(geoPos).ContinueWith(
                 (result) => Device.BeginInvokeOnMainThread(
                         () => ResolveComplete(result.Result)
                     )
                 );
         }
 
-        private void ResolveComplete(IEnumerable<String> addresses)
+        private void ResolveComplete(IEnumerable<Plugin.Geolocator.Abstractions.Address> addresses)
         {
             alternativePicker.Items.Clear();
             foreach (var addr in addresses)
             {
-                alternativePicker.Items.Add(addr);
+                alternativePicker.Items.Add(FormatAddress(addr));
             }
 
             if (addresses.Count() == 0)
@@ -129,7 +131,7 @@ private void ResolveComplete(IEnumerable<String> addresses)
             }
             else
             {
-                activePin.Label = addresses.First();
+                activePin.Label = alternativePicker.Items.First();
                 accept.IsEnabled = true;
             }
             alternativePicker.SelectedIndex = 0;
@@ -139,5 +141,40 @@ private void Accept_Clicked(object sender, EventArgs e)
         {
             pickResult.SetResult((string)alternativePicker.SelectedItem);
         }
+
+        private String FormatAddress(Plugin.Geolocator.Abstractions.Address address)
+        {
+            // option one: street number, street and city
+            if ((address.SubThoroughfare != null) && (address.Thoroughfare != null) && (address.Locality != null))
+            {
+                return address.SubThoroughfare + " " + address.Thoroughfare + ", " + address.Locality;
+            }
+            // option two: street and city only
+            else if ((address.Thoroughfare != null) && (address.Locality != null))
+            {
+                return address.Thoroughfare + ", " + address.Locality;
+            }
+            // option three: city + zip
+            else if ((address.Locality != null) && (address.PostalCode!=null))
+            {
+                return address.Locality + " " + address.PostalCode;
+            }
+            // option four: city + state
+            else if ((address.Locality != null) && (address.AdminArea != null))
+            {
+                return address.Locality + ", " + address.AdminArea;
+            }
+            // option five: city + country code
+            else if ((address.Locality != null) && (address.CountryCode != null))
+            {
+                return address.Locality + ", " + address.CountryCode;
+            }
+            // option six: concatenate fields
+            else
+            {
+                string[] fields = { address.SubThoroughfare, address.Thoroughfare, address.SubLocality, address.Locality, address.PostalCode, address.CountryCode, address.CountryName };
+                return String.Join(", ", fields);
+            }
+        }
     }
 }
\ No newline at end of file

From 16c9b9756048c34312eb35b798a2a7325c8c9215 Mon Sep 17 00:00:00 2001
From: "Michael Lacher (RDV)" <milacher@microsoft.com>
Date: Wed, 24 Jul 2019 14:16:34 -0700
Subject: [PATCH 3/4] removed BOM from UTF8 file

---
 .../Properties/AndroidManifest.xml            | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/Properties/AndroidManifest.xml b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/Properties/AndroidManifest.xml
index 91a2b54..4ba880a 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/Properties/AndroidManifest.xml
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI.Android/Properties/AndroidManifest.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.WlihaInputUI" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-	<application android:label="WlihaInputUI.Android">
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+  <application android:label="WlihaInputUI.Android">
     <meta-data android:name="com.google.android.maps.v2.API_KEY" android:value="AIzaSyBFf95FynaLaxo3XFyQFvsTqjGEnnQylAk"/>
-      <provider android:name="android.support.v4.content.FileProvider"
-          android:authorities="${applicationId}.fileprovider"
-          android:exported="false"
-          android:grantUriPermissions="true">
+    <provider android:name="android.support.v4.content.FileProvider"
+        android:authorities="${applicationId}.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
       <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
                        android:resource="@xml/file_paths"></meta-data>
-      </provider>
+    </provider>
   </application>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-	<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-	<uses-permission android:name="android.permission.INTERNET" />
-        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-        <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+  <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CAMERA" />
 </manifest>

From 70feebc1846bda7631b64c89d59031ac9e43789b Mon Sep 17 00:00:00 2001
From: "Michael Lacher (RDV)" <milacher@microsoft.com>
Date: Wed, 24 Jul 2019 17:43:22 -0700
Subject: [PATCH 4/4] integrated picker with main app

---
 .../WlihaInputUI/AddressPicker.xaml           |  3 +-
 .../WlihaInputUI/AddressPicker.xaml.cs        | 94 ++++++++++---------
 .../WlihaInputUI/WlihaInputUI/MainPage.xaml   | 24 ++---
 .../WlihaInputUI/MainPage.xaml.cs             | 40 ++++----
 4 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
index 53573d2..ddf2137 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml
@@ -9,8 +9,7 @@
              >
   <ContentPage.Content>
         <StackLayout x:Name="layout" VerticalOptions="FillAndExpand">
-            <Label x:Name="prompt" Text="Pick address on map" />
-            <Picker x:Name="alternativePicker" Title="Pick address" IsVisible="True" />
+            <Picker x:Name="alternativePicker" Title="Pick from map" IsVisible="True" />
             <Button x:Name="accept" Text="Accept" IsEnabled="False" Clicked="Accept_Clicked"/>
       </StackLayout>
   </ContentPage.Content>
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
index 6c5f6c7..fc686ce 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/AddressPicker.xaml.cs
@@ -13,15 +13,39 @@
 
 namespace WlihaInputUI
 {
+    public class Address
+    {
+        public string streetAndNumber;
+        public string city;
+        public string zipcode;
+
+        public override string ToString()
+        {
+            string result = streetAndNumber!=null ? streetAndNumber.Trim() : "";
+            if (!String.IsNullOrWhiteSpace(city))
+            {
+                if (!String.IsNullOrWhiteSpace(result)) result += ", ";
+                result += city;
+            }
+            if (!String.IsNullOrWhiteSpace(zipcode))
+            {
+                if (!String.IsNullOrWhiteSpace(zipcode)) result += ", ";
+                result += zipcode;
+            }
+            return result;
+        }
+    }
+
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class AddressPicker : ContentPage
     {
         private ExtendedMap map;
         private Pin activePin;
         private Geocoder geocoder;
-        private TaskCompletionSource<string> pickResult;
+        private TaskCompletionSource<Address> pickResult;
+        private List<Address> currentCandidates;
 
-        public static async Task<string> ModalPickAddress(INavigation where, String hint)
+        public static async Task<Address> ModalPickAddress(INavigation where, Address hint)
         {
             var picker = new AddressPicker(hint);
 
@@ -31,7 +55,7 @@ public static async Task<string> ModalPickAddress(INavigation where, String hint
             return result;
         }
 
-        public AddressPicker(String hint)
+        public AddressPicker(Address hint)
         {
             InitializeComponent();
 
@@ -46,15 +70,15 @@ public AddressPicker(String hint)
                 IsShowingUser = true
             };
             map.Tap += Map_Tap;
-            layout.Children.Insert(1, map);
+            layout.Children.Insert(0, map);
 
             activePin = new Pin();
             geocoder = new Geocoder();
-            pickResult = new TaskCompletionSource<string>();
+            pickResult = new TaskCompletionSource<Address>();
 
-            if ((hint!=null) && (hint != ""))
+            if ((hint!=null) && (hint.ToString() != ""))
             {
-                CrossGeolocator.Current.GetPositionsForAddressAsync(hint).ContinueWith(
+                CrossGeolocator.Current.GetPositionsForAddressAsync(hint.ToString()).ContinueWith(
                     (result) => Device.BeginInvokeOnMainThread(
                             () =>
                             {
@@ -92,7 +116,7 @@ public AddressPicker(String hint)
 
         private void Map_Tap(object sender, TapEventArgs e)
         {
-            UpdatePosition(e.Position, map.VisibleRegion.Radius);
+            UpdatePosition(e.Position, map.VisibleRegion != null ? map.VisibleRegion.Radius : new Distance(300));
         }
 
         private void UpdatePosition(Xamarin.Forms.Maps.Position position, Distance radius)
@@ -118,19 +142,31 @@ private void UpdatePosition(Xamarin.Forms.Maps.Position position, Distance radiu
 
         private void ResolveComplete(IEnumerable<Plugin.Geolocator.Abstractions.Address> addresses)
         {
+            currentCandidates = new List<Address>();
             alternativePicker.Items.Clear();
             foreach (var addr in addresses)
             {
-                alternativePicker.Items.Add(FormatAddress(addr));
+                Address a = new Address();
+                a.streetAndNumber = ((addr.SubThoroughfare ?? "") + " " + (addr.Thoroughfare ?? "")).Trim();
+                a.city = addr.Locality != null ? addr.Locality.Trim() : "";
+                a.zipcode = addr.PostalCode != null ? addr.PostalCode.Trim() : "";
+
+                if ((a.ToString() != "") && (!currentCandidates.Contains(a)))
+                {
+                    currentCandidates.Add(a);
+                    alternativePicker.Items.Add(a.ToString());
+                }
             }
 
-            if (addresses.Count() == 0)
+            if (currentCandidates.Count() == 0)
             {
-                alternativePicker.Items.Add("Failed to find address");
+                alternativePicker.Title = "Pick from map";
+                activePin.Label = "No address found";
                 accept.IsEnabled = false;
             }
             else
             {
+                alternativePicker.Title = "Select";
                 activePin.Label = alternativePicker.Items.First();
                 accept.IsEnabled = true;
             }
@@ -139,42 +175,8 @@ private void ResolveComplete(IEnumerable<Plugin.Geolocator.Abstractions.Address>
 
         private void Accept_Clicked(object sender, EventArgs e)
         {
-            pickResult.SetResult((string)alternativePicker.SelectedItem);
+            pickResult.SetResult(currentCandidates[alternativePicker.SelectedIndex]);
         }
 
-        private String FormatAddress(Plugin.Geolocator.Abstractions.Address address)
-        {
-            // option one: street number, street and city
-            if ((address.SubThoroughfare != null) && (address.Thoroughfare != null) && (address.Locality != null))
-            {
-                return address.SubThoroughfare + " " + address.Thoroughfare + ", " + address.Locality;
-            }
-            // option two: street and city only
-            else if ((address.Thoroughfare != null) && (address.Locality != null))
-            {
-                return address.Thoroughfare + ", " + address.Locality;
-            }
-            // option three: city + zip
-            else if ((address.Locality != null) && (address.PostalCode!=null))
-            {
-                return address.Locality + " " + address.PostalCode;
-            }
-            // option four: city + state
-            else if ((address.Locality != null) && (address.AdminArea != null))
-            {
-                return address.Locality + ", " + address.AdminArea;
-            }
-            // option five: city + country code
-            else if ((address.Locality != null) && (address.CountryCode != null))
-            {
-                return address.Locality + ", " + address.CountryCode;
-            }
-            // option six: concatenate fields
-            else
-            {
-                string[] fields = { address.SubThoroughfare, address.Thoroughfare, address.SubLocality, address.Locality, address.PostalCode, address.CountryCode, address.CountryName };
-                return String.Join(", ", fields);
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml
index cccc038..de503cc 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml
@@ -74,30 +74,20 @@
                 FontSize = "20" 
                 FontAttributes="Bold" />
                     <Entry x:Name="addrStreet"
-                Placeholder="Number and Street" />
+                Placeholder="Number and Street"/>
                     <Entry x:Name="addrUnit"
-                Placeholder="Unit" />
+                Placeholder="Unit"/>
                     <Entry x:Name="addrCity"
-                Placeholder="City" />
+                Placeholder="City"/>
                     <Entry x:Name="addrCounty"
-                Placeholder="County" />
+                Placeholder="County"/>
                     <Entry x:Name="addrZip"
-                Placeholder="Zip" />
-                    <!--<Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button Text="Save"
-                    Clicked="OnSaveButtonClicked" />
-                    <Button Grid.Column="1"
-                    Text="Delete"
-                    Clicked="OnDeleteButtonClicked"/>
-                </Grid>-->
+                Placeholder="Zip"/>
                 </StackLayout>
                 <StackLayout VerticalOptions="CenterAndExpand">
                 </StackLayout>
-                <StackLayout VerticalOptions="End">
+                <StackLayout FlowDirection="LeftToRight" VerticalOptions="End">
+                    <Button Text="Use Map" x:Name="mapButton" HorizontalOptions="Start" Clicked="MapButton_Clicked"/>
                     <Button Text="Next" x:Name="NextPageAddress" HorizontalOptions="End" Clicked="NextPageAddress_Clicked"/>
                 </StackLayout>
             </StackLayout>
diff --git a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
index 8395647..7034f15 100644
--- a/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
+++ b/Input/WlihaInputUI/WlihaInputUI/WlihaInputUI/MainPage.xaml.cs
@@ -8,24 +8,19 @@
 using IO.Swagger.Api;
 using IO.Swagger.Model;
 using IO.Swagger.Client;
+using System.Net.NetworkInformation;
+using Plugin.Geolocator.Abstractions;
 
 namespace WlihaInputUI
 {
     public partial class MainPage : TabbedPage
     {
-        string _fileName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "notes.txt");
-
         public MainPage()
         {
             InitializeComponent();
 
             CameraButtonEviction.Clicked += CameraButtonEviction_ClickedAsync;
             CameraButtonLease.Clicked += CameraButtonLease_ClickedAsync;
-
-            if (File.Exists(_fileName))
-            {
-                //street.Text = File.ReadAllText(_fileName);
-            }
         }
 
         private void NextPageTenant_Clicked(object sender, EventArgs e)
@@ -85,13 +80,13 @@ private async void CameraButtonEviction_ClickedAsync(object sender, EventArgs e)
         private async void CameraButtonLease_ClickedAsync(object sender, EventArgs e)
         {
             Take_Photo(LeasePhoto);
-	}
+        }
+        /*
         async void OnMapTestClicked(object sender, EventArgs e)
         {
-            String result = await AddressPicker.ModalPickAddress(Navigation, editor.Text);
-            await DisplayAlert("Picked Address", result, "OK");
+            
         }
-
+        */
         private async void Take_Photo(Xamarin.Forms.Image imageHolder)
         {/*
             var photo = await Plugin.Media.CrossMedia.Current.TakePhotoAsync(new Plugin.Media.Abstractions.StoreCameraMediaOptions() { });
@@ -167,18 +162,23 @@ private async void Take_Photo(Xamarin.Forms.Image imageHolder)
         }*/
         }
 
-        /*void OnSaveButtonClicked(object sender, EventArgs e)
+        private async void MapButton_Clicked(object sender, EventArgs e)
         {
-            File.WriteAllText(_fileName, street.Text);
-        }
+            Address hint = new Address()
+            {
+                streetAndNumber = addrStreet.Text,
+                city = addrCity.Text,
+                zipcode = addrZip.Text
+            };
 
-        void OnDeleteButtonClicked(object sender, EventArgs e)
-        {
-            if (File.Exists(_fileName))
+            Address result = await AddressPicker.ModalPickAddress(Navigation, hint);
+            if (result != null)
             {
-                File.Delete(_fileName);
+                addrStreet.Text = result.streetAndNumber;
+                addrCity.Text = result.city;
+                addrZip.Text = result.zipcode;
             }
-            street.Text = string.Empty;
-        }*/
+
+        }
     }
 }
\ No newline at end of file