Upgrade geo and related packages. No behavioral changes.

I was hoping this would solve #54, but the new iOverlay code isn't used for polygon-contains-linestring. WIP: Tests fail with this, need to investigate later.
a-b-street · Nov 9, 2024 · c78b5b9 · c78b5b9
1 parent ef6d48f
commit c78b5b9
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 161 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -13,16 +13,16 @@ console_error_panic_hook = "0.1.6"
 console_log = "1.0.0"
 contour = "0.12.0"
 fast_paths = "1.0.0"
-geo = { git = "https://github.com/dabreegster/geo", branch = "boolops_and_linesplit" }
+geo = "0.29.1"
 geojson = { git = "https://github.com/georust/geojson", features = ["geo-types"] }
 log = "0.4.20"
 osm-reader = { git = "https://github.com/a-b-street/osm-reader" }
 route-snapper-graph = { git = "https://github.com/dabreegster/route_snapper" }
+rstar = "0.12.0"
 serde = "1.0.188"
 serde_json = "1.0.105"
 serde-wasm-bindgen = "0.6.0"
-rstar = "0.12.0"
-utils = { git = "https://github.com/a-b-street/utils" }
+utils = { git = "https://github.com/a-b-street/utils", features = ["serde"] }
 wasm-bindgen = "0.2.87"
 web-sys = { version = "0.3.64", features = ["console"] }
 web-time = "1.0.0"

diff --git a/backend/src/cells.rs b/backend/src/cells.rs
@@ -177,6 +177,6 @@ fn floodfill(map: &MapModel, start: RoadID, neighbourhood: &Neighbourhood) -> Ce
     }
 }
 
-fn is_private(road: &Road) -> bool {
+fn is_private(_road: &Road) -> bool {
     false
 }
diff --git a/backend/src/geo_helpers.rs b/backend/src/geo_helpers.rs
@@ -1,7 +1,8 @@
 use geo::{
-    Contains, Intersects, LineInterpolatePoint, LineIntersection, LineLocatePoint, LineSplit,
-    LineString, Polygon,
+    Contains, Intersects, LineInterpolatePoint, LineIntersection, LineLocatePoint, LineString,
+    Polygon,
 };
+use utils::LineSplit;
 
 /// Looks for the first place ls2 crosses ls1. Returns the percent_along ls1 of that point.
 pub fn linestring_intersection(ls1: &LineString, ls2: &LineString) -> Option<f64> {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    fn is_private(road: &Road) -> bool {
+    fn is_private(_road: &Road) -> bool {
         false
     }