use azure map for GetPointOfInterestListByAddressAsync (#1988) (#1994)

xieofxie · ryanisgrig · commit 66277aaad365 · 2019-08-01T14:47:23.000-07:00
diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/FindParkingDialog.cs
@@ -116,20 +116,20 @@ protected async Task<DialogTurnResult> RouteToFindFindParkingDialog(WaterfallSte
                     {
                         var pointOfInterest = pointOfInterestAddressList[0];
                         pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(pointOfInterest.Geolocation.Latitude, pointOfInterest.Geolocation.Longitude);
-                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);
                     }
                     else
                     {
                         // Find parking lot near address
                         pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);
-                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);
                     }
                 }
                 else
                 {
                     // No entities identified, find nearby parking lots
                     pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);
-                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);
                 }
 
                 if (cards.Count == 0)
diff --git a/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs b/skills/src/csharp/pointofinterestskill/pointofinterestskill/Dialogs/PointOfInterestDialogBase.cs
@@ -120,7 +120,7 @@ protected async Task<DialogTurnResult> ConfirmCurrentLocation(WaterfallStepConte
                 var service = ServiceManager.InitAddressMapsService(Settings);
 
                 var pointOfInterestList = await service.GetPointOfInterestListByAddressAsync(double.NaN, double.NaN, sc.Result.ToString());
-                var cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                var cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);
 
                 if (cards.Count() == 0)
                 {
@@ -247,7 +247,7 @@ protected async Task<DialogTurnResult> ProcessCurrentLocationSelection(Waterfall
                 {
                     // No entities identified, find nearby locations
                     pointOfInterestList = await service.GetNearbyPointOfInterestListAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);
-                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);
                 }
                 else if (!string.IsNullOrEmpty(state.Keyword) && !string.IsNullOrEmpty(state.Address))
                 {
@@ -258,26 +258,26 @@ protected async Task<DialogTurnResult> ProcessCurrentLocationSelection(Waterfall
                     {
                         var pointOfInterest = pointOfInterestAddressList[0];
                         pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(pointOfInterest.Geolocation.Latitude, pointOfInterest.Geolocation.Longitude, state.Keyword);
-                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);
                     }
                     else
                     {
                         // No POIs found from address - search near current coordinates
                         pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Keyword);
-                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                        cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);
                     }
                 }
                 else if (!string.IsNullOrEmpty(state.Keyword))
                 {
                     // Fuzzy query search with keyword
                     pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Keyword);
-                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);
                 }
                 else if (!string.IsNullOrEmpty(state.Address))
                 {
                     // Fuzzy query search with address
-                    pointOfInterestList = await service.GetPointOfInterestListByAddressAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Address);
-                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);
+                    pointOfInterestList = await addressMapsService.GetPointOfInterestListByAddressAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Address);
+                    cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, addressMapsService);
                 }
 
                 if (cards.Count() == 0)
@@ -457,25 +457,17 @@ protected async Task<List<PointOfInterestModel>> CurrentLocationValidator(Prompt
             return await Task.FromResult(pointOfInterestList);
         }
 
-        protected async Task<List<Card>> GetPointOfInterestLocationCards(DialogContext sc, List<PointOfInterestModel> pointOfInterestList)
+        // service: for details. the one generates pointOfInterestList
+        protected async Task<List<Card>> GetPointOfInterestLocationCards(DialogContext sc, List<PointOfInterestModel> pointOfInterestList, IGeoSpatialService service)
         {
             var state = await Accessor.GetAsync(sc.Context);
-            var service = ServiceManager.InitMapsService(Settings);
-            var addressService = ServiceManager.InitAddressMapsService(Settings);
             var cards = new List<Card>();
 
             if (pointOfInterestList != null && pointOfInterestList.Count > 0)
             {
                 for (var i = 0; i < pointOfInterestList.Count; i++)
                 {
-                    if (sc.ActiveDialog.Id.Equals(Actions.CheckForCurrentLocation))
-                    {
-                        pointOfInterestList[i] = await addressService.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);
-                    }
-                    else
-                    {
-                        pointOfInterestList[i] = await service.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);
-                    }
+                    pointOfInterestList[i] = await service.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);
 
                     // Increase by one to avoid zero based options to the user which are confusing
                     pointOfInterestList[i].Index = i + 1;

Original file line number	Diff line number	Diff line change
`@@ -116,20 +116,20 @@ protected async Task<DialogTurnResult> RouteToFindFindParkingDialog(WaterfallSte`
`116`	`116`	`{`
`117`	`117`	`var pointOfInterest = pointOfInterestAddressList[0];`
`118`	`118`	`pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(pointOfInterest.Geolocation.Latitude, pointOfInterest.Geolocation.Longitude);`
`119`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`119`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`	`123`	`// Find parking lot near address`
`124`	`124`	`pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);`
`125`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`125`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`else`
`129`	`129`	`{`
`130`	`130`	`// No entities identified, find nearby parking lots`
`131`	`131`	`pointOfInterestList = await mapsService.GetPointOfInterestListByParkingCategoryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);`
`132`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`132`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, mapsService);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`if (cards.Count == 0)`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected async Task<DialogTurnResult> ConfirmCurrentLocation(WaterfallStepConte`
`120`	`120`	`var service = ServiceManager.InitAddressMapsService(Settings);`
`121`	`121`
`122`	`122`	`var pointOfInterestList = await service.GetPointOfInterestListByAddressAsync(double.NaN, double.NaN, sc.Result.ToString());`
`123`		`- var cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`123`	`+ var cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);`
`124`	`124`
`125`	`125`	`if (cards.Count() == 0)`
`126`	`126`	`{`
`@@ -247,7 +247,7 @@ protected async Task<DialogTurnResult> ProcessCurrentLocationSelection(Waterfall`
`247`	`247`	`{`
`248`	`248`	`// No entities identified, find nearby locations`
`249`	`249`	`pointOfInterestList = await service.GetNearbyPointOfInterestListAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude);`
`250`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`250`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);`
`251`	`251`	`}`
`252`	`252`	`else if (!string.IsNullOrEmpty(state.Keyword) && !string.IsNullOrEmpty(state.Address))`
`253`	`253`	`{`
`@@ -258,26 +258,26 @@ protected async Task<DialogTurnResult> ProcessCurrentLocationSelection(Waterfall`
`258`	`258`	`{`
`259`	`259`	`var pointOfInterest = pointOfInterestAddressList[0];`
`260`	`260`	`pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(pointOfInterest.Geolocation.Latitude, pointOfInterest.Geolocation.Longitude, state.Keyword);`
`261`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`261`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);`
`262`	`262`	`}`
`263`	`263`	`else`
`264`	`264`	`{`
`265`	`265`	`// No POIs found from address - search near current coordinates`
`266`	`266`	`pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Keyword);`
`267`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`267`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`else if (!string.IsNullOrEmpty(state.Keyword))`
`271`	`271`	`{`
`272`	`272`	`// Fuzzy query search with keyword`
`273`	`273`	`pointOfInterestList = await service.GetPointOfInterestListByQueryAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Keyword);`
`274`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`274`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, service);`
`275`	`275`	`}`
`276`	`276`	`else if (!string.IsNullOrEmpty(state.Address))`
`277`	`277`	`{`
`278`	`278`	`// Fuzzy query search with address`
`279`		`- pointOfInterestList = await service.GetPointOfInterestListByAddressAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Address);`
`280`		`- cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList);`
	`279`	`+ pointOfInterestList = await addressMapsService.GetPointOfInterestListByAddressAsync(state.CurrentCoordinates.Latitude, state.CurrentCoordinates.Longitude, state.Address);`
	`280`	`+ cards = await GetPointOfInterestLocationCards(sc, pointOfInterestList, addressMapsService);`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`if (cards.Count() == 0)`
`@@ -457,25 +457,17 @@ protected async Task<List<PointOfInterestModel>> CurrentLocationValidator(Prompt`
`457`	`457`	`return await Task.FromResult(pointOfInterestList);`
`458`	`458`	`}`
`459`	`459`
`460`		`- protected async Task<List<Card>> GetPointOfInterestLocationCards(DialogContext sc, List<PointOfInterestModel> pointOfInterestList)`
	`460`	`+ // service: for details. the one generates pointOfInterestList`
	`461`	`+ protected async Task<List<Card>> GetPointOfInterestLocationCards(DialogContext sc, List<PointOfInterestModel> pointOfInterestList, IGeoSpatialService service)`
`461`	`462`	`{`
`462`	`463`	`var state = await Accessor.GetAsync(sc.Context);`
`463`		`- var service = ServiceManager.InitMapsService(Settings);`
`464`		`- var addressService = ServiceManager.InitAddressMapsService(Settings);`
`465`	`464`	`var cards = new List<Card>();`
`466`	`465`
`467`	`466`	`if (pointOfInterestList != null && pointOfInterestList.Count > 0)`
`468`	`467`	`{`
`469`	`468`	`for (var i = 0; i < pointOfInterestList.Count; i++)`
`470`	`469`	`{`
`471`		`- if (sc.ActiveDialog.Id.Equals(Actions.CheckForCurrentLocation))`
`472`		`- {`
`473`		`- pointOfInterestList[i] = await addressService.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);`
`474`		`- }`
`475`		`- else`
`476`		`- {`
`477`		`- pointOfInterestList[i] = await service.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);`
`478`		`- }`
	`470`	`+ pointOfInterestList[i] = await service.GetPointOfInterestDetailsAsync(pointOfInterestList[i]);`
`479`	`471`
`480`	`472`	`// Increase by one to avoid zero based options to the user which are confusing`
`481`	`473`	`pointOfInterestList[i].Index = i + 1;`