Work on routing.

docs/cloverage/index.html

@@ -104,16 +104,16 @@
 </tr>
 <tr>
  <td><a href="walkmap/stl.clj.html">walkmap.stl</a></td><td class="with-bar"><div class="covered"
-                                style="width:55.989583333333336%;
+                                style="width:54.716981132075475%;
-                                        float:left;"> 215 </div><div class="not-covered"
+                                        float:left;"> 203 </div><div class="not-covered"
-                                style="width:44.010416666666664%;
+                                style="width:45.283018867924525%;
-                                        float:left;"> 169 </div></td>
+                                        float:left;"> 168 </div></td>
-<td class="with-number">55.99 %</td>
+<td class="with-number">54.72 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:38.1578947368421%;
+                                style="width:39.473684210526315%;
-                                        float:left;"> 29 </div><div class="partial"
+                                        float:left;"> 30 </div><div class="partial"
-                                style="width:13.157894736842104%;
+                                style="width:11.842105263157896%;
-                                        float:left;"> 10 </div><div class="not-covered"
+                                        float:left;"> 9 </div><div class="not-covered"
                                 style="width:48.68421052631579%;
                                         float:left;"> 37 </div></td>
 <td class="with-number">51.32 %</td>
@@ -170,26 +170,26 @@
 </tr>
 <tr>
  <td><a href="walkmap/vertex.clj.html">walkmap.vertex</a></td><td class="with-bar"><div class="covered"
-                                style="width:83.91959798994975%;
+                                style="width:84.52380952380952%;
-                                        float:left;"> 167 </div><div class="not-covered"
+                                        float:left;"> 213 </div><div class="not-covered"
-                                style="width:16.08040201005025%;
+                                style="width:15.476190476190476%;
-                                        float:left;"> 32 </div></td>
+                                        float:left;"> 39 </div></td>
-<td class="with-number">83.92 %</td>
+<td class="with-number">84.52 %</td>
 <td class="with-bar"><div class="covered"
-                                style="width:60.60606060606061%;
+                                style="width:64.28571428571429%;
-                                        float:left;"> 20 </div><div class="partial"
+                                        float:left;"> 27 </div><div class="partial"
-                                style="width:21.21212121212121%;
+                                style="width:19.047619047619047%;
-                                        float:left;"> 7 </div><div class="not-covered"
+                                        float:left;"> 8 </div><div class="not-covered"
-                                style="width:18.181818181818183%;
+                                style="width:16.666666666666668%;
-                                        float:left;"> 6 </div></td>
+                                        float:left;"> 7 </div></td>
-<td class="with-number">81.82 %</td>
+<td class="with-number">83.33 %</td>
-<td class="with-number">66</td><td class="with-number">7</td><td class="with-number">33</td>
+<td class="with-number">79</td><td class="with-number">8</td><td class="with-number">42</td>
 </tr>
 <tr><td>Totals:</td>
 <td class="with-bar"></td>
-<td class="with-number">46.27 %</td>
+<td class="with-number">47.23 %</td>
 <td class="with-bar"></td>
-<td class="with-number">51.59 %</td>
+<td class="with-number">52.63 %</td>
    </tr>
   </table>
  </body>

docs/cloverage/walkmap/stl.clj.html

@@ -29,7 +29,7 @@
                 008              [walkmap.polygon :refer [polygon?]]
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                009&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[walkmap.vertex&nbsp;:refer&nbsp;[vertex-key]])
+                009&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[walkmap.vertex&nbsp;:refer&nbsp;[canonicalise-vertex]])
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
                 010&nbsp;&nbsp;&nbsp;&nbsp;(:import&nbsp;org.clojars.smee.binary.core.BinaryIO
@@ -211,8 +211,8 @@
 <span class="not-tracked" title="0 out of 0 forms covered">
                 069&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;if&nbsp;it&nbsp;has&nbsp;a&nbsp;value&nbsp;for&nbsp;:x&nbsp;it&#x27;s&nbsp;a&nbsp;vertex,&nbsp;but&nbsp;it&nbsp;doesn&#x27;t&nbsp;yet&nbsp;conform&nbsp;to&nbsp;`vertex?`
                 </span><br/>
-<span class="partial" title="18 out of 19 forms covered">
+<span class="covered" title="6 out of 6 forms covered">
-                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:x&nbsp;o)&nbsp;(assoc&nbsp;o&nbsp;:kind&nbsp;:vertex&nbsp;:id&nbsp;(or&nbsp;(:id&nbsp;o)&nbsp;(vertex-key&nbsp;o)))
+                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:x&nbsp;o)&nbsp;(canonicalise-vertex&nbsp;o)
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
                 071&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;shouldn&#x27;t&nbsp;happen

docs/cloverage/walkmap/superstructure.clj.html

@@ -95,10 +95,10 @@
                 030            (assoc vi (:id v) (assoc current (:id o) (:id v))))
                 </span><br/>
 <span class="not-covered" title="0 out of 4 forms covered">
-                031&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(Exception.&nbsp;&quot;Not&nbsp;a&nbsp;vertex:&nbsp;&quot;&nbsp;v)))
+                031&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;&quot;Not&nbsp;a&nbsp;vertex:&nbsp;&quot;&nbsp;v)))
                 </span><br/>
 <span class="not-covered" title="0 out of 10 forms covered">
-                032&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(Exception.&nbsp;(subs&nbsp;(str&nbsp;&quot;No&nbsp;`:id`&nbsp;value:&nbsp;&quot;&nbsp;o)&nbsp;0&nbsp;80))))
+                032&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;(subs&nbsp;(str&nbsp;&quot;No&nbsp;`:id`&nbsp;value:&nbsp;&quot;&nbsp;o)&nbsp;0&nbsp;80))))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
                 033&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;;;&nbsp;it&nbsp;shouldn&#x27;t&nbsp;actually&nbsp;be&nbsp;an&nbsp;error&nbsp;to&nbsp;try&nbsp;to&nbsp;index&nbsp;a&nbsp;vertex,&nbsp;but&nbsp;it
@@ -221,7 +221,7 @@
                 072&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else
                 </span><br/>
 <span class="not-covered" title="0 out of 13 forms covered">
-                073&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(Exception.&nbsp;(str&nbsp;&quot;Don&#x27;t&nbsp;know&nbsp;how&nbsp;to&nbsp;index&nbsp;&quot;&nbsp;(or&nbsp;(type&nbsp;o)&nbsp;&quot;nil&quot;)))))))
+                073&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;(str&nbsp;&quot;Don&#x27;t&nbsp;know&nbsp;how&nbsp;to&nbsp;index&nbsp;&quot;&nbsp;(or&nbsp;(type&nbsp;o)&nbsp;&quot;nil&quot;)))))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
                 074&nbsp;&nbsp;

docs/cloverage/walkmap/vertex.clj.html

@@ -38,7 +38,7 @@
                 011      (and (:x o) (:y o)) (keyword (str "vert{" (:x o) "|" (:y o) "}"))
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
-                012&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;(throw&nbsp;(Exception.&nbsp;&quot;Not&nbsp;a&nbsp;vertex.&quot;))))
+                012&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;&quot;Not&nbsp;a&nbsp;vertex.&quot;))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
                 013&nbsp;&nbsp;
@@ -131,76 +131,115 @@
                 042&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                043&nbsp;&nbsp;(def&nbsp;ensure3d
+                043&nbsp;&nbsp;(defn&nbsp;canonicalise-vertex
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                044&nbsp;&nbsp;&nbsp;&nbsp;&quot;Given&nbsp;a&nbsp;vertex&nbsp;`o`,&nbsp;if&nbsp;`o`&nbsp;has&nbsp;a&nbsp;`:z`&nbsp;value,&nbsp;just&nbsp;return&nbsp;`o`;&nbsp;otherwise
+                044&nbsp;&nbsp;&nbsp;&nbsp;&quot;If&nbsp;`o`&nbsp;is&nbsp;a&nbsp;map&nbsp;with&nbsp;numeric&nbsp;values&nbsp;for&nbsp;`:x`,&nbsp;`:y`&nbsp;and&nbsp;optionally&nbsp;`:z`,
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                045&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;a&nbsp;vertex&nbsp;like&nbsp;`o`&nbsp;but&nbsp;having&nbsp;thie&nbsp;`dflt`&nbsp;value&nbsp;as&nbsp;the&nbsp;value&nbsp;of&nbsp;its
+                045&nbsp;&nbsp;&nbsp;&nbsp;upgrade&nbsp;it&nbsp;to&nbsp;something&nbsp;we&nbsp;will&nbsp;recognise&nbsp;as&nbsp;a&nbsp;vertex.&quot;
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                046&nbsp;&nbsp;&nbsp;&nbsp;`:z`&nbsp;key,&nbsp;or&nbsp;zero&nbsp;as&nbsp;the&nbsp;value&nbsp;of&nbsp;its&nbsp;`:z`&nbsp;key&nbsp;if&nbsp;`dflt`&nbsp;is&nbsp;not&nbsp;specified.
+                046&nbsp;&nbsp;&nbsp;&nbsp;[o]
-                </span><br/>
-<span class="blank" title="0 out of 0 forms covered">
-                047&nbsp;&nbsp;
-                </span><br/>
-<span class="not-tracked" title="0 out of 0 forms covered">
-                048&nbsp;&nbsp;&nbsp;&nbsp;If&nbsp;`o`&nbsp;is&nbsp;not&nbsp;a&nbsp;vertex,&nbsp;throws&nbsp;an&nbsp;exception.&quot;
-                </span><br/>
-<span class="covered" title="2 out of 2 forms covered">
-                049&nbsp;&nbsp;&nbsp;&nbsp;(memoize
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                050&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fn
+                047&nbsp;&nbsp;&nbsp;&nbsp;(if
+                </span><br/>
+<span class="partial" title="13 out of 17 forms covered">
+                048&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(and
+                </span><br/>
+<span class="covered" title="3 out of 3 forms covered">
+                049&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(map?&nbsp;o)
+                </span><br/>
+<span class="covered" title="5 out of 5 forms covered">
+                050&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number?&nbsp;(:x&nbsp;o))
+                </span><br/>
+<span class="covered" title="5 out of 5 forms covered">
+                051&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(number?&nbsp;(:y&nbsp;o))
+                </span><br/>
+<span class="covered" title="9 out of 9 forms covered">
+                052&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(or&nbsp;(nil?&nbsp;(:z&nbsp;o))&nbsp;(number?&nbsp;(:z&nbsp;o))))
+                </span><br/>
+<span class="covered" title="9 out of 9 forms covered">
+                053&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;o&nbsp;:kind&nbsp;:vertex&nbsp;:id&nbsp;(vertex-key&nbsp;o))
+                </span><br/>
+<span class="not-covered" title="0 out of 3 forms covered">
+                054&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;&quot;Not&nbsp;a&nbsp;vertex.&quot;))))
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                055&nbsp;&nbsp;
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                056&nbsp;&nbsp;(def&nbsp;ensure3d
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                051&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([o]
+                057&nbsp;&nbsp;&nbsp;&nbsp;&quot;Given&nbsp;a&nbsp;vertex&nbsp;`o`,&nbsp;if&nbsp;`o`&nbsp;has&nbsp;a&nbsp;`:z`&nbsp;value,&nbsp;just&nbsp;return&nbsp;`o`;&nbsp;otherwise
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                058&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;a&nbsp;vertex&nbsp;like&nbsp;`o`&nbsp;but&nbsp;having&nbsp;thie&nbsp;`dflt`&nbsp;value&nbsp;as&nbsp;the&nbsp;value&nbsp;of&nbsp;its
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                059&nbsp;&nbsp;&nbsp;&nbsp;`:z`&nbsp;key,&nbsp;or&nbsp;zero&nbsp;as&nbsp;the&nbsp;value&nbsp;of&nbsp;its&nbsp;`:z`&nbsp;key&nbsp;if&nbsp;`dflt`&nbsp;is&nbsp;not&nbsp;specified.
+                </span><br/>
+<span class="blank" title="0 out of 0 forms covered">
+                060&nbsp;&nbsp;
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                061&nbsp;&nbsp;&nbsp;&nbsp;If&nbsp;`o`&nbsp;is&nbsp;not&nbsp;a&nbsp;vertex,&nbsp;throws&nbsp;an&nbsp;exception.&quot;
+                </span><br/>
+<span class="covered" title="2 out of 2 forms covered">
+                062&nbsp;&nbsp;&nbsp;&nbsp;(memoize
+                </span><br/>
+<span class="covered" title="1 out of 1 forms covered">
+                063&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fn
+                </span><br/>
+<span class="not-tracked" title="0 out of 0 forms covered">
+                064&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([o]
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                052&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(ensure3d&nbsp;o&nbsp;0.0))
+                065&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(ensure3d&nbsp;o&nbsp;0.0))
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                053&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([o&nbsp;dflt]
+                066&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;([o&nbsp;dflt]
                 </span><br/>
 <span class="partial" title="2 out of 3 forms covered">
-                054&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond
+                067&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(cond
                 </span><br/>
 <span class="partial" title="5 out of 8 forms covered">
-                055&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(not&nbsp;(vertex?&nbsp;o))&nbsp;(throw&nbsp;(Exception.&nbsp;&quot;Not&nbsp;a&nbsp;vertex!&quot;))
+                068&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(not&nbsp;(vertex?&nbsp;o))&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;&quot;Not&nbsp;a&nbsp;vertex!&quot;))
                 </span><br/>
 <span class="covered" title="4 out of 4 forms covered">
-                056&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:z&nbsp;o)&nbsp;o
+                069&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(:z&nbsp;o)&nbsp;o
                 </span><br/>
 <span class="not-covered" title="0 out of 5 forms covered">
-                057&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;(assoc&nbsp;o&nbsp;:z&nbsp;dflt))))))
+                070&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:else&nbsp;(assoc&nbsp;o&nbsp;:z&nbsp;dflt))))))
                 </span><br/>
 <span class="blank" title="0 out of 0 forms covered">
-                058&nbsp;&nbsp;
+                071&nbsp;&nbsp;
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                059&nbsp;&nbsp;(def&nbsp;ensure2d
+                072&nbsp;&nbsp;(def&nbsp;ensure2d
                 </span><br/>
 <span class="not-tracked" title="0 out of 0 forms covered">
-                060&nbsp;&nbsp;&nbsp;&nbsp;&quot;If&nbsp;`o`&nbsp;is&nbsp;a&nbsp;vertex,&nbsp;set&nbsp;its&nbsp;`:z`&nbsp;value&nbsp;to&nbsp;zero;&nbsp;else&nbsp;throw&nbsp;an&nbsp;exception.&quot;
+                073&nbsp;&nbsp;&nbsp;&nbsp;&quot;If&nbsp;`o`&nbsp;is&nbsp;a&nbsp;vertex,&nbsp;set&nbsp;its&nbsp;`:z`&nbsp;value&nbsp;to&nbsp;zero;&nbsp;else&nbsp;throw&nbsp;an&nbsp;exception.&quot;
                 </span><br/>
 <span class="covered" title="2 out of 2 forms covered">
-                061&nbsp;&nbsp;&nbsp;&nbsp;(memoize
+                074&nbsp;&nbsp;&nbsp;&nbsp;(memoize
                 </span><br/>
 <span class="covered" title="1 out of 1 forms covered">
-                062&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fn&nbsp;[o]
+                075&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(fn&nbsp;[o]
                 </span><br/>
 <span class="not-covered" title="0 out of 1 forms covered">
-                063&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if
+                076&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(if
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
-                064&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vertex?&nbsp;o)
+                077&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(vertex?&nbsp;o)
                 </span><br/>
 <span class="not-covered" title="0 out of 5 forms covered">
-                065&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;o&nbsp;:z&nbsp;0.0)
+                078&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(assoc&nbsp;o&nbsp;:z&nbsp;0.0)
                 </span><br/>
 <span class="not-covered" title="0 out of 3 forms covered">
-                066&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(Exception.&nbsp;&quot;Not&nbsp;a&nbsp;vertex!&quot;))))))
+                079&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(throw&nbsp;(IllegalArgumentException.&nbsp;&quot;Not&nbsp;a&nbsp;vertex!&quot;))))))
                 </span><br/>
  </body>
 </html>

src/walkmap/edge.clj

@@ -8,7 +8,7 @@
             [walkmap.vertex :refer [ensure3d vertex?]]))
 
 (defn edge?
-  "True if `o` satisfies the conditions for a path. A path shall be a map
+  "True if `o` satisfies the conditions for a edge. An edge shall be a map
   having the keys `:start` and `:end`, such that the values of each of those
   keys shall be a vertex."
   [o]
@@ -19,7 +19,10 @@
 
 (defn path->edges
   "if `o` is a path, a polygon, or a sequence of vertices, return a sequence of
-  edges representing that path, polygon or sequence."
+  edges representing that path, polygon or sequence.
+
+  Throws `IllegalArgumentException` if `o` is not a path, a polygon, or
+  sequence of vertices."
   [o]
   (cond
     (seq? o)
@@ -34,7 +37,10 @@
     (path? o)
     (path->edges (:nodes o))
     (polygon? o)
-    (path->edges (polygon->path o))))
+    (path->edges (polygon->path o))
+    :else
+    (throw (IllegalArgumentException.
+             "Not a path, polygon, or sequence of vertices!"))))
 
 (defn length
   "Return the length of the edge `e`."

src/walkmap/stl.clj

@@ -6,7 +6,7 @@
             [org.clojars.smee.binary.core :as b]
             [taoensso.timbre :as l :refer [info error spy]]
             [walkmap.polygon :refer [polygon?]]
-            [walkmap.vertex :refer [vertex-key]])
+            [walkmap.vertex :refer [canonicalise-vertex]])
   (:import org.clojars.smee.binary.core.BinaryIO
            java.io.DataInput))
 
@@ -67,7 +67,7 @@
                     :kind :polygon
                     :vertices (canonicalise (:vertices o)))
     ;; if it has a value for :x it's a vertex, but it doesn't yet conform to `vertex?`
-    (:x o) (assoc o :kind :vertex :id (or (:id o) (vertex-key o)))
+    (:x o) (canonicalise-vertex o)
     ;; shouldn't happen
     :else o))
 

src/walkmap/superstructure.clj

@@ -28,8 +28,8 @@
           ;; deep-merge doesn't merge sets, only maps; so at this
           ;; stage we need to build a map.
           (assoc vi (:id v) (assoc current (:id o) (:id v))))
-        (throw (Exception. "Not a vertex: " v)))
+        (throw (IllegalArgumentException. "Not a vertex: " v)))
-      (throw (Exception. (subs (str "No `:id` value: " o) 0 80))))
+      (throw (IllegalArgumentException. (subs (str "No `:id` value: " o) 0 80))))
     ;; it shouldn't actually be an error to try to index a vertex, but it
     ;; also isn't useful to do so, so I'd be inclined to ignore it.
     (:vertex-index s)))
@@ -70,7 +70,5 @@
     (coll? o) (reduce u/deep-merge (map #(add-to-superstructure s %) o))
     (nil? o) o
     :else
-    (throw (Exception. (str "Don't know how to index " (or (type o) "nil")))))))
+    (throw (IllegalArgumentException. (str "Don't know how to index " (or (type o) "nil")))))))
 
-(:vertex-index (add-to-superstructure (:facets (s/decode-binary-stl "resources/isle_of_man.stl"))))
-(s/decode-binary-stl "resources/isle_of_man.stl")

src/walkmap/vertex.clj

@@ -9,7 +9,7 @@
   (cond
     (and (:x o) (:y o) (:z o)) (keyword (str "vert{" (:x o) "|" (:y o) "|" (:z o) "}"))
     (and (:x o) (:y o)) (keyword (str "vert{" (:x o) "|" (:y o) "}"))
-    :else (throw (Exception. "Not a vertex."))))
+    :else (throw (IllegalArgumentException. "Not a vertex."))))
 
 (defn vertex?
   "True if `o` satisfies the conditions for a vertex. That is, essentially,
@@ -40,6 +40,19 @@
   ([x y z]
    (assoc (make-vertex x y) :z z)))
 
+(defn canonicalise-vertex
+  "If `o` is a map with numeric values for `:x`, `:y` and optionally `:z`,
+  upgrade it to something we will recognise as a vertex."
+  [o]
+  (if
+    (and
+      (map? o)
+      (number? (:x o))
+      (number? (:y o))
+      (or (nil? (:z o)) (number? (:z o))))
+    (assoc o :kind :vertex :id (vertex-key o))
+    (throw (IllegalArgumentException. "Not a vertex."))))
+
 (def ensure3d
   "Given a vertex `o`, if `o` has a `:z` value, just return `o`; otherwise
   return a vertex like `o` but having thie `dflt` value as the value of its
@@ -52,7 +65,7 @@
        (ensure3d o 0.0))
       ([o dflt]
        (cond
-         (not (vertex? o)) (throw (Exception. "Not a vertex!"))
+         (not (vertex? o)) (throw (IllegalArgumentException. "Not a vertex!"))
          (:z o) o
          :else (assoc o :z dflt))))))
 
@@ -63,4 +76,4 @@
       (if
         (vertex? o)
         (assoc o :z 0.0)
-        (throw (Exception. "Not a vertex!"))))))
+        (throw (IllegalArgumentException. "Not a vertex!"))))))