From bdc347a04fcbc5d1e440dca9b1637c0e374103c0 Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Tue, 5 Dec 2017 08:18:52 +0100 Subject: [PATCH] implement #366, add here maps support (#367) * #366 initial work for supporting HERE maps * #366 additional work for handling HERE map in the admin * #366 additional work for handling HERE map in the admin when editing/creating an event * #366 refactor, add map configuration section in basic settings and system page, remove possibility to override the map configuration in the other conf page --- .../java/alfio/config/MvcConfiguration.java | 2 +- .../alfio/controller/EventController.java | 11 +- .../api/admin/LocationApiController.java | 54 +++++-- .../support/LocationDescriptor.java | 57 +++++++- .../alfio/model/system/ConfigurationKeys.java | 12 +- .../configuration/basic-settings.html | 29 ++++ .../admin/partials/configuration/system.html | 28 ++++ .../feature/configuration/configuration.js | 16 +++ .../resources/js/admin/service/service.js | 136 ++++++++++++------ .../support/LocationDescriptorTest.java | 53 ++++++- 10 files changed, 326 insertions(+), 72 deletions(-) diff --git a/src/main/java/alfio/config/MvcConfiguration.java b/src/main/java/alfio/config/MvcConfiguration.java index cafb633260..080edf10d9 100644 --- a/src/main/java/alfio/config/MvcConfiguration.java +++ b/src/main/java/alfio/config/MvcConfiguration.java @@ -230,7 +230,7 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response, + " frame-src 'self' https://js.stripe.com https://www.google.com;" + " font-src 'self';"// + " media-src blob: 'self';"//for loading camera api - + " connect-src 'self' https://api.stripe.com https://maps.googleapis.com/;" //<- currently stripe.js use jsonp but if they switch to xmlhttprequest+cors we will be ready + + " connect-src 'self' https://api.stripe.com https://maps.googleapis.com/ https://geocoder.cit.api.here.com;" //<- currently stripe.js use jsonp but if they switch to xmlhttprequest+cors we will be ready + (environment.acceptsProfiles(Initializer.PROFILE_DEBUG_CSP) ? " report-uri /report-csp-violation" : "")); } }; diff --git a/src/main/java/alfio/controller/EventController.java b/src/main/java/alfio/controller/EventController.java index 04f5e5cf8d..aa05ea04d1 100644 --- a/src/main/java/alfio/controller/EventController.java +++ b/src/main/java/alfio/controller/EventController.java @@ -190,8 +190,15 @@ public String showEvent(@PathVariable("eventName") String eventName, .collect(Collectors.toList()); // - LocationDescriptor ld = LocationDescriptor.fromGeoData(event.getLatLong(), TimeZone.getTimeZone(event.getTimeZone()), - configurationManager.getStringConfigValue(Configuration.from(event.getOrganizationId(), event.getId(), ConfigurationKeys.MAPS_CLIENT_API_KEY))); + final int orgId = event.getOrganizationId(); + final int eventId = event.getId(); + Map> geoInfoConfiguration = configurationManager.getStringConfigValueFrom( + Configuration.from(orgId, eventId, ConfigurationKeys.MAPS_PROVIDER), + Configuration.from(orgId, eventId, ConfigurationKeys.MAPS_CLIENT_API_KEY), + Configuration.from(orgId, eventId, ConfigurationKeys.MAPS_HERE_APP_ID), + Configuration.from(orgId, eventId, ConfigurationKeys.MAPS_HERE_APP_CODE)); + + LocationDescriptor ld = LocationDescriptor.fromGeoData(event.getLatLong(), TimeZone.getTimeZone(event.getTimeZone()), geoInfoConfiguration); final boolean hasAccessPromotions = ticketCategoryRepository.countAccessRestrictedRepositoryByEventId(event.getId()) > 0 || promoCodeRepository.countByEventAndOrganizationId(event.getId(), event.getOrganizationId()) > 0; diff --git a/src/main/java/alfio/controller/api/admin/LocationApiController.java b/src/main/java/alfio/controller/api/admin/LocationApiController.java index cb8fc04a25..b177c81323 100644 --- a/src/main/java/alfio/controller/api/admin/LocationApiController.java +++ b/src/main/java/alfio/controller/api/admin/LocationApiController.java @@ -17,17 +17,19 @@ package alfio.controller.api.admin; import alfio.manager.system.ConfigurationManager; +import alfio.model.modification.support.LocationDescriptor; import alfio.model.system.Configuration; import alfio.model.system.ConfigurationKeys; import com.moodysalem.TimezoneMapper; +import lombok.AllArgsConstructor; +import lombok.Getter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import java.util.*; +import java.util.function.Function; @RestController @RequestMapping("/admin/api") @@ -46,21 +48,53 @@ public String unhandledException(Exception e) { return e.getMessage(); } - @RequestMapping(value = "/location/maps-client-api-key") - public String mapsClientApiKey() { - return configurationManager.getStringConfigValue(Configuration.getSystemConfiguration(ConfigurationKeys.MAPS_CLIENT_API_KEY)).orElse(null); - } - - @RequestMapping(value = "/location/timezones") + @RequestMapping("/location/timezones") public List getTimezones() { List s = new ArrayList<>(ZoneId.getAvailableZoneIds()); s.sort(String::compareTo); return s; } - @RequestMapping(value = "/location/timezone") + @RequestMapping("/location/timezone") public String getTimezone(@RequestParam("lat") double lat, @RequestParam("lng") double lng) { String tzId = TimezoneMapper.tzNameAt(lat, lng); return getTimezones().contains(tzId) ? tzId : null; } + + + + @RequestMapping("/location/static-map-image") + public String getMapImage( + @RequestParam("lat") String lat, + @RequestParam("lng") String lng) { + Map> geoInfoConfiguration = getGeoConf(); + return LocationDescriptor.getMapUrl(lat, lng, geoInfoConfiguration); + } + + private Map> getGeoConf() { + Function pathKeyBuilder = (key) -> Configuration.getSystemConfiguration(key); + return configurationManager.getStringConfigValueFrom( + pathKeyBuilder.apply(ConfigurationKeys.MAPS_PROVIDER), + pathKeyBuilder.apply(ConfigurationKeys.MAPS_CLIENT_API_KEY), + pathKeyBuilder.apply(ConfigurationKeys.MAPS_HERE_APP_ID), + pathKeyBuilder.apply(ConfigurationKeys.MAPS_HERE_APP_CODE)); + } + + @RequestMapping("/location/map-provider-client-api-key") + public ProviderAndKeys getGeoInfoProviderAndKeys() { + Map> geoInfoConfiguration = getGeoConf(); + ConfigurationKeys.GeoInfoProvider provider = LocationDescriptor.getProvider(geoInfoConfiguration); + Map apiKeys = new HashMap<>(); + geoInfoConfiguration.forEach((k,v) -> { + v.ifPresent(value -> apiKeys.put(k, value)); + }); + return new ProviderAndKeys(provider, apiKeys); + } + + @AllArgsConstructor + @Getter + public static class ProviderAndKeys { + private final ConfigurationKeys.GeoInfoProvider provider; + private Map keys; + } } diff --git a/src/main/java/alfio/model/modification/support/LocationDescriptor.java b/src/main/java/alfio/model/modification/support/LocationDescriptor.java index 39bd53a120..0f8e402a29 100644 --- a/src/main/java/alfio/model/modification/support/LocationDescriptor.java +++ b/src/main/java/alfio/model/modification/support/LocationDescriptor.java @@ -16,6 +16,7 @@ */ package alfio.model.modification.support; +import alfio.model.system.ConfigurationKeys; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; @@ -32,8 +33,6 @@ @EqualsAndHashCode public class LocationDescriptor { - private static final String MAP_URL = "https://maps.googleapis.com/maps/api/staticmap?center=${latitude},${longitude}&key=${key}&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7C${latitude},${longitude}"; - private static final String OPENSTREETMAP = "https://tyler-demo.herokuapp.com/?center=${latitude},${longitude}&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7C${latitude},${longitude}"; private final String timeZone; private final String latitude; @@ -51,12 +50,56 @@ public LocationDescriptor(@JsonProperty("timeZone") String timeZone, this.mapUrl = mapUrl; } - public static LocationDescriptor fromGeoData(Pair coordinates, TimeZone timeZone, Optional apiKey) { + public static LocationDescriptor fromGeoData(Pair coordinates, TimeZone timeZone, Map> geoConf) { Map params = new HashMap<>(); - params.put("latitude", coordinates.getLeft()); - params.put("longitude", coordinates.getRight()); - apiKey.ifPresent((key) -> params.put("key", key)); - return new LocationDescriptor(timeZone.getID(), coordinates.getLeft(), coordinates.getRight(), new StrSubstitutor(params).replace(apiKey.isPresent() ? MAP_URL : OPENSTREETMAP)); + String lat = coordinates.getLeft(); + String lng = coordinates.getRight(); + params.put("latitude", lat); + params.put("longitude", lng); + + return new LocationDescriptor(timeZone.getID(), coordinates.getLeft(), coordinates.getRight(), getMapUrl(lat, lng, geoConf)); + } + + public static String getMapUrl(String lat, String lng, Map> geoConf) { + Map params = new HashMap<>(); + params.put("latitude", lat); + params.put("longitude", lng); + + ConfigurationKeys.GeoInfoProvider provider = getProvider(geoConf); + String mapUrl = mapUrl(provider); + + fillParams(provider, geoConf, params); + + return new StrSubstitutor(params).replace(mapUrl); + } + + // for backward compatibility reason, the logic is not straightforward + public static ConfigurationKeys.GeoInfoProvider getProvider(Map> geoConf) { + if((!geoConf.containsKey(ConfigurationKeys.MAPS_PROVIDER) || !geoConf.get(ConfigurationKeys.MAPS_PROVIDER).isPresent()) && + (geoConf.containsKey(ConfigurationKeys.MAPS_CLIENT_API_KEY) && geoConf.get(ConfigurationKeys.MAPS_CLIENT_API_KEY).isPresent())) { + return ConfigurationKeys.GeoInfoProvider.GOOGLE; + } else if (geoConf.containsKey(ConfigurationKeys.MAPS_PROVIDER) && geoConf.get(ConfigurationKeys.MAPS_PROVIDER).isPresent()) { + return geoConf.get(ConfigurationKeys.MAPS_PROVIDER).map(ConfigurationKeys.GeoInfoProvider::valueOf).orElseThrow(IllegalStateException::new); + } else { + return ConfigurationKeys.GeoInfoProvider.NONE; + } + } + + private static String mapUrl(ConfigurationKeys.GeoInfoProvider provider) { + switch (provider) { + case GOOGLE: return "https://maps.googleapis.com/maps/api/staticmap?center=${latitude},${longitude}&key=${key}&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7C${latitude},${longitude}"; + case HERE: return "https://image.maps.api.here.com/mia/1.6/mapview?c=${latitude},${longitude}&z=16&w=400&h=400&poi=${latitude},${longitude}&app_id=${appId}&app_code=${appCode}"; + default: return "https://tyler-demo.herokuapp.com/?center=${latitude},${longitude}&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7C${latitude},${longitude}"; + } + } + + private static void fillParams(ConfigurationKeys.GeoInfoProvider provider, Map> geoConf, Map params) { + if(ConfigurationKeys.GeoInfoProvider.GOOGLE == provider) { + geoConf.get(ConfigurationKeys.MAPS_CLIENT_API_KEY).ifPresent((key) -> params.put("key", key)); + } else if (ConfigurationKeys.GeoInfoProvider.HERE == provider) { + geoConf.get(ConfigurationKeys.MAPS_HERE_APP_ID).ifPresent((appId) -> params.put("appId", appId)); + geoConf.get(ConfigurationKeys.MAPS_HERE_APP_CODE).ifPresent((appCode) -> params.put("appCode", appCode)); + } } } diff --git a/src/main/java/alfio/model/system/ConfigurationKeys.java b/src/main/java/alfio/model/system/ConfigurationKeys.java index 3f1ad20516..eba93aa41e 100644 --- a/src/main/java/alfio/model/system/ConfigurationKeys.java +++ b/src/main/java/alfio/model/system/ConfigurationKeys.java @@ -33,7 +33,10 @@ public enum ConfigurationKeys { BASE_URL("Base application url", false, SettingCategory.GENERAL, ComponentType.TEXT, true, EnumSet.of(SYSTEM), true), - MAPS_CLIENT_API_KEY("Google maps' client api key", false, SettingCategory.GENERAL, ComponentType.TEXT, true, EnumSet.of(SYSTEM), true), + MAPS_PROVIDER("Select the maps provider (Google, Here)", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true), + MAPS_CLIENT_API_KEY("Google maps' client api key", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true), + MAPS_HERE_APP_ID("HERE map App ID", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true), + MAPS_HERE_APP_CODE("HERE map App Code", false, SettingCategory.MAP, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true), RECAPTCHA_API_KEY("Recaptcha api key", false, SettingCategory.GENERAL, ComponentType.TEXT, false, EnumSet.of(SYSTEM), true), @@ -162,7 +165,8 @@ public enum SettingCategory { INVOICE("Invoice settings"), INVOICE_EU("Invoice settings for EU"), MAIL("E-Mail settings"), - ALFIO_PI("Offline check-in and badge printing"); + ALFIO_PI("Offline check-in and badge printing"), + MAP("Maps settings"); private final String description; SettingCategory(String description) { @@ -171,6 +175,10 @@ public enum SettingCategory { } + public enum GeoInfoProvider { + GOOGLE, HERE, NONE + } + private static final Predicate INTERNAL = ConfigurationKeys::isInternal; private final String description; private final boolean internal; diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/basic-settings.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/basic-settings.html index c21280e286..904f58b56b 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/configuration/basic-settings.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/configuration/basic-settings.html @@ -60,6 +60,35 @@

E-Mail

+ +
+

Map

+ Map settings +
+
+

+ +

+

+ +

+
+ +
+
+ +
+
+ +
+
+

Payment

Payment provider settings diff --git a/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html b/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html index 8dad24dee2..b5c6a598b6 100644 --- a/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html +++ b/src/main/webapp/resources/angular-templates/admin/partials/configuration/system.html @@ -83,6 +83,34 @@

E-Mail

+
+

Map

+ Map settings +
+
+

+ +

+

+ +

+
+ +
+
+ +
+
+ +
+
+

Invoice settings

diff --git a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js index 979a2308e8..40dfa39590 100644 --- a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js +++ b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js @@ -115,7 +115,17 @@ mailReplyTo: _.find(original['MAIL'], function(e) {return e.configurationKey === 'MAIL_REPLY_TO';}), mailAttemptsCount: _.find(original['MAIL'], function(e) {return e.configurationKey === 'MAIL_ATTEMPTS_COUNT';}) }; + }; + + if(angular.isDefined(original['MAP']) && original['MAP'].length > 0) { + transformed.map = { + MAPS_PROVIDER: _.find(original['MAP'], function(e) {return e.key === 'MAPS_PROVIDER';}), + MAPS_CLIENT_API_KEY: _.find(original['MAP'], function(e) {return e.key === 'MAPS_CLIENT_API_KEY';}), + MAPS_HERE_APP_ID: _.find(original['MAP'], function(e) {return e.key === 'MAPS_HERE_APP_ID';}), + MAPS_HERE_APP_CODE: _.find(original['MAP'], function(e) {return e.key === 'MAPS_HERE_APP_CODE';}) + } } + _.forEach(['PAYMENT', 'PAYMENT_STRIPE', 'PAYMENT_PAYPAL', /*'PAYMENT_MOLLIE',*/ 'PAYMENT_OFFLINE', 'INVOICE_EU', 'ALFIO_PI'], function(group) { if(angular.isDefined(original[group]) && original[group].length > 0) { transformed[_.camelCase(group)] = { @@ -443,6 +453,12 @@ ctrl.payment = { settings: onlyBasic(settings['PAYMENT']) }; + ctrl.map = { + MAPS_PROVIDER: _.find(settings['MAP'], function(e) {return e.key === 'MAPS_PROVIDER';}), + MAPS_CLIENT_API_KEY: _.find(settings['MAP'], function(e) {return e.key === 'MAPS_CLIENT_API_KEY';}), + MAPS_HERE_APP_ID: _.find(settings['MAP'], function(e) {return e.key === 'MAPS_HERE_APP_ID';}), + MAPS_HERE_APP_CODE: _.find(settings['MAP'], function(e) {return e.key === 'MAPS_HERE_APP_CODE';}) + }; }); ctrl.saveSettings = function(frm, settings, pluginSettings) { if(!frm.$valid) { diff --git a/src/main/webapp/resources/js/admin/service/service.js b/src/main/webapp/resources/js/admin/service/service.js index bb72a993e6..035a06330a 100644 --- a/src/main/webapp/resources/js/admin/service/service.js +++ b/src/main/webapp/resources/js/admin/service/service.js @@ -334,16 +334,96 @@ baseServices.service("LocationService", function($http, $q, HttpErrorHandler) { - function mapUrl(lat, lng, key) { + var reqCounter = 0; + + function getMapUrl(latitude, longitude) { + return $http.get('/admin/api/location/static-map-image', {params: {lat: latitude, lng: longitude}}).then(function(res) { + return res.data; + }); + } + + + function handleGoogleGeolocate(location, locService, apiKeyAndProvider, resolve, reject) { + var key = apiKeyAndProvider.keys['MAPS_CLIENT_API_KEY']; + var keyParam = key ? ('&key='+encodeURIComponent(key)) : ''; - return "https://maps.googleapis.com/maps/api/staticmap?center="+lat+","+lng+"&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7C"+lat+","+lng+""+keyParam; + + if(!window.google || !window.google.maps) { + + reqCounter++; + + var script = document.createElement('script'); + + var callBackName = 'clientGeolocate'+reqCounter; + + script.src = 'https://maps.googleapis.com/maps/api/js?libraries=places&callback='+callBackName+keyParam; + document.head.appendChild(script); + window[callBackName] = function() { + search(); + } + } else { + search(); + } + + function search() { + var geocoder = new window.google.maps.Geocoder(); + geocoder.geocode({'address': location}, function(results, status) { + if (status === 'OK') { + var ret = {}; + ret.latitude = ""+results[0].geometry.location.lat() + ret.longitude = ""+results[0].geometry.location.lng() + $q.all([getMapUrl(ret.latitude, ret.longitude), locService.getTimezone(ret.latitude, ret.longitude)]).then(function(success) { + ret.mapUrl = success[0]; + var tz = success[1]; + if(tz.data) { + ret.timeZone = tz.data; + } + resolve(ret); + }, function () { + reject(); + }) + + } else { + reject(); + } + }); + } } - var reqCounter = 0; + + function handleHEREGeolocate(location, locService, apiKeyAndProvider, resolve, reject) { + var appId = apiKeyAndProvider.keys['MAPS_HERE_APP_ID']; + var appCode = apiKeyAndProvider.keys['MAPS_HERE_APP_CODE']; + $http.get('https://geocoder.cit.api.here.com/6.2/geocode.json', {params: {app_id: appId, app_code: appCode, searchtext: location}}).then(function(res) { + var view = res.data.Response.View; + if(view.length > 0 && view[0].Result.length > 0 && view[0].Result[0].Location) { + var location = view[0].Result[0].Location; + var pos = location.DisplayPosition; + var ret = {latitude: pos.Latitude, longitude: pos.Longitude}; + console.log(view); + + $q.all([getMapUrl(ret.latitude, ret.longitude), locService.getTimezone(ret.latitude, ret.longitude)]).then(function(success) { + ret.mapUrl = success[0]; + var tz = success[1]; + if(tz.data) { + ret.timeZone = tz.data; + } + resolve(ret); + }, function () { + reject(); + }) + } else { + reject(); + } + + }, function () { + reject(); + }) + } return { mapApiKey: function() { - return $http.get('/admin/api/location/maps-client-api-key.json').then(function(res) { + return $http.get('/admin/api/location/map-provider-client-api-key').then(function(res) { return res.data; }); }, @@ -351,44 +431,14 @@ var locService = this; return $q(function(resolve, reject) { - locService.mapApiKey().then(function(key) { - var keyParam = key ? ('&key='+encodeURIComponent(key)) : ''; - - if(!window.google || !window.google.maps) { + locService.mapApiKey().then(function(apiKeyAndProvider) { - reqCounter++; - - var script = document.createElement('script'); - - var callBackName = 'clientGeolocate'+reqCounter; - - script.src = 'https://maps.googleapis.com/maps/api/js?libraries=places&callback='+callBackName+keyParam; - document.head.appendChild(script); - window[callBackName] = function() { - search(); - } + if(apiKeyAndProvider.provider === 'GOOGLE') { + handleGoogleGeolocate(location, locService, apiKeyAndProvider, resolve, reject); + } else if (apiKeyAndProvider.provider === 'HERE') { + handleHEREGeolocate(location, locService, apiKeyAndProvider, resolve, reject); } else { - search(); - } - - function search() { - var geocoder = new window.google.maps.Geocoder(); - geocoder.geocode({'address': location}, function(results, status) { - if (status === 'OK') { - var ret = {}; - ret.latitude = ""+results[0].geometry.location.lat() - ret.longitude = ""+results[0].geometry.location.lng() - ret.mapUrl = mapUrl(ret.latitude, ret.longitude, key); - locService.getTimezone(ret.latitude, ret.longitude).then(function(res) { - if(res.data) { - ret.timeZone = res.data; - } - resolve(ret); - }); - } else { - reject(); - } - }); + alert('Must provide an API key (google or HERE maps)') } }) @@ -400,11 +450,7 @@ getTimezones: function() { return $http.get('/admin/api/location/timezones'); }, - getMapUrl : function(latitude, longitude) { - return this.mapApiKey().then(function(key) { - return mapUrl(latitude, longitude, key); - }, HttpErrorHandler.handle); - } + getMapUrl : getMapUrl }; }); diff --git a/src/test/java/alfio/model/modification/support/LocationDescriptorTest.java b/src/test/java/alfio/model/modification/support/LocationDescriptorTest.java index cdbdb30874..571a3902c9 100644 --- a/src/test/java/alfio/model/modification/support/LocationDescriptorTest.java +++ b/src/test/java/alfio/model/modification/support/LocationDescriptorTest.java @@ -16,12 +16,13 @@ */ package alfio.model.modification.support; +import alfio.model.system.ConfigurationKeys; import com.insightfullogic.lambdabehave.JunitSuiteRunner; import org.apache.commons.lang3.tuple.Pair; import org.junit.runner.RunWith; -import java.util.Optional; -import java.util.TimeZone; +import java.util.*; +import java.util.function.Function; import static com.insightfullogic.lambdabehave.Suite.describe; @@ -31,9 +32,51 @@ public class LocationDescriptorTest {{ final String latitude = "latitude"; final String longitude = "longitude"; final TimeZone timeZone = TimeZone.getDefault(); - final LocationDescriptor expected = new LocationDescriptor(timeZone.getID(), latitude, longitude, "https://maps.googleapis.com/maps/api/staticmap?center=latitude,longitude&key=mapKey&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7Clatitude,longitude"); - describe("LocationDescriptor", it -> { - it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, Optional.of("mapKey"))).isEqualTo(expected)); + Function locationDescriptorBuilder = (mapUrl) -> new LocationDescriptor(timeZone.getID(), latitude, longitude, mapUrl); + + + + describe("LocationDescriptorGoogle", it -> { + Map> geoInfo = Collections.singletonMap(ConfigurationKeys.MAPS_CLIENT_API_KEY, Optional.of("mapKey")); + final LocationDescriptor expected = locationDescriptorBuilder.apply("https://maps.googleapis.com/maps/api/staticmap?center=latitude,longitude&key=mapKey&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7Clatitude,longitude"); + it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, geoInfo)).isEqualTo(expected)); + }); + + describe("LocationDescriptorNone", it -> { + Map> geoInfo = Collections.emptyMap(); + final LocationDescriptor expected = locationDescriptorBuilder.apply("https://tyler-demo.herokuapp.com/?center=latitude,longitude&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7Clatitude,longitude"); + it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, geoInfo)).isEqualTo(expected)); + }); + + describe("LocationDescriptorGoogleWithTypeSet", it -> { + Map> geoInfo = new HashMap<>(); + + geoInfo.put(ConfigurationKeys.MAPS_PROVIDER, Optional.of(ConfigurationKeys.GeoInfoProvider.GOOGLE.name())); + geoInfo.put(ConfigurationKeys.MAPS_CLIENT_API_KEY, Optional.of("mapKey")); + + final LocationDescriptor expected = locationDescriptorBuilder.apply("https://maps.googleapis.com/maps/api/staticmap?center=latitude,longitude&key=mapKey&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7Clatitude,longitude"); + it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, geoInfo)).isEqualTo(expected)); + }); + + describe("LocationDescriptorHEREWithTypeSet", it -> { + Map> geoInfo = new HashMap<>(); + + geoInfo.put(ConfigurationKeys.MAPS_PROVIDER, Optional.of(ConfigurationKeys.GeoInfoProvider.HERE.name())); + geoInfo.put(ConfigurationKeys.MAPS_HERE_APP_ID, Optional.of("appId")); + geoInfo.put(ConfigurationKeys.MAPS_HERE_APP_CODE, Optional.of("appCode")); + + final LocationDescriptor expected = locationDescriptorBuilder.apply("https://image.maps.api.here.com/mia/1.6/mapview?c=latitude,longitude&z=16&w=400&h=400&poi=latitude,longitude&app_id=appId&app_code=appCode"); + it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, geoInfo)).isEqualTo(expected)); + }); + + describe("LocationDescriptorNONEWithTypeSet", it -> { + Map> geoInfo = new HashMap<>(); + + geoInfo.put(ConfigurationKeys.MAPS_PROVIDER, Optional.of(ConfigurationKeys.GeoInfoProvider.NONE.name())); + + + final LocationDescriptor expected = locationDescriptorBuilder.apply("https://tyler-demo.herokuapp.com/?center=latitude,longitude&zoom=16&size=400x400&markers=color:blue%7Clabel:E%7Clatitude,longitude"); + it.should("build the locationDescriptor", expect -> expect.that(LocationDescriptor.fromGeoData(Pair.of(latitude, longitude), timeZone, geoInfo)).isEqualTo(expected)); }); }} \ No newline at end of file