Merge branch 'fix-apostrophes'

koterpillar · Sep 23, 2017 · 9c63974 · 9c63974
2 parents eb0a505 + e57d00c
commit 9c63974
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Fetcher/EPA.hs b/src/Fetcher/EPA.hs
@@ -9,6 +9,7 @@ import Control.Monad
 import Control.Monad.IO.Class
 
 import Data.Aeson
+import qualified Data.List.Utils as L
 import Data.Maybe
 import Data.Time.Clock
 import Data.Time.Format
@@ -47,7 +48,7 @@ forecastAddress location =
   abbr ++
   "/JSON"
   where
-    city = location ^. locCity
+    city = L.replace "'" "''" $ location ^. locCity
     abbr = location ^. locRegion . to usStateAbbreviation
 
 data ForecastItem = ForecastItem

diff --git a/src/Utils.hs b/src/Utils.hs
@@ -68,7 +68,11 @@ removeAccents = T.filter (not . isMark) . normalize NFD
 
 -- Replace characters not allowed in Pebble pin IDs and topic names
 normalizeValue :: T.Text -> T.Text
-normalizeValue = T.replace " " "_" . removeAccents
+normalizeValue = T.map removeInvalidChars . removeAccents
+  where
+    removeInvalidChars ' ' = '_'
+    removeInvalidChars '\'' = '_'
+    removeInvalidChars c = c
 
 maybeMaximum :: Ord a => [a] -> Maybe a
 maybeMaximum [] = Nothing