Version 3.0.364

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; }
 	}
 }