diff --git a/Weather.cabal b/Weather.cabal
--- a/Weather.cabal
+++ b/Weather.cabal
@@ -2,7 +2,7 @@
-- documentation, see http://haskell.org/cabal/users-guide/
name: Weather
-version: 0.1.0.3
+version: 0.1.0.4
synopsis: Library for interacting with the Weather Underground JSON API.
description: Weather is a simple library for interacting with the Weather Underground JSON API. It is not complete, but it may be useful still.
homepage: https://github.com/bstamour/weather
diff --git a/Weather.cabal~ b/Weather.cabal~
--- a/Weather.cabal~
+++ b/Weather.cabal~
@@ -2,7 +2,7 @@
-- documentation, see http://haskell.org/cabal/users-guide/
name: Weather
-version: 0.1.0.2
+version: 0.1.0.3
synopsis: Library for interacting with the Weather Underground JSON API.
description: Weather is a simple library for interacting with the Weather Underground JSON API. It is not complete, but it may be useful still.
homepage: https://github.com/bstamour/weather
diff --git a/dist/build/Net/Weather.dyn_hi b/dist/build/Net/Weather.dyn_hi
new file mode 100644
Binary files /dev/null and b/dist/build/Net/Weather.dyn_hi differ
diff --git a/dist/build/Net/Weather.dyn_o b/dist/build/Net/Weather.dyn_o
new file mode 100644
Binary files /dev/null and b/dist/build/Net/Weather.dyn_o differ
diff --git a/dist/build/Net/Weather.hi b/dist/build/Net/Weather.hi
new file mode 100644
Binary files /dev/null and b/dist/build/Net/Weather.hi differ
diff --git a/dist/build/Net/Weather.o b/dist/build/Net/Weather.o
new file mode 100644
Binary files /dev/null and b/dist/build/Net/Weather.o differ
diff --git a/dist/build/autogen/Paths_Weather.hs b/dist/build/autogen/Paths_Weather.hs
new file mode 100644
--- /dev/null
+++ b/dist/build/autogen/Paths_Weather.hs
@@ -0,0 +1,35 @@
+module Paths_Weather (
+ version,
+ getBinDir, getLibDir, getDataDir, getLibexecDir,
+ getDataFileName, getSysconfDir
+ ) where
+
+import qualified Control.Exception as Exception
+import Data.Version (Version(..))
+import System.Environment (getEnv)
+import Prelude
+
+catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a
+catchIO = Exception.catch
+
+version :: Version
+version = Version [0,1,0,3] []
+bindir, libdir, datadir, libexecdir, sysconfdir :: FilePath
+
+bindir = "/home/bryan/.cabal/bin"
+libdir = "/home/bryan/.cabal/lib/x86_64-linux-ghc-7.8.4/Weather-0.1.0.3"
+datadir = "/home/bryan/.cabal/share/x86_64-linux-ghc-7.8.4/Weather-0.1.0.3"
+libexecdir = "/home/bryan/.cabal/libexec"
+sysconfdir = "/home/bryan/.cabal/etc"
+
+getBinDir, getLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath
+getBinDir = catchIO (getEnv "Weather_bindir") (\_ -> return bindir)
+getLibDir = catchIO (getEnv "Weather_libdir") (\_ -> return libdir)
+getDataDir = catchIO (getEnv "Weather_datadir") (\_ -> return datadir)
+getLibexecDir = catchIO (getEnv "Weather_libexecdir") (\_ -> return libexecdir)
+getSysconfDir = catchIO (getEnv "Weather_sysconfdir") (\_ -> return sysconfdir)
+
+getDataFileName :: FilePath -> IO FilePath
+getDataFileName name = do
+ dir <- getDataDir
+ return (dir ++ "/" ++ name)
diff --git a/dist/build/autogen/cabal_macros.h b/dist/build/autogen/cabal_macros.h
new file mode 100644
--- /dev/null
+++ b/dist/build/autogen/cabal_macros.h
@@ -0,0 +1,114 @@
+/* DO NOT EDIT: This file is automatically generated by Cabal */
+
+/* package HTTP-4000.2.19 */
+#define VERSION_HTTP "4000.2.19"
+#define MIN_VERSION_HTTP(major1,major2,minor) (\
+ (major1) < 4000 || \
+ (major1) == 4000 && (major2) < 2 || \
+ (major1) == 4000 && (major2) == 2 && (minor) <= 19)
+
+/* package aeson-0.8.0.2 */
+#define VERSION_aeson "0.8.0.2"
+#define MIN_VERSION_aeson(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 8 || \
+ (major1) == 0 && (major2) == 8 && (minor) <= 0)
+
+/* package base-4.7.0.2 */
+#define VERSION_base "4.7.0.2"
+#define MIN_VERSION_base(major1,major2,minor) (\
+ (major1) < 4 || \
+ (major1) == 4 && (major2) < 7 || \
+ (major1) == 4 && (major2) == 7 && (minor) <= 0)
+
+/* package bytestring-0.10.4.0 */
+#define VERSION_bytestring "0.10.4.0"
+#define MIN_VERSION_bytestring(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 10 || \
+ (major1) == 0 && (major2) == 10 && (minor) <= 4)
+
+/* package text-1.2.0.3 */
+#define VERSION_text "1.2.0.3"
+#define MIN_VERSION_text(major1,major2,minor) (\
+ (major1) < 1 || \
+ (major1) == 1 && (major2) < 2 || \
+ (major1) == 1 && (major2) == 2 && (minor) <= 0)
+
+/* package unordered-containers-0.2.5.1 */
+#define VERSION_unordered_containers "0.2.5.1"
+#define MIN_VERSION_unordered_containers(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 2 || \
+ (major1) == 0 && (major2) == 2 && (minor) <= 5)
+
+/* tool alex-3.1.4 */
+#define TOOL_VERSION_alex "3.1.4"
+#define MIN_TOOL_VERSION_alex(major1,major2,minor) (\
+ (major1) < 3 || \
+ (major1) == 3 && (major2) < 1 || \
+ (major1) == 3 && (major2) == 1 && (minor) <= 4)
+
+/* tool gcc-4.8.4 */
+#define TOOL_VERSION_gcc "4.8.4"
+#define MIN_TOOL_VERSION_gcc(major1,major2,minor) (\
+ (major1) < 4 || \
+ (major1) == 4 && (major2) < 8 || \
+ (major1) == 4 && (major2) == 8 && (minor) <= 4)
+
+/* tool ghc-7.8.4 */
+#define TOOL_VERSION_ghc "7.8.4"
+#define MIN_TOOL_VERSION_ghc(major1,major2,minor) (\
+ (major1) < 7 || \
+ (major1) == 7 && (major2) < 8 || \
+ (major1) == 7 && (major2) == 8 && (minor) <= 4)
+
+/* tool ghc-pkg-7.8.4 */
+#define TOOL_VERSION_ghc_pkg "7.8.4"
+#define MIN_TOOL_VERSION_ghc_pkg(major1,major2,minor) (\
+ (major1) < 7 || \
+ (major1) == 7 && (major2) < 8 || \
+ (major1) == 7 && (major2) == 8 && (minor) <= 4)
+
+/* tool haddock-2.14.3 */
+#define TOOL_VERSION_haddock "2.14.3"
+#define MIN_TOOL_VERSION_haddock(major1,major2,minor) (\
+ (major1) < 2 || \
+ (major1) == 2 && (major2) < 14 || \
+ (major1) == 2 && (major2) == 14 && (minor) <= 3)
+
+/* tool happy-1.19.5 */
+#define TOOL_VERSION_happy "1.19.5"
+#define MIN_TOOL_VERSION_happy(major1,major2,minor) (\
+ (major1) < 1 || \
+ (major1) == 1 && (major2) < 19 || \
+ (major1) == 1 && (major2) == 19 && (minor) <= 5)
+
+/* tool hpc-0.67 */
+#define TOOL_VERSION_hpc "0.67"
+#define MIN_TOOL_VERSION_hpc(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 67 || \
+ (major1) == 0 && (major2) == 67 && (minor) <= 0)
+
+/* tool hsc2hs-0.67 */
+#define TOOL_VERSION_hsc2hs "0.67"
+#define MIN_TOOL_VERSION_hsc2hs(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 67 || \
+ (major1) == 0 && (major2) == 67 && (minor) <= 0)
+
+/* tool hscolour-1.22 */
+#define TOOL_VERSION_hscolour "1.22"
+#define MIN_TOOL_VERSION_hscolour(major1,major2,minor) (\
+ (major1) < 1 || \
+ (major1) == 1 && (major2) < 22 || \
+ (major1) == 1 && (major2) == 22 && (minor) <= 0)
+
+/* tool pkg-config-0.25 */
+#define TOOL_VERSION_pkg_config "0.25"
+#define MIN_TOOL_VERSION_pkg_config(major1,major2,minor) (\
+ (major1) < 0 || \
+ (major1) == 0 && (major2) < 25 || \
+ (major1) == 0 && (major2) == 25 && (minor) <= 0)
+
diff --git a/dist/build/libHSWeather-0.1.0.3-ghc7.8.4.so b/dist/build/libHSWeather-0.1.0.3-ghc7.8.4.so
new file mode 100644
Binary files /dev/null and b/dist/build/libHSWeather-0.1.0.3-ghc7.8.4.so differ
diff --git a/dist/build/libHSWeather-0.1.0.3.a b/dist/build/libHSWeather-0.1.0.3.a
new file mode 100644
Binary files /dev/null and b/dist/build/libHSWeather-0.1.0.3.a differ
diff --git a/dist/doc/html/Weather-0.1.0.3-docs.tar.gz b/dist/doc/html/Weather-0.1.0.3-docs.tar.gz
new file mode 100644
Binary files /dev/null and b/dist/doc/html/Weather-0.1.0.3-docs.tar.gz differ
diff --git a/dist/doc/html/Weather-0.1.0.3-docs/Net-Weather.html b/dist/doc/html/Weather-0.1.0.3-docs/Net-Weather.html
new file mode 100644
--- /dev/null
+++ b/dist/doc/html/Weather-0.1.0.3-docs/Net-Weather.html
@@ -0,0 +1,4 @@
+Net.Weather Weather-0.1.0.3: Library for interacting with the Weather Underground JSON API. (Index)
+
+
+
+
diff --git a/dist/doc/html/Weather-0.1.0.3-docs/haddock-util.js b/dist/doc/html/Weather-0.1.0.3-docs/haddock-util.js
new file mode 100644
--- /dev/null
+++ b/dist/doc/html/Weather-0.1.0.3-docs/haddock-util.js
@@ -0,0 +1,344 @@
+// Haddock JavaScript utilities
+
+var rspace = /\s\s+/g,
+ rtrim = /^\s+|\s+$/g;
+
+function spaced(s) { return (" " + s + " ").replace(rspace, " "); }
+function trim(s) { return s.replace(rtrim, ""); }
+
+function hasClass(elem, value) {
+ var className = spaced(elem.className || "");
+ return className.indexOf( " " + value + " " ) >= 0;
+}
+
+function addClass(elem, value) {
+ var className = spaced(elem.className || "");
+ if ( className.indexOf( " " + value + " " ) < 0 ) {
+ elem.className = trim(className + " " + value);
+ }
+}
+
+function removeClass(elem, value) {
+ var className = spaced(elem.className || "");
+ className = className.replace(" " + value + " ", " ");
+ elem.className = trim(className);
+}
+
+function toggleClass(elem, valueOn, valueOff, bool) {
+ if (bool == null) { bool = ! hasClass(elem, valueOn); }
+ if (bool) {
+ removeClass(elem, valueOff);
+ addClass(elem, valueOn);
+ }
+ else {
+ removeClass(elem, valueOn);
+ addClass(elem, valueOff);
+ }
+ return bool;
+}
+
+
+function makeClassToggle(valueOn, valueOff)
+{
+ return function(elem, bool) {
+ return toggleClass(elem, valueOn, valueOff, bool);
+ }
+}
+
+toggleShow = makeClassToggle("show", "hide");
+toggleCollapser = makeClassToggle("collapser", "expander");
+
+function toggleSection(id)
+{
+ var b = toggleShow(document.getElementById("section." + id));
+ toggleCollapser(document.getElementById("control." + id), b);
+ rememberCollapsed(id, b);
+ return b;
+}
+
+var collapsed = {};
+function rememberCollapsed(id, b)
+{
+ if(b)
+ delete collapsed[id]
+ else
+ collapsed[id] = null;
+
+ var sections = [];
+ for(var i in collapsed)
+ {
+ if(collapsed.hasOwnProperty(i))
+ sections.push(i);
+ }
+ // cookie specific to this page; don't use setCookie which sets path=/
+ document.cookie = "collapsed=" + escape(sections.join('+'));
+}
+
+function restoreCollapsed()
+{
+ var cookie = getCookie("collapsed");
+ if(!cookie)
+ return;
+
+ var ids = cookie.split('+');
+ for(var i in ids)
+ {
+ if(document.getElementById("section." + ids[i]))
+ toggleSection(ids[i]);
+ }
+}
+
+function setCookie(name, value) {
+ document.cookie = name + "=" + escape(value) + ";path=/;";
+}
+
+function clearCookie(name) {
+ document.cookie = name + "=;path=/;expires=Thu, 01-Jan-1970 00:00:01 GMT;";
+}
+
+function getCookie(name) {
+ var nameEQ = name + "=";
+ var ca = document.cookie.split(';');
+ for(var i=0;i < ca.length;i++) {
+ var c = ca[i];
+ while (c.charAt(0)==' ') c = c.substring(1,c.length);
+ if (c.indexOf(nameEQ) == 0) {
+ return unescape(c.substring(nameEQ.length,c.length));
+ }
+ }
+ return null;
+}
+
+
+
+var max_results = 75; // 50 is not enough to search for map in the base libraries
+var shown_range = null;
+var last_search = null;
+
+function quick_search()
+{
+ perform_search(false);
+}
+
+function full_search()
+{
+ perform_search(true);
+}
+
+
+function perform_search(full)
+{
+ var text = document.getElementById("searchbox").value.toLowerCase();
+ if (text == last_search && !full) return;
+ last_search = text;
+
+ var table = document.getElementById("indexlist");
+ var status = document.getElementById("searchmsg");
+ var children = table.firstChild.childNodes;
+
+ // first figure out the first node with the prefix
+ var first = bisect(-1);
+ var last = (first == -1 ? -1 : bisect(1));
+
+ if (first == -1)
+ {
+ table.className = "";
+ status.innerHTML = "No results found, displaying all";
+ }
+ else if (first == 0 && last == children.length - 1)
+ {
+ table.className = "";
+ status.innerHTML = "";
+ }
+ else if (last - first >= max_results && !full)
+ {
+ table.className = "";
+ status.innerHTML = "More than " + max_results + ", press Search to display";
+ }
+ else
+ {
+ // decide what you need to clear/show
+ if (shown_range)
+ setclass(shown_range[0], shown_range[1], "indexrow");
+ setclass(first, last, "indexshow");
+ shown_range = [first, last];
+ table.className = "indexsearch";
+ status.innerHTML = "";
+ }
+
+
+ function setclass(first, last, status)
+ {
+ for (var i = first; i <= last; i++)
+ {
+ children[i].className = status;
+ }
+ }
+
+
+ // do a binary search, treating 0 as ...
+ // return either -1 (no 0's found) or location of most far match
+ function bisect(dir)
+ {
+ var first = 0, finish = children.length - 1;
+ var mid, success = false;
+
+ while (finish - first > 3)
+ {
+ mid = Math.floor((finish + first) / 2);
+
+ var i = checkitem(mid);
+ if (i == 0) i = dir;
+ if (i == -1)
+ finish = mid;
+ else
+ first = mid;
+ }
+ var a = (dir == 1 ? first : finish);
+ var b = (dir == 1 ? finish : first);
+ for (var i = b; i != a - dir; i -= dir)
+ {
+ if (checkitem(i) == 0) return i;
+ }
+ return -1;
+ }
+
+
+ // from an index, decide what the result is
+ // 0 = match, -1 is lower, 1 is higher
+ function checkitem(i)
+ {
+ var s = getitem(i).toLowerCase().substr(0, text.length);
+ if (s == text) return 0;
+ else return (s > text ? -1 : 1);
+ }
+
+
+ // from an index, get its string
+ // this abstracts over alternates
+ function getitem(i)
+ {
+ for ( ; i >= 0; i--)
+ {
+ var s = children[i].firstChild.firstChild.data;
+ if (s.indexOf(' ') == -1)
+ return s;
+ }
+ return ""; // should never be reached
+ }
+}
+
+function setSynopsis(filename) {
+ if (parent.window.synopsis) {
+ if (parent.window.synopsis.location.replace) {
+ // In Firefox this avoids adding the change to the history.
+ parent.window.synopsis.location.replace(filename);
+ } else {
+ parent.window.synopsis.location = filename;
+ }
+ }
+}
+
+function addMenuItem(html) {
+ var menu = document.getElementById("page-menu");
+ if (menu) {
+ var btn = menu.firstChild.cloneNode(false);
+ btn.innerHTML = html;
+ menu.appendChild(btn);
+ }
+}
+
+function adjustForFrames() {
+ var bodyCls;
+
+ if (parent.location.href == window.location.href) {
+ // not in frames, so add Frames button
+ addMenuItem("Frames ");
+ bodyCls = "no-frame";
+ }
+ else {
+ bodyCls = "in-frame";
+ }
+ addClass(document.body, bodyCls);
+}
+
+function reframe() {
+ setCookie("haddock-reframe", document.URL);
+ window.location = "frames.html";
+}
+
+function postReframe() {
+ var s = getCookie("haddock-reframe");
+ if (s) {
+ parent.window.main.location = s;
+ clearCookie("haddock-reframe");
+ }
+}
+
+function styles() {
+ var i, a, es = document.getElementsByTagName("link"), rs = [];
+ for (i = 0; a = es[i]; i++) {
+ if(a.rel.indexOf("style") != -1 && a.title) {
+ rs.push(a);
+ }
+ }
+ return rs;
+}
+
+function addStyleMenu() {
+ var as = styles();
+ var i, a, btns = "";
+ for(i=0; a = as[i]; i++) {
+ btns += ""
+ + a.title + " Net.Weather src/Net/Weather.hs
+module Net . Weather
+( Observation ( .. )
+, APIKey
+, getConditions
+) where
+import Control . Monad
+import Control . Applicative
+import Data . Text ( Text )
+import Data . Aeson
+import Data . ByteString . Lazy . Char8 ( pack )
+import Network . HTTP ( getResponseBody , simpleHTTP , getRequest )
+import qualified Data . HashMap . Strict as H
+data Observation =
+Observation { obsTime :: String
+, obsWeather :: String
+, obsTemp :: Float
+, obsRelHumidity :: String
+, obsWind :: String
+, obsFeelsLike :: String
+} deriving ( Show )
+instance FromJSON Observation where
+parseJSON ( Object v ) = Observation
+<$> v .: "observation_time"
+<*> v .: "weather"
+<*> v .: "temp_f"
+<*> v .: "relative_humidity"
+<*> v .: "wind_string"
+<*> v .: "feelslike_string"
+parseJSON _ = mzero
+type APIKey = String
+type City = String
+type State = String
+getConditions :: APIKey -> City -> State -> IO ( Maybe Observation )
+getConditions key city state = do
+obj <- evalJSONRequest $ conditionsQuery key city state
+return $ obj >>= getProperty "current_observation"
+getProperty :: FromJSON a => Text -> Value -> Maybe a
+getProperty property ( Object v ) = do
+val <- H . lookup property v
+case fromJSON val of
+Error _ -> Nothing
+Success x -> Just x
+getProperty _ _ = Nothing
+evalJSONRequest :: FromJSON a => String -> IO ( Maybe a )
+evalJSONRequest request = do
+body <- getResponseBody <=< simpleHTTP $ getRequest request
+return . decode $ pack body
+conditionsQuery :: String -> String -> String -> String
+conditionsQuery key city state =
+"http://api.wunderground.com/api/" ++ key
+++ "/conditions/q/" ++ state
+++ "/" ++ city ++ ".json"
+