Merge branch 'main' into gltf-structural_metadata

app/package.json

@@ -15,29 +15,28 @@
 	},
 	"devDependencies": {
 		"@iconify/svelte": "^3.1.6",
-		"@sveltejs/adapter-auto": "^2.0.0",
-		"@sveltejs/adapter-static": "^2.0.3",
-		"@sveltejs/kit": "^1.20.4",
-		"@tauri-apps/cli": "^1.5.6",
-		"@typescript-eslint/eslint-plugin": "^6.0.0",
-		"@typescript-eslint/parser": "^6.0.0",
-		"autoprefixer": "^10.4.16",
-		"eslint": "^8.28.0",
-		"eslint-config-prettier": "^8.5.0",
-		"eslint-plugin-svelte": "^2.30.0",
-		"postcss": "^8.4.31",
-		"prettier": "^2.8.0",
-		"prettier-plugin-svelte": "^2.10.1",
-		"svelte": "^4.0.5",
-		"svelte-check": "^3.4.3",
-		"tailwindcss": "^3.3.5",
-		"tslib": "^2.4.1",
-		"typescript": "^5.0.0",
-		"vite": "^4.5.1",
-		"vitest": "^0.34.0"
+		"@sveltejs/adapter-static": "^3.0.1",
+		"@sveltejs/kit": "^2.5.0",
+		"@tauri-apps/cli": "^1.5.9",
+		"@typescript-eslint/eslint-plugin": "^6.21.0",
+		"@typescript-eslint/parser": "^6.21.0",
+		"autoprefixer": "^10.4.17",
+		"eslint": "^8.56.0",
+		"eslint-config-prettier": "^9.1.0",
+		"eslint-plugin-svelte": "^2.35.1",
+		"postcss": "^8.4.35",
+		"prettier": "^3.2.5",
+		"prettier-plugin-svelte": "^3.1.2",
+		"svelte": "^4.2.10",
+		"svelte-check": "^3.6.4",
+		"tailwindcss": "^3.4.1",
+		"tslib": "^2.6.2",
+		"typescript": "^5.3.3",
+		"vite": "^5.1.1",
+		"vitest": "^1.2.2"
 	},
 	"type": "module",
 	"dependencies": {
-		"@tauri-apps/api": "^1.5.1"
+		"@tauri-apps/api": "^1.5.3"
 	}
 }

app/src-tauri/Cargo.toml

@@ -12,19 +12,17 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.0", features = [] }
+tauri-build = { version = "1.5.1", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5.2", features = [ "fs-read-dir", "dialog-all"] }
+tauri = { version = "1.5.4", features = [ "fs-read-dir", "dialog-all"] }
 nusamai = { path = "../../nusamai" }
 nusamai-geometry = { path = "../../nusamai-geometry" }
 nusamai-geojson = { path = "../../nusamai-geojson" }
 nusamai-plateau = { path = "../../nusamai-plateau" }
 nusamai-citygml = {path = "../../nusamai-citygml" }
-quick-xml = "0.31.0"
-geojson = "0.24.1"
 log = "0.4.20"
 pretty_env_logger = "0.5.0"
 

app/svelte.config.js

@@ -1,5 +1,5 @@
 import adapter from '@sveltejs/adapter-static';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {

nusamai-3dtiles/nusamai-3dtiles-json/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.192", features = ["derive"] }
-serde_json = { version = "1.0.108", features = ["indexmap", "float_roundtrip"] }
-serde_repr = "0.1.17"
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = { version = "1.0.113", features = ["indexmap", "float_roundtrip"] }
+serde_repr = "0.1.18"
 nusamai-gltf-json = { path = "../../nusamai-gltf/nusamai-gltf-json" }
 
 [dev-dependencies]

nusamai-citygml/Cargo.toml

@@ -10,13 +10,13 @@ serde = ["dep:serde", "serde_json", "nusamai-geometry/serde"]
 [dependencies]
 ahash = "0.8.8"
 chrono = { version = "0.4.34", features = ["serde"], default-features = false }
-indexmap = { version = "2.1", features = ["serde"] }
+indexmap = { version = "2.2", features = ["serde"] }
 log = "0.4.20"
 macros = { path = "./macros" }
 nusamai-geometry = { path = "../nusamai-geometry", features = ["serde"]}
 nusamai-projection = { path = "../nusamai-projection"}
 quick-xml = "0.31"
 serde = { version = "1.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0.108", features = ["indexmap"], optional = true }
+serde_json = { version = "1.0.113", features = ["indexmap"], optional = true }
 thiserror = "1.0"
 url = "2.5.0"

nusamai-czml/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4.34", features = ["serde"] }
-serde = { version = "1.0.195", features = ["derive"] }
-serde_json = { version = "1.0.111", features = ["float_roundtrip"] }
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = { version = "1.0.113", features = ["float_roundtrip"] }
 nusamai-geometry = { path = "../nusamai-geometry" }
 
 [dev-dependencies]

nusamai-geojson/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 geojson = "0.24.1"
 nusamai-geometry = { path = "../nusamai-geometry" }
-serde_json = { version = "1.0.108", features = ["indexmap"] }
+serde_json = { version = "1.0.113", features = ["indexmap"] }

nusamai-geometry/Cargo.toml

@@ -5,16 +5,16 @@ edition = "2021"
 
 [dependencies]
 num-traits = "0.2.18"
-serde = { version = "1.0.193", features = ["derive"], optional = true }
+serde = { version = "1.0.196", features = ["derive"], optional = true }
 
 [dev-dependencies]
 byteorder = "1.5.0"
-geo-types = "0.7.11"
+geo-types = "0.7.12"
 geojson = "0.24.1"
 indexmap = "2.2.3"
 quick-xml = "0.31.0"
-thiserror = "1.0.50"
+thiserror = "1.0.57"
 earcut-rs = { git = "https://github.com/MIERUNE/earcut-rs.git" }
-clap = { version = "4.4.8", features = ["derive"] }
-serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.108"
+clap = { version = "4.5.0", features = ["derive"] }
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = "1.0.113"

nusamai-gltf/Cargo.toml

@@ -7,11 +7,14 @@ version = "0.1.0"
 
 [dependencies]
 nusamai-gltf-json = { "path" = "nusamai-gltf-json" }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }
 nusamai-geometry = { path = "../nusamai-geometry" }
 quick-xml = "0.31.0"
-thiserror = "1.0.50"
+thiserror = "1.0.57"
 earcut-rs = { git = "https://github.com/MIERUNE/earcut-rs.git" }
 indexmap = "2.2.3"
 byteorder = "1.5.0"
 serde_json = "1.0.113"
+
+[dev-dependencies]
+glob = "0.3.1"

nusamai-gltf/nusamai-gltf-json/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { version = "1.0.192", features = ["derive"] }
-serde_json = { version = "1.0.108", features = ["indexmap", "float_roundtrip"] }
-serde_repr = "0.1.17"
+serde = { version = "1.0.196", features = ["derive"] }
+serde_json = { version = "1.0.113", features = ["indexmap", "float_roundtrip"] }
+serde_repr = "0.1.18"
 
 [dev-dependencies]
 glob = "0.3.1"

nusamai-gltf/nusamai-gltf-json/tests/load_examples.rs

@@ -19,3 +19,23 @@ fn load_examples() {
         assert_eq!(gltf, gltf2);
     }
 }
+
+#[test]
+fn load_3dtiles_examples() {
+    for path in glob::glob("./tests/samples/3d-tiles/**/*.gltf").unwrap() {
+        // deserialize
+        let path = path.unwrap();
+        println!("loading {:?}", path);
+        let src = std::fs::read_to_string(path).unwrap();
+        let gltf: Gltf = serde_json::from_str(&src).unwrap();
+
+        // serialize
+        let ser = serde_json::to_string(&gltf).unwrap();
+        // 'null' should not appear in output
+        assert!(!ser.contains("null"));
+
+        // deserialize again (expect the same deserialization result)
+        let gltf2 = serde_json::from_str(&ser).unwrap();
+        assert_eq!(gltf, gltf2);
+    }
+}