diff --git a/nusamai/Cargo.toml b/nusamai/Cargo.toml index dac570407..64bff7852 100644 --- a/nusamai/Cargo.toml +++ b/nusamai/Cargo.toml @@ -22,7 +22,7 @@ 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" } -nusamai-mvt = { git = "https://github.com/MIERUNE/tinymvt.git" } +tinymvt = { git = "https://github.com/MIERUNE/tinymvt.git" } fastanvil = "0.31.0" fastnbt = "2.5.0" geojson = "0.24.1" diff --git a/nusamai/src/sink/cesiumtiles/mod.rs b/nusamai/src/sink/cesiumtiles/mod.rs index 6d1db01a3..3f53148cf 100644 --- a/nusamai/src/sink/cesiumtiles/mod.rs +++ b/nusamai/src/sink/cesiumtiles/mod.rs @@ -31,7 +31,7 @@ use gltf::write_gltf_glb; use indexmap::IndexSet; use itertools::Itertools; use nusamai_citygml::{object::Value, schema::Schema}; -use nusamai_mvt::tileid::TileIdMethod; +use tinymvt::tileid::TileIdMethod; use nusamai_projection::cartesian::geodetic_to_geocentric; use rayon::prelude::*; use slice::{slice_to_tiles, SlicedFeature}; diff --git a/nusamai/src/sink/cesiumtiles/slice.rs b/nusamai/src/sink/cesiumtiles/slice.rs index 8a2aab043..295ecbd47 100644 --- a/nusamai/src/sink/cesiumtiles/slice.rs +++ b/nusamai/src/sink/cesiumtiles/slice.rs @@ -9,9 +9,9 @@ use nusamai_citygml::{ geometry::GeometryType, object::{ObjectStereotype, Value}, }; -use nusamai_mvt::TileZXY; use nusamai_plateau::{appearance, Entity}; use serde::{Deserialize, Serialize}; +use tinymvt::TileZXY; use super::{material::Material, tiling}; use crate::sink::cesiumtiles::{material::Texture, tiling::zxy_from_lng_lat}; diff --git a/nusamai/src/sink/cesiumtiles/tiling/tree.rs b/nusamai/src/sink/cesiumtiles/tiling/tree.rs index 7a4e84394..57150f0cd 100644 --- a/nusamai/src/sink/cesiumtiles/tiling/tree.rs +++ b/nusamai/src/sink/cesiumtiles/tiling/tree.rs @@ -1,7 +1,7 @@ //! Tileset encoder use cesiumtiles::tileset; -use nusamai_mvt::TileZXY; +use tinymvt::TileZXY; use super::scheme::{calc_parent_zxy, geometric_error}; diff --git a/nusamai/src/sink/mvt/mod.rs b/nusamai/src/sink/mvt/mod.rs index 34fd96c2c..76040f8e3 100644 --- a/nusamai/src/sink/mvt/mod.rs +++ b/nusamai/src/sink/mvt/mod.rs @@ -16,12 +16,12 @@ use flatgeom::{MultiPolygon, MultiPolygon2}; use hashbrown::HashMap; use itertools::Itertools; use nusamai_citygml::{object, schema::Schema}; -use nusamai_mvt::{geometry::GeometryEncoder, tag::TagsEncoder, tileid::TileIdMethod, vector_tile}; use prost::Message; use rayon::prelude::*; use serde::{Deserialize, Serialize}; use slice::slice_cityobj_geoms; use tags::convert_properties; +use tinymvt::{geometry::GeometryEncoder, tag::TagsEncoder, tileid::TileIdMethod, vector_tile}; use crate::{ get_parameter_value, diff --git a/nusamai/src/sink/mvt/slice.rs b/nusamai/src/sink/mvt/slice.rs index 6041df8a7..bcbd40274 100644 --- a/nusamai/src/sink/mvt/slice.rs +++ b/nusamai/src/sink/mvt/slice.rs @@ -6,8 +6,8 @@ use nusamai_citygml::{ geometry::GeometryType, object::{ObjectStereotype, Value}, }; -use nusamai_mvt::{webmercator::lnglat_to_web_mercator, TileZXY}; use nusamai_plateau::Entity; +use tinymvt::{webmercator::lnglat_to_web_mercator, TileZXY}; pub fn slice_cityobj_geoms( obj: &Entity, diff --git a/nusamai/src/sink/mvt/tags.rs b/nusamai/src/sink/mvt/tags.rs index 4bfd88bc7..0a3be2af5 100644 --- a/nusamai/src/sink/mvt/tags.rs +++ b/nusamai/src/sink/mvt/tags.rs @@ -1,5 +1,5 @@ use nusamai_citygml::object; -use nusamai_mvt::tag::TagsEncoder; +use tinymvt::tag::TagsEncoder; pub fn convert_properties( tags: &mut Vec, diff --git a/nusamai/src/transformer/transform/projection.rs b/nusamai/src/transformer/transform/projection.rs index 0b45b4e77..281084017 100644 --- a/nusamai/src/transformer/transform/projection.rs +++ b/nusamai/src/transformer/transform/projection.rs @@ -111,7 +111,7 @@ impl ProjectionTransform { Self::rectangular_to_lnglat(v[0], v[1], v[2], input_epsg); }; // LngLat to Web Mercator - (v[0], v[1]) = nusamai_mvt::webmercator::lnglat_to_web_mercator_meters(lng, lat) + (v[0], v[1]) = tinymvt::webmercator::lnglat_to_web_mercator_meters(lng, lat) }); geom_store.epsg = self.output_epsg; }