Merge pull request #474 from pierotofy/laz

Added LAZ support

app/migrations/0006_task_available_assets.py

@@ -13,6 +13,7 @@ ASSETS_MAP = {
     'orthophoto.tif': os.path.join('odm_orthophoto', 'odm_orthophoto.tif'),
     'orthophoto.png': os.path.join('odm_orthophoto', 'odm_orthophoto.png'),
     'georeferenced_model.las': os.path.join('odm_georeferencing', 'odm_georeferenced_model.las'),
+    'georeferenced_model.laz': os.path.join('odm_georeferencing', 'odm_georeferenced_model.laz'),
     'georeferenced_model.ply': os.path.join('odm_georeferencing', 'odm_georeferenced_model.ply'),
     'georeferenced_model.csv': os.path.join('odm_georeferencing', 'odm_georeferenced_model.csv'),
     'textured_model.zip': {

app/models/task.py

@@ -115,6 +115,7 @@ class Task(models.Model):
             'orthophoto.tif': os.path.join('odm_orthophoto', 'odm_orthophoto.tif'),
             'orthophoto.png': os.path.join('odm_orthophoto', 'odm_orthophoto.png'),
             'georeferenced_model.las': os.path.join('odm_georeferencing', 'odm_georeferenced_model.las'),
+            'georeferenced_model.laz': os.path.join('odm_georeferencing', 'odm_georeferenced_model.laz'),
             'georeferenced_model.ply': os.path.join('odm_georeferencing', 'odm_georeferenced_model.ply'),
             'georeferenced_model.csv': os.path.join('odm_georeferencing', 'odm_georeferenced_model.csv'),
             'textured_model.zip': {

app/static/app/js/classes/AssetDownloads.js

@@ -36,6 +36,7 @@ const api = {
       new AssetDownload("Terrain Model (GeoTIFF)","dtm.tif","fa fa-area-chart"),
       new AssetDownload("Surface Model (GeoTIFF)","dsm.tif","fa fa-area-chart"),
       new AssetDownload("Point Cloud (LAS)","georeferenced_model.las","fa fa-cube"),
+      new AssetDownload("Point Cloud (LAZ)","georeferenced_model.laz","fa fa-cube"),
       new AssetDownload("Point Cloud (PLY)","georeferenced_model.ply","fa fa-cube"),
       new AssetDownload("Point Cloud (CSV)","georeferenced_model.csv","fa fa-cube"),
       new AssetDownload("Textured Model","textured_model.zip","fa fa-connectdevelop"),

app/tests/test_worker.py

@@ -5,6 +5,7 @@ from app.models import Task
 from nodeodm.models import ProcessingNode
 from .classes import BootTestCase
 from .utils import start_processing_node
+from worker.tasks import redis_client
 
 class TestWorker(BootTestCase):
     def setUp(self):
@@ -13,6 +14,11 @@ class TestWorker(BootTestCase):
     def tearDown(self):
         pass
 
+    def test_redis(self):
+        # We can connect to redis. Other parts of the WebODM test suite
+        # rely on a valid redis connection.
+        self.assertTrue(redis_client.ping())
+
     def test_worker_tasks(self):
         project = Project.objects.get(name="User Test Project")
 

nodeodm/external/node-OpenDroneMap

@@ -1 +1 @@
-Subproject commit 432dc04405566ee494befc70eef61bd2c2fcabc5
+Subproject commit 1b3b33df63ce1423988dfb68969e827d27de9035