 (defn id->camera
   [id]
   (let [abbrev (re-find #"[A-Z]+" id)]
-    (cams/abbrev->cam abbrev)))
+    {:cam (cams/abbrev->cam abbrev)
+     :cam-name (cams/abbrev->name abbrev)}))
 
 (defn id->type
   [id]

        url (-> (html/select div [:.rawtable :a]) first :attrs :href)
        dims (->> (re-find #"(\d+)x(\d+)" (html/text div)) (drop 1))
        [w h] (for [dim dims] (Integer/parseInt dim))]
    {:w w, :h h, :id id, :cam cam, :type type, :sol sol
     :taken-marstime marstime :taken-utc taken-utc, :released released
     :thumbnail-url thumbnail-url, :url url}))


  [div]
  (let [rawtable (-> (html/select div [:.rawtable]) first)
        id (-> (html/select rawtable [:a]) first html/text str/trim)
        {:keys [cam cam-name]} (id->camera id)
        type (id->type id)
        sol (->> (html/text rawtable) (re-find #"sol (\d+)") second Integer.)
        [marstime taken-utc released] (div->times div)
