Small fixes.

twitchax · Aug 14, 2023 · 021eab5 · 021eab5
1 parent 4ccd2fd
commit 021eab5
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rtz-build/Cargo.toml b/rtz-build/Cargo.toml
@@ -13,10 +13,10 @@ categories = ["command-line-utilities"]
 
 [features]
 default = []
-full = ["tz-ned", "tz-osm", "admin-osm", "self-contained"]
+full = ["tz-ned", "tz-osm", "admin-osm", "self-contained", "rtz-core/full"]
 
 force-rebuild = []
-self-contained = []
+self-contained = ["rtz-core/self-contained"]
 
 tz-ned = []
 tz-osm = []

diff --git a/rtz/Cargo.toml b/rtz/Cargo.toml
@@ -85,6 +85,7 @@ js-sys = { version = "0.3.61", optional = true }
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
+cities-json = "*"
 
 [build-dependencies]
 rtz-build = { path = "../rtz-build", version = "0.2.6"}

diff --git a/rtz/src/geo/tz/ned.rs b/rtz/src/geo/tz/ned.rs
@@ -224,4 +224,12 @@ mod bench {
             black_box(NedTimezone::lookup(x, y));
         });
     }
+
+    #[bench]
+    fn bench_cities(b: &mut Bencher) {
+        b.iter(|| {
+            let city = cities_json::get_random_cities();
+            black_box(NedTimezone::lookup(city.lng as f32, city.lat as f32));
+        });
+    }
 }
diff --git a/rtz/src/geo/tz/osm.rs b/rtz/src/geo/tz/osm.rs
@@ -230,4 +230,12 @@ mod bench {
             black_box(OsmTimezone::lookup(x, y));
         });
     }
+
+    #[bench]
+    fn bench_cities(b: &mut Bencher) {
+        b.iter(|| {
+            let city = cities_json::get_random_cities();
+            black_box(OsmTimezone::lookup(city.lng as f32, city.lat as f32));
+        });
+    }
 }