Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the weather #27659

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions common/app/common/configuration.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
11 changes: 0 additions & 11 deletions common/app/conf/switches/FeatureSwitches.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions common/conf/env/DEVINFRA.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ aws.bucket=none
ophan.api.host=http://api.ophan.co.uk/api
ophan.api.key=none

weather.api.key=none

images.signature-salt=none

riffraff.url=
Expand Down Expand Up @@ -100,8 +98,6 @@ stack.automateKey=none
tests.mode=none
tests.baseUrl=http://localhost

weather.api.key=none

# Radiator
riffraff.url=https://localhost
riffraff.apikey=none
Expand Down
15 changes: 0 additions & 15 deletions dev-build/conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -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()
domlander marked this conversation as resolved.
Show resolved Hide resolved

# Analytics
GET /analytics/abtests controllers.admin.AnalyticsController.abtests()
GET /analytics/confidence controllers.admin.AnalyticsConfidenceController.renderConfidence()
Expand Down
2 changes: 0 additions & 2 deletions onward/app/AppLoader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
5 changes: 0 additions & 5 deletions onward/app/controllers/OnwardControllers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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]
Expand Down
18 changes: 0 additions & 18 deletions onward/app/views/weatherFragments/cityForecast.scala.html

This file was deleted.

44 changes: 0 additions & 44 deletions onward/app/views/weatherFragments/cityWeather.scala.html

This file was deleted.

140 changes: 0 additions & 140 deletions onward/app/weather/WeatherApi.scala

This file was deleted.

75 changes: 0 additions & 75 deletions onward/app/weather/controllers/LocationsController.scala

This file was deleted.

Loading
Loading