Skip to content

Commit

Permalink
refactoring module structure
Browse files Browse the repository at this point in the history
  • Loading branch information
benediktschwab committed Aug 5, 2024
1 parent 96b11c0 commit ae1cb5b
Show file tree
Hide file tree
Showing 71 changed files with 1,166 additions and 744 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ on:
pull_request: {}


env:
CARGO_INCREMENTAL: 0
CARGO_NET_RETRY: 10
RUSTUP_MAX_RETRIES: 10
RUST_BACKTRACE: short


jobs:

build:
Expand Down
12 changes: 8 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ members = [
resolver = "2"

[workspace.package]
version = "0.0.1-alpha.3"
version = "0.0.1-alpha.4"
authors = ["Benedikt Schwab <[email protected]>"]
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/envis-space/egml"

[workspace.dependencies]
thiserror = "1.0.61"
thiserror = "1.0.63"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
nalgebra = "0.33.0"
parry3d-f64 = "0.16.1"
parry3d-f64 = "0.17.0"
serde = "1.0.204"
quick-xml = "0.36.0"
quick-xml = "0.36.1"
geo = "0.28.0"
itertools = "0.13.0"
rayon = "1.10.0"
approx = "0.5.1"
uuid = "1.10.0"
sha2 = "0.10.8"
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

A Rust library for processing [GML](https://www.ogc.org/standard/gml/) data.

> [!WARNING]
> The library is at an early stage of development.
The library is at an early stage of development.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion crates/egml-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "CLI tool for processing GML data."


[dependencies]
egml = { version = "0.0.1-alpha.3", path = "../egml" }
egml = { version = "0.0.1-alpha.4", path = "../egml" }

tracing = { workspace = true }
tracing-subscriber = { workspace = true }
3 changes: 1 addition & 2 deletions crates/egml-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

CLI tool for processing [GML](https://www.ogc.org/standard/gml/) data.

> [!WARNING]
> The library is at an early stage of development.
The library is at an early stage of development.

## Contributing

Expand Down
6 changes: 4 additions & 2 deletions crates/egml-cli/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
use egml::geometry::{DirectPosition, LinearRing};
use egml::model::base::{Gml, Id};
use egml::model::geometry::{DirectPosition, LinearRing};
use tracing::info;

fn main() {
tracing_subscriber::fmt::init();
info!("Hello, world!");

let gml = Gml::new(Id::try_from("test_id").expect("must work"));
let point_a = DirectPosition::new(0.0, 0.0, 0.0).unwrap();
let point_b = DirectPosition::new(1.0, 1.0, 1.0).unwrap();
let point_c = DirectPosition::new(0.0, 0.0, 2.0).unwrap();
LinearRing::new(vec![point_a, point_b, point_c]).expect("should work");
LinearRing::new(gml, vec![point_a, point_b, point_c]).expect("should work");

let _test = "";
}
4 changes: 4 additions & 0 deletions crates/egml-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ thiserror = { workspace = true }
nalgebra = { workspace = true }
parry3d-f64 = { workspace = true }
itertools = { workspace = true }
rayon = { workspace = true }
approx = { workspace = true }
uuid = { workspace = true, features = ["v4"] }
sha2 = { workspace = true }
3 changes: 1 addition & 2 deletions crates/egml-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

Core primitives and operations for processing [GML](https://www.ogc.org/standard/gml/) data.

> [!WARNING]
> The library is at an early stage of development.
The library is at an early stage of development.

## Contributing

Expand Down
22 changes: 0 additions & 22 deletions crates/egml-core/src/base/id.rs

This file was deleted.

3 changes: 0 additions & 3 deletions crates/egml-core/src/base/mod.rs

This file was deleted.

8 changes: 6 additions & 2 deletions crates/egml-core/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use thiserror::Error;

#[derive(Error, Debug)]
#[derive(Error, Debug, Eq, PartialEq, Hash, Copy, Clone)]
pub enum Error {
#[error("Value not finite `{0}`")]
ValueNotFinite(&'static str),
Expand All @@ -12,7 +12,11 @@ pub enum Error {
MustNotBeEmpty(&'static str),
#[error("Contains equal elements")]
ContainsEqualElements,
#[error("Contains duplicate elements")]
ContainsDuplicateElements,
#[error("Contains equal first and last element")]
ContainsEqualStartAndLastElement,

#[error("Lower corner must be below upper corner: `{0}`")]
LowerCornerMustBeBelowUpperCorner(&'static str),
LowerCornerMustBeEqualOrBelowUpperCorner(&'static str),
}
41 changes: 0 additions & 41 deletions crates/egml-core/src/geometry/aggregates/multi_surface.rs

This file was deleted.

122 changes: 0 additions & 122 deletions crates/egml-core/src/geometry/envelope.rs

This file was deleted.

Loading

0 comments on commit ae1cb5b

Please sign in to comment.