From 5923592b539c9bc1daefcd0751a7c2e92396e091 Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Sun, 8 Feb 2026 08:56:16 -0600 Subject: [PATCH] Moved the weatherfeeder model out of internal/ so that downstream consumers can import it directly. --- internal/normalizers/common/wmo_text.go | 2 +- internal/normalizers/nws/alerts.go | 2 +- internal/normalizers/nws/forecast.go | 2 +- internal/normalizers/nws/helpers.go | 2 +- internal/normalizers/nws/observation.go | 2 +- internal/normalizers/nws/wmo_map.go | 2 +- internal/normalizers/openmeteo/forecast.go | 2 +- internal/normalizers/openmeteo/observation.go | 2 +- internal/normalizers/openweather/observation.go | 4 ++-- internal/normalizers/openweather/wmo_map.go | 2 +- internal/standards/wmo.go | 2 +- internal/standards/wmo_categories.go | 2 +- {internal/model => model}/alert.go | 0 {internal/model => model}/doc.go | 0 {internal/model => model}/forecast.go | 0 {internal/model => model}/observation.go | 0 {internal/model => model}/wmo.go | 0 17 files changed, 13 insertions(+), 13 deletions(-) rename {internal/model => model}/alert.go (100%) rename {internal/model => model}/doc.go (100%) rename {internal/model => model}/forecast.go (100%) rename {internal/model => model}/observation.go (100%) rename {internal/model => model}/wmo.go (100%) diff --git a/internal/normalizers/common/wmo_text.go b/internal/normalizers/common/wmo_text.go index 12f9957..38cf9ff 100644 --- a/internal/normalizers/common/wmo_text.go +++ b/internal/normalizers/common/wmo_text.go @@ -4,7 +4,7 @@ package common import ( "strings" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // WMOFromTextDescription is a cross-provider fallback that tries to infer a WMO code diff --git a/internal/normalizers/nws/alerts.go b/internal/normalizers/nws/alerts.go index dfb97fc..85d573c 100644 --- a/internal/normalizers/nws/alerts.go +++ b/internal/normalizers/nws/alerts.go @@ -9,10 +9,10 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" nwscommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/providers/nws" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // AlertsNormalizer converts: diff --git a/internal/normalizers/nws/forecast.go b/internal/normalizers/nws/forecast.go index 4011b8f..f7fb806 100644 --- a/internal/normalizers/nws/forecast.go +++ b/internal/normalizers/nws/forecast.go @@ -8,10 +8,10 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" nwscommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/providers/nws" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // ForecastNormalizer converts: diff --git a/internal/normalizers/nws/helpers.go b/internal/normalizers/nws/helpers.go index c6bb968..7c81b52 100644 --- a/internal/normalizers/nws/helpers.go +++ b/internal/normalizers/nws/helpers.go @@ -6,8 +6,8 @@ import ( "strings" "unicode" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // centroidLatLon returns a best-effort centroid (lat, lon) from a GeoJSON polygon. diff --git a/internal/normalizers/nws/observation.go b/internal/normalizers/nws/observation.go index 27988b0..3512476 100644 --- a/internal/normalizers/nws/observation.go +++ b/internal/normalizers/nws/observation.go @@ -8,10 +8,10 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" nwscommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/providers/nws" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // ObservationNormalizer converts: diff --git a/internal/normalizers/nws/wmo_map.go b/internal/normalizers/nws/wmo_map.go index 071da18..701cafe 100644 --- a/internal/normalizers/nws/wmo_map.go +++ b/internal/normalizers/nws/wmo_map.go @@ -4,8 +4,8 @@ package nws import ( "strings" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // mapNWSToWMO maps NWS signals into a canonical WMO code. diff --git a/internal/normalizers/openmeteo/forecast.go b/internal/normalizers/openmeteo/forecast.go index 71cd6de..ce0358f 100644 --- a/internal/normalizers/openmeteo/forecast.go +++ b/internal/normalizers/openmeteo/forecast.go @@ -7,10 +7,10 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" omcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/providers/openmeteo" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // ForecastNormalizer converts: diff --git a/internal/normalizers/openmeteo/observation.go b/internal/normalizers/openmeteo/observation.go index e7679b5..d79468e 100644 --- a/internal/normalizers/openmeteo/observation.go +++ b/internal/normalizers/openmeteo/observation.go @@ -8,10 +8,10 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" omcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/providers/openmeteo" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // ObservationNormalizer converts: diff --git a/internal/normalizers/openweather/observation.go b/internal/normalizers/openweather/observation.go index 98bfc2e..2a6bcb4 100644 --- a/internal/normalizers/openweather/observation.go +++ b/internal/normalizers/openweather/observation.go @@ -7,9 +7,9 @@ import ( "time" "gitea.maximumdirect.net/ejr/feedkit/event" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" normcommon "gitea.maximumdirect.net/ejr/weatherfeeder/internal/normalizers/common" "gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) // ObservationNormalizer converts: @@ -121,7 +121,7 @@ func buildObservation(parsed owmResponse) (model.WeatherObservation, time.Time, TextDescription: canonicalText, IconURL: iconURL, - TemperatureC: &tempC, + TemperatureC: &tempC, ApparentTemperatureC: apparentC, WindDirectionDegrees: parsed.Wind.Deg, diff --git a/internal/normalizers/openweather/wmo_map.go b/internal/normalizers/openweather/wmo_map.go index cc9c4ad..fd22a39 100644 --- a/internal/normalizers/openweather/wmo_map.go +++ b/internal/normalizers/openweather/wmo_map.go @@ -1,7 +1,7 @@ // FILE: ./internal/normalizers/openweather/wmo_map.go package openweather -import "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" +import "gitea.maximumdirect.net/ejr/weatherfeeder/model" // mapOpenWeatherToWMO maps OpenWeather weather condition IDs into weatherfeeder's // canonical WMO code vocabulary. diff --git a/internal/standards/wmo.go b/internal/standards/wmo.go index ab8ccf6..e1d0e76 100644 --- a/internal/standards/wmo.go +++ b/internal/standards/wmo.go @@ -3,7 +3,7 @@ package standards import ( "fmt" - "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" + "gitea.maximumdirect.net/ejr/weatherfeeder/model" ) type WMODescription struct { diff --git a/internal/standards/wmo_categories.go b/internal/standards/wmo_categories.go index 90b897e..b3297da 100644 --- a/internal/standards/wmo_categories.go +++ b/internal/standards/wmo_categories.go @@ -1,6 +1,6 @@ package standards -import "gitea.maximumdirect.net/ejr/weatherfeeder/internal/model" +import "gitea.maximumdirect.net/ejr/weatherfeeder/model" // This file provides small, shared helper functions for reasoning about WMO codes. // These are intentionally "coarse" categories that are useful for business logic, diff --git a/internal/model/alert.go b/model/alert.go similarity index 100% rename from internal/model/alert.go rename to model/alert.go diff --git a/internal/model/doc.go b/model/doc.go similarity index 100% rename from internal/model/doc.go rename to model/doc.go diff --git a/internal/model/forecast.go b/model/forecast.go similarity index 100% rename from internal/model/forecast.go rename to model/forecast.go diff --git a/internal/model/observation.go b/model/observation.go similarity index 100% rename from internal/model/observation.go rename to model/observation.go diff --git a/internal/model/wmo.go b/model/wmo.go similarity index 100% rename from internal/model/wmo.go rename to model/wmo.go