read both classification values, get min max classification into metadata json, add converter version to metadata json, fix classification collection

Author: unitycoder

MainWindow.xaml.cs

@@ -70,6 +70,10 @@ public partial class MainWindow : Window
         private readonly float cellSize = 0.5f;
         private static ConcurrentDictionary<(int, int, int), byte> occupiedCells = new();
 
+        // classification stats
+        static byte minClass = 255;
+        static byte maxClass = 0;
+
         // plugins
         string externalFileFormats = "";
 
@@ -198,6 +202,10 @@ private async void Main()
                 // get elapsed time using time
                 var startTime = DateTime.Now;
 
+                // classification minmax
+                minClass = 255;
+                maxClass = 0;
+
                 // if have files, process them
                 if (importSettings.errors.Count == 0)
                 {
@@ -753,12 +761,6 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                 return false;
             }
 
-            if (importSettings.importMetadata == true)
-            {
-                var metaData = taskReader.GetMetaData(importSettings, fileIndex);
-                lasHeaders.Add(metaData);
-            }
-
             if (importSettings.importMetadataOnly == false)
             {
                 int fullPointCount = taskReader.GetPointCount();
@@ -957,10 +959,16 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
                     if (importSettings.importClassification == true)
                     {
                         classification = taskReader.GetClassification();
-                        //classification = taskReader.GetIntensity();
+
+                        // get min and max
+                        if (classification < minClass) minClass = classification;
+                        if (classification > maxClass) maxClass = classification;
+
+                        //classification = (byte)255;
+
                         //if (classification<0 || classification>1) Log.Write("****: " + classification.ToString());
 
-                        //if (i < 20000) Log.Write("class: " + classification.ToString());
+                        //if (i < 10000) Log.Write("class: " + classification.ToString() + " minClass: " + minClass + " maxClass: " + maxClass);
                         //classification = 0;
                         //if (intensity.r < minInt)
                         //{
@@ -1023,7 +1031,27 @@ static bool ParseFile(ImportSettings importSettings, int fileIndex, int? taskId,
 
                 //Log.Write(jsonString, LogEvent.File);
 
-            } // if importMetadataOnly == false
+                if (importSettings.importMetadata == true)
+                {
+                    var metaData = taskReader.GetMetaData(importSettings, fileIndex);
+                    // NOTE now its added to every file..
+                    metaData.ConverterVersion = version;
+                    metaData.MinClassification = minClass;
+                    metaData.MaxClassification = maxClass;
+                    lasHeaders.Add(metaData);
+                }
+
+            } // if importMetadataOnly == false ^
+            else // only metadata:
+            {
+                if (importSettings.importMetadata == true)
+                {
+                    var metaData = taskReader.GetMetaData(importSettings, fileIndex);
+                    // NOTE now its added to every file..
+                    metaData.ConverterVersion = version;
+                    lasHeaders.Add(metaData);
+                }
+            }
 
             //Log.Write("taskid: " + taskId + " done");
             return true;

Readers/LAZ.cs

@@ -383,19 +383,13 @@ byte IReader.GetIntensity()
 
         byte IReader.GetClassification()
         {
-            //float c = new Color();
-            // get point reference
             var p = lazReader.point;
-            //c.r = (Remap(p.extended_classification, 2, 112, 0, 1)); // works, but we dont know range ahead of time, unless read first all values in all files?
-            //c.r = (Remap(p.extended_classification, 0, 255, 0, 1));
-            byte c = p.extended_classification;// / 255f;
-            //c.r = p.classification;
-            //c.r = p.extended_classification;
-            //float c = Tools.LUT255[(byte)(p.classification)];
-            //Console.WriteLine(c.r);
-            //c.g = c.r;
-            //c.b = c.r;
-            return c;
+            // now reads both, we dont know which one is enabled?
+            byte classification = p.classification;
+            byte extended = p.extended_classification;
+            // Choose extended if it's valid and not equal to default "unclassified"
+            byte finalClassification = (extended > 0 && extended != classification) ? extended : classification;
+            return finalClassification;
         }
 
         Float3 IReader.GetXYZ()

Structs/Metadata/LasHeader.cs

@@ -6,6 +6,7 @@ namespace PointCloudConverter.Structs
     [Serializable]
     public class LasHeader
     {
+        public string ConverterVersion { get; set; }
         public string FileName { get; set; }
         // v1.2
         public ushort ProjectionID { get; set; } // these are duplicate data from the VLR (just for convenience)
@@ -43,6 +44,8 @@ public class LasHeader
         public double MinY { get; set; }
         public double MaxZ { get; set; }
         public double MinZ { get; set; }
+        public byte MinClassification { get; set; }
+        public byte MaxClassification { get; set; }
         public List<LasVariableLengthRecord> VariableLengthRecords { get; set; }
         public ulong StartOfWaveformDataPacketRecord { get; internal set; }
         public ulong StartOfFirstExtendedVariableLengthRecord { get; internal set; }