Merge pull request #149 from Nikolai558/development

Releasing v2.6.5
Nikolai558 · Jun 11, 2023 · 2a37064 · 2a37064
2 parents b543fc7 + 1e0bf2b
commit 2a37064
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,10 @@
 # CHANGELOG
 
 ---
+- ## Version 2.6.5
+  - #148 Fixed an issue where if the GeoMap Object had multiple objects with 
+    the same description, the converter would only output the last object.
+
 - ## Version 2.6.4
   - #144 AWY LO DME Cuttoff now has a BCG and Filter value of 15 instead of 5
   - #139 Potential fix for persistent user settings between updates.

diff --git a/FE-BUDDY-instructionsBackup.pdf b/FE-BUDDY-instructionsBackup.pdf
diff --git a/FeBuddyLibrary/DataAccess/GeoJson.cs b/FeBuddyLibrary/DataAccess/GeoJson.cs
@@ -1213,6 +1213,13 @@ public void WriteGeoMapGeoJson(string dirPath, GeoMapSet geo)
                         }
                     }
 
+                    // This fixes the duplicate description issue #148
+                    if (File.Exists(file.FullName))
+                    {
+                        FeatureCollection inFile = JsonConvert.DeserializeObject<FeatureCollection>(File.ReadAllText(file.FullName));
+                        geojson.features.AddRange(inFile.features);
+                    }
+
                     string jsonString = JsonConvert.SerializeObject(geojson, new JsonSerializerSettings { Formatting = Formatting.None, NullValueHandling = NullValueHandling.Ignore });
 
                     //jsonString = PostProcess(jsonString);

diff --git a/FeBuddyWinFormUI/FeBuddyWinFormUI.csproj b/FeBuddyWinFormUI/FeBuddyWinFormUI.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>FE-BUDDY</AssemblyName>
-    <Version>2.6.4</Version>
+    <Version>2.6.5</Version>
     <Copyright>Copyright © 2023 Nikolas Boling, Kyle Sanders</Copyright>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>FE_BUDDY_icon.ico</ApplicationIcon>