diff options
Diffstat (limited to 'hittekaart-cli/src/main.rs')
| -rw-r--r-- | hittekaart-cli/src/main.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hittekaart-cli/src/main.rs b/hittekaart-cli/src/main.rs index 880ea61..944a4da 100644 --- a/hittekaart-cli/src/main.rs +++ b/hittekaart-cli/src/main.rs @@ -8,7 +8,7 @@ use color_eyre::{ use hittekaart::{ gpx::{self, Compression}, renderer::{self, Renderer, heatmap, marktile, tilehunt}, - storage::{Folder, Sqlite, Storage, TableFormat}, + storage::{Folder, MbTiles, OsmAnd, Storage}, }; use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle}; use is_terminal::IsTerminal; @@ -29,8 +29,8 @@ enum Mode { #[derive(ValueEnum, Debug, Clone, Copy, PartialEq, Eq, Hash)] enum Format { Folder, - Sqlite, OsmAnd, + MbTiles, } #[derive(Parser, Debug, Clone)] @@ -127,13 +127,13 @@ fn run<R: Renderer>(renderer: R, args: Args) -> Result<()> { let output = args.output.unwrap_or_else(|| "tiles".into()); Box::new(Folder::new(output)) } - Format::Sqlite => { - let output = args.output.unwrap_or_else(|| "tiles.sqlite".into()); - Box::new(Sqlite::connect(output, TableFormat::Simple)?) + Format::MbTiles => { + let output = args.output.unwrap_or_else(|| "tiles.mbtiles".into()); + Box::new(MbTiles::open(output)?) } Format::OsmAnd => { let output = args.output.unwrap_or_else(|| "tiles.sqlitedb".into()); - Box::new(Sqlite::connect(output, TableFormat::OsmAnd)?) + Box::new(OsmAnd::open(output)?) } }; storage.prepare()?; |
