From 549e11e920312f9a371d96f931786c55690ab2c5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jul 2019 12:19:18 +0300 Subject: [PATCH 1/3] Add citybikes to oulu conf --- app/configurations/config.oulu.js | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app/configurations/config.oulu.js b/app/configurations/config.oulu.js index aaf7ed26ba..eb220023aa 100644 --- a/app/configurations/config.oulu.js +++ b/app/configurations/config.oulu.js @@ -34,6 +34,31 @@ export default configMerger(walttiConfig, { // Navbar logo logo: 'oulu/oulu-logo.png', + cityBike: { + showCityBikes: true, + useUrl: { + fi: 'https://kaupunkipyorat.ouka.fi/', + sv: 'https://kaupunkipyorat.ouka.fi/home', + en: 'https://kaupunkipyorat.ouka.fi/home', + }, + networks: { + oulu: { + icon: 'citybike', + name: { + fi: 'Oulu', + sv: 'Uleåborg', + en: 'Oulu', + }, + type: 'citybike', + url: { + fi: 'https://kaupunkipyorat.ouka.fi/', + sv: 'https://kaupunkipyorat.ouka.fi/home', + en: 'https://kaupunkipyorat.ouka.fi/home', + }, + }, + }, + }, + searchParams: { 'boundary.rect.min_lat': 64.71, 'boundary.rect.max_lat': 65.38, @@ -41,6 +66,12 @@ export default configMerger(walttiConfig, { 'boundary.rect.max_lon': 26.61, }, + transportModes: { + citybike: { + availableForSelection: true, + }, + }, + areaPolygon: [[24.37, 64.71], [24.37, 65.38], [26.61, 65.38], [26.61, 64.71]], defaultEndpoint: { From a23f61082c6626d363110e721dd9c6ce6193b20b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jul 2019 12:19:40 +0300 Subject: [PATCH 2/3] Change turku's citybike network name --- app/configurations/config.turku.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/configurations/config.turku.js b/app/configurations/config.turku.js index 0187714a27..9afa015467 100644 --- a/app/configurations/config.turku.js +++ b/app/configurations/config.turku.js @@ -52,7 +52,7 @@ export default configMerger(walttiConfig, { en: 'https://www.foli.fi/en/citybikes', }, networks: { - smoove: { + turku: { icon: 'citybike', name: { fi: 'Turku', From 1a96260e4019ec65849cff4a643000a4bceb9eb1 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jul 2019 12:20:01 +0300 Subject: [PATCH 3/3] Enable turku and oulu citybike networks in matka conf --- app/configurations/config.matka.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js index 9e43538613..850f3104aa 100644 --- a/app/configurations/config.matka.js +++ b/app/configurations/config.matka.js @@ -135,6 +135,34 @@ export default { en: 'https://www.hsl.fi/en/citybikes', }, }, + turku: { + icon: 'citybike', + name: { + fi: 'Turku', + sv: 'Åbo', + en: 'Turku', + }, + type: 'citybike', + url: { + fi: 'https://www.foli.fi/kaupunkipyorat', + sv: 'https://www.foli.fi/sv/stadscyklar', + en: 'https://www.foli.fi/en/citybikes', + }, + }, + oulu: { + icon: 'citybike', + name: { + fi: 'Oulu', + sv: 'Uleåborg', + en: 'Oulu', + }, + type: 'citybike', + url: { + fi: 'https://kaupunkipyorat.ouka.fi/', + sv: 'https://kaupunkipyorat.ouka.fi/home', + en: 'https://kaupunkipyorat.ouka.fi/home', + }, + }, }, },