Now generating the right URI for fetch-local-data

src/clj/youyesyet/middleware.clj

@@ -27,9 +27,8 @@
                 ;; we check if one has been specified in the environment
                 ;; instead
                 (do
-                  (log/info "Taking '" (:app-context env) "' as *app-context* from env")
+                  (log/debug "Taking '" (:app-context env) "' as *app-context* from env")
                   (:app-context env)))]
-      (log/debug "Using '" *app-context* "' as *app-context*")
       (handler (assoc request :servlet-context *app-context*)))))
 
 

src/clj/youyesyet/routes/rest.clj

@@ -2,6 +2,7 @@
       :author "Simon Brooke"} youyesyet.routes.rest
   (:require [clojure.core.memoize :as memo]
             [clojure.java.io :as io]
+            [clojure.tools.logging :as log]
             [clojure.walk :refer [keywordize-keys]]
             [compojure.core :refer [defroutes GET POST]]
             [noir.response :as nresponse]
@@ -43,6 +44,7 @@
   work. So cache for only 90 seconds."
   (memo/ttl
     (fn [here]
+      (log/debug "Fetching local data for " here)
       (let [neighbourhood (l/neighbouring-localities here)
             addresses  (flatten
                          (map

src/cljs/youyesyet/canvasser_app/gis.cljs

@@ -109,9 +109,9 @@
 (defn map-remove-pins
   "Remove all pins from this map `view`. Side-effecty; liable to be problematic."
   [view]
-
   (if
     view
+    (doall
      (.eachLayer
       view
       (fn [layer]
@@ -119,7 +119,10 @@
           (if
             (instance? js/L.Marker layer)
             (.removeLayer view layer))
-          (catch js/Object any (js/console.log (str "Failed to remove pin '" layer "' from map: " any)))))))
+          (catch js/Object any
+            (js/console.log
+             (str "Failed to remove pin '"
+                  layer "' from map: " any))))))))
   view)
 
 

src/cljs/youyesyet/canvasser_app/handlers.cljs

@@ -140,20 +140,24 @@
 (reg-event-fx
  :fetch-locality
  (fn [{db :db} _]
-    (js/console.log "Fetching locality data")
-    ;; we return a map of (side) effects
-    {:http-xhrio {:method          :get
-                  :uri             (str source-host
+   (let [uri (str source-host
                   "rest/get-local-data?latitude="
                   (:latitude db)
                   "&longitude="
-                                        (:longitude db))
+                  (or (:longitude db) -4))]
+     (js/console.log
+      (str
+       "Fetching locality data: " uri))
+     ;; we return a map of (side) effects
+     {:http-xhrio {:method          :get
+                   :uri             uri
                    :format          (json-request-format)
                    :response-format (json-response-format {:keywords? true})
                    :on-success      [:process-locality]
                    :on-failure      [:bad-locality]}
-     :db  (add-to-feedback db :fetch-locality)}))
+      :db  (add-to-feedback db :fetch-locality)})))
 
+;; http://localhost:3000/rest/get-local-data?latitude=54.85131525968606&longitude=
 
 (reg-event-db
   :get-current-location
@@ -170,9 +174,9 @@
     ;; loop to do it again
     (dispatch [:dispatch-later [{:ms 5000 :dispatch [:fetch-locality]}
                                 {:ms 1000 :dispatch [:get-current-location]}]])
+    (refresh-map-pins)
     (assoc
       (remove-from-feedback db :fetch-locality)
-      (refresh-map-pins)
       :addresses (js->clj response))))
 
 

src/cljs/youyesyet/canvasser_app/views/map.cljs

@@ -84,9 +84,9 @@
     (.on view "moveend"
          (fn [_] (let [c (.getCenter view)]
                    (js/console.log (str "Moving centre to " c))
-                   (dispatch :set-latitude (.-lat c))
-                   (dispatch :set-longitude (.-lon c))
-                   (dispatch :fetch-locality))))
+                   (dispatch-sync [:set-latitude (.-lat c)])
+                   (dispatch-sync [:set-longitude (.-lng c)])
+                   (dispatch [:fetch-locality]))))
     (refresh-map-pins)
     view))