From f4f40e8df5a091f18a088a17609826306a8cc58d Mon Sep 17 00:00:00 2001
From: Xavier GUIHOT <x.guihot@gmail.com>
Date: Mon, 15 Apr 2019 19:47:30 +0100
Subject: [PATCH] Issue-3: Force LH's name to be Lufthansa (#5)

---
 src/main/scala/com/geobase/load/Loader.scala | 28 +++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/com/geobase/load/Loader.scala b/src/main/scala/com/geobase/load/Loader.scala
index c8c7150..4872b20 100644
--- a/src/main/scala/com/geobase/load/Loader.scala
+++ b/src/main/scala/com/geobase/load/Loader.scala
@@ -74,19 +74,21 @@ private[geobase] object Loader {
 
     println("GeoBase: Loading airlines")
 
+    // Since during the parsing of the csv file providing the mapping airline code to airline name,
+    // we choose the first name amongst the list of possible names, we might not always choose the
+    // most appropriate name. Thus this list of custom exceptions:
+    val forcedAirlineNames = List(Airline("LH", "DE", "Lufthansa"))
+
     // Airline code to airline name:
     val airlineNames =
       Source
         .fromURL(getClass.getResource("/optd_airlines.csv"))
         .getLines
         .drop(1) // Remove the header
-        .map { line =>
-          val splitLine = line.split("\\^", -1)
-
-          val airlineCode = splitLine(5)
-          val airlineName = splitLine(7)
-
-          Airline(airlineCode, "", airlineName)
+        .map(_.split("\\^", -1))
+        .collect {
+          case Array(_, _, _, _, _, code, _, name, _*) if code.nonEmpty && name.nonEmpty =>
+            Airline(code, "", name)
         }
         .toList
 
@@ -96,17 +98,11 @@ private[geobase] object Loader {
         .fromURL(getClass.getResource("/airlines.csv"))
         .getLines
         .drop(1) // Remove the header
-        .map { line =>
-          val splitLine = line.split("\\^", -1)
-
-          val airlineCode = splitLine(0)
-          val countryCode = splitLine(1)
-
-          Airline(airlineCode, countryCode, "")
-        }
+        .map(_.split("\\^", -1))
+        .map { case Array(code, country) => Airline(code, country, "") }
         .toList
 
-    (airlineNames ::: airlineCountries)
+    (forcedAirlineNames ::: airlineNames ::: airlineCountries)
       .groupBy(_.airlineCode)
       .mapValues { airlines =>
         val code    = airlines.head.airlineCode