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

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

@@ -531,7 +531,7 @@ dependencies = [
 
 [[package]]
 name = "geodb-cli"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "anyhow",
  "clap",
@@ -540,7 +540,7 @@ dependencies = [
 
 [[package]]
 name = "geodb-core"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "criterion",
@@ -556,19 +556,20 @@ dependencies = [
 
 [[package]]
 name = "geodb-ffi"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "flate2",
  "geodb-core",
  "once_cell",
  "serde",
+ "serde_json",
  "uniffi",
 ]
 
 [[package]]
 name = "geodb-py"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "geodb-core",
  "pyo3",
@@ -579,14 +580,14 @@ dependencies = [
 
 [[package]]
 name = "geodb-rs"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "geodb-core",
 ]
 
 [[package]]
 name = "geodb-wasm"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
  "bincode",
  "console_error_panic_hook",

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

@@ -14,7 +14,7 @@ members = ["crates/geodb-py"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/holg/geodb-rs"
@@ -31,7 +31,19 @@ serde-wasm-bindgen = "0.6"
 serde_json = { version = "1" }
 thiserror = "1"
 wasm-bindgen = "=0.2.105"  # Pinned to match trunk 0.21.14's bundled wasm-bindgen-cli
-web-sys = { version = "0.3", features = ["console"] }
+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.5 → geodb_rs-0.1.6}/PKG-INFO

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

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

@@ -10,6 +10,10 @@ 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.5 → 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.5 → geodb_rs-0.1.6}/crates/geodb-core/src/legacy_model/search.rs

@@ -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,7 +518,11 @@ 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

{geodb_rs-0.1.5 → geodb_rs-0.1.6}/crates/geodb-core/src/loader/builder.rs

@@ -9,16 +9,19 @@ use crate::common::raw::CountryRaw;
 use crate::common::raw_normalize::apply_all_metadata;
 use crate::error::{GeoError, Result};
 use std::fs::{self, File};
-use std::io::BufWriter;
+use std::io::{BufWriter, Write};
 use std::path::Path;
 
 #[cfg(feature = "compact")]
 use flate2::{write::GzEncoder, Compression};
 
+// Raw download URL for the dataset (GitHub raw content)
+const DATA_DOWNLOAD_URL: &str = "https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/master/json/countries%2Bstates%2Bcities.json.gz";
+
 // Extends GeoDb with Builder/Source capabilities
 impl GeoDb<DefaultBackend> {
     /// **Smart Builder Logic:**
-    /// Checks cache -> Loads Binary OR Builds Source -> Writes Cache.
+    /// Checks cache -> Downloads if missing -> Loads Binary OR Builds Source -> Writes Cache.
     pub(super) fn load_via_builder(path: &Path, filter: Option<&[&str]>) -> Result<Self> {
         let cache_path = common_io::get_cache_path(path);
 
@@ -30,7 +33,16 @@ impl GeoDb<DefaultBackend> {
             }
         }
 
-        // 2. Build (Slow)
+        // 2. Download if source file doesn't exist
+        if !path.exists() {
+            eprintln!(
+                "Data file not found at {:?}, downloading from GitHub...",
+                path
+            );
+            Self::download_dataset(path)?;
+        }
+
+        // 3. Build (Slow)
         // This converts JSON -> Active Structs (Flat or Nested)
         let db = Self::build_from_source(path)?;
 
@@ -158,4 +170,34 @@ impl GeoDb<DefaultBackend> {
 
         Ok(())
     }
+
+    /// Downloads the dataset from GitHub to the specified path
+    fn download_dataset(dest_path: &Path) -> Result<()> {
+        // Ensure parent directory exists
+        if let Some(parent) = dest_path.parent() {
+            fs::create_dir_all(parent).map_err(GeoError::Io)?;
+        }
+
+        // Download using reqwest (blocking)
+        let response = reqwest::blocking::get(DATA_DOWNLOAD_URL)
+            .map_err(|e| GeoError::InvalidData(format!("Failed to download dataset: {}", e)))?;
+
+        if !response.status().is_success() {
+            return Err(GeoError::InvalidData(format!(
+                "Failed to download dataset: HTTP {}",
+                response.status()
+            )));
+        }
+
+        // Write to file
+        let mut file = File::create(dest_path).map_err(GeoError::Io)?;
+        let bytes = response
+            .bytes()
+            .map_err(|e| GeoError::InvalidData(format!("Failed to read response: {}", e)))?;
+
+        file.write_all(&bytes).map_err(GeoError::Io)?;
+
+        eprintln!("Downloaded {} bytes to {:?}", bytes.len(), dest_path);
+        Ok(())
+    }
 }

{geodb_rs-0.1.5 → geodb_rs-0.1.6}/crates/geodb-core/src/model/mod.rs

@@ -54,6 +54,7 @@
 pub mod flat;
 // pub mod region;
 pub mod convert;
+pub mod query;
 pub mod search;
 // Re-exports for convenience
 pub use super::{CityView, CountryView, StateView};
@@ -63,6 +64,7 @@ pub use crate::common::DbStats;
 pub use crate::error::{GeoDbError, GeoError, Result};
 pub use crate::text::{equals_folded, fold_ascii_lower, fold_key};
 pub use flat::{City, Country, CountryTimezone, GeoDb, State};
+pub use query::CityQuery;
 #[cfg(not(feature = "compact"))]
 pub const CACHE_SUFFIX: &str = ".flat.bin";
 #[cfg(feature = "compact")]