update dependencies (#676)

- quick-xml
- tinymvt
- indexmap

app/src-tauri/Cargo.toml

@@ -10,23 +10,23 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc", features = [] }
+tauri-build = { version = "2.0.2", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "2.0.0", features = [] }
+tauri = { version = "2.0.6", features = [] }
 nusamai = { path = "../../nusamai" }
 flatgeom = "0.0"
 nusamai-geojson = { path = "../../nusamai-geojson" }
 nusamai-plateau = { path = "../../nusamai-plateau" }
 nusamai-citygml = {path = "../../nusamai-citygml" }
-log = "0.4.21"
-tauri-plugin-log = "2.0.0"
-thiserror = "1.0.58"
-tauri-plugin-fs = "2.0.0"
-tauri-plugin-shell = "2.0.0"
-tauri-plugin-dialog = "2.0.0"
+log = "0.4.22"
+tauri-plugin-log = "2.0.1"
+thiserror = "1.0.65"
+tauri-plugin-fs = "2.0.3"
+tauri-plugin-shell = "2.0.2"
+tauri-plugin-dialog = "2.0.3"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

nusamai-citygml/Cargo.toml

@@ -9,14 +9,14 @@ serde = ["dep:serde", "serde_json", "flatgeom/serde"]
 
 [dependencies]
 ahash = "0.8.11"
-chrono = { version = "0.4.35", features = ["serde"], default-features = false }
-indexmap = { version = "2.2.6", features = ["serde"] }
-log = "0.4.21"
+chrono = { version = "0.4.38", features = ["serde"], default-features = false }
+indexmap = { version = "2.6.0", features = ["serde"] }
+log = "0.4.22"
 macros = { path = "./macros" }
 flatgeom = "0.0"
 nusamai-projection = { path = "../nusamai-projection"}
-quick-xml = "0.36.2"
+quick-xml = "0.37.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0.115", features = ["indexmap"], optional = true }
+serde_json = { version = "1.0.132", features = ["indexmap"], optional = true }
 thiserror = "1.0"
-url = { version = "2.5.0", features = ["serde"] }
+url = { version = "2.5.2", features = ["serde"] }

nusamai-czml/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-chrono = { version = "0.4.35", features = ["serde"] }
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = { version = "1.0.115", features = ["float_roundtrip"] }
+chrono = { version = "0.4.38", features = ["serde"] }
+serde = { version = "1.0.214", features = ["derive"] }
+serde_json = { version = "1.0.132", features = ["float_roundtrip"] }
 flatgeom = "0.0"
 
 [dev-dependencies]

nusamai-geojson/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 geojson = "0.24.1"
 flatgeom = "0.0"
-serde_json = { version = "1.0.115", features = ["indexmap"] }
+serde_json = { version = "1.0.132", features = ["indexmap"] }

nusamai-gltf/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.1.0"
 [dependencies]
 nusamai-gltf-json = { "path" = "nusamai-gltf-json" }
 byteorder = "1.5.0"
-serde_json = "1.0.115"
+serde_json = "1.0.132"
 
 [dev-dependencies]
 glob = "0.3.1"

nusamai-gltf/nusamai-gltf-json/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = { version = "1.0.115", features = ["float_roundtrip"] }
-serde_repr = "0.1.18"
+serde = { version = "1.0.214", features = ["derive"] }
+serde_json = { version = "1.0.132", features = ["float_roundtrip"] }
+serde_repr = "0.1.19"
 cesiumtiles = { git = "https://github.com/MIERUNE/cesiumtiles-rs.git" }
 
 [dev-dependencies]

nusamai-gpkg/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-sqlx = { version = "0.8.0", features = ["sqlite", "runtime-tokio"] }
+sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio"] }
 flatgeom = "0.0"
-thiserror = "1.0.58"
-url = "2.5.0"
-indexmap = "2.2.6"
+thiserror = "1.0.65"
+url = "2.5.2"
+indexmap = "2.6.0"
 
 [dev-dependencies]
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.41", features = ["full"] }

nusamai-plateau/Cargo.toml

@@ -8,21 +8,21 @@ default = ["serde"]
 serde = ["dep:serde"]
 
 [dependencies]
-quick-xml = "0.36.2"
-serde = { version = "1.0.197", features = ["derive", "rc"], optional = true }
+quick-xml = "0.37.0"
+serde = { version = "1.0.214", features = ["derive", "rc"], optional = true }
 nusamai-citygml = { path = "../nusamai-citygml", features = ["serde"]}
 flatgeom = "0.0"
-chrono = { version = "0.4.35", features = ["serde"], default-features = false }
-url = "2.5.0"
-stretto = "0.8.3"
+chrono = { version = "0.4.38", features = ["serde"], default-features = false }
+url = "2.5.2"
+stretto = "0.8.4"
 hashbrown = { version = "0.15.0", features = ["serde"] }
-indexmap = "2.2.6"
-log = "0.4.21"
+indexmap = "2.6.0"
+log = "0.4.22"
 
 [dev-dependencies]
-zstd = { version = "0.13.0", features = ["zdict_builder"] }
+zstd = { version = "0.13.2", features = ["zdict_builder"] }
 bincode = { version = "2.0.0-rc.3", default-features = false, features = ["std", "serde"] }
 clap = { version = "4.5", features = ["derive"] }
-serde = { version = "1.0.197", features = ["derive"] }
-lz4_flex = "0.11.2"
-serde_json = "1.0.115"
+serde = { version = "1.0.214", features = ["derive"] }
+lz4_flex = "0.11.3"
+serde_json = "1.0.132"

nusamai-projection/Cargo.toml

@@ -4,5 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-japan-geoid = "0.4.0"
-thiserror = "1.0.58"
+japan-geoid = "0.4.1"
+thiserror = "1.0.65"

nusamai/Cargo.toml

@@ -4,35 +4,35 @@ version.workspace = true
 edition = "2021"
 
 [dependencies]
-indexmap = { version = "2.2.6", features = ["serde", "rayon"] }
+indexmap = { version = "2.6.0", features = ["serde", "rayon"] }
 rayon = "1.10.0"
-serde = { version = "1.0.197", features = ["derive"] }
+serde = { version = "1.0.214", features = ["derive"] }
 nusamai-plateau = { path = "../nusamai-plateau" }
 nusamai-citygml = { path = "../nusamai-citygml" }
-quick-xml = "0.36.2"
-clap = { version = "4.5.4", features = ["derive", "string"] }
-thiserror = "1.0.58"
-ctrlc = "3.4.4"
+quick-xml = "0.37.0"
+clap = { version = "4.5.20", features = ["derive", "string"] }
+thiserror = "1.0.65"
+ctrlc = "3.4.5"
 bincode = { version = "2.0.0-rc.3", default-features = false, features = ["std", "serde"] }
-lz4_flex = "0.11.2"
+lz4_flex = "0.11.3"
 nusamai-geojson = { path = "../nusamai-geojson" }
 nusamai-gltf = { path = "../nusamai-gltf" }
 nusamai-gltf-json = { path = "../nusamai-gltf/nusamai-gltf-json" }
 cesiumtiles = { git = "https://github.com/MIERUNE/cesiumtiles-rs.git" }
 flatgeom = { version = "0.0", features = ["serde"] }
 nusamai-czml = { path = "../nusamai-czml" }
 nusamai-projection = { path = "../nusamai-projection" }
-tinymvt = { git = "https://github.com/MIERUNE/tinymvt.git" }
+tinymvt = "0.0.1"
 fastanvil = "0.31.0"
 fastnbt = "2.5.0"
 geojson = "0.24.1"
-serde_json = { version = "1.0.115", features = ["indexmap"] }
-url = "2.5.0"
+serde_json = { version = "1.0.132", features = ["indexmap"] }
+url = "2.5.2"
 nusamai-gpkg = { path = "../nusamai-gpkg" }
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.41", features = ["full"] }
 byteorder = "1.5.0"
 hashbrown = { version = "0.15.0", features = ["serde"] }
-log = { version = "0.4.21" }
+log = { version = "0.4.22" }
 pretty_env_logger = "0.5.0"
 itertools = "0.13"
 prost = "0.13.3"
@@ -45,20 +45,20 @@ glob = "0.3.1"
 shellexpand = "3.1.0"
 kml = "0.8.5"
 nusamai-kml = { path = "../nusamai-kml" }
-image = { version = "0.25.0", default-features = false, features = ["rayon", "tiff", "jpeg", "webp", "png"] }
-flate2 = "1.0.28"
-chrono = "0.4.35"
+image = { version = "0.25.4", default-features = false, features = ["rayon", "tiff", "jpeg", "webp", "png"] }
+flate2 = "1.0.34"
+chrono = "0.4.38"
 kv-extsort = { git = "https://github.com/MIERUNE/kv-extsort-rs.git" }
-bytemuck = { version = "1.16.0", features = ["derive"] }
+bytemuck = { version = "1.19.0", features = ["derive"] }
 dda-voxelize = "0.2.0-alpha.1"
 atlas-packer = { git = "https://github.com/MIERUNE/atlas-packer.git" }
 # atlas-packer = { path = "../atlas_packer" };
-tempfile = "3.10.1"
+tempfile = "3.13.0"
 glam = "0.29.0"
 
 [dev-dependencies]
 rand = "0.8.5"
-tokio = { version = "1.36", features = ["full"] }
+tokio = { version = "1.41", features = ["full"] }
 byteorder = "1.5.0"
 glob = "0.3.1"
-assert_cmd = "2.0.14"
+assert_cmd = "2.0.16"

nusamai/src/sink/cesiumtiles/mod.rs

@@ -15,6 +15,7 @@ use std::{
     sync::{mpsc, Arc, Mutex},
 };
 
+use crate::sink::mvt::tileid::TileIdMethod;
 use ahash::RandomState;
 use atlas_packer::{
     export::{AtlasExporter as _, WebpAtlasExporter},
@@ -31,7 +32,6 @@ use gltf::write_gltf_glb;
 use indexmap::IndexSet;
 use itertools::Itertools;
 use nusamai_citygml::{object::Value, schema::Schema};
-use tinymvt::tileid::TileIdMethod;
 use nusamai_projection::cartesian::geodetic_to_geocentric;
 use rayon::prelude::*;
 use slice::{slice_to_tiles, SlicedFeature};

nusamai/src/sink/mvt/mod.rs

@@ -2,7 +2,7 @@
 
 mod slice;
 mod tags;
-mod tileid;
+pub mod tileid;
 
 use std::{
     convert::Infallible,
@@ -457,7 +457,7 @@ fn make_tile(default_detail: i32, serialized_feats: &[Vec<u8>]) -> Result<Vec<u8
 
         layer.features.push(vector_tile::tile::Feature {
             id,
-            tags: layer.tags_enc.flush_tags(),
+            tags: layer.tags_enc.take_tags(),
             r#type: Some(vector_tile::tile::GeomType::Polygon as i32),
             geometry,
         });

nusamai/src/sink/mvt/tags.rs

@@ -4,34 +4,34 @@ use tinymvt::tag::TagsEncoder;
 pub fn convert_properties(tags_enc: &mut TagsEncoder, name: &str, tree: &object::Value) {
     match &tree {
         nusamai_citygml::Value::String(v) => {
-            tags_enc.add(name, v.clone().into());
+            tags_enc.add(name, v.clone());
         }
         nusamai_citygml::Value::Code(v) => {
-            tags_enc.add(name, v.value().into());
+            tags_enc.add(name, v.value());
         }
         nusamai_citygml::Value::Integer(v) => {
-            tags_enc.add(name, (*v).into());
+            tags_enc.add(name, *v);
         }
         nusamai_citygml::Value::NonNegativeInteger(v) => {
-            tags_enc.add(name, (*v).into());
+            tags_enc.add(name, *v);
         }
         nusamai_citygml::Value::Double(v) => {
-            tags_enc.add(name, (*v).into());
+            tags_enc.add(name, *v);
         }
         nusamai_citygml::Value::Measure(v) => {
-            tags_enc.add(name, v.value().into());
+            tags_enc.add(name, v.value());
         }
         nusamai_citygml::Value::Boolean(v) => {
-            tags_enc.add(name, (*v).into());
+            tags_enc.add(name, *v);
         }
         nusamai_citygml::Value::Uri(v) => {
-            tags_enc.add(name, v.value().to_string().into());
+            tags_enc.add(name, v.value().to_string());
         }
         nusamai_citygml::Value::Date(v) => {
-            tags_enc.add(name, v.to_string().into());
+            tags_enc.add(name, v.to_string());
         }
         nusamai_citygml::Value::Point(v) => {
-            tags_enc.add(name, format!("{:?}", v).into()); // FIXME
+            tags_enc.add(name, format!("{:?}", v)); // FIXME
         }
         nusamai_citygml::Value::Array(_arr) => {
             // ignore non-root attributes