correctly report wind speed at carrier in feet #88

rkusa · Apr 11, 2021 · c3e6442 · c3e6442
1 parent 3e66d50
commit c3e6442
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,16 +6,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.2]
+
 ### Changed
 
 - Changed the wind direction of ATIS reports from true to magnetic north
 
-## [2.2.0] - 2021-01-24
+### Fixed
+
+- Correctly report wind speed at carrier in feet (instead of in m/s) [#99](https://github.com/rkusa/DATIS/issues/88)
+
+## [2.2.1] - 2021-01-24
 
 ### Fixed
 
-- Fixed pronunciation pronunciation of noun "wind" (from `/waɪnd/` to `/wɪnd/`) for Windows' TTS. #80
-- Fixed carrier report to report correct magnetic BRC (by estimating the magnetic declination using the IGRF model). #68
+- Fixed pronunciation pronunciation of noun "wind" (from `/waɪnd/` to `/wɪnd/`) for Windows' TTS. [#80](https://github.com/rkusa/DATIS/issues/80)
+- Fixed carrier report to report correct magnetic BRC (by estimating the magnetic declination using the IGRF model). [#68](https://github.com/rkusa/DATIS/issues/68)
 
 ## [2.2.0] - 2021-01-22
 

diff --git a/crates/datis-cmd/Cargo.toml b/crates/datis-cmd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis-cmd"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Markus Ast <m@rkusa.st>"]
 edition = "2018"
 

diff --git a/crates/datis-core/Cargo.toml b/crates/datis-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis-core"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Markus Ast <m@rkusa.st>"]
 edition = "2018"
 

diff --git a/crates/datis-core/src/station.rs b/crates/datis-core/src/station.rs
@@ -138,12 +138,6 @@ impl Station {
                                 }
                             });
 
-                    log::debug!(
-                        "Declination is {:.2} for heading {:.2} ",
-                        declination,
-                        heading.to_degrees()
-                    );
-
                     let heading = (heading.to_degrees() - declination).floor() as u16;
 
                     Ok(Some(Report {
@@ -419,7 +413,7 @@ impl Carrier {
                 "wind"
             },
             pronounce_number(wind_dir, spoken),
-            pronounce_number(weather.wind_speed.round(), spoken),
+            pronounce_number((weather.wind_speed * 1.94384).round(), spoken),
             _break,
         );
 
@@ -787,8 +781,8 @@ mod test {
         };
 
         let report = station.generate_report(26).await.unwrap().unwrap();
-        assert_eq!(report.spoken, "<speak version=\"1.0\" xml:lang=\"en\">\n99, | Stennis\'s <phoneme alphabet=\"ipa\" ph=\"w&#618;nd\">wind</phoneme> ZERO ZERO 6 at 3 knots, | altimeter 2 NINER NINER 7, | CASE 1, | BRC 1 8 ZERO, | expected final heading 1 7 1, | report initial.\n</speak>");
-        assert_eq!(report.textual, "99, Stennis\'s wind 006 at 3 knots, altimeter 2997, CASE 1, BRC 180, expected final heading 171, report initial.");
+        assert_eq!(report.spoken, "<speak version=\"1.0\" xml:lang=\"en\">\n99, | Stennis\'s <phoneme alphabet=\"ipa\" ph=\"w&#618;nd\">wind</phoneme> ZERO ZERO 6 at 5 knots, | altimeter 2 NINER NINER 7, | CASE 1, | BRC 1 8 ZERO, | expected final heading 1 7 1, | report initial.\n</speak>");
+        assert_eq!(report.textual, "99, Stennis\'s wind 006 at 5 knots, altimeter 2997, CASE 1, BRC 180, expected final heading 171, report initial.");
     }
 
     #[tokio::test]

diff --git a/crates/datis-module/Cargo.toml b/crates/datis-module/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "datis"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Markus Ast <m@rkusa.st>"]
 edition = "2018"
 

diff --git a/crates/radio-station/Cargo.toml b/crates/radio-station/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dcs-radio-station"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Markus Ast <m@rkusa.st>"]
 edition = "2018"
 

diff --git a/crates/srs/Cargo.toml b/crates/srs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "srs"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["rkusa"]
 edition = "2018"
 

diff --git a/crates/win-tts/Cargo.toml b/crates/win-tts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "win-tts"
-version = "2.2.1"
+version = "2.2.2"
 authors = ["Markus Ast <m@rkusa.st>"]
 edition = "2018"
 

diff --git a/mod/Mods/services/DATIS/entry.lua b/mod/Mods/services/DATIS/entry.lua
@@ -5,7 +5,7 @@ declare_plugin("DATIS", {
     "datis.dll",
   },
 
-  version       = "2.2.1",
+  version       = "2.2.2",
   state         = "installed",
   developerName = "github.com/rkusa",
   info          = _("DATIS enables a DCS server with an SRS server running on the same machine (TCP=127.0.0.1) to get weather from the mission for stations and frequencies set in the mission editor, and then to report same in a standardized format over SRS using either the Amazon or Google text to speech engines."),