WIP

guardian · Dec 9, 2024 · 68561e8 · 68561e8
1 parent 59a82e0
commit 68561e8
Show file tree

Hide file tree

Showing 26 changed files with 0 additions and 1,243 deletions.
diff --git a/common/app/common/configuration.scala b/common/app/common/configuration.scala
@@ -159,10 +159,6 @@ class GuardianConfiguration extends GuLogging {
     lazy val url = configuration.getMandatoryStringProperty("contributionsService.url")
   }
 
-  object weather {
-    lazy val apiKey = configuration.getStringProperty("weather.api.key")
-  }
-
   object indexes {
     lazy val tagIndexesBucket =
       configuration.getMandatoryStringProperty("tag_indexes.bucket")

diff --git a/common/app/conf/switches/FeatureSwitches.scala b/common/app/conf/switches/FeatureSwitches.scala
@@ -173,17 +173,6 @@ trait FeatureSwitches {
     highImpact = false,
   )
 
-  val WeatherSwitch = Switch(
-    SwitchGroup.Feature,
-    "weather",
-    "If this is switched on then the weather component is displayed",
-    owners = Seq(Owner.withGithub("johnduffell")),
-    safeState = Off,
-    sellByDate = never,
-    exposeClientSide = true,
-    highImpact = false,
-  )
-
   val HistoryTags = Switch(
     SwitchGroup.Feature,
     "history-tags",

diff --git a/dev-build/conf/routes b/dev-build/conf/routes
@@ -54,21 +54,6 @@ OPTIONS    /email
 # Business data
 GET            /business-data/stocks.json                                                                                        controllers.StocksController.stocks
 
-# Weather - EVEN OLDER
-GET            /weather/city/:id.json                                                                                            weather.controllers.WeatherController.forCity(id)
-GET            /weather/city.json                                                                                                weather.controllers.LocationsController.whatIsMyCity()
-GET            /weather/locations                                                                                                weather.controllers.LocationsController.findCity(query: String)
-GET            /weather/forecast/:id.json                                                                                        weather.controllers.WeatherController.forecastForCityId(id)
-
-# Weather - OLD
-GET            /weatherapi/city/:id.json                                                                                         weather.controllers.WeatherController.forCity(id)
-GET            /weatherapi/city.json                                                                                             weather.controllers.LocationsController.whatIsMyCity()
-GET            /weatherapi/locations                                                                                             weather.controllers.LocationsController.findCity(query: String)
-GET            /weatherapi/forecast/:id.json                                                                                     weather.controllers.WeatherController.forecastForCityId(id)
-
-#Weather - DCR
-GET            /weather                                                                                                          weather.controllers.WeatherController.theWeather()
-
 # Analytics
 GET            /analytics/abtests                                                                                                controllers.admin.AnalyticsController.abtests()
 GET            /analytics/confidence                                                                                             controllers.admin.AnalyticsConfidenceController.renderConfidence()

diff --git a/onward/app/AppLoader.scala b/onward/app/AppLoader.scala
@@ -19,7 +19,6 @@ import play.api.routing.Router
 import play.api.libs.ws.WSClient
 import router.Routes
 import services.{OphanApi, PopularInTagService}
-import weather.WeatherApi
 import _root_.commercial.targeting.TargetingLifecycle
 
 import scala.concurrent.ExecutionContext
@@ -41,7 +40,6 @@ trait OnwardServices {
   lazy val contentApiClient = wire[ContentApiClient]
   lazy val ophanApi = wire[OphanApi]
   lazy val stocksData = wire[StocksData]
-  lazy val weatherApi = wire[WeatherApi]
   lazy val geoMostPopularAgent = wire[GeoMostPopularAgent]
   lazy val dayMostPopularAgent = wire[DayMostPopularAgent]
   lazy val mostPopularAgent = wire[MostPopularAgent]

diff --git a/onward/app/controllers/OnwardControllers.scala b/onward/app/controllers/OnwardControllers.scala
@@ -2,14 +2,12 @@ package controllers
 
 import org.apache.pekko.actor.{ActorSystem => PekkoActorSystem}
 import com.softwaremill.macwire._
-import weather.controllers.{LocationsController, WeatherController}
 import business.StocksData
 import contentapi.ContentApiClient
 import feed._
 import model.ApplicationContext
 import play.api.libs.ws.WSClient
 import play.api.mvc.ControllerComponents
-import weather.WeatherApi
 import agents.DeeplyReadAgent
 import renderers.DotcomRenderingService
 import services.PopularInTagService
@@ -20,7 +18,6 @@ trait OnwardControllers {
   def wsClient: WSClient
   def contentApiClient: ContentApiClient
   def stocksData: StocksData
-  def weatherApi: WeatherApi
   def geoMostPopularAgent: GeoMostPopularAgent
   def dayMostPopularAgent: DayMostPopularAgent
   def mostPopularAgent: MostPopularAgent
@@ -36,8 +33,6 @@ trait OnwardControllers {
   def popularInTagService: PopularInTagService
 
   lazy val navigationController = wire[NavigationController]
-  lazy val weatherController = wire[WeatherController]
-  lazy val locationsController = wire[LocationsController]
   lazy val mostViewedSocialController = wire[MostViewedSocialController]
   lazy val mostPopularController = wire[MostPopularController]
   lazy val topStoriesController = wire[TopStoriesController]

diff --git a/onward/app/views/weatherFragments/cityForecast.scala.html b/onward/app/views/weatherFragments/cityForecast.scala.html
diff --git a/onward/app/views/weatherFragments/cityWeather.scala.html b/onward/app/views/weatherFragments/cityWeather.scala.html
diff --git a/onward/app/weather/WeatherApi.scala b/onward/app/weather/WeatherApi.scala
diff --git a/onward/app/weather/controllers/LocationsController.scala b/onward/app/weather/controllers/LocationsController.scala