Skip to content

Commit f0ef919

Browse files
committed
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. The cells in the test output change, but visually and behaviorally they're identical.
1 parent 76b5180 commit f0ef919

11 files changed

+99
-162
lines changed

backend/Cargo.lock

+64-132
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ console_error_panic_hook = "0.1.6"
1313
console_log = "1.0.0"
1414
contour = "0.12.0"
1515
fast_paths = "1.0.0"
16-
geo = { git = "https://github.com/dabreegster/geo", branch = "boolops_and_linesplit" }
16+
geo = "0.29.1"
1717
geojson = { git = "https://github.com/georust/geojson", features = ["geo-types"] }
1818
log = "0.4.20"
1919
osm-reader = { git = "https://github.com/a-b-street/osm-reader" }
2020
route-snapper-graph = { git = "https://github.com/dabreegster/route_snapper" }
21+
rstar = "0.12.0"
2122
serde = "1.0.188"
2223
serde_json = "1.0.105"
2324
serde-wasm-bindgen = "0.6.0"
24-
rstar = "0.12.0"
25-
utils = { git = "https://github.com/a-b-street/utils" }
25+
utils = { git = "https://github.com/a-b-street/utils", features = ["serde"] }
2626
wasm-bindgen = "0.2.87"
2727
web-sys = { version = "0.3.64", features = ["console"] }
2828
web-time = "1.0.0"

backend/src/geo_helpers.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use geo::{
2-
Contains, Intersects, LineInterpolatePoint, LineIntersection, LineLocatePoint, LineSplit,
3-
LineString, Polygon,
2+
Contains, Intersects, LineInterpolatePoint, LineIntersection, LineLocatePoint, LineString,
3+
Polygon,
44
};
5+
use utils::LineSplit;
56

67
/// Looks for the first place ls2 crosses ls1. Returns the percent_along ls1 of that point.
78
pub fn linestring_intersection(ls1: &LineString, ls2: &LineString) -> Option<f64> {

0 commit comments

Comments
 (0)