                 from (from-query lat lng)
                 transport-type (transportation-query)
                 category (category-query)
-                directions (<! (fetch-draw-directions mappy to from
-                                                      transport-type category))]
-            (<! (draw-yelp-info mappy directions category))
+                directions (<! (fetch-draw-directions map to from
+                                                      transport-type
+                                                      directions-layer))]
+            (<! (draw-yelp-info map directions category
+                                biz-layer biz-layer-items))
             ;; stop loading spinner
             (stop-spinner)
             )))))

       (if (empty? numbered-biz)
         (dommy/append! (sel1 :#map-text-container) (no-biz-template))
         (do
           (draw-yelp-markers m numbered-biz)
           (create-biz-sidebar start-point end-point numbered-biz)
           (expand-biz-sidebar)) ;; reduce map size to allow for biz sidebar
         (reset-map m map-bounds))))))

;; Full page rendering after button submit

(defn setup-button-click [lat lng]
  (let [clicks (u/listen (dom/getElement "btn-go") "click")]
    (go (while true
          ;; wait for a click
          (<! clicks)

              [[(:sw-lat map-bounds) (:sw-lng map-bounds)]
               [(:ne-lat map-bounds) (:ne-lng map-bounds)]]))

(defn add-numbered-marker [layer layer-items lat lng num]
  (let [NumberedDivIcon (.-NumberedDivIcon js/L)
        marker (-> L (.marker [lat, lng]
                              {:icon (NumberedDivIcon. {:number (str num)})})
                   (.on "click" #(aset js/window "location"
                                       (str "#" (section-id num)))))
        new-layer (.addLayer layer marker)]
    (swap! layer-items assoc num new-layer)))

(defn add-numbered-marker-active [layer layer-items lat lng num]
  (let [NumberedDivIconActive (.-NumberedDivIconActive js/L)
        marker (-> L (.marker [lat, lng]
                              {:icon (NumberedDivIconActive. {:number (str num)})})
                   (.on "click" #(aset js/window "location"
                                       (str "#" (section-id num)))))
        new-layer (.addLayer layer marker)]
    (swap! layer-items assoc num new-layer)))

(defn remove-marker [layer layer-items num]
  (let [marker (get @layer-items num)]
    (swap! layer-items dissoc num)
    (.removeLayer layer marker)))

;; Draw directions/markers

(defn draw-directions [m directions directions-layer]
  (let [{:keys [start-point end-point lines map-bounds]} directions
        start-circle (-> L (.circle (vec start-point) 8 {:color "green"}))
        end-circle (-> L (.circle (vec end-point) 8 {:color "red"}))
