From 5ded76199f3f476dc397bd69350130df3d04923d Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 29 Jan 2020 19:39:49 +0000 Subject: [PATCH] Tidyup of unused database keys and subscription handlers --- src/cljs/geocsv/client/ajax.cljs | 2 -- src/cljs/geocsv/client/db.cljs | 4 +--- src/cljs/geocsv/client/events.cljs | 5 ----- src/cljs/geocsv/client/views/map.cljs | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/cljs/geocsv/client/ajax.cljs b/src/cljs/geocsv/client/ajax.cljs index 2d55989..c1adc58 100644 --- a/src/cljs/geocsv/client/ajax.cljs +++ b/src/cljs/geocsv/client/ajax.cljs @@ -6,11 +6,9 @@ [re-frame.core :as rf])) (defn local-uri? [{:keys [uri]}] - (js/console.log (str "local-uri?: received `" (str uri) "` (type " (type uri) ") as uri")) (not (re-find #"^\w+?://" (str uri)))) (defn default-headers [request] - (js/console.log (str "default-headers: received `" request "` as request")) (if (local-uri? request) (-> request (update :headers #(merge {"x-csrf-token" js/csrfToken} %))) diff --git a/src/cljs/geocsv/client/db.cljs b/src/cljs/geocsv/client/db.cljs index cba96d4..b6cb488 100644 --- a/src/cljs/geocsv/client/db.cljs +++ b/src/cljs/geocsv/client/db.cljs @@ -38,6 +38,4 @@ "Other-key-customers" "Power-supplier"} ;; need to be fetched from server side :latitude 56 - :longitude -4 - :map {:map-centre [56 -4] - :map-zoom 6}}) + :longitude -4}) diff --git a/src/cljs/geocsv/client/events.cljs b/src/cljs/geocsv/client/events.cljs index 342db20..5b6da4a 100644 --- a/src/cljs/geocsv/client/events.cljs +++ b/src/cljs/geocsv/client/events.cljs @@ -198,11 +198,6 @@ (js/console.log (str "Fetching longitude" v)) v))) -(rf/reg-sub - :map - (fn [db _] - (:map db))) - (rf/reg-sub :route (fn [db _] diff --git a/src/cljs/geocsv/client/views/map.cljs b/src/cljs/geocsv/client/views/map.cljs index bb01c2d..27b5945 100644 --- a/src/cljs/geocsv/client/views/map.cljs +++ b/src/cljs/geocsv/client/views/map.cljs @@ -83,7 +83,7 @@ (defn map-render "Render the actual div containing the map." [] - [:div#map {:style {:height "1000px"}}]) + [:div#map {:style {:height "800px"}}]) (defn panel "A reagent class for the map object."