Skip to content

Commit

Permalink
new api srouce for iss position
Browse files Browse the repository at this point in the history
  • Loading branch information
awb99 committed Apr 23, 2024
1 parent 8bc8905 commit 1c77f3c
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 6 deletions.
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
]
:deps {org.clojure/clojure {:mvn/version "1.11.1"}
org.pinkgorilla/timbre {:mvn/version "0.0.6"}
org.pinkgorilla/goldly-docs {:mvn/version "0.7.23"}}
org.pinkgorilla/goldly-docs {:mvn/version "0.7.24"}}

:aliases
{:webly {:extra-deps {org.pinkgorilla/ui-repl {:mvn/version "0.1.104"}}
Expand Down
36 changes: 31 additions & 5 deletions src/page/leaflet_iss.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,47 @@
{:first true
:data "not yet downloaded"}))

(defn pos [] ;{ :iss_position {:longitude "-111.4007", :latitude "2.9204"}}
;; http://open-notify.org/Open-Notify-API/ISS-Location-Now/
; (def url "http://api.open-notify.org/iss-now.json")

#_ {"timestamp" 1713834614
"iss_position" {"longitude" "31.4551"
"latitude" "33.6290"}
"message" "success"}

#_(defn pos [] ;{ :iss_position {:longitude "-111.4007", :latitude "2.9204"}}
(when-let [lng (get-in @issstate [:data :iss_position :longitude])]
(when-let [lat (get-in @issstate [:data :iss_position :latitude])]
[(js/parseFloat lat) (js/parseFloat lng)])))


;(def url "http://api.open-notify.org/iss-now.json")

; we use google translate as an ssh proxy.
; this is needed because demo when served on github pages runs on https, and the iss-now api is only on http.

(def url "https://api-open--notify-org.translate.goog/iss-now.json?_x_tr_sch=http&_x_tr_sl=ja&_x_tr_tl=en&_x_tr_hl=es-419")
;(def url "https://api-open--notify-org.translate.goog/iss-now.json?_x_tr_sch=http&_x_tr_sl=ja&_x_tr_tl=en&_x_tr_hl=es-419")

(def url "https://api.wheretheiss.at/v1/satellites/25544")

#_{"name" "iss"
"id" 25544
"latitude" 32.849420902899
"longitude" 30.295992877302
"altitude" 414.81381786305
"velocity" 27603.64815935
"visibility" "eclipsed"
"footprint" 4480.9838165584
"timestamp" 1713834594
"daynum" 2460423.5485417
"solar_lat" 12.643240818375
"solar_lon" 162.10532634786
"units" "kilometers"}

(defn pos []
(when-let [lng (get-in @issstate [:data :longitude])]
(when-let [lat (get-in @issstate [:data :latitude])]
[lat lng])))

(defn download []
;; http://open-notify.org/Open-Notify-API/ISS-Location-Now/
(get-json url issstate [:data]))

(defn iss []
Expand Down

0 comments on commit 1c77f3c

Please sign in to comment.