Version 3.0.364

TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfo.cs

@@ -54,7 +54,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 	public enum DataSource
 	{
 		/// <summary>
-		/// Data source corpi.
+		/// Data source copri.
 		/// </summary>
 		Copri,
 		/// <summary>

TINKLib/Model/Connector/FilteredConnector.cs

@@ -7,6 +7,7 @@ using TINK.Model.Connector.Filter;
 using TINK.Model.Services.CopriApi;
 using TINK.Model.Stations;
 using TINK.Model.Stations.StationNS;
+using TINK.Model.Stations.StationNS.Operator;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
@@ -92,11 +93,18 @@ namespace TINK.Model.Connector
 				var providerBikesAndStations = await m_oInnerQuery.GetBikesAndStationsAsync();
 
 				// Do filtering.
-				var filteredStationsDictionary = new StationDictionary(providerBikesAndStations.Response.StationsAll.CopriVersion, DoFilter(providerBikesAndStations.Response.StationsAll, Filter));
-				var filteredBikesDictionary = new BikeCollection(DoFilter(providerBikesAndStations.Response.Bikes, Filter));
+				var filteredStationsDictionary = new StationDictionary(
+					providerBikesAndStations.Response.StationsAll.CopriVersion,
+					DoFilter(providerBikesAndStations.Response.StationsAll, Filter));
+
+				var filteredBikesOccupiedDictionary = new BikeCollection(
+					DoFilter(providerBikesAndStations.Response.BikesOccupied, Filter));
+
 				var filteredBikesAndStations = new Result<StationsAndBikesContainer>(
 					providerBikesAndStations.Source,
-					new StationsAndBikesContainer(filteredStationsDictionary, filteredBikesDictionary),
+					new StationsAndBikesContainer(
+						filteredStationsDictionary,
+						filteredBikesOccupiedDictionary),
 					providerBikesAndStations.GeneralData,
 					providerBikesAndStations.Exception);
 
@@ -106,17 +114,25 @@ namespace TINK.Model.Connector
 			/// <summary> Filter bikes by group. </summary>
 			/// <param name="bikes">Bikes to filter.</param>
 			/// <returns>Filtered bikes.</returns>
-			private static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IGroupFilter filter)
-			{
-				return bikes.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
-			}
+			private static Dictionary<string, BikeInfo> DoFilter(BikeCollection bikes, IGroupFilter filter) =>
+				bikes
+					.Where(x => filter.DoFilter(x.Group).Count() > 0)
+					.ToDictionary(x => x.Id);
 
-			/// <summary> Filter stations by group. </summary>
-			/// <returns></returns>
-			private static Dictionary<string, IStation> DoFilter(StationDictionary stations, IGroupFilter filter)
-			{
-				return stations.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
-			}
+			/// <summary> Filter stations by group and removes bike group collection entries which do not match group filter. </summary>
+			/// <returns>Matching stations.</returns>
+			private static Dictionary<string, IStation> DoFilter(StationDictionary stations, IGroupFilter filter) =>
+				stations
+					.Where(station => filter.DoFilter(station.Group).Count() > 0)
+					.Select(station => new Station(
+						station.Id,
+						station.Group,
+						station.Position,
+						station.StationName,
+						station.OperatorData,
+						new BikeGroupCol(station.BikeGroups
+							.Where(group => filter.DoFilter(new List<string> { group.Group }).Count() > 0))) as IStation)
+					.ToDictionary(x => x.Id);
 		}
 	}
 }

TINKLib/Model/Connector/NullFilterConnector.cs

@@ -86,8 +86,11 @@ namespace TINK.Model.Connector
 				return new Result<StationsAndBikesContainer>(
 					result.Source,
 					new StationsAndBikesContainer(
-						new StationDictionary(result.Response.StationsAll.CopriVersion, result.Response.StationsAll.ToDictionary(x => x.Id)),
-						new BikeCollection(result.Response.Bikes.ToDictionary(x => x.Id))),
+						new StationDictionary(
+							result.Response.StationsAll.CopriVersion,
+							result.Response.StationsAll.ToDictionary(x => x.Id)),
+						new BikeCollection(
+							result.Response.BikesOccupied?.ToDictionary(x => x.Id) ?? new Dictionary<string, BikeInfo>())),
 					result.GeneralData,
 					result.Exception);
 			}

TINKLib/Model/Connector/Query/CachedQuery.cs

@@ -41,31 +41,19 @@ namespace TINK.Model.Connector
 					resultStations.Source,
 					new StationsAndBikesContainer(
 						resultStations.Response.GetStationsAllMutable(),
-						(await server.GetBikesAvailable(true)).Response.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Cache)),
+						new BikeCollection() /* There are no bikes occupied because user is not logged in. */),
 					resultStations.GeneralData,
 					resultStations.Exception);
 			}
 
-			var resultBikes = await server.GetBikesAvailable();
-			if (resultBikes.Source == typeof(CopriCallsMonkeyStore))
-			{
-				// Communication with copri in order to get bikes failed.
-				return new Result<StationsAndBikesContainer>(
-					resultBikes.Source,
-					new StationsAndBikesContainer(
-						(await server.GetStations(true)).Response.GetStationsAllMutable(),
-						resultBikes.Response.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Cache)),
-					resultBikes.GeneralData,
-					resultBikes.Exception);
-			}
-
-			// Communicatin with copri succeeded.
+			// Communication with copri succeeded.
 			server.AddToCache(resultStations);
-			server.AddToCache(resultBikes);
 
 			return new Result<StationsAndBikesContainer>(
 				resultStations.Source,
-				new StationsAndBikesContainer(resultStations.Response.GetStationsAllMutable(), resultBikes.Response.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Copri)),
+				new StationsAndBikesContainer(
+					resultStations.Response.GetStationsAllMutable(),
+					new BikeCollection()),
 				resultStations.GeneralData);
 		}
 

TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Serilog;
@@ -6,6 +7,7 @@ using TINK.Model.Bikes;
 using TINK.Model.Connector.Updater;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
+using TINK.Repository.Response;
 
 namespace TINK.Model.Connector
 {
@@ -25,90 +27,47 @@ namespace TINK.Model.Connector
 			Server = copriServer as ICachedCopriServer;
 			if (Server == null)
 			{
-				throw new ArgumentException($"Copri server is not of expected typ. Type detected is {copriServer.GetType()}.");
+				throw new ArgumentException($"Copri server is not of expected type. Type detected is {copriServer.GetType()}.");
 			}
 		}
 
 		/// <summary> Gets all stations including positions.</summary>
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
+			BikeCollection GetBikeCollection(IEnumerable<BikeInfoReservedOrBooked> bikeInfoEnumerable, Bikes.BikeInfoNS.BC.DataSource dataSource) =>
+				BikeCollectionFactory.GetBikesAll(
+											null, // Bikes available are no more of interest because count of available bikes at each given station is was added to station object. 
+											bikeInfoEnumerable ?? new Dictionary<string, BikeInfoReservedOrBooked>().Values,
+											Mail,
+											DateTimeProvider,
+											dataSource);
+
 			var stationsResponse = await Server.GetStations();
 
 			if (stationsResponse.Source == typeof(CopriCallsMonkeyStore)
 				|| stationsResponse.Exception != null)
 			{
-				// Stations were read from cache ==> get bikes availbalbe and occupied from cache as well to avoid inconsistencies
+				// Stations were read from cache ==> get bikes available and occupied from cache as well to avoid inconsistencies
 				return new Result<StationsAndBikesContainer>(
 					stationsResponse.Source,
 					new StationsAndBikesContainer(
 						stationsResponse.Response.GetStationsAllMutable(),
-						BikeCollectionFactory.GetBikesAll(
-							(await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
-							(await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
-							Mail,
-							DateTimeProvider,
-							Bikes.BikeInfoNS.BC.DataSource.Cache)),
+						GetBikeCollection(stationsResponse.Response.bikes_occupied?.Values, Bikes.BikeInfoNS.BC.DataSource.Cache)),
 					stationsResponse.GeneralData,
 					stationsResponse.Exception);
 			}
 
-			var bikesAvailableResponse = await Server.GetBikesAvailable();
-			if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
-				|| bikesAvailableResponse.Exception != null)
-			{
-				// Bikes avilable were read from cache ==> get bikes occupied from cache as well to avoid inconsistencies
-				return new Result<StationsAndBikesContainer>(
-					bikesAvailableResponse.Source,
-					new StationsAndBikesContainer(
-						(await Server.GetStations(true)).Response.GetStationsAllMutable(),
-						BikeCollectionFactory.GetBikesAll(bikesAvailableResponse.Response?.bikes?.Values,
-						(await Server.GetBikesOccupied(true)).Response?.bikes_occupied?.Values,
-						Mail,
-						DateTimeProvider,
-						Bikes.BikeInfoNS.BC.DataSource.Cache)),
-					bikesAvailableResponse.GeneralData,
-					bikesAvailableResponse.Exception);
-			}
-
-			var bikesOccupiedResponse = await Server.GetBikesOccupied();
-			if (bikesOccupiedResponse.Source == typeof(CopriCallsMonkeyStore)
-				|| bikesOccupiedResponse.Exception != null)
-			{
-				// Bikes occupied were read from cache ==> get bikes available from cache as well to avoid inconsistencies
-				return new Result<StationsAndBikesContainer>(
-					bikesOccupiedResponse.Source,
-					new StationsAndBikesContainer(
-						(await Server.GetStations(true)).Response.GetStationsAllMutable(),
-						BikeCollectionFactory.GetBikesAll(
-							(await Server.GetBikesAvailable(true)).Response?.bikes?.Values,
-							bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-							Mail,
-							DateTimeProvider,
-							Bikes.BikeInfoNS.BC.DataSource.Cache)),
-					bikesOccupiedResponse.GeneralData,
-					bikesOccupiedResponse.Exception);
-			}
 
 			// Both types bikes could read from copri =>  update cache
 			Server.AddToCache(stationsResponse);
-			Server.AddToCache(bikesAvailableResponse);
-			Server.AddToCache(bikesOccupiedResponse);
-
-			var exceptions = new[] { stationsResponse?.Exception, bikesAvailableResponse?.Exception, bikesOccupiedResponse?.Exception }.Where(x => x != null).ToArray();
-
-			var stationsMutable = stationsResponse.Response.GetStationsAllMutable();
-			var bikesMutable = BikeCollectionFactory.GetBikesAll(
-						bikesAvailableResponse.Response?.bikes?.Values,
-						bikesOccupiedResponse.Response?.bikes_occupied?.Values,
-						Mail,
-						DateTimeProvider,
-						Bikes.BikeInfoNS.BC.DataSource.Copri);
 
 			return new Result<StationsAndBikesContainer>(
 				stationsResponse.Source,
-				new StationsAndBikesContainer(stationsMutable, bikesMutable),
+				new StationsAndBikesContainer(
+					stationsResponse.Response.GetStationsAllMutable(),
+					GetBikeCollection(stationsResponse.Response.bikes_occupied?.Values, Bikes.BikeInfoNS.BC.DataSource.Copri)),
 				stationsResponse.GeneralData,
-				exceptions.Length > 0 ? new AggregateException(exceptions) : null);
+				stationsResponse?.Exception);
 		}
 
 		/// <summary> Gets bikes occupied. </summary>

TINKLib/Model/Connector/Query/Query.cs

@@ -32,11 +32,12 @@ namespace TINK.Model.Connector
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var stationsAllResponse = await server.GetStationsAsync();
-			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
 
 			return new Result<StationsAndBikesContainer>(
 				typeof(CopriCallsMonkeyStore),
-				new StationsAndBikesContainer(stationsAllResponse.GetStationsAllMutable(), bikesAvailableResponse.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Cache)),
+				new StationsAndBikesContainer(
+					stationsAllResponse.GetStationsAllMutable(),
+					new BikeCollection() /* There are no bikes occupied because user is not logged in. */),
 				stationsAllResponse.GetGeneralData());
 		}
 

TINKLib/Model/Connector/Query/QueryLoggedIn.cs

@@ -1,10 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TINK.Model.Bikes;
 using TINK.Model.Connector.Updater;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
+using TINK.Repository.Response;
 
 namespace TINK.Model.Connector
 {
@@ -34,16 +36,14 @@ namespace TINK.Model.Connector
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var stationResponse = await server.GetStationsAsync();
-			var bikesAvailableResponse = await server.GetBikesAvailableAsync();
-			var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
 
 			return new Result<StationsAndBikesContainer>(
 				typeof(CopriCallsMonkeyStore),
 				new StationsAndBikesContainer(
 					stationResponse.GetStationsAllMutable(),
 					BikeCollectionFactory.GetBikesAll(
-						bikesAvailableResponse?.bikes?.Values,
-						bikesOccupiedResponse?.bikes_occupied?.Values,
+						null, // Bikes available are no more of interest because count of available bikes at each given station is was added to station object. 
+						stationResponse.bikes_occupied?.Values ?? new Dictionary<string, BikeInfoReservedOrBooked>().Values,
 						Mail,
 						DateTimeProvider,
 						Bikes.BikeInfoNS.BC.DataSource.Cache)),

TINKLib/Model/Connector/TextToTypeHelper.cs

@@ -7,9 +7,12 @@ using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Model.State;
+using TINK.Model.Stations.StationNS;
+using TINK.Model.Stations.StationNS.Operator;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
 using TINK.Repository.Response.Stations.Station;
+using Xamarin.Forms;
 
 namespace TINK.Model.Connector
 {
@@ -388,5 +391,52 @@ namespace TINK.Model.Connector
 		/// <param name="bike">Bike get to state from.</param>
 		public static bool GetIsFeedbackPending(this BikeInfoAvailable bike)
 			=> bike.co2saving != null;
+
+		/// <summary>
+		/// Gets the count of bikes available at station.
+		/// </summary>
+		/// <param name="stationInfo">Object to get information from.</param>
+		/// <returns>Count of bikes available or null if information is unknown.</returns>
+		public static int? GetBikesAvailableCount(this StationInfo stationInfo)
+			=> !string.IsNullOrWhiteSpace(stationInfo?.bike_count)
+				&& int.TryParse(stationInfo?.bike_count, out int bikeCount)
+					? bikeCount
+					: (int?)null;
+
+		/// <summary>
+		/// Gets station object from response object.
+		/// </summary>
+		/// <param name="station">Response object to get station object from.</param>
+		/// <returns>Station object.</returns>
+		public static Station GetStation(this StationInfo station) =>
+			new Station(
+					station.station,
+					station.GetGroup(),
+					station.GetPosition(),
+					station.description,
+					new Data(station.operator_data?.operator_name,
+						station.operator_data?.operator_phone,
+						station.operator_data?.operator_hours,
+						station.operator_data?.operator_email,
+						!string.IsNullOrEmpty(station.operator_data?.operator_color)
+							? Color.FromHex(station.operator_data?.operator_color)
+							: (Color?)null),
+					new BikeGroupCol(station.station_type?.Select(x => new BikeGroupCol.Entry(
+						x.Key,
+						int.TryParse(x.Value.bike_count, out int count) ? count : 0,
+						x.Value.bike_group)) ?? new List<BikeGroupCol.Entry>()
+						));
+
+		/// <summary>
+		/// Gets the bike group object from response object.
+		/// </summary>
+		/// <param name="bikeGroup">Response object to get station from.</param>
+		/// <param name="name">Name of the bike group.</param>
+		/// <returns></returns>
+		public static BikeGroupCol.Entry GetBikeGroup(this BikeGroup bikeGroup, string name) =>
+			new BikeGroupCol.Entry(
+				name,
+				int.TryParse(bikeGroup?.bike_count ?? "0", out var countCity) ? countCity : 0,
+				bikeGroup?.bike_group ?? string.Empty);
 	}
 }

TINKLib/Model/Connector/Updater/UpdaterJSON.cs

@@ -30,7 +30,7 @@ namespace TINK.Model.Connector.Updater
 		/// <summary>
 		/// Gets all station for station provider and add them into station list.
 		/// </summary>
-		/// <param name="p_oStationList">List of stations to update.</param>
+		/// <param name="stationsAllResponse">List of stations to update.</param>
 		public static StationDictionary GetStationsAllMutable(this StationsAvailableResponse stationsAllResponse)
 		{
 			// Get stations from Copri/ file/ memory, ....
@@ -43,7 +43,7 @@ namespace TINK.Model.Connector.Updater
 
 			Version.TryParse(stationsAllResponse.copri_version, out Version copriVersion);
 
-			var stations = new StationDictionary(p_oVersion: copriVersion);
+			var stations = new StationDictionary(version: copriVersion);
 
 			foreach (var station in stationsAllResponse.stations)
 			{
@@ -54,18 +54,7 @@ namespace TINK.Model.Connector.Updater
 						string.Format("Station id {0} is not unique.", station.Value.station), stationsAllResponse);
 				}
 
-				stations.Add(new Stations.StationNS.Station(
-					station.Value.station,
-					station.Value.GetGroup(),
-					station.Value.GetPosition(),
-					station.Value.description,
-					new Data(station.Value.operator_data?.operator_name,
-						station.Value.operator_data?.operator_phone,
-						station.Value.operator_data?.operator_hours,
-						station.Value.operator_data?.operator_email,
-						!string.IsNullOrEmpty(station.Value.operator_data?.operator_color)
-							? Color.FromHex(station.Value.operator_data?.operator_color)
-							: (Color?)null)));
+				stations.Add(station.Value.GetStation());
 			}
 
 			return stations;

TINKLib/Model/Settings/JsonSettingsDictionary.cs

@@ -148,7 +148,7 @@ namespace TINK.Model.Settings
 		/// <returns>Logging level</returns>
 		public static Uri GetCopriHostUri(this IDictionary<string, string> settingsJSON)
 		{
-			// Get uri of corpi server.
+			// Get uri of copri server.
 			if (!settingsJSON.TryGetValue(typeof(CopriServerUriList).ToString(), out string uriText)
 				|| string.IsNullOrEmpty(uriText))
 			{
@@ -381,7 +381,7 @@ namespace TINK.Model.Settings
 		/// <returns>Active lock service name.</returns>
 		public static string GetActiveLockService(this IDictionary<string, string> settingsJSON)
 		{
-			// Get uri of corpi server.
+			// Get uri of copri server.
 			if (!settingsJSON.TryGetValue(typeof(ILocksService).Name, out string activeLockService)
 				|| string.IsNullOrEmpty(activeLockService))
 			{
@@ -418,7 +418,7 @@ namespace TINK.Model.Settings
 		/// <returns>Active lock service name.</returns>
 		public static string GetActiveGeolocationService(this IDictionary<string, string> settingsJSON)
 		{
-			// Get uri of corpi server.
+			// Get uri of copri server.
 			if (!settingsJSON.TryGetValue(typeof(IGeolocationService).Name, out string activeGeolocationService)
 				|| string.IsNullOrEmpty(activeGeolocationService))
 			{

TINKLib/Model/Stations/StationCollection.cs

@@ -10,19 +10,27 @@ namespace TINK.Model.Stations
 		/// <summary> Holds the list of stations. </summary>
 		private readonly IDictionary<string, IStation> m_oStationDictionary;
 
+		/// <summary>
+		/// Gets a station by key.
+		/// </summary>
+		/// <param name="key">Key to get station.</param>
+		/// <returns>Station for given key.</returns>
+		public IStation this[string key] =>
+			ContainsKey(key) ? m_oStationDictionary[key] : new NullStation();
+
 		/// <summary> Count of stations. </summary>
 		public int Count { get { return m_oStationDictionary.Count; } }
 
 		public Version CopriVersion { get; }
 
 		/// <summary> Constructs a station dictionary object. </summary>
-		/// <param name="p_oVersion">Version of copri- service.</param>
-		public StationDictionary(Version p_oVersion = null, IDictionary<string, IStation> p_oStations = null)
+		/// <param name="version">Version of copri- service.</param>
+		public StationDictionary(Version version = null, IDictionary<string, IStation> stations = null)
 		{
-			m_oStationDictionary = p_oStations ?? new Dictionary<string, IStation>();
+			m_oStationDictionary = stations ?? new Dictionary<string, IStation>();
 
-			CopriVersion = p_oVersion != null
-				? new Version(p_oVersion.Major, p_oVersion.Minor, p_oVersion.Revision, p_oVersion.Build)
+			CopriVersion = version != null
+				? new Version(version.Major, version.Minor, version.Revision, version.Build)
 				: new Version(0, 0, 0, 0);
 		}
 

TINKLib/Model/Stations/StationNS/IStation.cs

@@ -3,6 +3,9 @@ using TINK.Model.Stations.StationNS.Operator;
 
 namespace TINK.Model.Stations.StationNS
 {
+	/// <summary>
+	/// Holds station information, i.e. static information like station name, station position and dynamic information like bikes available.
+	/// </summary>
 	public interface IStation
 	{
 		/// <summary> Holds the unique id of the station.c</summary>
@@ -19,5 +22,12 @@ namespace TINK.Model.Stations.StationNS
 
 		/// <summary> Holds operator related data.</summary>
 		IData OperatorData { get; }
+
+		/// <summary> Gets the count of bikes available at station. </summary>
+		int? AvailableBikesCount { get; }
+
+		/// <summary> Gets bike <see cref="BikeGroupCol.Entry"/> objects. </summary>
+		/// <remarks> Each entry has a name, holds the count of available bikes at station and the group value.		/// </remarks>
+		IBikeGroupCol BikeGroups { get; }
 	}
 }

TINKLib/Model/Stations/StationNS/NullStation.cs

@@ -20,5 +20,12 @@ namespace TINK.Model.Stations.StationNS
 
 		/// <summary> Holds operator related data.</summary>
 		public IData OperatorData => new Data();
+
+		/// <summary> Gets the count of bikes available at station. </summary>
+		public int? AvailableBikesCount => null;
+
+		/// <summary> Gets bike <see cref="BikeGroupCol.Entry"/> objects. </summary>
+		/// <remarks> Each entry has a name, holds the count of available bikes at station and the group value.		/// </remarks>
+		public IBikeGroupCol BikeGroups => null;
 	}
 }

TINKLib/Model/Stations/StationNS/Operator/BikeGroupCol.cs

@@ -0,0 +1,49 @@
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TINK.Model.Stations.StationNS.Operator
+{
+	public class BikeGroupCol : List<BikeGroupCol.Entry> , IBikeGroupCol
+	{
+		/// <summary>
+		/// Holds a group of bikes at a station.
+		/// </summary>
+		public class Entry
+		{
+			/// <summary>
+			/// Bike group entry.
+			/// </summary>
+			/// <param name="name">Name of the group, either "Citybikes" or "Cargobikes".</param>
+			/// <param name="availableCount"></param>
+			/// <param name="group"></param>
+			public Entry(string name, int? availableCount = null, string group = null)
+			{
+				Name = name;
+				AvailableCount = availableCount ?? 0;
+				Group = group ?? string.Empty;
+			}
+
+			/// <summary>
+			/// Name of the group, either "Citybikes" or "Cargobikes".
+			/// </summary>
+			public string Name { get; }
+
+			/// <summary> Holds the count of bikes available of given type at station. </summary>
+			public int AvailableCount { get; }
+
+			/// <summary>
+			/// Holds the group of the bikes. Konrad separates cargo and city bikes by group.
+			/// </summary>
+			public string Group { get; }
+		}
+
+		public BikeGroupCol() : base() { }
+
+		public BikeGroupCol(IEnumerable<Entry> source) : base(source) { }
+
+		/// <summary> Holds the count of bikes available of any type at station. </summary>
+		public int AvailableCount => this.Select(x => x.AvailableCount).Sum();
+
+	}
+}

TINKLib/Model/Stations/StationNS/Operator/IBikeGroupCol.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace TINK.Model.Stations.StationNS.Operator
+{
+	public interface IBikeGroupCol : IEnumerable<BikeGroupCol.Entry>
+	{
+		/// <summary> Holds the count of bikes available of given type at station. </summary>
+		int AvailableCount { get; }
+	}
+}

TINKLib/Model/Stations/StationNS/Station.cs

@@ -14,16 +14,18 @@ namespace TINK.Model.Stations.StationNS
 		/// <param name="stationName">Name of the station.</param>
 		public Station(
 			string id,
-			IEnumerable<string> group,
-			IPosition position,
+			IEnumerable<string> group = null,
+			IPosition position = null,
 			string stationName = "",
-			Data operatorData = null)
+			IData operatorData = null,
+			IBikeGroupCol bikeGropCol = null)
 		{
 			Id = id;
 			Group = group ?? throw new ArgumentException("Can not construct station object. Group of stations must not be null.");
 			Position = position;
 			StationName = stationName ?? string.Empty;
 			OperatorData = operatorData ?? new Data();
+			BikeGroups = bikeGropCol ?? new BikeGroupCol();
 		}
 
 		/// <summary> Holds the unique id of the station.c</summary>
@@ -40,5 +42,12 @@ namespace TINK.Model.Stations.StationNS
 
 		/// <summary> Holds operator related info.</summary>
 		public IData OperatorData { get; }
+
+		/// <summary> Gets the count of bikes available at station. </summary>
+		public int? AvailableBikesCount => BikeGroups.AvailableCount;
+
+		/// <summary> Gets bike <see cref="BikeGroupCol.Entry"/> objects. </summary>
+		/// <remarks> Each entry has a name, holds the count of available bikes at station and the group value.		/// </remarks>
+		public IBikeGroupCol BikeGroups { get; }
 	}
 }

TINKLib/Model/TinkApp.cs

@@ -408,7 +408,7 @@ namespace TINK.Model
 		/// <summary> Holds available app themes.</summary>
 		public IServicesContainer<IGeolocationService> GeolocationServices { get; }
 
-		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or Lastenrad Bayern.</summary>
+		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or LastenRad Bayern.</summary>
 		public AppFlavor Flavor { get; private set; }
 
 		/// <summary> Manages the different types of LocksService objects.</summary>
@@ -418,7 +418,7 @@ namespace TINK.Model
 		private LoggingLevelSwitch m_oLoggingLevelSwitch;
 
 		/// <summary>
-		/// Object to allow swithing logging level
+		/// Object to allow switching logging level
 		/// </summary>
 		public LoggingLevelSwitch Level
 		{
@@ -448,7 +448,7 @@ namespace TINK.Model
 				return;
 			}
 
-			Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
+			Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing violation occurs.
 
 			Level.MinimumLevel = minimumLevel;
 
@@ -480,7 +480,7 @@ namespace TINK.Model
 				var sourceContex = e.Properties[Constants.SourceContextPropertyName].ToString();
 
 				if ((e.Level == LogEventLevel.Information) &&
-					(sourceContex.Contains(typeof(AppAndEnvironmentInfo).Namespace) /* Log App and enviroment info. */
+					(sourceContex.Contains(typeof(AppAndEnvironmentInfo).Namespace) /* Log App and environment info. */
 					|| sourceContex.Contains(typeof(ViewModel.Bikes.Bike.BluetoothLock.RequestHandler.Base).Namespace /* Log info-level messages to provide context for bluetooth log. */ )))
 				{
 					return true;

TINKLib/Model/WhatsNew.cs

@@ -687,6 +687,11 @@ namespace TINK.Model
 					AppResources.ChangeLog_3_0_363_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
+				{
+					new Version(3, 0, 364),
+					AppResources.ChangeLog_MinorImprovements,
+					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
+				},
 		};
 
 		/// <summary> Manges the whats new information.</summary>