Merge pull request #135 from dxw/misc-2

Minor improvements
dxw · Nov 26, 2024 · 1dfa815 · 1dfa815
2 parents a27bd7c + 53462c5
commit 1dfa815
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 114 deletions.
diff --git a/app/assets/stylesheets/daqi-levels.scss b/app/assets/stylesheets/daqi-levels.scss
@@ -53,3 +53,15 @@
 .daqi-level-10 {
   @apply text-white bg-stone-700;
 }
+
+.stroke-white {
+  svg {
+    stroke: white;
+  }
+}
+
+.stroke-black {
+  svg {
+    stroke: black;
+  }
+}
diff --git a/app/controllers/forecasts_controller.rb b/app/controllers/forecasts_controller.rb
@@ -48,9 +48,9 @@ def forecast_for_day(day, forecasts)
   end
 
   def zone
-    return Zone.default unless params[:zone]
-
-    Zone.find_by(name: params[:zone])
+    Zone.find_by!(name: params[:zone])
+  rescue ActiveRecord::RecordNotFound
+    Zone.default
   end
 
   def date

diff --git a/app/controllers/visitors_controller.rb b/app/controllers/visitors_controller.rb
diff --git a/app/javascript/controllers/map_controller.js b/app/javascript/controllers/map_controller.js
@@ -209,30 +209,21 @@ export default class MapController extends Controller {
   addZonesLayer() {
     const { zoneBoundaryLayers, zoneLabelMarkers } = this.zones();
     zoneBoundaryLayers.forEach((layer) => layer.addTo(this.map));
+    this.updateZoneBoundaryLayerStyles(zoneBoundaryLayers);
+
+    this.map.on("zoomend", () => {
+      this.updateZoneBoundaryLayerStyles(zoneBoundaryLayers);
+    });
+
     this.addZoneLabelMarkers(zoneLabelMarkers);
   }
 
   zones() {
     const zoneBoundaryLayers = [];
     const zoneLabelMarkers = [];
-    const zoneBoundaryLayerLevelStyles = {
-      1: { weight: 3 }, // stroke width
-      2: { weight: 1 },
-    };
 
     for (const [, zone] of Object.entries(zones)) {
-      const layer = L.geoJSON(zone, {
-        style: function (feature) {
-          return {
-            color: "black", // stroke color
-            weight:
-              zoneBoundaryLayerLevelStyles[feature.properties.level].weight,
-            fill: false,
-          };
-        },
-        pane: "zones",
-      });
-
+      const layer = L.geoJSON(zone, { pane: "zones" });
       zoneBoundaryLayers.push(layer);
 
       const bounds = layer.getBounds();
@@ -255,6 +246,18 @@ export default class MapController extends Controller {
     return { zoneBoundaryLayers, zoneLabelMarkers };
   }
 
+  updateZoneBoundaryLayerStyles(zoneBoundaryLayers) {
+    const zoom = this.map.getZoom();
+
+    zoneBoundaryLayers.forEach((layer) => {
+      layer.setStyle({
+        weight: 0.1 * 20 ** (zoom / 14), // Scale the stroke width with zoom
+        color: "black", // stroke color
+        fill: false,
+      });
+    });
+  }
+
   addZoneLabelMarkers(zoneLabelMarkers) {
     // Only show the zone labels when the map is zoomed in enough
     zoneLabelMarkers.forEach(({ marker, londonBorough }) => {

diff --git a/...hs/city-of-westminster-simplified.geojson → ...n/boroughs/westminster-simplified.geojson b/...hs/city-of-westminster-simplified.geojson → ...n/boroughs/westminster-simplified.geojson
@@ -1,7 +1,7 @@
 {
   "type": "Feature",
   "properties": {
-    "name": "City of Westminster",
+    "name": "Westminster",
     "level": 2,
     "londonBorough": true
   },

diff --git a/...ndon/boroughs/city-of-westminster.geojson → ...aries/london/boroughs/westminster.geojson b/...ndon/boroughs/city-of-westminster.geojson → ...aries/london/boroughs/westminster.geojson
@@ -1,7 +1,7 @@
 {
   "type": "Feature",
   "properties": {
-    "name": "City of Westminster",
+    "name": "Westminster",
     "level": 2,
     "londonBorough": true
   },

diff --git a/app/javascript/zone_boundaries/zone-boundaries.js b/app/javascript/zone_boundaries/zone-boundaries.js
@@ -9,7 +9,6 @@ export { default as brent } from "./london/boroughs/brent-simplified.geojson";
 export { default as bromley } from "./london/boroughs/bromley-simplified.geojson";
 export { default as camden } from "./london/boroughs/camden-simplified.geojson";
 export { default as cityOfLondon } from "./london/boroughs/city-of-london-simplified.geojson";
-export { default as cityOfWestminster } from "./london/boroughs/city-of-westminster-simplified.geojson";
 export { default as croydon } from "./london/boroughs/croydon-simplified.geojson";
 export { default as ealing } from "./london/boroughs/ealing-simplified.geojson";
 export { default as enfield } from "./london/boroughs/enfield-simplified.geojson";
@@ -35,6 +34,7 @@ export { default as sutton } from "./london/boroughs/sutton-simplified.geojson";
 export { default as towerHamlets } from "./london/boroughs/tower-hamlets-simplified.geojson";
 export { default as walthamForest } from "./london/boroughs/waltham-forest-simplified.geojson";
 export { default as wandsworth } from "./london/boroughs/wandsworth-simplified.geojson";
+export { default as westminster } from "./london/boroughs/westminster-simplified.geojson";
 
 export { default as centralLondon } from "./london/regions/central-london-simplified.geojson";
 export { default as eastLondon } from "./london/regions/east-london-simplified.geojson";

diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
@@ -1,17 +1,17 @@
 <header class="site-header">
   <div class="site-title">
-    <span class="site-name">airTEXT</span>
+    <%= link_to "airTEXT", root_path, class: "site-name" %>
     <span class="site-strapline">Air quality service</span>
   </div>
   <nav data-controller="navigation">
     <button data-action="navigation#toggleMenu">
     ☰
     </button>
     <ul class="hidden" data-navigation-target="menuList">
-      <li><a href="forecast">Air quality forecast</a></li>
+      <li><%= link_to "Air quality forecast", forecast_path %></li>
       <li>Alerts</li>
-      <li><a href="health_advice" class="">Health advice</a></li>
-      <li><a href="about" class="">About</a></li>
+      <li><%= link_to "Health advice", health_advice_path %></li>
+      <li><%= link_to "About", about_path %></li>
       <li>Contact</li>
     </ul>
   </nav>

diff --git a/app/views/visitors/index.html.erb b/app/views/visitors/index.html.erb
diff --git a/config/list-of-zones.json b/config/list-of-zones.json
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,7 +3,7 @@
 Rails.application.routes.draw do
   get "health_check" => "application#health_check"
 
-  root to: "visitors#index"
+  root to: "forecasts#show"
 
   get "map", to: "map#show"
 

diff --git a/spec/controllers/forecasts_controller_spec.rb b/spec/controllers/forecasts_controller_spec.rb
@@ -3,7 +3,6 @@
   let(:barnet) { double("Barnet") }
 
   before do
-    allow(Zone).to receive(:find_by).and_return(barnet)
     allow(Zone).to receive(:default).and_return(central_london)
     allow(CercForecastService).to receive(:latest_forecasts_for).and_return(forecasts)
   end
@@ -23,7 +22,9 @@
 
     context "when zone IS given" do
       it "obtains forecasts for the given zone from the CercForecastService" do
-        get :show, params: {zone: double}
+        allow(Zone).to receive(:find_by).and_return(barnet)
+
+        get :show, params: {zone: "Barnet"}
 
         expect(CercForecastService).to have_received(:latest_forecasts_for).with(barnet)
       end

diff --git a/spec/features/visitors/share_forecasts_spec.rb b/spec/features/visitors/share_forecasts_spec.rb
@@ -20,7 +20,7 @@
     # Then I see the share icons for multiple platforms
 
     it "shows share icons for multiple platforms" do
-      view_forecasts
+      visit forecast_path
 
       click_on "Share with others"
 
@@ -44,7 +44,7 @@
       let(:share_message) { CGI.escape_uri_component(today_forecast.share_message) }
 
       before do
-        view_forecasts
+        visit forecast_path
 
         click_on "Share with others"
       end

diff --git a/spec/features/visitors/view_air_quality_alerts_spec.rb b/spec/features/visitors/view_air_quality_alerts_spec.rb
@@ -23,7 +23,7 @@
 
   describe "View air quality alert for today" do
     it "shows an air quality alert of high for today" do
-      view_forecasts
+      visit forecast_path
 
       within(".today[data-date='#{Date.today}']") do
         expect_to_see_alert_level(:high)
@@ -36,7 +36,7 @@
 
   describe "View air quality alert for tomorrow", js: true do
     it "shows an air quality alert of moderate for tomorrow" do
-      view_forecasts
+      visit forecast_path
       switch_to_tab_for(:tomorrow)
 
       within(".tomorrow[data-date='#{Date.tomorrow}']") do
@@ -52,7 +52,7 @@
 
   describe "View air quality alert for the day after tomorrow", js: true do
     it "shows an air quality alert of very high for the day after tomorrow" do
-      view_forecasts
+      visit forecast_path
       switch_to_tab_for(:day_after_tomorrow)
 
       within(".day_after_tomorrow[data-date='#{Date.tomorrow + 1.day}']") do

diff --git a/spec/features/visitors/view_forecasts_spec.rb b/spec/features/visitors/view_forecasts_spec.rb
@@ -45,7 +45,7 @@
         # and I see predicted temperature level
         ##
 
-        view_forecasts
+        visit forecast_path
 
         # See the forecasts page
         expect(page).to have_content("Air quality forecast")
@@ -85,7 +85,7 @@
         # And I see predicted temperature level for tomorrow
         ##
 
-        view_forecasts
+        visit forecast_path
         switch_to_tab_for(:tomorrow)
 
         # See that the tomorrow tab is active
@@ -118,7 +118,7 @@
         # And I see predicted temperature level for the day after tomorrow
         ##
 
-        view_forecasts
+        visit forecast_path
         switch_to_tab_for(:day_after_tomorrow)
 
         # See that the day after tomorrow tab is active
@@ -153,7 +153,7 @@
         end
 
         it "shows the pollen prediction" do
-          view_forecasts
+          visit forecast_path
 
           expect(page).to have_css(".pollen")
         end
@@ -170,7 +170,7 @@
         end
 
         it "does not show the pollen prediction" do
-          view_forecasts
+          visit forecast_path
 
           expect(page).not_to have_css(".pollen")
         end

diff --git a/spec/support/features/forecast_helper.rb b/spec/support/features/forecast_helper.rb
@@ -5,11 +5,6 @@ def stub_cerc_api_with(forecasts)
       HttpStubs.stub_forecasts_with(forecast_response)
     end
 
-    def view_forecasts
-      visit root_path
-      click_link("View forecasts")
-    end
-
     def switch_to_tab_for(day)
       case day
       when :tomorrow