Move geom to its own repo

a-b-street · Nov 27, 2023 · 4c69f7e · 4c69f7e
1 parent a3f31bb
commit 4c69f7e
Show file tree

Hide file tree

Showing 49 changed files with 43 additions and 5,326 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,6 @@ members = [
   "cli",
   "collisions",
   "convert_osm",
-  "geom",
   "headless",
   "importer",
   "kml",
@@ -49,6 +48,7 @@ futures = { version = "0.3.27"}
 futures-channel = { version = "0.3.29"}
 geo = "0.26.0"
 geojson = { version = "0.24.1", features = ["geo-types"] }
+geom = { git = "https://github.com/a-b-street/geom" }
 getrandom = "0.2.11"
 instant = "0.1.7"
 log = "0.4.20"
@@ -65,7 +65,6 @@ web-sys = "0.3.65"
 # due to the 2 core dependency crates listed below. This patch is required to
 # avoid Cargo from getting confused.
 [patch."https://github.com/a-b-street/abstreet/"]
-geom = { path = "geom" }
 abstutil = { path = "abstutil" }
 
 [patch.crates-io]

diff --git a/apps/fifteen_min/Cargo.toml b/apps/fifteen_min/Cargo.toml
@@ -16,7 +16,7 @@ abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
 contour = { workspace = true }
 geojson = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 log = { workspace = true }
 map_gui = { path = "../../map_gui" }

diff --git a/apps/game/Cargo.toml b/apps/game/Cargo.toml
@@ -29,7 +29,7 @@ fs-err = { workspace = true }
 futures-channel = { workspace = true }
 geo = { workspace = true }
 geojson = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 instant = { workspace = true }
 kml = { path = "../../kml" }

diff --git a/apps/ltn/Cargo.toml b/apps/ltn/Cargo.toml
@@ -22,7 +22,7 @@ flate2 = { workspace = true }
 futures-channel = { workspace = true }
 geo = { workspace = true }
 geojson = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 home = { version = "0.5.5", optional = true }
 lazy_static = "1.4.0"

diff --git a/apps/map_editor/Cargo.toml b/apps/map_editor/Cargo.toml
@@ -15,7 +15,7 @@ wasm = ["getrandom/js", "wasm-bindgen", "widgetry/wasm-backend"]
 abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
 fs-err = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 log = { workspace = true }
 raw_map = { path = "../../raw_map" }

diff --git a/apps/osm_viewer/Cargo.toml b/apps/osm_viewer/Cargo.toml
@@ -14,7 +14,7 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
 [dependencies]
 abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 map_gui = { path = "../../map_gui" }
 map_model = { path = "../../map_model" }

diff --git a/apps/parking_mapper/Cargo.toml b/apps/parking_mapper/Cargo.toml
@@ -12,7 +12,7 @@ abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
 anyhow = { workspace = true }
 fs-err = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 log = { workspace = true }
 map_gui = { path = "../../map_gui" }
 map_model = { path = "../../map_model" }

diff --git a/apps/santa/Cargo.toml b/apps/santa/Cargo.toml
@@ -15,7 +15,7 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
 abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
 anyhow = { workspace = true }
-geom = { path = "../../geom" }
+geom = { workspace = true }
 getrandom = { workspace = true, optional = true }
 kml = { path = "../../kml" }
 log = { workspace = true }

diff --git a/blockfinding/Cargo.toml b/blockfinding/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 abstutil = { path = "../abstutil" }
 anyhow = { workspace = true }
-geom = { path = "../geom" }
+geom = { workspace = true }
 log = { workspace = true }
 map_model = { path = "../map_model" }
 serde = { workspace = true }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -11,7 +11,7 @@ convert_osm = { path = "../convert_osm" }
 csv = { workspace = true }
 fs-err = { workspace = true }
 geo = { workspace = true }
-geom = { path = "../geom" }
+geom = { workspace = true }
 importer = { path = "../importer" }
 log = { workspace = true }
 map_model = { path = "../map_model" }

diff --git a/collisions/Cargo.toml b/collisions/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Dustin Carlino <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-geom = { path = "../geom" }
+geom = { workspace = true }
 kml = { path = "../kml" }
 log = { workspace = true }
 serde = { workspace = true }
diff --git a/convert_osm/Cargo.toml b/convert_osm/Cargo.toml
@@ -10,7 +10,7 @@ abstutil = { path = "../abstutil" }
 anyhow = { workspace = true }
 csv = { workspace = true }
 fs-err = { workspace = true }
-geom = { path = "../geom" }
+geom = { workspace = true }
 kml = { path = "../kml" }
 log = { workspace = true }
 osm2streets = { git = "https://github.com/a-b-street/osm2streets" }

diff --git a/geom/Cargo.toml b/geom/Cargo.toml
diff --git a/geom/README.md b/geom/README.md
diff --git a/geom/src/angle.rs b/geom/src/angle.rs