Skip to content

Commit 0c9d52b

Browse files
robfitzgeraldrobfitzgerald
authored
Merge pull request #10 from NREL/rjf/pub-reqs
Rjf/pub reqs
2 parents ec638ed + 8d17943 commit 0c9d52b

36 files changed

+195
-121
lines changed

‎rust/Cargo.toml‎

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,54 @@
11
[workspace]
22
resolver = "2"
3-
members = ["bambam", "bambam-osm", "bambam-gtfs", "bambam-overturemaps"]
3+
members = ["bambam", "bambam-osm", "bambam-gtfs", "bambam-omf"]
44

55
[workspace.dependencies]
6-
kdam = "0.6.2"
6+
7+
# nrel
78
bamcensus-core = { version = "0.1.0" }
89
bamcensus-acs = { version = "0.1.0" }
910
bamcensus = { version = "0.1.0" }
1011
bamcensus-lehd = { version = "0.1.0" }
1112
routee-compass = { version = "0.14.0" }
1213
routee-compass-core = { version = "0.14.0" }
1314
routee-compass-powertrain = { version = "0.14.0" }
14-
uom = { version = "0.37.0", features = ["serde"]}
15+
16+
# third party
17+
arrow = { version = "55.0.0" }
18+
chrono = { version = "0.4.41", features = ["serde"] }
19+
clap = { version = "4.3.19", features = ["derive"] }
20+
config = "0.15.11"
21+
csv = "1.3.1"
22+
downloader = { version = "0.2.8" }
23+
env_logger = "0.11.3"
24+
flate2 = "1.0"
25+
futures = { version = "0.3.31", features = ["executor"] }
26+
geo = { version = "0.30.0", features = ["use-serde"] }
27+
geo-buffer = "0.2.0"
28+
geojson = { version = "0.24.1" }
29+
geozero = { version = "0.14.0", features = ["with-wkb"] }
30+
gtfs-structures = "0.43.0"
31+
h3o = { version = "0.8.0", features = ["serde", "geo"] }
32+
hex = "0.4.3"
33+
itertools = { version = "0.14.0" }
34+
kdam = "0.6.2"
35+
log = "0.4.19"
36+
num-traits = "0.2.19"
37+
object_store = { "version" = "0.12.0", features = ["aws"] }
38+
osmio = "0.14.0"
39+
osmpbf = "0.3.4"
40+
parquet = { version = "55.0.0", features = ["snap", "async", "object_store"] }
41+
rayon = "1.10.0"
42+
regex = { version = "1.11.1" }
43+
reqwest = { version = "0.12.12", features = ["blocking"] }
44+
rstar = { version = "0.12.0" }
45+
serde = { version = "1.0.160", features = ["derive"] }
46+
serde_json = { version = "1.0" }
47+
skiplist = "0.5.1"
48+
thiserror = "2.0.12"
49+
tokio = "1.39.2"
50+
toml = { version = "0.8.20" }
51+
uom = { version = "0.37.0", features = ["serde"]}
52+
wkb = "0.7.1"
53+
wkt = { version = "0.13.0", features = ["serde"] }
54+
zip = "2.1.3"

‎rust/bambam-gtfs/Cargo.toml‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,47 @@
22
name = "bambam-gtfs"
33
version = "0.1.0"
44
edition = "2021"
5+
license = "BSD-3-Clause"
6+
exclude = ["test", "**/.DS_Store", "target/"]
57
readme = "README.md"
8+
repository = "https://github.com/NREL/bambam-gtfs"
9+
documentation = "https://docs.rs/bambam-gtfs"
610
description = "GTFS Command Line Utilities for The Behavior and Advanced Mobility Big Access Model"
7-
documentation = "pages.github.nrel.gov/BAM/bambam-gtfs"
11+
keywords = [
12+
"nrel",
13+
"access-model",
14+
"accessibility",
15+
"routing",
16+
"reachability",
17+
"transit",
18+
"multimodal",
19+
"routee",
20+
]
21+
categories = ["command-line-utilities", "science", "science::geo"]
822

923
[dependencies]
1024

11-
log = "0.4.19"
12-
itertools = { version = "0.14.0" }
13-
chrono = { version = "0.4.41", features = ["serde"] }
14-
skiplist = "0.5.1"
15-
zip = "2.1.3"
16-
# rusqlite = { version = "0.32.1", features = ["bundled"] }
17-
18-
env_logger = "0.11.3"
19-
config = "0.15.11"
20-
thiserror = "2.0.12"
25+
chrono = { workspace = true }
26+
clap = { workspace = true }
27+
config = { workspace = true }
28+
csv = { workspace = true }
29+
downloader = { workspace = true }
30+
env_logger = { workspace = true }
31+
flate2 = { workspace = true }
32+
geo = { workspace = true }
33+
geojson = { workspace = true }
34+
gtfs-structures = { workspace = true }
35+
h3o = { workspace = true }
36+
itertools = { workspace = true }
2137
kdam = { workspace = true }
22-
clap = { version = "4.3.19", features = ["derive"] }
23-
24-
serde = { version = "1.0.160", features = ["derive"] }
25-
serde_json = { version = "1.0" }
26-
csv = { version = "1.2.2" }
27-
flate2 = "1.0"
28-
29-
rstar = { version = "0.12.0" }
30-
geo = { version = "0.30.0", features = ["use-serde"] }
31-
wkt = { version = "0.13.0", features = ["serde"] }
32-
wkb = "0.7.1"
33-
geojson = { version = "0.24.1" }
34-
# shapefile = "0.6.0"
35-
36-
h3o = { version = "0.6.4", features = ["serde", "geo"] }
37-
gtfs-structures = "0.43.0"
38-
39-
rayon = "1.10.0"
40-
tokio = "1.39.2"
41-
downloader = { version = "0.2.8" }
38+
log = { workspace = true }
39+
rayon = { workspace = true }
40+
rstar = { workspace = true }
41+
serde = { workspace = true }
42+
serde_json = { workspace = true }
43+
skiplist = { workspace = true }
44+
thiserror = { workspace = true }
45+
tokio = { workspace = true }
46+
wkb = { workspace = true }
47+
wkt = { workspace = true }
48+
zip = { workspace = true }

‎rust/bambam-omf/Cargo.toml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
[package]
2+
name = "bambam-omf"
3+
version = "0.1.0"
4+
edition = "2021"
5+
license = "BSD-3-Clause"
6+
exclude = ["test", "**/.DS_Store", "target/"]
7+
readme = "README.md"
8+
repository = "https://github.com/NREL/bambam-omf"
9+
documentation = "https://docs.rs/bambam-omf"
10+
description = "OvertureMaps Foundation support for The Behavior and Advanced Mobility Big Access Model"
11+
keywords = [
12+
"nrel",
13+
"access-model",
14+
"accessibility",
15+
"routing",
16+
"reachability",
17+
"transit",
18+
"multimodal",
19+
"routee",
20+
]
21+
categories = ["command-line-utilities", "science", "science::geo"]
22+
23+
[dependencies]
24+
bamcensus-core = { workspace = true }
25+
bamcensus-acs = { workspace = true }
26+
bamcensus-lehd = { workspace = true }
27+
bamcensus = { workspace = true }
28+
routee-compass = { workspace = true }
29+
routee-compass-core = { workspace = true }
30+
routee-compass-powertrain = { workspace = true }
31+
32+
arrow = { workspace = true }
33+
chrono = { workspace = true }
34+
csv = { workspace = true }
35+
futures = { workspace = true }
36+
geo = { workspace = true }
37+
geozero = { workspace = true }
38+
hex = { workspace = true }
39+
log = { workspace = true }
40+
object_store = { workspace = true }
41+
parquet = { workspace = true }
42+
rayon = { workspace = true }
43+
reqwest = { workspace = true }
44+
serde = { workspace = true }
45+
serde_json = { workspace = true }
46+
thiserror = { workspace = true }
47+
tokio = { workspace = true }

rust/bambam-overturemaps/README.md renamed to rust/bambam-omf/README.md

File renamed without changes.

rust/bambam-overturemaps/src/collection/collector.rs renamed to rust/bambam-omf/src/collection/collector.rs

File renamed without changes.

rust/bambam-overturemaps/src/collection/collector_config.rs renamed to rust/bambam-omf/src/collection/collector_config.rs

File renamed without changes.

rust/bambam-overturemaps/src/collection/constants.rs renamed to rust/bambam-omf/src/collection/constants.rs

File renamed without changes.

rust/bambam-overturemaps/src/collection/error.rs renamed to rust/bambam-omf/src/collection/error.rs

File renamed without changes.

rust/bambam-overturemaps/src/collection/filter/bbox.rs renamed to rust/bambam-omf/src/collection/filter/bbox.rs

File renamed without changes.

rust/bambam-overturemaps/src/collection/filter/bbox_row_predicate.rs renamed to rust/bambam-omf/src/collection/filter/bbox_row_predicate.rs

File renamed without changes.

0 commit comments

Comments
 (0)