transformer: Selectionの修正

app/src-tauri/src/main.rs

@@ -21,7 +21,7 @@
     source::{citygml::CityGmlSourceProvider, DataSourceProvider},
     transformer::{
         self, MappingRules, MultiThreadTransformer, NusamaiTransformBuilder, TransformBuilder,
-        TransformerRegistry,
+        TransformerSettings,
     },
 };
 use nusamai_plateau::models::TopLevelCityObject;
@@ -148,7 +148,7 @@
     filetype: String,
     epsg: u16,
     rules_path: String,
-    transformer_registry: TransformerRegistry,
+    transformer_registry: TransformerSettings,
     sink_parameters: Parameters,
     tasks_state: tauri::State<ConversionTasksState>,
     app: tauri::AppHandle,
@@ -312,7 +312,7 @@
 
 /// Get the transform options for a given sink type
 #[tauri::command]
-fn get_transform(filetype: String) -> Result<TransformerRegistry, Error> {
+fn get_transform(filetype: String) -> Result<TransformerSettings, Error> {
     let sink_provider = select_sink_provider(&filetype).ok_or_else(|| {
         let msg = format!("Invalid sink type: {}", filetype);
         log::error!("{}", msg);

app/src/lib/transformer.ts

@@ -24,7 +24,7 @@ export interface BooleanConfig {
 
 type TransformerParameterType = boolean | SelectionConfig<string>;
 
-export type TransformerRegistry = {
+export type TransformerSettings = {
 	configs: Array<TransformerConfig<TransformerParameterType>>;
 };
 

app/src/routes/+page.svelte

@@ -3,7 +3,7 @@
 	import { invoke } from '@tauri-apps/api/core';
 	import { attachConsole } from '@tauri-apps/plugin-log';
 	import type { SinkParameters } from '$lib/sinkparams';
-	import type { TransformerRegistry } from '$lib/transformer';
+	import type { TransformerSettings } from '$lib/transformer';
 
 	import Icon from '@iconify/svelte';
 	import InputSelector from './InputSelector.svelte';
@@ -23,7 +23,7 @@
 	let isConvertButtonDisabled = true;
 
 	$: isConvertButtonDisabled = !inputPaths.length || !outputPath || isRunning;
-	let transformerRegistry: TransformerRegistry;
+	let transformerRegistry: TransformerSettings;
 
 	async function convertAndSave() {
 		isRunning = true;

app/src/routes/SettingSelector.svelte

@@ -2,7 +2,7 @@
 	import { filetypeOptions } from '$lib/settings';
 	import { invoke } from '@tauri-apps/api/core';
 	import type { SinkParameters } from '$lib/sinkparams';
-	import type { TransformerRegistry } from '$lib/transformer';
+	import type { TransformerSettings } from '$lib/transformer';
 	import Icon from '@iconify/svelte';
 	import {  } from '@tauri-apps/api';
 	import SinkOptions from '$lib/components/SinkOptions.svelte';
@@ -13,7 +13,7 @@ import * as dialog from "@tauri-apps/plugin-dialog"
 	export let epsg: number = 4979;
 	export let rulesPath: string;
 	export let sinkParameters: SinkParameters;
-	export let transformerRegistry: TransformerRegistry;
+	export let transformerRegistry: TransformerSettings;
 
 	$: epsgOptions = filetypeOptions[filetype]?.epsg || [];
 	$: disableEpsgOptions = epsgOptions.length < 2;

nusamai-plateau/src/entity.rs

@@ -5,7 +5,7 @@ use nusamai_citygml::{geometry::GeometryStore, object::Value};
 use crate::appearance::AppearanceStore;
 
 /// City objects, features, objects or data
-#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 pub struct Entity {
     /// Attribute tree
     pub root: Value,

nusamai/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod option;
 pub mod parameters;
 pub mod pipeline;
 pub mod sink;

nusamai/src/main.rs

@@ -13,7 +13,7 @@ use nusamai::{
     source::{citygml::CityGmlSourceProvider, DataSource, DataSourceProvider},
     transformer::{
         self, MappingRules, MultiThreadTransformer, NusamaiTransformBuilder, ParameterType,
-        TransformBuilder, TransformerConfig, TransformerRegistry,
+        TransformBuilder, TransformerConfig, TransformerSettings,
     },
     BUILTIN_SINKS,
 };
@@ -227,7 +227,7 @@ fn main() -> ExitCode {
     .collect();
 
     let updated_transformer_registry = match update_result {
-        Ok(configs) => TransformerRegistry { configs },
+        Ok(configs) => TransformerSettings { configs },
         Err(error_message) => {
             log::error!("{}", error_message);
             return ExitCode::FAILURE;

nusamai/src/sink/cesiumtiles/mod.rs

@@ -41,11 +41,10 @@ use url::Url;
 
 use crate::{
     get_parameter_value,
-    option::use_textured_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 use utils::calculate_normal;
 
@@ -108,9 +107,12 @@ impl DataSinkProvider for CesiumTilesSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_textured_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config(
+            "max_lod",
+            Some(&["textured_max_lod", "all_lod"]),
+        ));
 
         settings
     }
@@ -137,15 +139,15 @@ impl DataSinkProvider for CesiumTilesSinkProvider {
 
 struct CesiumTilesSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
     limit_texture_resolution: Option<bool>,
     gzip_compress: Option<bool>,
     min_z: u8,
     max_z: u8,
 }
 
 impl DataSink for CesiumTilesSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements = DataRequirements {
             resolve_appearance: true,
             key_value: crate::transformer::KeyValueSpec::JsonifyObjects,

nusamai/src/sink/czml/mod.rs

@@ -20,11 +20,10 @@ use rayon::prelude::*;
 
 use crate::{
     get_parameter_value,
-    option::use_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 
 use super::option::output_parameter;
@@ -46,9 +45,9 @@ impl DataSinkProvider for CzmlSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config("max_lod", None));
 
         settings
     }
@@ -66,11 +65,11 @@ impl DataSinkProvider for CzmlSinkProvider {
 
 pub struct CzmlSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
 }
 
 impl DataSink for CzmlSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements = DataRequirements::default();
 
         for config in properties.configs.iter() {

nusamai/src/sink/geojson/mod.rs

@@ -20,12 +20,11 @@ use rayon::prelude::*;
 
 use crate::{
     get_parameter_value,
-    option::use_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 
 use super::option::output_parameter;
@@ -47,9 +46,9 @@ impl DataSinkProvider for GeoJsonSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config("max_lod", None));
 
         settings
     }
@@ -67,11 +66,11 @@ impl DataSinkProvider for GeoJsonSinkProvider {
 
 pub struct GeoJsonSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
 }
 
 impl DataSink for GeoJsonSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements = DataRequirements {
             tree_flattening: transformer::TreeFlatteningSpec::Flatten {
                 feature: transformer::FeatureFlatteningOption::AllExceptThematicSurfaces,

nusamai/src/sink/gltf/mod.rs

@@ -32,11 +32,10 @@ use url::Url;
 
 use crate::{
     get_parameter_value,
-    option::use_textured_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{cesiumtiles::metadata, DataRequirements, DataSink, DataSinkProvider, SinkInfo},
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 
 use super::option::{limit_texture_resolution_parameter, output_parameter};
@@ -59,9 +58,9 @@ impl DataSinkProvider for GltfSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_textured_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config("max_lod", Some(&["textured_max_lod"])));
 
         settings
     }
@@ -81,7 +80,7 @@ impl DataSinkProvider for GltfSinkProvider {
 
 pub struct GltfSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
     limit_texture_resolution: Option<bool>,
 }
 
@@ -149,7 +148,7 @@ pub struct PrimitiveInfo {
 pub type Primitives = HashMap<material::Material, PrimitiveInfo>;
 
 impl DataSink for GltfSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements: DataRequirements = DataRequirements {
             resolve_appearance: true,
             key_value: crate::transformer::KeyValueSpec::JsonifyObjectsAndArrays,

nusamai/src/sink/gpkg/mod.rs

@@ -21,12 +21,11 @@ use url::Url;
 
 use crate::{
     get_parameter_value,
-    option::use_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
     transformer,
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 
 use super::option::output_parameter;
@@ -48,9 +47,9 @@ impl DataSinkProvider for GpkgSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config("max_lod", None));
 
         settings
     }
@@ -68,7 +67,7 @@ impl DataSinkProvider for GpkgSinkProvider {
 
 pub struct GpkgSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
 }
 
 // An ephimeral container to wrap and pass the data in the pipeline
@@ -265,7 +264,7 @@ impl GpkgSink {
 pub enum GpkgTransformOption {}
 
 impl DataSink for GpkgSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements = DataRequirements {
             tree_flattening: transformer::TreeFlatteningSpec::Flatten {
                 feature: transformer::FeatureFlatteningOption::AllExceptThematicSurfaces,

nusamai/src/sink/kml/mod.rs

@@ -20,11 +20,10 @@ use rayon::prelude::*;
 
 use crate::{
     get_parameter_value,
-    option::use_lod_config,
     parameters::*,
     pipeline::{Feedback, PipelineError, Receiver, Result},
     sink::{DataRequirements, DataSink, DataSinkProvider, SinkInfo},
-    transformer::TransformerRegistry,
+    transformer::{use_lod_config, TransformerSettings},
 };
 
 use super::option::output_parameter;
@@ -45,9 +44,9 @@ impl DataSinkProvider for KmlSinkProvider {
         params
     }
 
-    fn transformer_options(&self) -> TransformerRegistry {
-        let mut settings: TransformerRegistry = TransformerRegistry::new();
-        settings.insert(use_lod_config("max_lod"));
+    fn transformer_options(&self) -> TransformerSettings {
+        let mut settings: TransformerSettings = TransformerSettings::new();
+        settings.insert(use_lod_config("max_lod", None));
 
         settings
     }
@@ -65,11 +64,11 @@ impl DataSinkProvider for KmlSinkProvider {
 
 pub struct KmlSink {
     output_path: PathBuf,
-    transform_settings: TransformerRegistry,
+    transform_settings: TransformerSettings,
 }
 
 impl DataSink for KmlSink {
-    fn make_requirements(&mut self, properties: TransformerRegistry) -> DataRequirements {
+    fn make_requirements(&mut self, properties: TransformerSettings) -> DataRequirements {
         let default_requirements = DataRequirements::default();
 
         for config in properties.configs.iter() {