Add force-simple parameter when copying #723
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
upsicleclown
force-pushed
the
add-force-simple-copying
branch
from
4d2da6b to
b73553d
Compare
nyurik
reviewed
Jun 21, 2023
nyurik
reviewed
Jun 21, 2023
martin-mbtiles/src/tile_copier.rs
Outdated
| @@ -267,18 +279,40 @@ mod tests { | |||
| )); | |||
| } | |||
|
|
|||
| #[actix_rt::test] | |||
| async fn copy_force_simple() { | |||
| let src_filepath = PathBuf::from("../tests/fixtures/files/world_cities.mbtiles"); | |||
There was a problem hiding this comment.
May want to call them same as other tests for consistency
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
nyurik
reviewed
Jun 22, 2023
nyurik
reviewed
Jun 22, 2023
There was a problem hiding this comment.
One more thing: please add this function to the tests (welcome to modify it if needed)
async fn get_one<T>(conn: &mut SqliteConnection, sql: &str) -> T
where
for<'r> T: Decode<'r, Sqlite> + Type<Sqlite>,
{
query(sql).fetch_one(conn).await.unwrap().get::<T, _>(0)
}This way you can get a single value with simpler code:
get_one::<u8>(&mut dst_conn, "SELECT COUNT(DISTINCT zoom_level) FROM tiles;").awaitinstead of the one you have
query("SELECT COUNT(DISTINCT zoom_level) FROM tiles;")
.fetch_one(&mut dst_conn)
.await
.unwrap()
.get::<u8, _>(0),
upsicleclown
force-pushed
the
add-force-simple-copying
branch
from
43b4d3b to
1661128
Compare
nyurik
reviewed
Jun 22, 2023
martin-mbtiles/src/tile_copier.rs
Outdated
| @@ -267,18 +279,40 @@ mod tests { | |||
| )); | |||
| } | |||
|
|
|||
| #[actix_rt::test] | |||
| async fn copy_force_simple() { | |||
| let src_filepath = PathBuf::from("../tests/fixtures/files/world_cities.mbtiles"); | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
nyurik
approved these changes
Jun 23, 2023
| assert_eq!( | ||
| Args::try_parse_from(["mbtiles", "copy"]) | ||
| .unwrap_err() | ||
| .kind(), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add
--force-simpleflag tombtiles copytool.If supplied, ensures the destination file has a
tilestable (as opposed to atilesview made up ofimagesandmaptables).