Revision of schengen data loading (now only looking at uniform visas).

src/Data/DataLoader.elm

@@ -11,11 +11,9 @@ Description:
 - consulate: Consulate of a Schengen State located in a third country
 - consulateCountry: Third country in which consulate is located
 - year: Year the entry was supplied for
-- totalVisasApplied: Sum of ALL different kinds of visas that were applied for
-- totalVisasIssued: Sum of ALL different kinds of visas that were issued
-- totalUniformApplied: Sum of the uniform visas that were applied for
-- totalUniformIssued: Sum of the uniform visas that were issued
-- uniformAppliedMEV: Share (in %) of Uniform Visas that were issued as MEVs
+- totalVisasApplied: Sum of Uniform visas that were applied for
+- totalVisasIssued: Sum of Uniform visas that were issued
+- totalAppliedMEV: Amount of Uniform Visas that were issued as MEVs
 
 Additional Notes:
 - Visas come in multiple forms, e.g. ATVs, LTVs and Uniform Visas
@@ -38,9 +36,7 @@ type alias Entry =
     -- Additional data sanity will be necessary.
     , totalVisasApplied: Maybe Float
     , totalVisasIssued: Maybe Float
-    , totalUniformApplied: Maybe Float
-    , totalUniformIssued: Maybe Float
-    , uniformIssuedMEV: Maybe Float
+    , totalIssuedMEV: Maybe Float
     }
 
 override : List Entry -> List Entry
@@ -68,9 +64,7 @@ decoder =
     |> Csv.Decode.andMap (Csv.Decode.field "Consulate" Ok)
     |> Csv.Decode.andMap (Csv.Decode.field "Country where consulate is located" Ok)
     |> Csv.Decode.andMap (String.toInt >> Result.fromMaybe "Error parsing Year" |> Csv.Decode.field "Year")
-    |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing total of visas applied" |> Csv.Decode.maybe |> Csv.Decode.field "Total ATVs and uniform visas applied for")
-    |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing total of visas issued" |> Csv.Decode.maybe |> Csv.Decode.field "Total ATVs and uniform visas issued  (including multiple ATVs, MEVs and LTVs)")
     |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing total of uniform visas applied" |> Csv.Decode.maybe |> Csv.Decode.field "Uniform visas applied for")
     |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing total of uniform visas issued" |> Csv.Decode.maybe |> Csv.Decode.field "Total  uniform visas issued (including MEV)")
-    |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing share of MEVs on total of uniform visas issued" |> Csv.Decode.maybe |> Csv.Decode.field "Share of MEVs on total number of uniform visas issued")
+    |> Csv.Decode.andMap (String.toFloat >> Result.fromMaybe "Error parsing total of multiple entry uniform visas issued" |> Csv.Decode.maybe |> Csv.Decode.field "Multiple entry uniform visas (MEVs) issued")
     |> Csv.Decode.map Entry
\ No newline at end of file

src/Data/Query.elm

@@ -24,16 +24,10 @@ sumTotalVisasApplied entries =
         |> List.map (.totalVisasApplied >> Maybe.withDefault 0)
         |> List.sum
 
-sumUniformIssuedMEV : List Entry -> Float
-sumUniformIssuedMEV entries =
+sumTotalIssuedMEV : List Entry -> Float
+sumTotalIssuedMEV entries =
     entries
-        |> List.map (.uniformIssuedMEV >> Maybe.withDefault 0)
-        |> List.sum
-
-sumTotalUniformIssued : List Entry -> Float
-sumTotalUniformIssued entries =
-    entries
-        |> List.map (.totalUniformIssued >> Maybe.withDefault 0)
+        |> List.map (.totalIssuedMEV >> Maybe.withDefault 0)
         |> List.sum
 
 groupBySchengen : List Entry -> Dict String (List Entry)

src/Views/MapView.elm

@@ -417,8 +417,8 @@ viewChernoffLayer model frame preCountries =
                         , length = Data.Query.sumTotalVisasApplied country.entries
                             / maxAppliedSum
                         }
-                    , nose = Data.Query.sumUniformIssuedMEV country.entries
-                        / Data.Query.sumTotalUniformIssued country.entries
+                    , nose = Data.Query.sumTotalIssuedMEV country.entries
+                        / Data.Query.sumTotalVisasIssued country.entries
                     , eyes =
                         { left = eye, right = eye }
                     }