geodb-rs 0.1.4__tar.gz → 0.1.6__tar.gz

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/Cargo.lock

@@ -165,9 +165,9 @@ checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
 dependencies = [
  "cfg_aliases",
 ]
@@ -224,9 +224,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.47"
+version = "1.2.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
+checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -461,12 +461,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.2"
@@ -537,7 +531,7 @@ dependencies = [
 
 [[package]]
 name = "geodb-cli"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "anyhow",
  "clap",
@@ -546,7 +540,7 @@ dependencies = [
 
 [[package]]
 name = "geodb-core"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "criterion",
@@ -562,19 +556,20 @@ dependencies = [
 
 [[package]]
 name = "geodb-ffi"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "flate2",
  "geodb-core",
  "once_cell",
  "serde",
+ "serde_json",
  "uniffi",
 ]
 
 [[package]]
 name = "geodb-py"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "geodb-core",
  "pyo3",
@@ -585,14 +580,14 @@ dependencies = [
 
 [[package]]
 name = "geodb-rs"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "geodb-core",
 ]
 
 [[package]]
 name = "geodb-wasm"
-version = "0.1.4"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "console_error_panic_hook",
@@ -676,12 +671,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -754,9 +748,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56"
+checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
 dependencies = [
  "base64",
  "bytes",
@@ -948,9 +942,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
 [[package]]
 name = "linux-raw-sys"
@@ -966,9 +960,9 @@ checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lru-slab"
@@ -993,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "minicov"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
+checksum = "4869b6a491569605d66d3952bcdf03df789e5b536e5f0cf7758a7f08a55ae24d"
 dependencies = [
  "cc",
  "walkdir",
@@ -1019,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
  "wasi",
@@ -1450,9 +1444,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
 dependencies = [
  "web-time",
  "zeroize",
@@ -1603,9 +1597,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
 [[package]]
 name = "siphasher"
@@ -1677,9 +1671,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.110"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1889,9 +1883,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
  "bitflags",
  "bytes",
@@ -1919,9 +1913,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -1929,9 +1923,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
 dependencies = [
  "once_cell",
 ]
@@ -2444,9 +2438,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
@@ -2488,18 +2482,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.28"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43fa6694ed34d6e57407afbccdeecfa268c470a7d2a5b0cf49ce9fcc345afb90"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.28"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c640b22cd9817fae95be82f0d2f90b11f7605f6c319d16705c459b27ac2cbc26"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
 dependencies = [
  "proc-macro2",
  "quote",

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/Cargo.toml

@@ -1,17 +1,25 @@
+
 [package]
 name = "geodb-rs"
-version = "0.1.4"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 publish = false
-license = "MIT"
+license.workspace = true
 description = "Workspace crate for geodb-core and geodb-wasm; hosts examples and dev tooling."
-repository = "https://github.com/holg/geodb-rs"
+repository.workspace = true
 readme = "README.md"
 [workspace]
 members = ["crates/geodb-py"]
 
 resolver = "2"
 
+[workspace.package]
+version = "0.1.6"
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/holg/geodb-rs"
+authors = ["Holger Trahe"]
+
 [workspace.dependencies]
 bincode = "1"
 deunicode = "1.6"
@@ -22,8 +30,20 @@ serde = { version = "1", features = ["derive"] }
 serde-wasm-bindgen = "0.6"
 serde_json = { version = "1" }
 thiserror = "1"
-wasm-bindgen = "0.2"
-web-sys = { version = "0.3", features = ["console"] }
+wasm-bindgen = "=0.2.105"  # Pinned to match trunk 0.21.14's bundled wasm-bindgen-cli
+web-sys = { version = "0.3", features = [
+    "console",
+    "Window",
+    "Document",
+    "Location",
+    "Element",
+    "HtmlElement",
+    "HtmlInputElement",
+    "Event",
+    "EventTarget",
+    "UrlSearchParams",
+    "CssStyleDeclaration"
+] }
 
 [dependencies]
 geodb-core = { path = "crates/geodb-core" }

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geodb-rs
-Version: 0.1.4
+Version: 0.1.6
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/crates/geodb-core/Cargo.toml

@@ -1,15 +1,19 @@
 [package]
 name = "geodb-core"
-version = "0.1.4"
-edition = "2021"
-authors = ["Holger Trahe"]
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
 license = "MIT OR Apache-2.0"
 description = "A high-performance geographic database with countries, states, cities, and more"
-repository = "https://github.com/holg/geodb-rs"
+repository.workspace = true
 readme = "README.md"
 documentation = "https://docs.rs/geodb-core"
 keywords = ["geography", "database", "countries", "cities", "geo"]
 categories = ["database", "data-structures"]
+# Exclude all data files from published package (reduces package to <1MB)
+# Data is automatically downloaded from GitHub on first load
+# Download requires the 'builder' feature (enabled by default)
+exclude = ["data/*.bin", "data/*.json.gz", "data/*.json"]
 
 # Configure docs.rs build
 [package.metadata.docs.rs]

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/crates/geodb-core/README.md

@@ -20,6 +20,10 @@
 [![PyPI Downloads](https://img.shields.io/pypi/dm/geodb-rs.svg?label=downloads)](https://pypi.org/project/geodb-rs/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/geodb-rs.svg)](https://pypi.org/project/geodb-rs/)
 
+### pub.dev (Flutter)
+[![pub.dev](https://img.shields.io/pub/v/geodb_flutter.svg)](https://pub.dev/packages/geodb_flutter)
+[![pub.dev likes](https://img.shields.io/pub/likes/geodb_flutter)](https://pub.dev/packages/geodb_flutter)
+
 ### App Store
 [![iOS](https://img.shields.io/badge/iOS-App%20Store-blue?logo=apple)](https://apps.apple.com/app/geodb-rs/id6755972245)
 [![TestFlight](https://img.shields.io/badge/TestFlight-Beta-orange?logo=apple)](https://testflight.apple.com/join/TuFejJEq)
@@ -33,6 +37,7 @@ This repository is a **Cargo workspace** containing:
 - **`geodb-wasm`** — WebAssembly bindings + browser demo — docs: https://docs.rs/geodb-wasm
 - **`geodb-py`** — Python bindings (published on PyPI as "geodb-rs") — https://pypi.org/project/geodb-rs/
 - **`geodb-ffi`** — FFI bindings for mobile platforms (iOS, macOS, watchOS, Android)
+- **`geodb_flutter`** — Flutter plugin (published on pub.dev) — https://pub.dev/packages/geodb_flutter
 
 ---
 
@@ -55,13 +60,21 @@ The dataset is adapted from
 https://github.com/dr5hn/countries-states-cities-database
 (licensed under **CC-BY-4.0**, attribution required).
 
-> Important: Data source we rely on
+> **Important: Data source and automatic downloading**
 >
-> geodb-core ships and expects the upstream dataset from the following file in the dr5hn/countries-states-cities-database repository:
+> geodb-core uses the upstream dataset from the dr5hn/countries-states-cities-database repository:
 >
 > https://github.com/dr5hn/countries-states-cities-database/blob/master/json/countries%2Bstates%2Bcities.json.gz
 >
-> The default loader uses a copy of this file placed under `crates/geodb-core/data/countries+states+cities.json.gz` and builds a binary cache alongside it. If you update or replace the dataset, ensure it retains the same JSON structure. Please observe the CC-BY-4.0 license and attribution of the upstream project.
+> **Automatic data download and caching:**
+> - The published crate does NOT include data files (keeps package size under 1MB)
+> - **On first load**, the library automatically downloads the dataset from GitHub (~3.7MB)
+> - After download, a binary cache is generated for fast subsequent loads
+> - Download and cache generation happen only once per system
+> - Requires the `builder` feature (enabled by default) and internet connection for first load
+> - Downloaded data and cache stored in `crates/geodb-core/data/` directory
+>
+> If you update or replace the dataset, ensure it retains the same JSON structure. Please observe the CC-BY-4.0 license and attribution of the upstream project.
 
 ---
 
@@ -71,14 +84,16 @@ https://github.com/dr5hn/countries-states-cities-database
 
 ```toml
 [dependencies]
-geodb-core = "0.2"
+geodb-core = "0.1"
 ```
 
+**Note:** First load will download the dataset from GitHub (~3.7MB) and build the binary cache (requires internet connection). Subsequent loads will be instant using the cached binary.
+
 ### For WebAssembly (browser/Node)
 
 ```toml
 [dependencies]
-geodb-wasm = "0.2"
+geodb-wasm = "0.1"
 ```
 
 ### For Swift (iOS, macOS, watchOS)
@@ -114,7 +129,25 @@ for city in results {
 let nearest = engine.findNearest(lat: 52.52, lng: 13.405, count: 10)
 ```
 
-### For Android (Kotlin)
+### For Flutter (iOS, Android, macOS)
+
+```yaml
+# pubspec.yaml
+dependencies:
+  geodb_flutter: ^0.1.8
+```
+
+```dart
+import 'package:geodb_flutter/geodb_flutter.dart';
+
+final geodb = GeodbFlutter();
+await geodb.initialize();
+
+final results = await geodb.smartSearch('Berlin');
+final nearest = await geodb.findNearest(lat: 52.52, lng: 13.405, count: 10);
+```
+
+### For Android (Kotlin - Native)
 
 See the example app in `GeoDB-App/android-app/`. The app uses UniFFI-generated Kotlin bindings.
 
@@ -263,21 +296,46 @@ if let Some(us) = db.find_country_by_iso2("US") {
 let countries = db.find_countries_by_phone_code("+44");
 ```
 
-### Search for cities named "Springfield"
+### Filter-based city search (CityQuery API)
+
+Use the chainable `query_cities()` API to disambiguate cities with common names:
 
 ```rust
-let results: Vec<_> = db.countries()
-    .iter()
-    .flat_map(|country| {
-        country.states().iter().flat_map(move |state| {
-            state.cities().iter()
-                .filter(|c| c.name() == "Springfield")
-                .map(move |c| (country.name(), state.name(), c.name()))
-        })
-    })
+use geodb_core::prelude::*;
+
+let db = GeoDb::<DefaultBackend>::load()?;
+
+// Find Springfield in Illinois, US (not the 30+ other Springfields!)
+let results = db.query_cities()
+    .filter_country("US")
+    .filter_region("Illinois")
+    .filter_city("Springfield")
     .collect();
+
+assert_eq!(results.len(), 1);
+let (city, state, country) = &results[0];
+println!("{} - {}, {}", city.name(), state.name(), country.iso2());
+// Output: Springfield - Illinois, US
+
+// Find Lüdinghausen in NRW (accent-insensitive search)
+let city = db.query_cities()
+    .filter_country("DE")
+    .filter_region("Nordrhein-Westfalen")
+    .filter_city("Ludinghausen")  // works without umlaut too
+    .first();
+
+// Count all Springfields worldwide
+let count = db.query_cities()
+    .filter_city("Springfield")
+    .count();
+println!("Found {} cities named Springfield", count);
 ```
 
+Filters support:
+- **Country**: ISO2/ISO3 codes (`"US"`, `"DEU"`) or name substring (`"Germany"`)
+- **Region**: State code (`"CA"`, `"NW"`) or name (`"California"`, `"Nordrhein-Westfalen"`)
+- **City**: Name substring with accent-insensitive matching
+
 ---
 
 # WebAssembly (`geodb-wasm`)
@@ -316,13 +374,31 @@ Install:
 cargo install geodb-cli
 ```
 
-Examples:
+Commands:
 
 ```bash
-geodb-cli --help
-geodb-cli stats
-geodb-cli find-country US
-geodb-cli list-cities --country US --state CA
+geodb-cli --help                    # Show all commands
+geodb-cli stats                     # Database statistics
+geodb-cli countries                 # List all countries
+geodb-cli country US                # Lookup country by ISO2/ISO3 code
+geodb-cli states US                 # List all states for a country
+geodb-cli cities "Springfield"      # Search cities by substring
+geodb-cli smart "Berlin"            # Smart search (cities/states/countries)
+geodb-cli nearest --lat 52.52 --lng 13.405 -n 5   # Find 5 nearest cities
+geodb-cli radius --lat 52.52 --lng 13.405 -r 50   # Cities within 50km
+```
+
+Filter-based query (disambiguate cities):
+
+```bash
+# Find Springfield in Illinois, US (not the 30+ other Springfields!)
+geodb-cli query --city Springfield --country US --region Illinois
+
+# Find Lüdinghausen in NRW, Germany
+geodb-cli query --city "Lüdinghausen" --country DE --region "Nordrhein-Westfalen"
+
+# List all cities in Bavaria
+geodb-cli query --country Germany --region Bavaria -n 50
 ```
 
 Docs.rs: https://docs.rs/geodb-cli
@@ -365,6 +441,59 @@ print(db.stats())  # (countries, states, cities)
 
 ---
 
+# Flutter Plugin (`geodb_flutter`)
+
+Cross-platform Flutter plugin with native Rust performance.
+
+### pub.dev
+[![pub.dev](https://img.shields.io/pub/v/geodb_flutter.svg)](https://pub.dev/packages/geodb_flutter)
+
+### Installation
+
+```yaml
+dependencies:
+  geodb_flutter: ^0.1.8
+```
+
+### Platform Support
+
+| Platform | Status | Architectures |
+|----------|--------|---------------|
+| iOS | Ready | arm64 device, arm64 simulator |
+| macOS | Ready | arm64, x86_64 (Universal) |
+| Android | Ready | arm64-v8a, armeabi-v7a, x86_64, x86 |
+
+### Quick Start
+
+```dart
+import 'package:geodb_flutter/geodb_flutter.dart';
+
+final geodb = GeodbFlutter();
+
+// Initialize (required first)
+await geodb.initialize();
+
+// Get stats
+final stats = await geodb.getStats();
+print('${stats.cities} cities in ${stats.countries} countries');
+
+// Smart search
+final results = await geodb.smartSearch('Berlin');
+for (final city in results) {
+  print('${city.name}, ${city.country} (${city.iso2})');
+}
+
+// Find nearest cities
+final nearest = await geodb.findNearest(lat: 52.52, lng: 13.405, count: 10);
+
+// Search within radius
+final nearby = await geodb.findInRadius(lat: 52.52, lng: 13.405, radiusKm: 50.0);
+```
+
+For a complete example, see `GeoDB-Apps/geodb_city_autocomplete/` in the repository.
+
+---
+
 # Mobile Apps (`GeoDB-App`)
 
 The repository includes native apps for Apple and Android platforms:

{geodb_rs-0.1.4 → geodb_rs-0.1.6}/crates/geodb-core/src/legacy_model/search.rs

@@ -1,12 +1,12 @@
 // crates/geodb-core/src/legacy_model/search.rs
 
-use crate::traits::CityContext;
 use crate::alias::CityMetaIndex;
 use crate::common::{DbStats, SmartHitGeneric};
 use crate::legacy_model::nested::{City, Country, GeoDb, State};
-use crate::spatial::{decode_geoid, haversine_distance, distance_squared};
+use crate::spatial::{decode_geoid, distance_squared, haversine_distance};
 #[allow(unused_imports)]
 use crate::text::{fold_key, match_score};
+use crate::traits::CityContext;
 use crate::traits::{GeoBackend, GeoSearch};
 use std::collections::HashSet;
 type MySmartHit<'a, B> = SmartHitGeneric<'a, Country<B>, State<B>, City<B>>;
@@ -495,7 +495,7 @@ impl<B: GeoBackend> GeoSearch<B> for GeoDb<B> {
         }
         None
     }
-    fn find_nearest(&self, lat: f64, lng: f64, count: usize) -> Vec<&City<B>> {
+    fn find_nearest(&self, lat: f64, lng: f64, count: usize) -> Vec<CityContext<'_, B>> {
         // Legacy: We don't have a spatial_index, so we must scan the whole world.
         // This is slower (O(N)), but correct.
 
@@ -509,7 +509,7 @@ impl<B: GeoBackend> GeoSearch<B> for GeoDb<B> {
 
                     // Squared Euclidean for fast sorting
                     let dist = distance_squared(lat, lng, c_lat, c_lng);
-                    candidates.push((dist, city));
+                    candidates.push((dist, city, state, country));
                 }
             }
         }
@@ -518,14 +518,22 @@ impl<B: GeoBackend> GeoSearch<B> for GeoDb<B> {
         candidates.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap());
 
         // Take top N
-        candidates.into_iter().take(count).map(|(_, c)| c).collect()
+        candidates
+            .into_iter()
+            .take(count)
+            .map(|(_, c, s, co)| (c, s, co))
+            .collect()
     }
 
     // crates/geodb-core/src/model/search.rs
 
     // crates/geodb-core/src/legacy_model/search.rs
 
-    fn find_cities_in_radius_by_geoid(&self, geoid: u64, radius_km: f64) -> Vec<CityContext<'_, B>> {
+    fn find_cities_in_radius_by_geoid(
+        &self,
+        geoid: u64,
+        radius_km: f64,
+    ) -> Vec<CityContext<'_, B>> {
         let (center_lat, center_lng) = decode_geoid(geoid);
 
         // BBox calc (Same as above)
@@ -556,8 +564,12 @@ impl<B: GeoBackend> GeoSearch<B> for GeoDb<B> {
             }
         }
 
-        candidates.sort_unstable_by(|a, b| a.0.partial_cmp(&b.0).unwrap_or(std::cmp::Ordering::Equal));
-        candidates.into_iter().map(|(_, city, state, country)| (city, state, country)).collect()
+        candidates
+            .sort_unstable_by(|a, b| a.0.partial_cmp(&b.0).unwrap_or(std::cmp::Ordering::Equal));
+        candidates
+            .into_iter()
+            .map(|(_, city, state, country)| (city, state, country))
+            .collect()
     }
 
     // ... (Ensure enrich_with_city_meta is present as a no-op or todo) ...