Fix 61/multi day route colors (#63)

Author: larsen

notebooks/rando-planner.clj

@@ -282,7 +282,8 @@ be morale-crushing."]])
 
 ;;   - `:date`: This key denotes the date of the daily plan in the format "YYYY-MM-DD". It is used to compute the sun rise and set times.
 ;;   - `:label`: An arbitrary string, a label or description of the daily plan
-;;   - `:average-speed' [Optional]: The value associated with this key is expected to be
+;;   - `:color` [Optional]: Color used to draw the portion of route corresponding to the daily plan. It is used only if you provide a color for each day in the daily plan
+;;   - `:average-speed` [Optional]: The value associated with this key is expected to be
 ;;       a numerical value denoting speed, expressed as km/h.
 ;;   - `:activities`: This key holds a vector of activities planned for the day. Each activity is represented as a map containing:
 ;;     - `:start`: This key denotes the starting time of an activity, in the format "HH:mm"

src/rando_planner/leaflet.clj

@@ -15,6 +15,7 @@
       (assoc plan
              :points points
              :grouped-by-day (vals grouped-by-day)
+             :point-groups-colors (remove nil? (map :color (:daily-plans plan)))
              :center center
              :bounds bounds))
     plan))
@@ -100,13 +101,19 @@
                                             (.setView @m (clj->js (:center value)) (:zoom value)))
                                           (.addTo tile-layer @m)
                                           (when (:points value)
-                                            (let [point-groups (:grouped-by-day value)]
-                                              (js/console.log (count point-groups))
+                                            (let [point-groups (:grouped-by-day value)
+                                                  point-groups-colors (:point-groups-colors value)]
+                                              (js/console.log "here!")
+                                              (js/console.log point-groups-colors)
                                               (doall
                                                (for [[pp color] (map vector
                                                                      point-groups
-                                                                     (take (count point-groups)
-                                                                           (cycle '["#660e60","#893f71","#ac6f82","#cfa093","#f3d0a4"])))]
+                                                                     (if (= (count point-groups)
+                                                                            (count point-groups-colors))
+                                                                       point-groups-colors
+                                                                       ;; If the user didn't provide a color for each segment
+                                                                       (take (count point-groups)
+                                                                             (cycle '["orange" "green" "red"]))))]
                                                  (.addTo (.polyline js/L (clj->js (map (fn [{lat :lat, lon :lon} p]
                                                                                          [lat lon])
                                                                                        pp))