"japan-geoid" crate の変更に追従する (#192)

ciscorn · web-flow · commit 2767d46b6abd · 2024-01-21T17:11:54.000+09:00
[MIERUNE/japan-geoid] の変更に追従するだけの修正を行います。

（mainがビルドできなくなっているため、特例的にレビューなしでマージします）。
diff --git a/nusamai-projection/Cargo.toml b/nusamai-projection/Cargo.toml
@@ -5,5 +5,4 @@ edition = "2021"
 
 [dependencies]
 japan-geoid = { git = "https://github.com/MIERUNE/japan-geoid" }
-lz4_flex = "0.11.1"
 thiserror = "1.0.50"
diff --git a/nusamai-projection/examples/data/gsigeo2011_ver2_2.bin.lz4 b/nusamai-projection/examples/data/gsigeo2011_ver2_2.bin.lz4
diff --git a/nusamai-projection/src/vshift.rs b/nusamai-projection/src/vshift.rs
@@ -1,4 +1,5 @@
-use japan_geoid::{Geoid, MemoryGrid};
+use japan_geoid::gsi::MemoryGrid;
+use japan_geoid::Geoid;
 
 /// Convert from JGD 2011 Geograhpic 3D (EPSG:6697) to WGS84 Geograhpic 3D (EPSG:4979)
 pub struct JGD2011ToWGS84 {
@@ -7,13 +8,9 @@ pub struct JGD2011ToWGS84 {
 
 impl JGD2011ToWGS84 {
     /// Create a new instance with the embed geoid model data.
-    pub fn from_embedded_model() -> Self {
-        const EMBEDDED_MODEL: &[u8] = include_bytes!("../examples/data/gsigeo2011_ver2_2.bin.lz4");
-        let decompressed = &lz4_flex::decompress_size_prepended(EMBEDDED_MODEL).unwrap();
-        let mut reader = std::io::Cursor::new(decompressed);
-
+    pub fn new() -> Self {
         Self {
-            geoid: MemoryGrid::from_binary_reader(&mut reader).unwrap(),
+            geoid: japan_geoid::gsi::load_embedded_gsigeo2011(),
         }
     }
 
@@ -24,14 +21,20 @@ impl JGD2011ToWGS84 {
     }
 }
 
+impl Default for JGD2011ToWGS84 {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[test]
     fn fixtures() {
         let (lng_jgd, lat_jgd, elevation) = (138.2839817085188, 37.12378643088312, 0.);
-        let jgd_to_wgs = JGD2011ToWGS84::from_embedded_model();
+        let jgd_to_wgs = JGD2011ToWGS84::new();
         let (lng_wgs, lat_wgs, ellips_height) = jgd_to_wgs.convert(lng_jgd, lat_jgd, elevation);
         assert!((ellips_height - 39.47387115961899).abs() < 1e-8);
         // (lng, lat) must not change.
