Skip to content

Commit

Permalink
change crate name (#673)
Browse files Browse the repository at this point in the history
<!-- Close or Related Issues -->
Close #0

### What I did(変更内容)
<!-- Please describe the motivation behind this PR and the changes it
introduces. -->
<!-- どのような変更をしますか? 目的は? -->

- ...


### Notes(連絡事項)
<!-- If manual testing is required, please describe the procedure. -->
<!-- 手動での動作確認が必要なら手順を簡単に伝えてください。そのほか連絡事項など。 -->

None / なし
  • Loading branch information
nokonoko1203 authored Oct 23, 2024
1 parent 8377f80 commit 0a8804e
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion nusamai/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/cesiumtiles/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/cesiumtiles/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/cesiumtiles/tiling/tree.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Tileset encoder
use cesiumtiles::tileset;
use nusamai_mvt::TileZXY;
use tinymvt::TileZXY;

use super::scheme::{calc_parent_zxy, geometric_error};

Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/mvt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/mvt/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<E>(
obj: &Entity,
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/sink/mvt/tags.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use nusamai_citygml::object;
use nusamai_mvt::tag::TagsEncoder;
use tinymvt::tag::TagsEncoder;

pub fn convert_properties(
tags: &mut Vec<u32>,
Expand Down
2 changes: 1 addition & 1 deletion nusamai/src/transformer/transform/projection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 0a8804e

Please sign in to comment.