Merge branch '324-get-cofu-payment-methods-for-a-station-from-geojson-instead-of-tile' into 'master'

Resolve "Get cofu payment methods for a station from geojson instead of tile"

Closes #324

See merge request pace/mobile/android/pace-cloud-sdk!352

Author: talipatpace

library/src/main/java/cloud/pace/sdk/poikit/geo/GeoAPIManager.kt

@@ -285,6 +285,7 @@ class GeoAPIManagerImpl(
         const val TYPE_KEY = "type"
         const val URL_KEY = "url"
         const val CONNECTED_FUELING_STATUS_KEY = "connectedFuelingStatus"
+        const val PAYMENT_METHOD_KINDS_KEY = "paymentMethodKinds"
 
         private const val CACHE_MAX_AGE = 60 * 60 * 1000 // 60 min
         private const val CACHE_RADIUS = 30 * 1000 // 30 km

library/src/main/java/cloud/pace/sdk/poikit/poi/GasStation.kt

@@ -180,8 +180,6 @@ open class GasStation(id: String, geometry: ArrayList<Geometry.CommandGeo>) :
 
         values[OSM_PAYMENT_METHODS]?.let { value ->
             val methods = value.split(",")
-
-            cofuPaymentMethods = methods.filter { it.startsWith("cofu:") }.toMutableList()
             paymentMethods = methods.toMutableList()
         }
 

library/src/main/java/cloud/pace/sdk/poikit/poi/tiles/converter/TilesResponseBodyConverter.kt

@@ -3,6 +3,7 @@ package cloud.pace.sdk.poikit.poi.tiles.converter
 import TileQueryResponseOuterClass
 import cloud.pace.sdk.poikit.POIKit
 import cloud.pace.sdk.poikit.geo.ConnectedFuelingStatus
+import cloud.pace.sdk.poikit.geo.GeoAPIManagerImpl.Companion.PAYMENT_METHOD_KINDS_KEY
 import cloud.pace.sdk.poikit.poi.GasStation
 import cloud.pace.sdk.poikit.poi.Geometry
 import cloud.pace.sdk.poikit.poi.LocationPoint
@@ -43,6 +44,9 @@ class TilesResponseBodyConverter : Converter<ResponseBody, List<GasStation>> {
                             updatedAt = Date()
                             cofuGasStation = cofuGasStationsMap[it.id]
                             isOnlineCoFuGasStation = cofuGasStation?.connectedFuelingStatus == ConnectedFuelingStatus.ONLINE
+
+                            val paymentMethodKinds = cofuGasStation?.properties?.get(PAYMENT_METHOD_KINDS_KEY) as? List<*>
+                            cofuPaymentMethods = paymentMethodKinds?.filterIsInstance<String>()?.toMutableList() ?: mutableListOf()
                         }
                     }
                 } catch (e: Exception) {