feat: add conservation effort from edn

deps.edn

@@ -9,7 +9,8 @@
         hiccup/hiccup {:mvn/version "2.0.0"}
         cheshire/cheshire {:mvn/version "6.1.0"}
         camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
-        io.github.paintparty/bling {:mvn/version "0.8.8"}}
+        io.github.paintparty/bling {:mvn/version "0.8.8"}
+        borkdude/edamame {:mvn/version "1.4.32"}}
  :aliases {:repl/conjure
            {:extra-deps {nrepl/nrepl       {:mvn/version "1.0.0"}
                          cider/cider-nrepl {:mvn/version "0.42.1"}}

src/core.clj

@@ -1,22 +1,27 @@
 (ns core
   (:require
-   [bling.core :as bling]
-   [bling.hifi]
-   [cheshire.core :as json]
-   [clojure.java.io :refer [reader]]
-   [clojure.math :as math]
-   [clojure.string :refer [lower-case]]
-   [ebird]
-   [hiccup.page :refer [html5]]
-   [reitit.ring :as ring]
-   [ring.adapter.jetty]
-   [ring.logger :refer [wrap-with-logger]]
-   [ring.middleware.reload]
-   [wikidata :as wd]))
+    [bling.core :as bling]
+    [bling.hifi]
+    [cheshire.core :as json]
+    [clojure.java.io :refer [reader]]
+    [clojure.math :as math]
+    [clojure.string :refer [lower-case]]
+    [ebird]
+    [hiccup.page :refer [html5]]
+    [reitit.ring :as ring]
+    [ring.adapter.jetty]
+    [ring.logger :refer [wrap-with-logger]]
+    [ring.middleware.reload]
+    [edamame.core :as soy :refer [parse-next]]
+    [wikidata :as wd]
+    [clojure.core :as c]))
 
 (def known-species (atom {}))
 (def observations (atom []))
 (def nearby (atom {}))
+(def last-update (atom nil))
+
+(def conservation-info (with-open [f (reader "./conservation.edn")] (parse-next (soy/reader f))))
 
 (defn get-nearby [species] 
   (let [species (lower-case (species :latin))
@@ -50,6 +55,7 @@
   (let [body (json/parse-stream (reader (:body request)) true)
         birds (:birds body)
         now (java.time.LocalDateTime/now)]
+    (reset! last-update now)
     (add-observations birds now)
     {:status 200}))
 
@@ -59,6 +65,7 @@
      :certainty (apply max (map :certainty s))
      :count (count s)
      :nearby (get-nearby bird)
+     :rote-liste (get-in conservation-info [(:latin bird) :status])
      :first-seen (apply min (map #(.toEpochSecond (.atZone (:time %) (java.time.ZoneId/of "Europe/Berlin"))) s))}))
 
 (defn summarise-observations [observations since]
@@ -104,51 +111,62 @@
                 "li.open::marker {content: '⚝ '; font-size: 1.2em; color:" (colours :blue) "}")]
    [:script {:type "text/javascript"} script]
    [:title "🐦  Vogel-Himbeere  🍓"]])
+
+(defn template-concern*
+  ([colour-name key] (template-concern* colour-name nil key))
+  ([colour-name ?background-colour key]
+   [:span {:style (str "color:" (colours colour-name) ";" (when ?background-colour (str "background-color:" (colours ?background-colour))))}
+    (str "(" key ")")]))
 (def template-concern
-  {:least-concern [:span {:style (str "color:" (colours :dark-green))} "(♪♪)"]
-   :near-threatened [:span {:style (str "color:" (colours :green))} "(♪)"]
-   :vulnerable [:span {:style (str "color:" (colours :yellow))} "(〜)"]
-   :endangered [:span {:style (str "color:" (colours :light-orange))} "(!)"]
-   :critical [:span {:style (str "color:" (colours :orange))} "(!!)"]})
-(defn template-observation [{bird :bird certainty :certainty count :count nearby :nearby}]
+  (-> {:common [:dark-green "♪♪"]
+       :least-concern [:dark-green "lc"]
+       :somewhat-common [:green "♪"]
+       :near-threatened [:green "nt"]
+       :rare [:text :yellow "〜"]
+       :vulnerable [:text :yellow "v"]
+       :very-rare [:light-orange "!"]
+       :endangered [:light-orange "e"]
+       :extremely-rare [:orange "!!"]
+       :critical [:orange "c"]}
+      (update-vals (partial apply template-concern*))))
+(defn template-observation [{bird :bird certainty :certainty count :count nearby :nearby concern :rote-liste}]
   (let [observation-count (:observation-count nearby)]
-   [:li.closed
-   {:onclick "onExpand(this)"
-    }
-   [:span {:style (when (or (not observation-count) (= 0 observation-count))
-                    "text-decoration-style:double;text-decoration-line:underline;text-decoration-skip-ink:all;")}
-    (or (get-in bird [:name :de])
-        (ebird/get-name (:latin bird))
-        (get-in bird [:name :en]))]
-   " "
-   [:span.latin 
-    {:style (str 
-              "font-variant: small-caps;"
-              "font-family: Cinzel;"
-              "font-weight: 600;"
-              "text-decoration-style: dashed;"
-              "text-decoration-line: underline;"
-              "color:" (:brown colours) ";")}
-    (:latin bird)]
-   " "
-   (template-concern (:iucn bird))
-   [:div.info {:style "display: none;font-size: 0.8em;"}
-    (str (or observation-count "no") " nearby observations")]
-   [:br]
-   [:span.certainty
-    {:style (str
-              "font-size: 0.8em;"
-              "font-style: italic;")}
-    (str "Seen " count " times with maximum likelihood ") 
-    [:span {:style (condp < certainty
-                     0.8 (str "color:" (:orange colours) ";")
-                     0.5 (str "color:" (:light-orange colours) ";")
-                     nil)} (double (/ (math/round (* 10000 certainty)) 100.0))]
-    "&nbsp;%"]]))
+    [:li.closed
+     {:onclick "onExpand(this)"}
+     [:span {:style (when (or (not observation-count) (= 0 observation-count))
+                      "text-decoration-style:double;text-decoration-line:underline;text-decoration-skip-ink:all;")}
+      (or (get-in bird [:name :de])
+          (ebird/get-name (:latin bird))
+          (get-in bird [:name :en]))]
+     " "
+     [:span.latin 
+      {:style (str 
+                "font-variant: small-caps;"
+                "font-family: Cinzel;"
+                "font-weight: 600;"
+                "text-decoration-style: dashed;"
+                "text-decoration-line: underline;"
+                "color:" (:brown colours) ";")}
+      (:latin bird)]
+     " "
+     (template-concern (if (contains? template-concern concern) concern (:iucn bird)))
+     [:div.info {:style "display: none;font-size: 0.8em;"}
+      (str (or observation-count "no") " nearby observations")]
+     [:br]
+     [:span.certainty
+      {:style (str
+                "font-size: 0.8em;"
+                "font-style: italic;")}
+      (str "Seen " count " times with maximum likelihood ") 
+      [:span {:style (condp < certainty
+                       0.8 (str "color:" (:orange colours) ";")
+                       0.5 (str "color:" (:light-orange colours) ";")
+                       nil)} (double (/ (math/round (* 10000 certainty)) 100.0))]
+      "&nbsp;%"]]))
+(def date-formatter (java.time.format.DateTimeFormatter/ofPattern "dd MMM HH:mm"))
 (defn list-observation [_]
   (let [since (.minusDays (java.time.LocalDateTime/now) 1)
         observations (summarise-observations @observations since)]
-    (print @nearby)
     {:status 200
      :headers {"charset" "utf-8"
                "Content-Type" "text/html; charset=utf-8"}
@@ -162,9 +180,11 @@
                          "font-family: \"B612 Mono\";"
                          "background-color:" (:background colours) ";"
                          "color:" (:text colours) ";")}
-                    [:h1 "Birds today 🐦"]
-                    [:ul
-                     (map template-observation observations)]]))}))
+                   [:h1 "Birds today 🐦"
+                    [:span {:style (str "font-size:0.3em;margin-left:3em;color:" (colours :brown))}
+                     (str "last updated " (if @last-update (.format @last-update date-formatter) "never"))]]
+                   [:ul
+                    (map template-observation observations)]]))}))
 
 (def router
   (wrap-with-logger

src/wikidata.clj

@@ -39,7 +39,6 @@
                      (json/parse-string true)
                      (:results)
                      (:bindings))]
-    (print bindings)
     {:name (apply hash-map (flatten (map (fn [{name :name}] [(keyword (:xml:lang name)) (:value name)]) bindings)))
      :latin latin
      :iucn (concerns (get-in (first bindings) [:concern :value]))}))