-
1
-
2
-
3
-
4
-
5
-
6
-
7
-
8
-
9
-
10
+
+
+
+
1
+
2
+
3
+
4
+
5
+
6
+
7
+
8
+
9
+
10
+
-<%= link_to("Learn more about the colour scale", health_advice_path, class: "text-sm text-blue-600 underline") %>
+<%= link_to("Learn more about the colour scale", health_advice_path, class: "text-sm text-blue-600 underline text-right block") %>
<%= render "pollutant_selector" %>
diff --git a/config/routes.rb b/config/routes.rb
index 6923cb75..cf127899 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@
root to: redirect("/forecast")
get :forecast, to: "forecasts#show"
+ get :pollutant_forecasts, to: "forecasts#pollutant_forecasts"
get :subscribe, to: "subscriptions#new"
get :health_advice, to: "pages#health_advice"
get :about, to: "pages#about"
diff --git a/package.json b/package.json
index c8dcc3cc..0b57324a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
"devDependencies": {
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.11.1",
- "@maptiler/leaflet-maptilersdk": "^2.0.0",
"esbuild": "^0.24.0",
"eslint": "^9.0.0",
"eslint-config-prettier": "^9.0.0",
@@ -35,6 +34,7 @@
"@hotwired/stimulus": "^3.2.2",
"@hotwired/turbo-rails": "^8.0.10",
"@maptiler/geocoding-control": "^2.0.0",
+ "@maptiler/leaflet-maptilersdk": "^2.0.0",
"@turf/boolean-point-in-polygon": "^7.1.0",
"depcheck": "^1.4.7",
"leaflet.fullscreen": "^3.0.2",
diff --git a/spec/controllers/forecasts_controller_spec.rb b/spec/controllers/forecasts_controller_spec.rb
index 667077b5..4b60b83b 100644
--- a/spec/controllers/forecasts_controller_spec.rb
+++ b/spec/controllers/forecasts_controller_spec.rb
@@ -4,7 +4,6 @@
before do
allow(Zone).to receive(:default).and_return(central_london)
- allow(CercForecastService).to receive(:latest_forecasts_for).and_return(forecasts)
end
let(:forecasts) do
@@ -12,11 +11,15 @@
end
describe "GET :show" do
+ before do
+ allow(CercForecastService).to receive(:latest_forecasts).and_return(forecasts)
+ end
+
context "when NO zone is given" do
it "obtains forecasts for the default zone (Central London) from the CercForecastService" do
get :show
- expect(CercForecastService).to have_received(:latest_forecasts_for).with(central_london)
+ expect(CercForecastService).to have_received(:latest_forecasts).with(central_london)
end
end
@@ -26,7 +29,7 @@
get :show, params: {zone: "Barnet"}
- expect(CercForecastService).to have_received(:latest_forecasts_for).with(barnet)
+ expect(CercForecastService).to have_received(:latest_forecasts).with(barnet)
end
end
@@ -111,26 +114,52 @@
end
end
end
+
+ context "when a _pollutant_ parameter is received" do
+ before do
+ get :show, params: {pollutant: pollutant}
+ end
+
+ context "when the pollutant is recognised" do
+ let(:pollutant) { "PM10" }
+
+ it "set the pollutant to the given value" do
+ expect(assigns(:pollutant)).to eq("PM10")
+ end
+ end
+
+ context "when the pollutant is not recognised" do
+ let(:pollutant) { "invalid" }
+
+ it "defaults to showing the Total forecast" do
+ expect(assigns(:pollutant)).to eq("Total")
+ end
+ end
+ end
end
- context "when a _pollutant_ parameter is received" do
+ describe "GET :pollutant_forecasts" do
+ let(:day) { nil }
+ let(:pollutant) { nil }
+
before do
- get :show, params: {pollutant: pollutant}
+ allow(CercForecastService).to receive(:latest_forecasts).and_return([forecasts])
+ get :pollutant_forecasts, params: {day: day, pollutant: pollutant}
end
- context "when the pollutant is recognised" do
- let(:pollutant) { "PM10" }
+ context "when a _day_ parameter is received" do
+ let(:day) { "tomorrow" }
- it "set the pollutant to the given value" do
- expect(assigns(:pollutant)).to eq("PM10")
+ it "returns the total forecasts for the given day" do
+ expect(response.body).to eq({"Central London" => forecasts.pollutant_forecasts("Total").second}.to_json)
end
end
- context "when the pollutant is not recognised" do
- let(:pollutant) { "invalid" }
+ context "when a _pollutant_ parameter is received" do
+ let(:pollutant) { "PM10" }
- it "defaults to showing the Total forecast" do
- expect(assigns(:pollutant)).to eq("Total")
+ it "returns the PM10 forecasts for today" do
+ expect(response.body).to eq({"Central London" => forecasts.pollutant_forecasts("PM10").first}.to_json)
end
end
end
diff --git a/spec/factories/air_pollutions_predictions.rb b/spec/factories/air_pollutions_predictions.rb
index 2e839896..9242e4bd 100644
--- a/spec/factories/air_pollutions_predictions.rb
+++ b/spec/factories/air_pollutions_predictions.rb
@@ -1,47 +1,47 @@
FactoryBot.define do
factory :air_pollution_prediction, class: Hash do
forecasted_at { Time.current - 2.hours }
- nitrogen_dioxide { 1 }
- particulate_matter_10 { 1 }
- particulate_matter_2_5 { 2 }
- ozone { 2 }
+ no2 { 1 }
+ pm10 { 1 }
+ pm2_5 { 2 }
+ o3 { 2 }
total { 2 }
label { "LOW" }
trait :low do
total { 2 }
label { "LOW" }
- nitrogen_dioxide { 1 }
- particulate_matter_10 { 1 }
- particulate_matter_2_5 { 2 }
- ozone { 2 }
+ no2 { 1 }
+ pm10 { 1 }
+ pm2_5 { 2 }
+ o3 { 2 }
end
trait :moderate do
total { 4 }
label { "MODERATE" }
- nitrogen_dioxide { 4 }
- particulate_matter_10 { 4 }
- particulate_matter_2_5 { 4 }
- ozone { 4 }
+ no2 { 4 }
+ pm10 { 4 }
+ pm2_5 { 4 }
+ o3 { 4 }
end
trait :high do
total { 8 }
label { "HIGH" }
- nitrogen_dioxide { 8 }
- particulate_matter_10 { 8 }
- particulate_matter_2_5 { 8 }
- ozone { 8 }
+ no2 { 8 }
+ pm10 { 8 }
+ pm2_5 { 8 }
+ o3 { 8 }
end
trait :very_high do
total { 10 }
label { "VERY HIGH" }
- nitrogen_dioxide { 10 }
- particulate_matter_10 { 10 }
- particulate_matter_2_5 { 10 }
- ozone { 10 }
+ no2 { 10 }
+ pm10 { 10 }
+ pm2_5 { 10 }
+ o3 { 10 }
end
initialize_with { attributes }
diff --git a/spec/models/cached_forecast_spec.rb b/spec/models/cached_forecast_spec.rb
index 58da92ba..b40ccca1 100644
--- a/spec/models/cached_forecast_spec.rb
+++ b/spec/models/cached_forecast_spec.rb
@@ -88,6 +88,35 @@ def time_at_cache_limit
end
end
+ describe "::latest_for_all_zones" do
+ let(:brent) { FactoryBot.create(:zone, name: "Brent") }
+ let(:barnet) { FactoryBot.create(:zone, name: "Barnet") }
+
+ let!(:first_brent) {
+ FactoryBot.create(:cached_forecast, zone: brent, obtained_at: Time.current - 2.days)
+ }
+ let!(:last_brent) {
+ FactoryBot.create(:cached_forecast, zone: brent, obtained_at: Time.current)
+ }
+ let!(:middle_brent) {
+ FactoryBot.create(:cached_forecast, zone: brent, obtained_at: Time.current - 1.day)
+ }
+
+ let!(:first_barnet) {
+ FactoryBot.create(:cached_forecast, zone: barnet, obtained_at: Time.current - 2.days)
+ }
+ let!(:last_barnet) {
+ FactoryBot.create(:cached_forecast, zone: barnet, obtained_at: Time.current)
+ }
+ let!(:middle_barnet) {
+ FactoryBot.create(:cached_forecast, zone: barnet, obtained_at: Time.current - 1.day)
+ }
+
+ it "returns the latest record for each zone" do
+ expect(CachedForecast.latest_for_all_zones).to match_array([last_brent, last_barnet])
+ end
+ end
+
describe "::store" do
let(:active_record_zone) { FactoryBot.create(:zone, cerc_id: 123) }
let(:forecast_zone) { FactoryBot.build(:forecast_zone, id: 123) }
diff --git a/spec/services/cerc_forecast_service_spec.rb b/spec/services/cerc_forecast_service_spec.rb
index 010e5ac0..5031a63f 100644
--- a/spec/services/cerc_forecast_service_spec.rb
+++ b/spec/services/cerc_forecast_service_spec.rb
@@ -1,5 +1,5 @@
RSpec.describe CercForecastService do
- describe "::latest_forecasts_for(zone)" do
+ describe "::latest_forecasts(zone)" do
let(:zone) { FactoryBot.create(:zone, cerc_id: 55) }
context "when the cache is stale" do
@@ -11,14 +11,14 @@
end
it "asks the CercApiClient for the latest_forecasts (for all zones)" do
- CercForecastService.latest_forecasts_for(zone)
+ CercForecastService.latest_forecasts(zone)
expect(CercApiClient).to have_received(:latest_forecasts).with(no_args)
end
it "caches a built forecast for each zone" do
api_temperature = latest_forecasts_from_api["zones"].first["forecasts"].first["temp_max"]
- cached_temperature = CercForecastService.latest_forecasts_for(zone).data.first.temperature[:max]
+ cached_temperature = CercForecastService.latest_forecasts(zone).data.first.temperature[:max]
expect(cached_temperature).to eq(api_temperature)
end
end
@@ -32,13 +32,26 @@
end
it "does not ask the CercApiClient for the latest_forecasts" do
- CercForecastService.latest_forecasts_for(zone)
+ CercForecastService.latest_forecasts(zone)
expect(CercApiClient).not_to have_received(:latest_forecasts)
end
it "returns the cached forecast for the given zone" do
- expect(CercForecastService.latest_forecasts_for(zone)).to eq(latest_forecast_from_cache)
+ expect(CercForecastService.latest_forecasts(zone)).to eq(latest_forecast_from_cache)
+ end
+ end
+
+ context "when no zone is given" do
+ let(:latest_forecast_from_cache) { double("CachedForecast") }
+
+ before do
+ allow(CachedForecast).to receive(:stale?).and_return(false)
+ allow(CachedForecast).to receive(:latest_for_all_zones).and_return([latest_forecast_from_cache])
+ end
+
+ it "returns the latest forecasts for all zones" do
+ expect(CercForecastService.latest_forecasts).to match_array([latest_forecast_from_cache])
end
end
end
@@ -86,10 +99,10 @@
expect(forecast.zone[:type]).to eq(1)
expect(forecast.air_pollution[:forecasted_at]).to eq(Time.zone.parse("202410021550"))
- expect(forecast.air_pollution[:nitrogen_dioxide]).to eq(1)
- expect(forecast.air_pollution[:particulate_matter_10]).to eq(1)
- expect(forecast.air_pollution[:particulate_matter_2_5]).to eq(1)
- expect(forecast.air_pollution[:ozone]).to eq(2)
+ expect(forecast.air_pollution[:no2]).to eq(1)
+ expect(forecast.air_pollution[:pm10]).to eq(1)
+ expect(forecast.air_pollution[:pm2_5]).to eq(1)
+ expect(forecast.air_pollution[:o3]).to eq(2)
expect(forecast.air_pollution[:total]).to eq(10)
expect(forecast.air_pollution[:label]).to eq("VERY HIGH")