Merge b836996 into 4be8028

TRViS.ILocationService/ILocationLonLat_deg.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace TRViS.Services;
+
+public interface ILocationLonLat_deg : IEquatable<ILocationLonLat_deg>
+{
+	bool HasLonLatLocation { get; }
+	double Location_lon_deg { get; }
+	double Location_lat_deg { get; }
+
+	bool IEquatable<ILocationLonLat_deg>.Equals(ILocationLonLat_deg? other)
+	{
+		if (other is null)
+			return false;
+
+		if (ReferenceEquals(this, other))
+			return true;
+
+		return
+			HasLonLatLocation == other.HasLonLatLocation
+			&&
+			Location_lon_deg == other.Location_lon_deg
+			&&
+			Location_lat_deg == other.Location_lat_deg
+		;
+	}
+}

TRViS.ILocationService/ILocationService.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace TRViS.Services;
+
+public interface ILocationService
+{
+	bool IsEnabled { get; set; }
+	bool CanUseService { get; }
+	event EventHandler<bool>? CanUseServiceChanged;
+
+	event EventHandler<LocationStateChangedEventArgs>? LocationStateChanged;
+
+	StaLocationInfo[]? StaLocationInfo { get; set; }
+
+	int CurrentStationIndex { get; }
+
+	bool IsRunningToNextStation { get; }
+
+	void ResetLocationInfo();
+
+	void ForceSetLocationInfo(int stationIndex, bool isRunningToNextStation);
+}

TRViS.ILocationService/LocationLonLat_deg.cs

@@ -0,0 +1,48 @@
+using System;
+
+namespace TRViS.Services;
+
+public class LocationLonLat_deg : ILocationLonLat_deg, IEquatable<LocationLonLat_deg>
+{
+	public bool HasLonLatLocation { get; }
+	public double Location_lon_deg { get; }
+	public double Location_lat_deg { get; }
+
+	public LocationLonLat_deg(
+		double location_lon_deg,
+		double location_lat_deg
+	)
+	{
+		Location_lon_deg = location_lon_deg;
+		Location_lat_deg = location_lat_deg;
+		HasLonLatLocation = true;
+	}
+
+	public bool Equals(LocationLonLat_deg? other)
+	{
+		if (other is null)
+			return false;
+
+		if (ReferenceEquals(this, other))
+			return true;
+
+		return
+			((IEquatable<ILocationLonLat_deg>)this).Equals(other)
+			&&
+			Location_lon_deg == other.Location_lon_deg
+			&&
+			Location_lat_deg == other.Location_lat_deg
+		;
+	}
+
+	public override bool Equals(object obj)
+		=> Equals(obj as LocationLonLat_deg);
+
+	public override int GetHashCode()
+		=> HashCode.Combine(Location_lon_deg, Location_lat_deg);
+
+	public override string ToString()
+	{
+		return $"{nameof(LocationLonLat_deg)} {{ lon:{Location_lon_deg}, lat:{Location_lat_deg} }}";
+	}
+}

TRViS.ILocationService/LocationStateChangedEventArgs.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace TRViS.Services;
+
+public class LocationStateChangedEventArgs(
+  int newStationIndex,
+  bool isRunningToNextStation
+) : EventArgs, IEquatable<LocationStateChangedEventArgs>
+{
+  public int NewStationIndex { get; } = newStationIndex;
+  public bool IsRunningToNextStation { get; } = isRunningToNextStation;
+
+  public bool Equals(LocationStateChangedEventArgs? other)
+	{
+		if (other is null)
+			return false;
+
+		if (ReferenceEquals(this, other))
+			return true;
+
+		return
+			NewStationIndex == other.NewStationIndex
+			&&
+			IsRunningToNextStation == other.IsRunningToNextStation
+		;
+	}
+
+	public override bool Equals(object obj)
+		=> Equals(obj as LocationStateChangedEventArgs);
+
+	public override int GetHashCode()
+		=> HashCode.Combine(NewStationIndex, IsRunningToNextStation);
+
+	public override string ToString()
+	{
+		return $"{nameof(LocationStateChangedEventArgs)} {{ {nameof(NewStationIndex)}: {NewStationIndex}, {nameof(IsRunningToNextStation)}: {IsRunningToNextStation} }}";
+	}
+}

TRViS.LocationService/StaLocationInfo.cs → TRViS.ILocationService/StaLocationInfo.cs

@@ -1,73 +1,6 @@
-namespace TRViS.Services;
-
-public interface ILocationLonLat_deg : IEquatable<ILocationLonLat_deg>
-{
-	bool HasLonLatLocation { get; }
-	double Location_lon_deg { get; }
-	double Location_lat_deg { get; }
-
-	bool IEquatable<ILocationLonLat_deg>.Equals(ILocationLonLat_deg? other)
-	{
-		if (other is null)
-			return false;
+using System;
 
-		if (ReferenceEquals(this, other))
-			return true;
-
-		return
-			HasLonLatLocation == other.HasLonLatLocation
-			&&
-			Location_lon_deg == other.Location_lon_deg
-			&&
-			Location_lat_deg == other.Location_lat_deg
-		;
-	}
-}
-
-public class LocationLonLat_deg : ILocationLonLat_deg, IEquatable<LocationLonLat_deg>
-{
-	public bool HasLonLatLocation { get; }
-	public double Location_lon_deg { get; }
-	public double Location_lat_deg { get; }
-
-	public LocationLonLat_deg(
-		double location_lon_deg,
-		double location_lat_deg
-	)
-	{
-		Location_lon_deg = location_lon_deg;
-		Location_lat_deg = location_lat_deg;
-		HasLonLatLocation = true;
-	}
-
-	public bool Equals(LocationLonLat_deg? other)
-	{
-		if (other is null)
-			return false;
-
-		if (ReferenceEquals(this, other))
-			return true;
-
-		return
-			((IEquatable<ILocationLonLat_deg>)this).Equals(other)
-			&&
-			Location_lon_deg == other.Location_lon_deg
-			&&
-			Location_lat_deg == other.Location_lat_deg
-		;
-	}
-
-	public override bool Equals(object obj)
-		=> Equals(obj as LocationLonLat_deg);
-
-	public override int GetHashCode()
-		=> HashCode.Combine(Location_lon_deg, Location_lat_deg);
-
-	public override string ToString()
-	{
-		return $"{nameof(LocationLonLat_deg)} {{ lon:{Location_lon_deg}, lat:{Location_lat_deg} }}";
-	}
-}
+namespace TRViS.Services;
 
 public class StaLocationInfo : ILocationLonLat_deg, IEquatable<StaLocationInfo>
 {

TRViS.ILocationService/TRViS.ILocationService.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.1</TargetFramework>
+		<LangVersion>12.0</LangVersion>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
+</Project>

TRViS.IO.Tests/TRViS.IO.Tests.csproj

@@ -9,9 +9,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="NUnit" Version="4.1.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
 		<PackageReference Include="NUnit.Analyzers" Version="4.2.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 <PrivateAssets>all</PrivateAssets>
 </PackageReference>

TRViS.IO/Loaders/ILoader.cs

@@ -6,11 +6,11 @@ public interface ILoader : IDisposable
 {
 	IReadOnlyList<TrainDataGroup> GetTrainDataGroupList();
 
-	TrainData? GetTrainData(int trainId);
+	TrainData? GetTrainData(string trainId);
 
 	IReadOnlyList<Models.DB.WorkGroup> GetWorkGroupList();
 
-	IReadOnlyList<Models.DB.Work> GetWorkList(int workGroupId);
+	IReadOnlyList<Models.DB.Work> GetWorkList(string workGroupId);
 
-	IReadOnlyList<Models.DB.TrainData> GetTrainDataList(int workId);
+	IReadOnlyList<Models.DB.TrainData> GetTrainDataList(string workId);
 }