enhance naming

Author: sprocketc

src/renderer/element/handlers.cljs

@@ -424,7 +424,7 @@
   (let [svgs (reverse (root-svgs db))
         pointer-pos (:adjusted-pointer-pos db)]
     (or
-     (some #(when (bounds/contained-point? (:bounds %) pointer-pos) %) svgs)
+     (some #(when (bounds/contain-point? (:bounds %) pointer-pos) %) svgs)
      (element db :canvas))))
 
 (defn translate
@@ -501,7 +501,7 @@
         el-bounds (tool/bounds el)]
     (or
      (some #(when (bounds/contained? el-bounds (:bounds %)) %) svgs)
-     (some #(when (bounds/intersected? el-bounds (:bounds %)) %) svgs)
+     (some #(when (bounds/intersect? el-bounds (:bounds %)) %) svgs)
      (element db :canvas))))
 
 (defn create

src/renderer/tool/transform/select.cljs

@@ -69,7 +69,7 @@
   (let [{{:keys [x y width height]} :attrs} (element.h/get-temp db)
         selection-bounds [x y (+ x width) (+ y height)]]
     (if intersecting?
-      (bounds/intersected? (:bounds el) selection-bounds)
+      (bounds/intersect? (:bounds el) selection-bounds)
       (bounds/contained? (:bounds el) selection-bounds))))
 
 (defn reduce-by-area

src/renderer/utils/bounds.cljs

@@ -3,7 +3,7 @@
    [clojure.core.matrix :as mat]))
 
 (defn from-bbox
-  "Experimental way of getting the bounds of uknown or complicated elements 
+  "Experimental way of getting the bounds of uknown or complicated elements
    using the getBBox method.
    https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement/getBBox"
   [el]
@@ -30,7 +30,7 @@
   (let [[x1 y1 _x2 _y2] bounds]
     (mat/add [x1 y1] (mat/div (->dimensions bounds) 2))))
 
-(defn intersected?
+(defn intersect?
   [a-bounds b-bounds]
   (when (and a-bounds b-bounds)
     (let [[a-left a-top a-right a-bottom] a-bounds
@@ -50,7 +50,7 @@
            (< a-right b-right)
            (< a-bottom b-bottom)))))
 
-(defn contained-point?
+(defn contain-point?
   [[left top right bottom] [x y]]
   (and (<= left x)
        (<= top y)

test/bounds_test.cljs

@@ -10,25 +10,25 @@
     (is (= (bounds/union [11 11 11 11] [0 0 0 0]) [0 0 11 11]))))
 
 
-(deftest test-intersected?
+(deftest test-intersect?
   (testing "bounds are intesrecting"
-    (is (= (bounds/intersected? [0 0 10 10] [11 11 20 20]) false))
-    (is (= (bounds/intersected? [0 0 10 10] [9 9 20 20]) true))
-    (is (= (bounds/intersected? [0 0 10 10] [10 10 11 11]) true))))
+    (is (= (bounds/intersect? [0 0 10 10] [11 11 20 20]) false))
+    (is (= (bounds/intersect? [0 0 10 10] [9 9 20 20]) true))
+    (is (= (bounds/intersect? [0 0 10 10] [10 10 11 11]) true))))
 
 (deftest test-contained?
   (testing "bounds are contained"
     (is (= (bounds/contained? [0 0 10 10] [0 0 10 10]) false))
     (is (= (bounds/contained? [5 5 10 10] [0 0 20 20]) true))
     (is (= (bounds/contained? [0 0 10 10] [1 1 10 10]) false))))
 
-(deftest test-contained-point?
+(deftest test-contain-point?
   (testing "bounds contain point"
-    (is (= (bounds/contained-point? [0 0 10 10] [0 0]) true))
-    (is (= (bounds/contained-point? [0 0 10 10] [5 5]) true))
-    (is (= (bounds/contained-point? [0 0 10 10] [10 10]) true))
-    (is (= (bounds/contained-point? [0 0 10 10] [-5 5]) false))
-    (is (= (bounds/contained-point? [0 0 10 10] [5 -5]) false))))
+    (is (= (bounds/contain-point? [0 0 10 10] [0 0]) true))
+    (is (= (bounds/contain-point? [0 0 10 10] [5 5]) true))
+    (is (= (bounds/contain-point? [0 0 10 10] [10 10]) true))
+    (is (= (bounds/contain-point? [0 0 10 10] [-5 5]) false))
+    (is (= (bounds/contain-point? [0 0 10 10] [5 -5]) false))))
 
 (deftest test-center
   (testing "center of bounds"