a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-28 17:04:20 +03:00
Code Issues Projects Releases Wiki Activity

update to geo 0.20.1

Browse Source
This commit is contained in:
Michael Kirk 2022-04-20 18:57:22 -07:00 committed by Dustin Carlino
parent b64874b92c
commit d76bb3fbbd
8 changed files with 17 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Cargo.lock generated
View File

@ -302,25 +302,6 @@ dependencies = [
"url",
]
[[package]]
name = "cbindgen"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc"
dependencies = [
"clap",
"heck 0.3.3",
"indexmap",
"log",
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"tempfile",
"toml",
]
[[package]]
name = "cc"
version = "1.0.68"
@ -1363,9 +1344,9 @@ dependencies = [
[[package]]
name = "geo"
version = "0.19.0"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61faf6a68f9432b5287c393268e86a07e4dfed79e6e0962b0e6e59b2f70c77d8"
checksum = "d7e2e3be15682a45e9dfe9a04f84bff275390047204ab22f3c6b2312fcfb9e24"
dependencies = [
"geo-types",
"geographiclib-rs",
@ -1388,9 +1369,9 @@ dependencies = [
[[package]]
name = "geo-types"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "658ffd4025e593f0b64e8fa7a1afc4082e4471ac823034b9d4e338edc9adc6fb"
checksum = "a9537881a3d2941ff3fe901e744c45f0fa4c142334f499f27d26be1d72299ba8"
dependencies = [
"approx",
"num-traits",
@ -2895,9 +2876,8 @@ dependencies = [
[[package]]
name = "polylabel"
version = "2.4.0"
source = "git+https://github.com/urschrei/polylabel-rs#4ac85aaa652825784186ee8344a0d9a6c446be16"
source = "git+https://github.com/michaelkirk/polylabel-rs?branch=mkirk/optional-cbindgen#b96b417659d82ebe3a409b499d8669ff36d7ffe8"
dependencies = [
"cbindgen",
"geo",
"libc",
"num-traits",
@ -3167,15 +3147,6 @@ version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "remove_dir_all"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
]
[[package]]
name = "reqwest"
version = "0.11.3"
@ -3737,20 +3708,6 @@ dependencies = [
"version-compare",
]
[[package]]
name = "tempfile"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
"cfg-if 1.0.0",
"libc",
"rand",
"redox_syscall",
"remove_dir_all",
"winapi",
]
[[package]]
name = "termcolor"
version = "1.1.2"

5
Cargo.toml
View File

@ -36,3 +36,8 @@ opt-level = 3
[patch.crates-io]
# Waiting for release: https://github.com/21re/rust-geo-booleanop/pull/27
geo-booleanop = { git = "https://github.com/21re/rust-geo-booleanop" }
# Waiting for release: https://github.com/urschrei/polylabel-rs/pull/18 (updates geo)
# Waiting for merge and release: https://github.com/urschrei/polylabel-rs/pull/21 (makes cbindgen optional to avoid redundant, unused, clap dependency)
polylabel = { git = "https://github.com/michaelkirk/polylabel-rs", branch="mkirk/optional-cbindgen" }

2
apps/game/Cargo.toml
View File

@ -28,7 +28,7 @@ downcast-rs = "1.2.0"
enumset = "1.0.3"
fs-err = "2.6.0"
futures-channel = { version = "0.3.12"}
geo = "0.19"
geo = "0.20.1"
geojson = { version = "0.22.2", features = ["geo-types"] }
geom = { path = "../../geom" }
getrandom = { version = "0.2.3", optional = true }

2
apps/ltn/Cargo.toml
View File

@ -18,7 +18,7 @@ anyhow = "1.0.38"
contour = "0.4.0"
flate2 = "1.0.20"
fs-err = "2.6.0"
geo = "0.19"
geo = "0.20.1"
geojson = { version = "0.22.2", features = ["geo-types"] }
geom = { path = "../../geom" }
getrandom = { version = "0.2.3", optional = true }

2
cli/Cargo.toml
View File

@ -10,7 +10,7 @@ abstutil = { path = "../abstutil" }
anyhow = "1.0.38"
csv = "1.1.4"
fs-err = "2.6.0"
geo = "0.19"
geo = "0.20.1"
geojson = { version = "0.22.2", features = ["geo-types"] }
geom = { path = "../geom" }
importer = { path = "../importer" }

4
geom/Cargo.toml
View File

@ -10,13 +10,13 @@ abstutil = { path = "../abstutil" }
anyhow = "1.0.38"
earcutr = "0.1.1"
fs-err = "2.6.0"
geo = "0.19"
geo = "0.20.1"
geo-booleanop = "0.3.2"
geojson = { version = "0.22.0", features = ["geo-types"] }
histogram = "0.6.9"
instant = "0.1.7"
ordered-float = { version = "2.4.0", features=["serde"] }
polylabel = { git = "https://github.com/urschrei/polylabel-rs" }
polylabel = "2.4.0"
serde = "1.0.123"
[dev-dependencies]

2
importer/Cargo.toml
View File

@ -16,7 +16,7 @@ anyhow = "1.0.38"
collisions = { path = "../collisions" }
convert_osm = { path = "../convert_osm" }
csv = "1.1.4"
geo = "0.19"
geo = "0.20.1"
geojson = { version = "0.22.2", features = ["geo-types"] }
geom = { path = "../geom" }
gdal = { version = "0.8.0", optional = true }

2
popdat/Cargo.toml
View File

@ -10,7 +10,7 @@ abstutil = { path = "../abstutil" }
anyhow = "1.0.38"
flatgeobuf = { version = "0.5" }
futures = "0.3.12"
geo = "0.19"
geo = "0.20.1"
geojson = { version = "0.22.2", features = ["geo-types"] }
geom = { path = "../geom" }
geozero = "0.7"