deploy: 3064732

a-b-street · Nov 2, 2024 · 4190971 · 4190971
1 parent c1d7361
commit 4190971
Show file tree

Hide file tree

Showing 22 changed files with 43 additions and 57 deletions.
diff --git a/assets/backend_bg.wasm b/assets/backend_bg.wasm
diff --git a/assets/main-8db54073.js → assets/main-c78a0624.js b/assets/main-8db54073.js → assets/main-c78a0624.js
diff --git a/assets/worker-9d0a8ef5.js → assets/worker-8c9d5013.js b/assets/worker-9d0a8ef5.js → assets/worker-8c9d5013.js
diff --git a/doc/graph/enum.Direction.html b/doc/graph/enum.Direction.html
diff --git a/doc/graph/enum.GtfsSource.html b/doc/graph/enum.GtfsSource.html
diff --git a/doc/graph/enum.PathStep.html b/doc/graph/enum.PathStep.html
diff --git a/doc/graph/struct.Graph.html b/doc/graph/struct.Graph.html
diff --git a/doc/graph/struct.GtfsModel.html b/doc/graph/struct.GtfsModel.html
diff --git a/doc/graph/struct.Intersection.html b/doc/graph/struct.Intersection.html
diff --git a/doc/graph/struct.IntersectionID.html b/doc/graph/struct.IntersectionID.html
diff --git a/doc/graph/struct.Position.html b/doc/graph/struct.Position.html
diff --git a/doc/graph/struct.ProfileID.html b/doc/graph/struct.ProfileID.html
diff --git a/doc/graph/struct.Road.html b/doc/graph/struct.Road.html
diff --git a/doc/graph/struct.RoadID.html b/doc/graph/struct.RoadID.html
diff --git a/doc/graph/struct.Route.html b/doc/graph/struct.Route.html
diff --git a/doc/graph/struct.Router.html b/doc/graph/struct.Router.html
diff --git a/doc/graph/struct.Timer.html b/doc/graph/struct.Timer.html
diff --git a/doc/search-index.js b/doc/search-index.js
diff --git a/doc/src/graph/scrape.rs.html b/doc/src/graph/scrape.rs.html
@@ -181,7 +181,7 @@
 <span class="kw">use </span>std::time::Duration;
 
 <span class="kw">use </span>anyhow::Result;
-<span class="kw">use </span>geo::{EuclideanLength, LineString};
+<span class="kw">use </span>geo::{Euclidean, Length, LineString};
 <span class="kw">use </span>utils::Tags;
 
 <span class="kw">use </span><span class="kw">crate</span>::gtfs::GtfsModel;
@@ -250,7 +250,7 @@
                 node1: e.osm_node1,
                 node2: e.osm_node2,
                 osm_tags: e.osm_tags,
-                length_meters: e.linestring.euclidean_length(),
+                length_meters: e.linestring.length::&lt;Euclidean&gt;(),
                 linestring: e.linestring,
 
                 access: Vec::new(),

diff --git a/doc/src/graph/snap.rs.html b/doc/src/graph/snap.rs.html
@@ -132,8 +132,8 @@
 <a href="#132" id="132">132</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>anyhow::Result;
 <span class="kw">use </span>geo::{
-    Closest, ClosestPoint, EuclideanDistance, EuclideanLength, LineInterpolatePoint,
-    LineLocatePoint, LineString,
+    Closest, ClosestPoint, Distance, Euclidean, Length, LineInterpolatePoint, LineLocatePoint,
+    LineString,
 };
 
 <span class="kw">use crate</span>::{Graph, IntersectionID, PathStep, ProfileID, Route};
@@ -181,7 +181,7 @@
                             </span><span class="kw">let </span>new_fraction_along = input.line_locate_point(<span class="kw-2">&amp;</span>pt)<span class="question-mark">?</span>;
                             <span class="kw">if </span>new_fraction_along &gt; fraction_along {
                                 <span class="kw">let </span>dist = (<span class="number">100.0
-                                    </span>* pt.euclidean_distance(<span class="kw-2">&amp;</span><span class="self">self</span>.intersections[i.<span class="number">0</span>].point))
+                                    </span>* Euclidean::distance(pt, <span class="self">self</span>.intersections[i.<span class="number">0</span>].point))
                                     <span class="kw">as </span>usize;
                                 <span class="prelude-val">Some</span>((i, step, dist, new_fraction_along))
                             } <span class="kw">else </span>{
@@ -240,8 +240,8 @@
 <span class="comment">// TODO Reconsider exposing
 </span><span class="kw">pub fn </span>score_similarity(ls1: <span class="kw-2">&amp;</span>LineString, ls2: <span class="kw-2">&amp;</span>LineString) -&gt; <span class="prelude-ty">Option</span>&lt;(f64, f64)&gt; {
     <span class="comment">// Just check length
-    </span><span class="kw">let </span>len1 = ls1.euclidean_length();
-    <span class="kw">let </span>len2 = ls2.euclidean_length();
+    </span><span class="kw">let </span>len1 = ls1.length::&lt;Euclidean&gt;();
+    <span class="kw">let </span>len2 = ls2.length::&lt;Euclidean&gt;();
     <span class="kw">let </span>len_pct = <span class="kw">if </span>len1 &lt; len2 {
         len2 / len1
     } <span class="kw">else </span>{
@@ -257,7 +257,7 @@
         </span><span class="kw">let </span>pt1 = ls1.line_interpolate_point(pct)<span class="question-mark">?</span>;
         <span class="kw">let </span>pt2 = ls2.line_interpolate_point(pct)<span class="question-mark">?</span>;
 
-        dist_between_equiv_pts += pt1.euclidean_distance(<span class="kw-2">&amp;</span>pt2);
+        dist_between_equiv_pts += Euclidean::distance(pt1, pt2);
     }
 
     <span class="prelude-val">Some</span>((len_pct, dist_between_equiv_pts))

diff --git a/doc/src/graph/transit_route.rs.html b/doc/src/graph/transit_route.rs.html
@@ -294,7 +294,7 @@
 
 <span class="kw">use </span>anyhow::{bail, <span class="prelude-ty">Result</span>};
 <span class="kw">use </span>chrono::NaiveTime;
-<span class="kw">use </span>geo::{EuclideanDistance, LineString};
+<span class="kw">use </span>geo::{Distance, Euclidean, LineString};
 <span class="kw">use </span>geojson::{Feature, GeoJson, Geometry};
 <span class="kw">use </span>utils::PriorityQueueItem;
 
@@ -326,7 +326,7 @@
         </span><span class="kw">let </span>heuristic = |i: IntersectionID| {
             <span class="kw">if </span>use_heuristic {
                 Duration::from_secs_f64(
-                    <span class="self">self</span>.intersections[i.<span class="number">0</span>].point.euclidean_distance(<span class="kw-2">&amp;</span>end_pt) / <span class="number">1.34112</span>,
+                    Euclidean::distance(<span class="self">self</span>.intersections[i.<span class="number">0</span>].point, end_pt) / <span class="number">1.34112</span>,
                 )
             } <span class="kw">else </span>{
                 Duration::ZERO

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>15-minute neighborhood tool</title>
-    <script type="module" crossorigin src="/15m/assets/main-8db54073.js"></script>
+    <script type="module" crossorigin src="/15m/assets/main-c78a0624.js"></script>
     <link rel="stylesheet" href="/15m/assets/index-4f769499.css">
   </head>
   <body>