fix stations with dots in their name

Fixes #103

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.1.2] - 2021-07-01
+
+### Fixed
+
+- Fixed ATIS stations for airfields that have a dot (`.`) in their name (e.g. Antonio B. Won Pat Intl on Marina) [#103](https://github.com/rkusa/DATIS/issues/103)
+
 ## [3.1.1] - 2021-06-22
 
 ### Fixed

crates/datis-cmd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "datis-cmd"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

crates/datis-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "datis-core"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

crates/datis-core/src/extract.rs

@@ -48,7 +48,7 @@ pub fn extract_station_config_from_mission_description(
 }
 
 pub fn extract_atis_station_config(config: &str) -> Option<StationConfig> {
-    let re = RegexBuilder::new(r"ATIS ([a-zA-Z0-9- ]+) ([1-3]\d{2}(\.\d{1,3})?)(,(.+))?")
+    let re = RegexBuilder::new(r"ATIS ([a-zA-Z0-9-\. ]+) ([1-3]\d{2}(\.\d{1,3})?)(,(.+))?")
         .case_insensitive(true)
         .build()
         .unwrap();
@@ -370,6 +370,34 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_airfield_names_with_dot() {
+        let freqs = extract_station_config_from_mission_description(
+            r#"
+            ATIS Antonio B. Won Pat Intl 251.000
+        "#,
+        );
+
+        assert_eq!(
+            freqs,
+            vec![(
+                "Antonio B. Won Pat Intl".to_string(),
+                StationConfig {
+                    name: "Antonio B. Won Pat Intl".to_string(),
+                    atis: 251_000_000,
+                    traffic: None,
+                    tts: None,
+                    info_ltr_override: None,
+                    active_rwy_override: None,
+                    no_hpa: false,
+                    no_qfe: false,
+                }
+            ),]
+            .into_iter()
+            .collect()
+        );
+    }
+
     #[test]
     fn test_advanced_mission_descriptiopn_extraction() {
         let freqs = extract_station_config_from_mission_description(

crates/datis-module/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "datis"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

crates/radio-station/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dcs-radio-station"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

crates/srs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "srs"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["rkusa"]
 edition = "2018"
 

crates/win-tts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "win-tts"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Markus Ast <[email protected]>"]
 edition = "2018"
 

mod/Mods/services/DATIS/entry.lua

@@ -5,7 +5,7 @@ declare_plugin("DATIS", {
     "datis.dll",
   },
 
-  version       = "3.1.1",
+  version       = "3.1.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."),