From 6a5484fead497ca5dd87908097787ab23294c45a Mon Sep 17 00:00:00 2001
From: KatKatKateryna <kateryna@speckle.systems>
Date: Tue, 20 Aug 2024 15:28:59 +0100
Subject: [PATCH] send complete displayValues for Meshes

---
 pygeoapi/provider/speckle.py | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/pygeoapi/provider/speckle.py b/pygeoapi/provider/speckle.py
index 97d0350..6608a5f 100644
--- a/pygeoapi/provider/speckle.py
+++ b/pygeoapi/provider/speckle.py
@@ -984,13 +984,36 @@ class SpeckleProvider(BaseProvider):
         elif isinstance(displayVal, List):
             faces = []
             verts = []
+            colors = []
             for item in displayVal:
-                #if isinstance(item, Mesh):
-                #    start_vert_count = len(verts)
-                #    verts.extend(item.vertices)
-                #    faces.extend(item.faces)
-                #else:
-                return item
+                if isinstance(item, Mesh):
+                    start_vert_count = int(len(verts)/3)
+
+                    # only add colors if existing and incoming colors are valid (same length as vertices)
+                    if len(colors) == start_vert_count and isinstance(item.colors, List) and len(item.colors)== int(len(item.vertices)/3)>0:
+                        colors.extend(item.colors)
+                    else:
+                        colors = []
+
+                    verts.extend(item.vertices)
+
+                    count = 0
+                    for _ in item.faces:
+                        try:
+                            vert_num = item.faces[count]
+                            faces.append(vert_num)
+                            faces.extend([ x+start_vert_count for x in item.faces[count+1 : count+1+vert_num]])
+                            count += vert_num+1
+                        except IndexError:
+                            break
+                else:
+                    return item
+
+            mesh = Mesh.create(faces= faces, vertices=verts, colors=colors)
+            for prop in displayVal[0].get_member_names():
+                if prop not in ["colors", "vertices", "faces"]:
+                    mesh[prop] = getattr(displayVal[0], prop)
+            return mesh
         
         return obj