onomastics-ng: fix color palette

onomastics-ng/cli/Main.hs

@@ -38,7 +38,7 @@ main = do
             case mode options of
                 Relative -> relativeCount
                 Absolute -> absoluteCount
-        colors = if null $ colorPalette options then defaultColorPalette else colorPalette options
+        colors = colorPalette options ++ defaultColorPalette
         svgSettings = SvgSettings{scaleToMaximum = Global}
     res <- runStoepel manager' $ do
         let theNames = map Just (surnames options)

onomastics-ng/web/Main.hs

@@ -88,9 +88,7 @@ app manager' (theDistricts, theStates) = serve onomapApi server
                 let stats = map (computeAreaStatistics computeFunction theAreas) theStats
                 return
                     Response
-                        { color = case colors of
-                            [] -> defaultColorPalette
-                            x -> x
+                        { color = colors ++ defaultColorPalette
                         , areas = theAreas
                         , statistics = zip surnames stats
                         }