fix DefaultFinder auto nearby search

Sync behaviour like https://github.com/ringsaturn/tzf/blob/v0.15.0/tzf_default_finder.go#L61-L85
ringsaturn · Apr 12, 2024 · 2afeefb · 2afeefb
1 parent 1fa5059
commit 2afeefb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -385,11 +385,21 @@ impl DefaultFinder {
     /// ```
     #[must_use]
     pub fn get_tz_name(&self, lng: f64, lat: f64) -> &str {
-        let fuzzy_name = self.fuzzy_finder.get_tz_name(lng, lat);
-        if !fuzzy_name.is_empty() {
-            return fuzzy_name;
+        for &dx in &[0.0, -0.001, 0.001] {
+            for &dy in &[0.0, -0.001, 0.001] {
+                let dlng = dx + lng;
+                let dlat = dy + lat;
+                let fuzzy_name = self.fuzzy_finder.get_tz_name(dlng, dlat);
+                if !fuzzy_name.is_empty() {
+                    return fuzzy_name;
+                }
+                let name = self.finder.get_tz_name(dlng, dlat);
+                if !name.is_empty() {
+                    return name;
+                }
+            }
         }
-        self.finder.get_tz_name(lng, lat)
+        ""
     }
 
     /// ```rust

diff --git a/tests/default.rs b/tests/default.rs
@@ -17,6 +17,10 @@ mod tests {
         assert_eq!(finder.get_tz_name(-4.5706, 46.2747), "Etc/GMT");
         assert_eq!(finder.get_tz_name(-73.7729, 38.3530), "Etc/GMT+5");
         assert_eq!(finder.get_tz_name(114.1594, 22.3173), "Asia/Hong_Kong");
+
+        // Shenzhen actually, but we used a simplified polygon data.
+        assert_eq!(finder.get_tz_name(114.0668, 22.5153), "Asia/Hong_Kong");
+
         assert_eq!(
             finder.get_tz_name(12.452_899_553_691_935, 41.903_699_636_969_634),
             "Europe/Vatican"