Skip to content

flight-fix #475

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.

Sign up for GitHub

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

Open
ycaK wants to merge 9 commits into
base: master
Choose a base branch
from
Open

flight-fix #475

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
120be64
flight-fix
ycaK Nov 12, 2018
f381c17
flight-fix LF
ycaK Nov 12, 2018
b4d1ee2
flight-fix indentation fix
ycaK Nov 12, 2018
ed4a5f3
flight-fix indentation v2
ycaK Nov 12, 2018
4d22a35
flight-fix final
ycaK Nov 12, 2018
48ae9b6
flight-fix -> link-fix
ycaK Nov 12, 2018
a32cc1d
flight-fix redundancy
ycaK Nov 13, 2018
e2a313c
Add files via upload
ycaK Nov 13, 2018
5514e4f
flight-fix
ycaK Nov 13, 2018
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
39 changes: 19 additions & 20 deletions endpoints/flight/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,24 @@ app.get('/flight', (req, res) => {
if (!data.language) data.language = ''

if (data.type === 'departures' && data.language === 'is') {
url = 'http://www.kefairport.is/Flugaaetlun/Brottfarir/'
url = 'https://www.isavia.is/keflavikurflugvollur/flugaaetlun/brottfarir'
} else if (data.type === 'departures' && data.language === 'en') {
url = 'http://www.kefairport.is/English/Timetables/Departures/'
url = 'https://www.isavia.is/en/keflavik-airport/flight-schedule/departures'
} else if (data.type === 'arrivals' && data.language === 'is') {
url = 'http://www.kefairport.is/Flugaaetlun/Komur/'
url = 'https://www.isavia.is/keflavikurflugvollur/flugaaetlun/komur'
} else if (data.type === 'arrivals' && data.language === 'en') {
url = 'http://www.kefairport.is/English/Timetables/Arrivals/'
url = 'https://www.isavia.is/en/keflavik-airport/flight-schedule/arrivals'
} else {
url = 'http://www.kefairport.is/English/Timetables/Arrivals/'
url = 'https://www.isavia.is/en/keflavik-airport/flight-schedule/arrivals'
}

request.get({
headers: { 'User-Agent': h.browser() },
url,
}, (error, response, body) => {
if (error || response.statusCode !== 200) {
return res.status(500).json({ error: 'www.kefairport.is refuses to respond or give back data' })
return res.status(500).json({ error: 'www.isavia.is refuses to respond or give back data' })
}

try {
$ = cheerio.load(body)
} catch (err) {
Expand All @@ -40,28 +39,28 @@ app.get('/flight', (req, res) => {

const obj = { results: [] }

$('table tr').each(function (key) {
$('.schedule-items-entry').each(function (key) {
if (key !== 0) {
let flight = {}
if (data.type === 'departures') {
flight = {
date: $(this).children('td').slice(0).html(),
flightNumber: $(this).children('td').slice(1).html(),
airline: $(this).children('td').slice(2).html(),
to: $(this).children('td').slice(3).html(),
plannedArrival: $(this).children('td').slice(4).html(),
realArrival: $(this).children('td').slice(5).html(),
status: $(this).children('td').slice(6).html(),
flightNumber: $(this).children('td').slice(2).html(),
airline: $(this).children('td').slice(3).children('span').html(),
to: $(this).children('td').slice(1).children('span').html(),
plannedArrival: $(this).children('td').slice(4).children('span').html(), // Status contains data for plannedArrival now, consider deleting this var
realArrival: '\r\n', // There is not var on website named realArrival anymore, consider deleting it
status: $(this).children('td').slice(4).children('span').html(),
}
} else {
flight = {
date: $(this).children('td').slice(0).html(),
flightNumber: $(this).children('td').slice(1).html(),
airline: $(this).children('td').slice(2).html(),
from: $(this).children('td').slice(3).html(),
plannedArrival: $(this).children('td').slice(4).html(),
realArrival: $(this).children('td').slice(5).html(),
status: $(this).children('td').slice(6).html(),
flightNumber: $(this).children('td').slice(2).html(),
airline: $(this).children('td').slice(3).children('span').html(),
from: $(this).children('td').slice(1).children('span').html(),
plannedArrival: $(this).children('td').slice(4).children('span').html(), // Status contains data for plannedArrival now, consider deleting this var
realArrival: '\r\n', // There is not var on website named realArrival anymore, consider deleting it
status: $(this).children('td').slice(4).children('span').html(),
}
}

Expand Down