onomastics-ng: fix title and color alpha

2022-10-07 02:40:52 +02:00
parent 23ff9fd7e6
commit da23296f0e
2 changed files with 7 additions and 3 deletions
--- a/onomastics-ng/lib/Onomap/Svg.hs
+++ b/onomastics-ng/lib/Onomap/Svg.hs
@@ -39,7 +39,13 @@ drawMap settings colorPalette areas statistics =
                                                , ": "
                                                , Text.intercalate
                                                    ", "
-                                                    (map (\(surname, statistic) -> localize (showRounded count) <> " (" <> Text.toTitle surname <> ")") statistics)
+                                                    ( map
+                                                        ( \(surname, statistic) ->
+                                                            let count = fromMaybe 0 (Map.lookup (key area) (getByArea statistic))
+                                                             in localize (showRounded count) <> " (" <> Text.toTitle surname <> ")"
+                                                        )
+                                                        statistics
+                                                    )
                                                ]
                                        )
                                    )
@@ -52,7 +58,6 @@ drawMap settings colorPalette areas statistics =
                                                then 0
                                                else
                                                    count
-                                                        / fromIntegral (length statistics)
                                                        / ( case scaleToMaximum settings of
                                                                Global -> globalMaximum
                                                                Local -> theMaximum