Fix xyz conversion when offset_scale is None

PermafrostDiscoveryGateway · May 10, 2022 · cbb9530 · cbb9530
1 parent a7635e9
commit cbb9530
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/py3dtiles/convert.py b/py3dtiles/convert.py
@@ -640,7 +640,12 @@ def add_tasks_to_process(state, name, task, point_count):
 
             zmq_send_to_process(zmq_idle_clients, zmq_skt, [pickle.dumps({
                 'filename': file,
-                'offset_scale': (-avg_min, root_scale, rotation_matrix[:3, :3].T if rotation_matrix is not None else None, infos['color_scale'].get(file)),
+                'offset_scale': (
+                    -avg_min,
+                    root_scale,
+                    rotation_matrix[:3, :3].T if rotation_matrix is not None else None,
+                    infos['color_scale'].get(file) if infos['color_scale'] is not None else None,
+                ),
                 'portion': portion,
                 'id': _id
             })])

diff --git a/tests/fixtures/simple.xyz b/tests/fixtures/simple.xyz
@@ -0,0 +1,3 @@
+281345.1234 369123.4567 0.0000
+281345.5678 369123.8901 0.0000
+281345.9012 369123.2345 0.0000
diff --git a/tests/test_convert.py b/tests/test_convert.py
@@ -55,3 +55,12 @@ def test_convert_with_srs(tmp_dir):
             srs_out='4978')
     assert os.path.exists(os.path.join(tmp_dir, 'tileset.json'))
     assert os.path.exists(os.path.join(tmp_dir, 'r.pnts'))
+
+
+def test_convert_simple_xyz(tmp_dir):
+    convert(os.path.join(fixtures_dir, 'simple.xyz'),
+            outfolder=tmp_dir,
+            srs_in='3857',
+            srs_out='4978')
+    assert os.path.exists(os.path.join(tmp_dir, 'tileset.json'))
+    assert os.path.exists(os.path.join(tmp_dir, 'r.pnts'))