Modification of naming

MIERUNE · Sep 4, 2024 · a7d9f36 · a7d9f36
1 parent 72ff456
commit a7d9f36
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 42 deletions.
diff --git a/nusamai/src/sink/cesiumtiles/mod.rs b/nusamai/src/sink/cesiumtiles/mod.rs
@@ -43,7 +43,7 @@ use crate::{
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
     transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
+        LodSelection, Selection, TransformerConfig, TransformerRegistry,
     },
 };
 use utils::calculate_normal;
@@ -97,7 +97,7 @@ impl DataSinkProvider for CesiumTilesSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/czml/mod.rs b/nusamai/src/sink/czml/mod.rs
@@ -24,9 +24,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct CzmlSinkProvider {}
@@ -63,7 +61,7 @@ impl DataSinkProvider for CzmlSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/geojson/mod.rs b/nusamai/src/sink/geojson/mod.rs
@@ -24,9 +24,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct GeoJsonSinkProvider {}
@@ -63,7 +61,7 @@ impl DataSinkProvider for GeoJsonSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/gltf/mod.rs b/nusamai/src/sink/gltf/mod.rs
@@ -34,7 +34,7 @@ use crate::{
     sink::{cesiumtiles::metadata, DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
     transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
+        LodSelection, Selection, TransformerConfig, TransformerRegistry,
     },
 };
 
@@ -85,7 +85,7 @@ impl DataSinkProvider for GltfSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/gpkg/mod.rs b/nusamai/src/sink/gpkg/mod.rs
@@ -25,9 +25,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct GpkgSinkProvider {}
@@ -64,7 +62,7 @@ impl DataSinkProvider for GpkgSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/kml/mod.rs b/nusamai/src/sink/kml/mod.rs
@@ -24,9 +24,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct KmlSinkProvider {}
@@ -63,7 +61,7 @@ impl DataSinkProvider for KmlSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/minecraft/mod.rs b/nusamai/src/sink/minecraft/mod.rs
@@ -25,9 +25,7 @@ use crate::{
     pipeline::{Feedback, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 use block_colors::{DefaultBlockResolver, Voxel};
@@ -68,7 +66,7 @@ impl DataSinkProvider for MinecraftSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/mvt/mod.rs b/nusamai/src/sink/mvt/mod.rs
@@ -29,9 +29,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct MvtSinkProvider {}
@@ -94,7 +92,7 @@ impl DataSinkProvider for MvtSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/obj/mod.rs b/nusamai/src/sink/obj/mod.rs
@@ -41,7 +41,7 @@ use crate::{
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
     transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
+        LodSelection, Selection, TransformerConfig, TransformerRegistry,
     },
 };
 
@@ -102,7 +102,7 @@ impl DataSinkProvider for ObjSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/ply/mod.rs b/nusamai/src/sink/ply/mod.rs
@@ -21,7 +21,7 @@ use crate::{
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
     transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
+        LodSelection, Selection, TransformerConfig, TransformerRegistry,
     },
 };
 
@@ -72,7 +72,7 @@ impl DataSinkProvider for StanfordPlySinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/sink/shapefile/mod.rs b/nusamai/src/sink/shapefile/mod.rs
@@ -28,9 +28,7 @@ use crate::{
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::{
-        LodSelection, Selection, SelectionOptions, TransformerConfig, TransformerRegistry,
-    },
+    transformer::{LodSelection, Selection, TransformerConfig, TransformerRegistry},
 };
 
 pub struct ShapefileSinkProvider {}
@@ -67,7 +65,7 @@ impl DataSinkProvider for ShapefileSinkProvider {
             key: "use_lod".to_string(),
             label: "出力LODの選択".to_string(),
             parameter: transformer::ParameterType::Selection(Selection::new_lod_selections(
-                "maxlod",
+                "max_lod",
             )),
             requirements: vec![transformer::Requirement::UseLod(LodSelection::MaxLod)],
         });

diff --git a/nusamai/src/transformer/setting.rs b/nusamai/src/transformer/setting.rs
@@ -1,5 +1,3 @@
-use std::option;
-
 use serde::{Deserialize, Serialize};
 
 use crate::{sink::DataRequirements, transformer};
@@ -54,8 +52,8 @@ impl Selection {
     pub fn new_lod_selections(selected_value: &str) -> Self {
         Self::new(
             vec![
-                ("最大LOD", "maxlod"),
-                ("最小LOD", "minlod"),
+                ("最大LOD", "max_lod"),
+                ("最小LOD", "min_lod"),
                 ("LOD0", "lod0"),
                 ("LOD1", "lod1"),
                 ("LOD2", "lod2"),
@@ -172,13 +170,13 @@ impl TransformerRegistry {
                 ParameterType::Selection(value) => {
                     if config.key == "use_lod" {
                         match value.selected_value.as_str() {
-                            "maxlod" => {
+                            "max_lod" => {
                                 data_requirements.set_lod_filter(transformer::LodFilterSpec {
                                     mode: transformer::LodFilterMode::Highest,
                                     ..Default::default()
                                 })
                             }
-                            "minlod" => {
+                            "min_lod" => {
                                 data_requirements.set_lod_filter(transformer::LodFilterSpec {
                                     mode: transformer::LodFilterMode::Lowest,
                                     ..Default::default()