Updated Weather Hazards URL + Upgrade to .NET 9 + Added Docker Support

.dockerignore

@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**

Dockerfile

@@ -0,0 +1,30 @@
+# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+# This stage is used when running from VS in fast mode (Default for Debug configuration)
+FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble AS base
+USER $APP_UID
+WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
+
+# This stage is used to build the service project
+FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["ws4kp.csproj", "."]
+RUN dotnet restore "./ws4kp.csproj"
+COPY . .
+WORKDIR "/src/."
+RUN dotnet build "./ws4kp.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+# This stage is used to publish the service project to be copied to the final stage
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./ws4kp.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "ws4kp.dll"]

Properties/launchSettings.json

@@ -44,6 +44,17 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json",

Scripts/index.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 /// <reference path="jquery.touchSwipe.min.js" />
 
 // Redirect user to SSL version of site.
@@ -1810,7 +1810,7 @@ var btnGetGps_click = function ()
 var PopulateWeatherParameters = function ()
 {
     spanCity.text(_WeatherParameters.City + ", ");
-    spanState.text(_WeatherParameters.State);
+    spanState.text(_WeatherParameters.ZoneId.substring(0,2));
     spanStationId.text(_WeatherParameters.StationId);
     spanRadarId.text(_WeatherParameters.RadarId);
     spanZoneId.text(_WeatherParameters.ZoneId);

Scripts/outlook1.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 
 var canvas1;
 

Scripts/speech1.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 
 var frmSpeech;
 var btnSpeak;

Scripts/twc1.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 
 var frmGetLatLng;
 var txtAddress;

Scripts/twc2.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 /// <reference path="jquery.touchSwipe.min.js" />
 
 // Redirect user to SSL version of site.

Scripts/twc3.js

@@ -1,4 +1,4 @@
-/// <reference path="jquery-3.1.0.min.js" />
+/// <reference path="jquery-3.7.1.min.js" />
 /// <reference path="Timer.js" />
 
 //timemachine.config({
@@ -2991,7 +2991,7 @@ var GetWeatherHazards3 = function (WeatherParameters)
         Hazards: [],
     };
 
-    var Url = "https://alerts.weather.gov/cap/wwaatmget.php?x=" + ZoneId + "&y=0";
+    var Url = "https://api.weather.gov/alerts/active.atom?zone=" + ZoneId;
     //Url = "cors/?u=" + encodeURIComponent(Url);
 
     // Load the xml file using ajax 
@@ -3085,7 +3085,8 @@ var GetWeatherHazards3 = function (WeatherParameters)
                         console.log(xml);
 
                         var description = $xml.find("description");
-                        WeatherParameters.WeatherHazardConditions.Hazards.push(description.text());
+                        var title = $xml.find("headline");
+                        WeatherParameters.WeatherHazardConditions.Hazards.push(title.text() + " " + description.text());
 
                         HazardCounter++;
                         if (HazardCounter == HazardUrls.length)
@@ -12921,8 +12922,8 @@ var DrawNoaaImage = function (context)
         {
             context.drawImage(_NoaaImage, 356, 39);
         };
-        //_NoaaImage.src = "Images/noaa4.png";
-        _NoaaImage.src = "Images/noaa5.gif";
+        //_NoaaImage.src = "images/noaa4.png";
+        _NoaaImage.src = "images/noaa5.gif";
     }
     else
     {
@@ -12941,9 +12942,9 @@ var DrawLogoImage = function (context)
             //SmoothingEnabled(context, true);
             context.drawImage(_LogoImage, 50, 30, 85, 67);
         };
-        //LogoImage.src = "Images/Logo1.png";
-        //_LogoImage.src = "Images/Logo3.gif";
-        _LogoImage.src = "Images/Logo3.png";
+        //LogoImage.src = "images/Logo1.png";
+        //_LogoImage.src = "images/Logo3.gif";
+        _LogoImage.src = "images/Logo3.png";
     }
     else
     {