3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-07 21:32:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Refactor svg uploads

Browse source
This commit is contained in:
alonso.torres 2021-01-13 10:46:24 +01:00 • committed by Alonso Torres
parent b999c05d1e
commit 25824629f2
8 changed files with 216 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/app/util/geom/path.cljs
View file

@ -180,6 +180,48 @@
param-list (command->param-list entry)]
(str/fmt "%s%s" command-str (str/join " " param-list))))
(defn cmd-pos [{:keys [params]}]
(when (and (contains? params :x)
(contains? params :y))
(gpt/point params)))
(defn simplify-commands
"Removes some commands and convert relative to absolute coordinates"
[commands]
(let [simplify-command
(fn [[pos result] [command prev]]
(let [command
(cond-> command
(= :line-to-horizontal (:command command))
(-> (assoc :command :line-to)
(update :params dissoc :value)
(assoc-in [:params :x] (get-in command [:params :value]))
(assoc-in [:params :y] (if (:relative command) 0 (:y pos))))
(= :line-to-vertical (:command command))
(-> (assoc :command :line-to)
(update :params dissoc :value)
(assoc-in [:params :y] (get-in command [:params :value]))
(assoc-in [:params :x] (if (:relative command) 0 (:x pos))))
(:relative command)
(-> (assoc :relative false)
(cd/update-in-when [:params :x] + (:x pos))
(cd/update-in-when [:params :y] + (:y pos)))
)]
[(cmd-pos command) (conj result command)]))
start (first commands)
start-pos (cmd-pos start)]
(->> (map vector (rest commands) commands)
(reduce simplify-command [start-pos [start]])
(second))))
(defn path->content [string]
(let [clean-string (-> string
(str/trim)
@ -188,7 +230,8 @@
;; Remove all consecutive spaces
(str/replace #"\s+" " "))
commands (re-seq commands-regex clean-string)]
(mapcat parse-command commands)))
(-> (mapcat parse-command commands)
(simplify-commands))))
(defn content->path [content]
(->> content