wolfhece 2.1.50__py3-none-any.whl → 2.1.56__py3-none-any.whl

wolfhece/lazviewer/laz_viewer.py

@@ -261,13 +261,23 @@ class xyz_laz():
                 y=np.frombuffer(f.read(blocsize),dtype_file)
                 z=np.frombuffer(f.read(nbloc*4),np.float32)
                 classi=np.frombuffer(f.read(nbloc),np.int8)
+
                 count+=4+(2*blocsize+nbloc*(4+1))
 
-                if len(myret)==0:
-                    # dt=[('x',np.float32),('y',np.float32),('z',np.float32),('classification',np.int8)]
-                    myret=np.array([x,y,z,classi]).transpose()
+                if classi.shape[0] != nbloc:
+                    logging.warning(_('Bad classification size - file {}'.format(fn)))
                 else:
-                    myret=np.concatenate((myret,np.array([x,y,z,classi]).transpose()))
+                    if len(myret)==0:
+                        # dt=[('x',np.float32),('y',np.float32),('z',np.float32),('classification',np.int8)]
+                        myret=np.array([x,y,z,classi]).transpose()
+                    else:
+                        if len(x)>1:
+                            added = np.array([x,y,z,classi]).transpose()
+
+                            if myret.shape[1] == added.shape[1]:
+                                myret=np.concatenate((myret,added))
+                            else:
+                                logging.warning(_('Incompatible shapes'))
 
         # Format Numpy
         self.data = myret
@@ -485,16 +495,17 @@ class xyz_laz_grids():
         """
         Scan all LAZ to find used data
 
-        Args:
-            bounds (Union[tuple[tuple[float,float],tuple[float,float]], list[list[float, float],list[float, float]]]): [[xmin,xmax], [ymin,ymax]]
-
-        Returns:
-            _type_: np.ndarray
+        :param bounds: [[xmin,xmax], [ymin,ymax]]
+        :type bounds: Union[tuple[tuple[float,float],tuple[float,float]], list[list[float, float],list[float, float]]]
+        :return: np.ndarray
         """
         ret = [cur.scan(bounds) for cur in self.grids]
         ret = [cur for cur in ret if len(cur)>0]
 
-        return np.concatenate(ret)
+        if len(ret)==0:
+            return np.asarray([])
+        else:
+            return np.concatenate(ret)
 
     def read_dir(self, dir_grids):
         dirs = listdir(dir_grids)
@@ -637,8 +648,8 @@ def find_pointsXYZ(xyz:np.ndarray, bounds:Union[tuple[tuple[float,float],tuple[f
     xb=bounds[0]
     yb=bounds[1]
     # Get arrays which indicate invalid X, Y, or Z values.
-    X_valid = (xb[0] <= xyz[:,0]) & (xb[1] >= xyz[:,0])
-    Y_valid = (yb[0] <= xyz[:,1]) & (yb[1] >= xyz[:,1])
+    X_valid = np.logical_and((xb[0] <= xyz[:,0]), (xb[1] >= xyz[:,0]))
+    Y_valid = np.logical_and((yb[0] <= xyz[:,1]), (yb[1] >= xyz[:,1]))
     good_indices = np.where(X_valid & Y_valid)[0]
 
     return xyz[good_indices]

wolfhece/models/blues.pal

@@ -0,0 +1,65 @@
+16
+0.0
+247
+251
+255
+0.06666666666666667
+233
+242
+250
+0.13333333333333333
+220
+233
+246
+0.2
+207
+225
+242
+0.26666666666666666
+192
+216
+237
+0.3333333333333333
+171
+207
+229
+0.39999999999999997
+147
+196
+222
+0.4666666666666666
+120
+181
+216
+0.5333333333333333
+96
+166
+209
+0.6
+74
+151
+201
+0.6666666666666666
+55
+135
+192
+0.7333333333333333
+37
+117
+183
+0.7999999999999999
+23
+100
+171
+0.8666666666666666
+9
+83
+157
+0.9333333333333332
+8
+65
+133
+0.9999999999999999
+8
+48
+107