   icon)
 
 (defn activate-marker
-  [owner key]
+  [owner id]
   (let [l-map (om/get-state owner :map)
         markers (om/get-state owner :markers)
-        active (om/get-state owner [:markers key :marker])]
+        active (om/get-state owner [:markers id])]
     (dorun
-      (map #(.setIcon (:marker %) (activate-ico (:icon %))) (vals markers)))
+      (map #(.setIcon (:marker %) (reset-ico (:icon %))) markers))
     (when active
-      (do (.setIcon active green-ico)
-          (.panTo l-map (.getLatLng active))))))
+      (do (.setIcon (:marker active) (activate-ico (:icon active)))
+          (.panTo l-map (.getLatLng (:marker active)))))))
 
 (defn path-to-route
   [path]


        ;(delete-markers owner to-delete)
        (add-markers data owner to-add)
        ;(activate-marker owner (last active-hive))
        ))

    om/IDidMount
    (did-mount [_]

       :map nil})

    om/IWillReceiveProps
    (will-receive-props [this {:keys [collections] :as next-props}]
      (let [next-units (reduce into #{} (map :points collections))
            current-units (reduce into #{} (map :points (:collections (om/get-props owner))))
            to-add (set/difference next-units current-units)
