Merge pull request #102 from Nikolai558/development

Releasing 2.3.4

ChangeLog.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
 ---
+- ## Version 2.3.4
+  - #100: Temporary fix for when a color is not defined inside the vSTARS video map. (Skips "color" property)
+  - #101: Temporary fix for labels inside the vSTARS video map. (Ignore labels)
+  - Added uninstall batch file to GitHub Repository
+
 - ## Version 2.3.3
   - #97: Fixed the problem where the .id commands for the 3LD were not working.
 

FeBuddyLibrary/DataAccess/GeoJson.cs

@@ -352,6 +352,16 @@ private List<Feature> CreateLineStringVideoMap(List<vmElement> vmElements, Dicti
 
             foreach (var item in vmElements)
             {
+                if (item.XsiType != "Line")
+                {
+                    continue;
+                }
+
+                if (!colors.ContainsKey(item.Color.ToLower()))
+                {
+                    colors.Add(item.Color.ToLower(), null);
+                }
+
                 bool crossesAM = false;
                 var coords = CheckAMCrossing(item.StartLat, item.StartLon, item.EndLat, item.EndLon);
                 if (coords.Count() == 4)
@@ -368,6 +378,7 @@ private List<Feature> CreateLineStringVideoMap(List<vmElement> vmElements, Dicti
                     currentFeature.properties = new Properties()
                     {
                         color = colors?[item.Color.ToLower()] ?? null,
+                        //color = null,
                         style = Char.ToLowerInvariant(item.Style[0]) + item.Style[1..],
                         thickness = item.Thickness,
                     };

FeBuddyWinFormUI/FeBuddyWinFormUI.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>FE-BUDDY</AssemblyName>
-    <Version>2.3.3</Version>
+    <Version>2.3.4</Version>
     <Copyright>Copyright © 2022 Nikolas Boling, Kyle Sanders</Copyright>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>FE_BUDDY_icon.ico</ApplicationIcon>

uninstall.bat

@@ -0,0 +1,111 @@
+@echo off
+PING 127.0.0.1 - n 5 > nul
+tasklist /FI "IMAGENAME eq FE-BUDDY.exe" 2>NUL | find /I /N "FE-BUDDY.exe">NUL
+if "%ERRORLEVEL%"=="0" taskkill /F /im FE-BUDDY.exe
+
+TITLE FE-BUDDY UNINSTALL
+
+SET /A NOT_FOUND_COUNT=0
+
+CD /d "%temp%"
+	if NOT exist FE-BUDDY (
+		SET /A NOT_FOUND_COUNT=%NOT_FOUND_COUNT% + 1
+		SET FE-BUDDY_TEMP_FOLDER=NOT_FOUND
+	)
+
+	if exist FE-BUDDY (
+		SET FE-BUDDY_TEMP_FOLDER=FOUND
+		RD /Q /S "FE-BUDDY"
+	)
+
+CD /d "%userprofile%\\AppData\\Local"
+	if NOT exist FE-BUDDY (
+		SET /A NOT_FOUND_COUNT=%NOT_FOUND_COUNT% + 1
+		SET FE-BUDDY_APPDATA_FOLDER=NOT_FOUND
+	)
+
+	if exist FE-BUDDY (
+		SET FE-BUDDY_APPDATA_FOLDER=FOUND
+		RD /Q /S "FE-BUDDY"
+	)
+
+CD /d "%userprofile%\\Desktop"
+	if NOT exist FE-BUDDY.lnk (
+		SET /A NOT_FOUND_COUNT=%NOT_FOUND_COUNT% + 1
+		SET FE-BUDDY_SHORTCUT=NOT_FOUND
+	)
+
+	if exist FE-BUDDY.lnk (
+		SET FE-BUDDY_SHORTCUT=FOUND
+		DEL /Q "FE-BUDDY.lnk"
+	)
+
+CD /d "%appdata%\\Microsoft\\Windows\\Start Menu\\Programs"
+ if NOT exist "Kyle Sanders" (
+     SET OLD_START_SHORTCUT=NOT_FOUND
+)
+
+	if exist "Kyle Sanders" (
+		SET OLD_START_SHORTCUT=FOUND
+		RD /Q /S "Kyle Sanders"
+	)
+
+	if NOT exist FE-BUDDY.lnk (
+		SET /A NOT_FOUND_COUNT=%NOT_FOUND_COUNT% + 1
+		SET NEW_START_SHORTCUT=NOT_FOUND
+	)
+
+	if exist FE-BUDDY.lnk (
+		SET NEW_START_SHORTCUT=FOUND
+		DEL /Q "FE-BUDDY.lnk"
+	)
+
+IF %NOT_FOUND_COUNT%==0 SET UNINSTALL_STATUS=COMPLETE
+IF %NOT_FOUND_COUNT% GEQ 1 SET UNINSTALL_STATUS=PARTIAL
+IF %NOT_FOUND_COUNT%==4 SET UNINSTALL_STATUS=FAIL
+
+IF %UNINSTALL_STATUS%==COMPLETE GOTO UNINSTALLED
+IF %UNINSTALL_STATUS%==PARTIAL GOTO UNINSTALLED
+IF %UNINSTALL_STATUS%==FAIL GOTO FAILED
+
+CLS
+
+:UNINSTALLED
+
+ECHO.
+ECHO.
+ECHO SUCCESSFULLY UNINSTALLED THE FOLLOWING:
+ECHO.
+IF %FE-BUDDY_TEMP_FOLDER%==FOUND ECHO        -temp\\FE-BUDDY
+IF %FE-BUDDY_APPDATA_FOLDER%==FOUND ECHO        -AppData\\Local\\FE-BUDDY
+IF %FE-BUDDY_SHORTCUT%==FOUND ECHO        -Desktop\\FE-BUDDY Shortcut
+IF %OLD_START_SHORTCUT%==FOUND ECHO        -Start Menu\\Kyle Sanders
+IF %NEW_START_SHORTCUT%==FOUND ECHO        -Start Menu\\FE-BUDDY Shortcut
+
+:FAILED
+
+IF NOT %NOT_FOUND_COUNT%==0 (
+	ECHO.
+	ECHO.
+	ECHO.
+	ECHO.
+	IF %UNINSTALL_STATUS%==PARTIAL ECHO NOT ABLE TO COMPLETELY UNINSTALL BECAUSE THE FOLLOWING COULD NOT BE FOUND:
+	IF %UNINSTALL_STATUS%==FAIL ECHO UNINSTALL FAILED COMPLETELY BECAUSE THE FOLLOWING COULD NOT BE FOUND:
+	ECHO.
+	IF %FE-BUDDY_TEMP_FOLDER%==NOT_FOUND ECHO        -temp\\FE-BUDDY
+	IF %FE-BUDDY_APPDATA_FOLDER%==NOT_FOUND ECHO        -AppData\\Local\\FE-BUDDY
+	IF %FE-BUDDY_SHORTCUT%==NOT_FOUND (
+		ECHO        -Desktop\\FE-BUDDY Shortcut
+		ECHO             --If the shortcut was renamed, delete the shortcut manually.
+	)
+ IF %NEW_START_SHORTCUT%==NOT_FOUND ECHO        -Start Menu\\FE-BUDDY Shortcut
+)
+
+ECHO.
+ECHO.
+ECHO.
+ECHO.
+ECHO.
+ECHO ...Close this prompt when ready.
+
+PAUSE>NUL;