build: Update project version

Assets/Cryville.EEW.Unity/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.0.4")]
+[assembly: AssemblyVersion("0.0.6")]

Assets/Cryville.EEW.Unity/Config.cs

@@ -1,5 +1,9 @@
+using Cryville.EEW.Core;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Cryville.EEW.Unity {
@@ -8,12 +12,17 @@ namespace Cryville.EEW.Unity {
 		float SeverityColorMappingLuminanceMultiplier,
 		bool UseContinuousColor,
 		string ColorScheme,
+		string LocationNamer,
 
 		string OverrideTimeZone,
 		bool DoDisplayTimeZone,
 		bool DoSwitchBackToHistory,
 
+		string NowcastWarningDelayTolerance,
+
 		string OverrideDisplayCulture,
+		IReadOnlyCollection<TTSCultureConfig> TTSCultures,
+		bool DoIgnoreLanguageVariant,
 
 		IReadOnlyCollection<EventSourceConfig> EventSources
 	) {
@@ -22,12 +31,17 @@ namespace Cryville.EEW.Unity {
 			1f,
 			false,
 			"Default",
+			"FERegionLong",
 
 			null,
 			true,
 			true,
 
+			"1:00:00",
+
 			"",
+			new List<TTSCultureConfig> { new(SharedCultures.CurrentUICulture) },
+			true,
 
 			new List<EventSourceConfig> {
 				new JMAAtomEventSourceConfig(Array.Empty<string>()),
@@ -58,9 +72,23 @@ namespace Cryville.EEW.Unity {
 	record NOAAEventSourceConfig([property: JsonRequired] string Subtype) : EventSourceConfig;
 	record UpdateCheckerEventSourceConfig : EventSourceConfig;
 	record USGSQuakeMLEventSourceConfig([property: JsonRequired] string Subtype) : EventSourceConfig;
-	record WolfxEventSourceConfig(IReadOnlyCollection<string> Filter = null, bool IsFilterWhitelist = false) : EventSourceConfig;
+	record WolfxEventSourceConfig(IReadOnlyCollection<string> Filter = null, bool IsFilterWhitelist = false, bool UseRawCENCLocationName = false) : EventSourceConfig;
 
 	[JsonSerializable(typeof(Config))]
-	[JsonSourceGenerationOptions(WriteIndented = true)]
+	[JsonSourceGenerationOptions(Converters = new Type[] { typeof(CultureInfoConverter) }, WriteIndented = true)]
 	sealed partial class ConfigSerializationContext : JsonSerializerContext { }
+
+	sealed class CultureInfoConverter : JsonConverter<CultureInfo> {
+		public override CultureInfo Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
+			Debug.Assert(typeToConvert == typeof(CultureInfo));
+			var value = reader.GetString();
+			if (value == null) return CultureInfo.InvariantCulture;
+			if (value == "") return SharedCultures.CurrentUICulture;
+			return SharedCultures.Get(value);
+		}
+
+		public override void Write(Utf8JsonWriter writer, CultureInfo value, JsonSerializerOptions options) {
+			writer.WriteStringValue(value.Name);
+		}
+	}
 }

Assets/Cryville.EEW.Unity/Cryville.EEW.Unity.asmdef

@@ -3,6 +3,7 @@
     "rootNamespace": "",
     "references": [
         "GUID:b92f9c7ac10b1c04e86fc48210f62ab1",
+        "GUID:1e0937e40dadba24a97b7342c4559580",
         "GUID:e5b7e7f40a80a814ba706299d68f9213",
         "GUID:da293eebbcb9a4947a212534c52d1a32"
     ],

Assets/Cryville.EEW.Unity/SharedSettings.cs

@@ -26,12 +26,12 @@ namespace Cryville.EEW.Unity {
 		public IColorScheme ColorScheme { get; private set; } = new SeverityBasedColorScheme(DefaultSeverityScheme.Instance, DefaultSeverityColorMapping.Instance);
 		public ISubColorScheme BorderColorScheme { get; private set; } = new WrappedColorScheme(new SeverityBasedColorScheme(DefaultSeverityScheme.Instance, DefaultSeverityColorMapping.SecondaryInstance));
 		public ISubColorScheme TextColorScheme { get; private set; } = new DefaultTextColorScheme(Color.White, Color.Black);
-		public TimeSpan NowcastWarningDelayTolerance => TimeSpan.FromMinutes(60); // TODO TTS
+		public TimeSpan NowcastWarningDelayTolerance { get; private set; } = TimeSpan.FromMinutes(60);
 
 		public CultureInfo RVMCulture { get; private set; } = SharedCultures.CurrentUICulture;
 		readonly int _infoLocationSpecificity = 3;
 		readonly int _ttsLocationSpecificity = 3;
-		readonly LocationNamer _locationNamer = new() { Namer = new FERegionLongNamer() }; // TODO TTS
+		readonly LocationNamer _locationNamer = new() { Namer = new FERegionLongNamer() };
 		public bool NameLocation(double lat, double lon, CultureInfo localCulture, ref CultureInfo targetCulture, out string name, out int specificity) {
 			specificity = _ttsLocationSpecificity;
 			return _locationNamer.Name(lat, lon, localCulture, ref targetCulture, out name, ref specificity);
@@ -41,6 +41,9 @@ namespace Cryville.EEW.Unity {
 			return _locationNamer.Name(lat, lon, localCulture, ref targetCulture, out name, ref specificity);
 		}
 
+		public IReadOnlyCollection<TTSCultureConfig> TTSCultures { get; private set; }
+		public bool DoIgnoreLanguageVariant { get; private set; }
+
 		public TimeZoneInfo OverrideTimeZone { get; private set; }
 		public bool DoDisplayTimeZone { get; private set; } = true;
 		public bool DoSwitchBackToHistory { get; private set; } = true;
@@ -114,12 +117,20 @@ namespace Cryville.EEW.Unity {
 				"SREV" => new DefaultTextColorScheme(Color.White, Color.FromArgb(28, 28, 28), 0.555f),
 				_ => new DefaultTextColorScheme(Color.White, Color.Black),
 			};
+			_locationNamer.Namer = config.LocationNamer switch {
+				"FERegionShort" => new FERegionShortNamer(),
+				_ => new FERegionLongNamer(),
+			};
+			if (config.NowcastWarningDelayTolerance is string nowcastWarningDelayTolerance)
+				NowcastWarningDelayTolerance = TimeSpan.Parse(nowcastWarningDelayTolerance, CultureInfo.InvariantCulture);
 			OverrideTimeZone = ParseTimeZone(config.OverrideTimeZone);
 			DoDisplayTimeZone = config.DoDisplayTimeZone;
 			DoSwitchBackToHistory = config.DoSwitchBackToHistory;
 			RVMCulture = config.OverrideDisplayCulture is string rvmCulture
 				? (string.IsNullOrEmpty(rvmCulture) ? SharedCultures.CurrentUICulture : SharedCultures.Get(rvmCulture))
 				: CultureInfo.InvariantCulture;
+			TTSCultures = config.TTSCultures ?? new List<TTSCultureConfig> { new(CultureInfo.InvariantCulture) };
+			DoIgnoreLanguageVariant = config.DoIgnoreLanguageVariant;
 			EventSources = config.EventSources;
 		}
 

Assets/Cryville.EEW.Unity/TTSWorker.cs

@@ -1,3 +1,4 @@
+using SpeechLib;
 using System;
 using System.Globalization;
 using System.Threading;
@@ -5,7 +6,14 @@ using System.Threading.Tasks;
 
 namespace Cryville.EEW.Unity {
 	class TTSWorker : Core.Audio.TTSWorker {
-		public TTSWorker() : base(CreateSoundPlayer()) { }
+		readonly ISpVoice _voice;
+
+		public TTSWorker() : base(CreateSoundPlayer()) {
+			try {
+				_voice = new SpVoiceClass();
+			}
+			catch { }
+		}
 
 		static SoundPlayer CreateSoundPlayer() {
 			try {
@@ -16,10 +24,25 @@ namespace Cryville.EEW.Unity {
 			}
 		}
 
-		protected override bool IsSpeaking() => false;
+		protected override bool IsSpeaking() {
+			if (_voice == null) return false;
+			_voice.GetStatus(out var status, out _);
+			return (status.dwRunningState & (uint)SpeechRunState.SRSEIsSpeaking) != 0;
+		}
 
-		protected override Task Speak(CultureInfo culture, string content, CancellationToken cancellationToken) => Task.CompletedTask;
+		protected override Task Speak(CultureInfo culture, string content, CancellationToken cancellationToken) {
+			if (_voice == null) return Task.CompletedTask;
+			_voice.Speak(
+				string.Format(CultureInfo.InvariantCulture, "<LANG LANGID=\"{0:x}\">{1}</LANG>", culture.LCID, content),
+				(uint)(SpeechVoiceSpeakFlags.SVSFlagsAsync | SpeechVoiceSpeakFlags.SVSFPurgeBeforeSpeak),
+				out _
+			);
+			return Task.CompletedTask;
+		}
 
-		protected override void StopCurrent() { }
+		protected override void StopCurrent() {
+			if (_voice == null) return;
+			_voice.Skip("SENTENCE", int.MaxValue, out _);
+		}
 	}
 }

Assets/Cryville.EEW.Unity/UI/EventOngoingListView.cs

@@ -23,6 +23,7 @@ namespace Cryville.EEW.Unity.UI {
 			child.SetViewModel(e);
 			child.transform.SetParent(m_listView, false);
 			_displayingViews.Add(child);
+			OnDisplayingViewsChanged();
 
 			SwitchTo(_displayingReports.Count - 1);
 
@@ -37,6 +38,7 @@ namespace Cryville.EEW.Unity.UI {
 			child.SetParent(null, false);
 			Destroy(child.gameObject);
 			_displayingViews.RemoveAt(index);
+			OnDisplayingViewsChanged();
 
 			if (_displayingReports.Count == 0) {
 				m_currentView.gameObject.SetActive(false);
@@ -49,6 +51,14 @@ namespace Cryville.EEW.Unity.UI {
 
 			if (_displayingReports.Count <= 1) m_listView.gameObject.SetActive(false);
 		}
+		void OnDisplayingViewsChanged() {
+			_maxBaseDuration = 1;
+			foreach (var e in _displayingReports) {
+				float duration = GetBaseDuration(e);
+				if (duration > _maxBaseDuration)
+					_maxBaseDuration = duration;
+			}
+		}
 
 		void Awake() {
 			if (Instance != null) {
@@ -63,6 +73,7 @@ namespace Cryville.EEW.Unity.UI {
 
 		int _index = -1;
 		float _tickDown;
+		float _maxBaseDuration;
 		void Update() {
 			if (_displayingReports.Count == 0) return;
 			_tickDown -= Time.deltaTime;
@@ -77,12 +88,15 @@ namespace Cryville.EEW.Unity.UI {
 			_index = index;
 			var e = _displayingReports[index];
 			m_currentView.SetViewModel(e, true);
-			var keyProp = e.Properties.FirstOrDefault();
 			_displayingViews[_index].SetCurrent(true);
-			_tickDown = MathF.Exp(Math.Max(-1f, keyProp?.Severity ?? -1f) + 1);
+			_tickDown = GetBaseDuration(e) / Math.Min(_maxBaseDuration, 4) * 4;
 			m_currentView.gameObject.SetActive(true);
 			Worker.Instance.SetCurrent(e);
 		}
+		static float GetBaseDuration(ReportViewModel e) {
+			return MathF.Exp(Math.Max(-1f, e.Properties.FirstOrDefault()?.Severity ?? -1f) + 1);
+		}
+
 		public void OnItemClicked(ReportViewModel viewModel) {
 			int index = _displayingReports.IndexOf(viewModel);
 			if (index == -1) return;

Assets/Cryville.EEW.Unity/Worker.cs

@@ -65,6 +65,8 @@ namespace Cryville.EEW.Unity {
 			_worker.RVMGeneratorContext = SharedSettings.Instance;
 			_worker.TTSMessageGeneratorContext = SharedSettings.Instance;
 			_worker.RVMCulture = SharedSettings.Instance.RVMCulture;
+			_worker.SetTTSCultures(SharedSettings.Instance.TTSCultures ?? new TTSCultureConfig[0]);
+			_worker.IgnoreLanguageVariant = SharedSettings.Instance.DoIgnoreLanguageVariant;
 			_ongoingReportManager.Changed += OnOngoingReported;
 			_worker.Reported += OnReported;
 			_grouper.GroupUpdated += OnGroupUpdated;
@@ -88,9 +90,10 @@ namespace Cryville.EEW.Unity {
 			_ongoingReportManager.Dispose();
 		}
 
-		static void RegisterViewModelGenerators(CoreWorker worker) {
+		CENCEarthquakeRVMGenerator _cencEarthquakeRVMGenerator;
+		void RegisterViewModelGenerators(CoreWorker worker) {
 			worker.RegisterViewModelGenerator(new BMKGEarthquakeRVMGenerator());
-			worker.RegisterViewModelGenerator(new CENCEarthquakeRVMGenerator());
+			worker.RegisterViewModelGenerator(_cencEarthquakeRVMGenerator = new CENCEarthquakeRVMGenerator());
 			worker.RegisterViewModelGenerator(new CENCEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new CWAEarthquakeRVMGenerator());
 			worker.RegisterViewModelGenerator(new CWAEEWRVMGenerator());
@@ -105,9 +108,10 @@ namespace Cryville.EEW.Unity {
 			worker.RegisterViewModelGenerator(new SichuanEEWRVMGenerator());
 			worker.RegisterViewModelGenerator(new VersionRVMGenerator());
 		}
-		static void RegisterTTSMessageGenerators(CoreWorker worker) {
+		CENCEarthquakeTTSMessageGenerator _cencEarthquakeTTSMessageGenerator;
+		void RegisterTTSMessageGenerators(CoreWorker worker) {
 			worker.RegisterTTSMessageGenerator(new BMKGEarthquakeTTSMessageGenerator());
-			worker.RegisterTTSMessageGenerator(new CENCEarthquakeTTSMessageGenerator());
+			worker.RegisterTTSMessageGenerator(_cencEarthquakeTTSMessageGenerator = new CENCEarthquakeTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CENCEEWTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CWAEarthquakeTTSMessageGenerator());
 			worker.RegisterTTSMessageGenerator(new CWAEEWTTSMessageGenerator());
@@ -130,7 +134,7 @@ namespace Cryville.EEW.Unity {
 			BMKGOpenDataWorker bmkgWorker = new(new Uri("http://localhost:9095/autogempa.json"));
 			bmkgWorker.SetDataUris(new Uri[] { new("http://localhost:9095/gempadirasakan.json") });
 			_worker.AddWorker(bmkgWorker);
-			_worker.AddWorker(new NOAAAtomWorker(new("http://localhost:9095/PAAQAtom.xml")));
+			_worker.AddWorker(new NOAAAtomWorker(new("http://localhost:9095/PAAQAtom.xml"), forceHttps: false));
 			_worker.AddWorker(new UpdateCheckerWorker(typeof(Worker).Assembly.GetName().Version?.ToString(3) ?? "", "unity"));
 #else
 			foreach (var source in SharedSettings.Instance.EventSources) {
@@ -164,7 +168,7 @@ namespace Cryville.EEW.Unity {
 			worker.IsFilterWhitelist = config.IsFilterWhitelist;
 			return worker;
 		}
-		static WolfxWorker BuildWolfxWorkerFilter(WolfxWorker worker, WolfxEventSourceConfig config) {
+		WolfxWorker BuildWolfxWorkerFilter(WolfxWorker worker, WolfxEventSourceConfig config) {
 			if (config.Filter != null) worker.SetFilter(config.Filter.Select(i => i switch {
 				"cenc_eew" => typeof(CENCEEW),
 				"cenc_eqlist" => typeof(WolfxEarthquakeList<CENCEarthquake>),
@@ -175,6 +179,11 @@ namespace Cryville.EEW.Unity {
 				_ => throw new InvalidOperationException("Unknown Wolfx event type."),
 			}));
 			worker.IsFilterWhitelist = config.IsFilterWhitelist;
+
+			_cencEarthquakeRVMGenerator.UseRawLocationName
+				= _cencEarthquakeTTSMessageGenerator.UseRawLocationName
+				= config.UseRawCENCLocationName;
+
 			return worker;
 		}
 		static BMKGOpenDataWorker BuildBMKGOpenDataWorkerUris(BMKGOpenDataWorker worker, BMKGOpenDataEventSourceConfig config) {