diff options
3 files changed, 21 insertions, 8 deletions
diff --git a/src/Costasdev.Busurbano.Backend/Configuration/AppConfiguration.cs b/src/Costasdev.Busurbano.Backend/Configuration/AppConfiguration.cs index db0b573..8262b76 100644 --- a/src/Costasdev.Busurbano.Backend/Configuration/AppConfiguration.cs +++ b/src/Costasdev.Busurbano.Backend/Configuration/AppConfiguration.cs @@ -5,8 +5,11 @@ public class AppConfiguration public required string VitrasaScheduleBasePath { get; set; } public required string RenfeScheduleBasePath { get; set; } - public string OtpGeocodingBaseUrl { get; set; } = "https://planificador-rutas-api.vigo.org/v1"; - public string OtpPlannerBaseUrl { get; set; } = "https://planificador-rutas.vigo.org/otp/routers/default"; + [Obsolete] + public required string OtpGeocodingBaseUrl { get; set; } = "https://planificador-rutas-api.vigo.org/v1"; + [Obsolete] + public required string OtpPlannerBaseUrl { get; set; } = "https://planificador-rutas.vigo.org/otp/routers/default"; + public required string OpenTripPlannerBaseUrl { get; set; } // Default Routing Parameters public double WalkSpeed { get; set; } = 1.4; @@ -20,6 +23,6 @@ public class AppConfiguration public double WalkReluctance { get; set; } = 2.0; // Slightly penalize walking to add slack // Fare Configuration - public double FareCashPerBus { get; set; } = 1.63; - public double FareCardPerBus { get; set; } = 0.67; + [Obsolete] public double FareCashPerBus { get; set; } = 1.63; + [Obsolete] public double FareCardPerBus { get; set; } = 0.67; } diff --git a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs index 2ddbcd1..b4d8c96 100644 --- a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs +++ b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs @@ -1,4 +1,5 @@ using System.Net; +using Costasdev.Busurbano.Backend.Configuration; using Costasdev.Busurbano.Backend.GraphClient; using Costasdev.Busurbano.Backend.GraphClient.App; using Costasdev.Busurbano.Backend.Helpers; @@ -7,6 +8,7 @@ using Costasdev.Busurbano.Backend.Types; using Costasdev.Busurbano.Backend.Types.Arrivals; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; +using Microsoft.Extensions.Options; namespace Costasdev.Busurbano.Backend.Controllers; @@ -19,13 +21,15 @@ public partial class ArrivalsController : ControllerBase private readonly HttpClient _httpClient; private readonly ArrivalsPipeline _pipeline; private readonly FeedService _feedService; + private readonly AppConfiguration _config; public ArrivalsController( ILogger<ArrivalsController> logger, IMemoryCache cache, HttpClient httpClient, ArrivalsPipeline pipeline, - FeedService feedService + FeedService feedService, + IOptions<AppConfiguration> configOptions ) { _logger = logger; @@ -33,6 +37,7 @@ public partial class ArrivalsController : ControllerBase _httpClient = httpClient; _pipeline = pipeline; _feedService = feedService; + _config = configOptions.Value; } [HttpGet("arrivals")] @@ -49,7 +54,7 @@ public partial class ArrivalsController : ControllerBase new ArrivalsAtStopContent.Args(id, reduced) ); - var request = new HttpRequestMessage(HttpMethod.Post, "http://100.67.54.115:3957/otp/gtfs/v1"); + var request = new HttpRequestMessage(HttpMethod.Post, $"{_config.OpenTripPlannerBaseUrl}/gtfs/v1"); request.Content = JsonContent.Create(new GraphClientRequest { Query = requestContent diff --git a/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs b/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs index 52d919f..e7efc09 100644 --- a/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs +++ b/src/Costasdev.Busurbano.Backend/Controllers/TileController.cs @@ -11,6 +11,8 @@ using Microsoft.Extensions.Caching.Memory; using System.Text.Json; using Costasdev.Busurbano.Backend.Helpers; using Costasdev.Busurbano.Backend.Services; +using Costasdev.Busurbano.Backend.Configuration; +using Microsoft.Extensions.Options; namespace Costasdev.Busurbano.Backend.Controllers; @@ -22,18 +24,21 @@ public class TileController : ControllerBase private readonly IMemoryCache _cache; private readonly HttpClient _httpClient; private readonly FeedService _feedService; + private readonly AppConfiguration _config; public TileController( ILogger<TileController> logger, IMemoryCache cache, HttpClient httpClient, - FeedService feedService + FeedService feedService, + IOptions<AppConfiguration> configOptions ) { _logger = logger; _cache = cache; _httpClient = httpClient; _feedService = feedService; + _config = configOptions.Value; } [HttpGet("stops/{z:int}/{x:int}/{y:int}")] @@ -63,7 +68,7 @@ public class TileController : ControllerBase var latMin = latMinRad * 180.0 / Math.PI; var requestContent = StopTileRequestContent.Query(new StopTileRequestContent.Bbox(lonMin, latMin, lonMax, latMax)); - var request = new HttpRequestMessage(HttpMethod.Post, "http://100.67.54.115:3957/otp/gtfs/v1"); + var request = new HttpRequestMessage(HttpMethod.Post, $"{_config.OpenTripPlannerBaseUrl}/gtfs/v1"); request.Content = JsonContent.Create(new GraphClientRequest { Query = requestContent |