Skip to content

Commit

Permalink
Merge branch 'main' into feat/websocket-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
kasugamirai authored Sep 17, 2024
2 parents 6b7afe5 + e9c373f commit bae9fb2
Show file tree
Hide file tree
Showing 14 changed files with 312 additions and 61 deletions.
34 changes: 34 additions & 0 deletions schema/actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,40 @@
"File"
]
},
{
"name": "CityGmlGeometryLodFilter",
"type": "processor",
"description": "Filters CityGML geometries by LOD",
"parameter": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "CityGmlGeometryLodFilter",
"type": "object",
"required": [
"lods"
],
"properties": {
"lods": {
"type": "array",
"items": {
"type": "integer",
"format": "uint8",
"minimum": 0.0
}
}
}
},
"builtin": true,
"inputPorts": [
"default"
],
"outputPorts": [
"default",
"rejected"
],
"categories": [
"Geometry"
]
},
{
"name": "Clipper",
"type": "processor",
Expand Down
80 changes: 45 additions & 35 deletions worker/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 24 additions & 12 deletions worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,18 @@ cesiumtiles = { git = "https://github.com/reearth/cesiumtiles-rs.git" }
Inflector = "0.11.4"
ahash = "0.8.11"
approx = "0.5.1"
async-recursion = "1.1.1"
async-stream = "0.3.5"
async-trait = "0.1.82"
async_zip = { version = "0.0.17", features = ["full"] }
base64 = "0.22.1"
byteorder = "1.5.0"
bytes = { version = "1.7.1", features = ["serde"] }
chrono = { version = "0.4.38", features = ["serde"] }
clap = { version = "4.5.17", features = ["env", "string"] }
clipper-sys = "0.7.2"
color-eyre = "0.6.3"
colored = "2.1.0"
colorsys = "0.6.7"
crossbeam = "0.8.4"
csv = "1.3.0"
Expand All @@ -90,6 +96,7 @@ futures = "0.3.30"
futures-util = "0.3.30"
geojson = "0.24.1"
hashbrown = "0.14.5"
home = "0.5.9"
image = { version = "0.25.2", default-features = false, features = ["jpeg", "png", "rayon", "tiff", "webp"] }
indexmap = "2.5.0"
indoc = "2.0.5"
Expand All @@ -101,44 +108,49 @@ nalgebra-glm = "0.19.0"
num-traits = "0.2.19"
nutype = { version = "0.5.0", features = ["schemars08", "serde"] }
object_store = "0.11.0"
once_cell = "1.19.0"
once_cell = "1.20.0"
opendal = { version = "0.49.2", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"] }
opentelemetry = { version = "0.24.0", default-features = false, features = ["metrics", "trace"] }
opentelemetry-otlp = { version = "0.17.0", default-features = false, features = ["grpc-tonic", "metrics", "trace"] }
opentelemetry-semantic-conventions = "0.16.0"
opentelemetry-stdout = { version = "0.5.0", default-features = false, features = ["metrics", "trace"] }
opentelemetry_sdk = { version = "0.24.1", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics", "trace"] }
opentelemetry-otlp = { version = "0.25.0", default-features = false, features = ["grpc-tonic", "metrics", "trace"] }
opentelemetry-semantic-conventions = "0.25.0"
opentelemetry-stdout = { version = "0.25.0", default-features = false, features = ["metrics", "trace"] }
opentelemetry_sdk = { version = "0.25.0", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
parking_lot = "0.12.3"
petgraph = "0.6.5"
pretty_assertions = "1.4.0"
pretty_assertions = "1.4.1"
quick-xml = "0.36.1"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.10.6"
reqwest = { version = "0.12.7", default-features = false, features = ["blocking", "rustls-tls"] }
rhai = { version = "1.19.0", features = ["internals", "metadata", "serde", "sync"] }
rmp-serde = "1.3.0"
robust = "1.1.0"
rstar = "0.12.0"
rstest = "0.22.0"
rust_xlsxwriter = "0.75.0"
rust_xlsxwriter = "0.76.0"
schemars = { version = "0.8.21", features = ["uuid1"] }
serde = { version = "1.0.209", features = ["derive"] }
serde_derive = "1.0.209"
serde = { version = "1.0.210", features = ["derive"] }
serde_derive = "1.0.210"
serde_json = { version = "1.0.128", features = ["arbitrary_precision"] }
serde_with = "3.9.0"
serde_yaml = "0.9.34"
sha2 = "0.10.8"
slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_trace"] }
slog-async = "2.8.0"
slog-term = "2.9.1"
sloggers = { version = "2.2.0", default-features = false }
strum = "0.26.3"
strum_macros = "0.26.4"
tempfile = "3.12.0"
thiserror = "1.0.63"
time = { version = "0.3.36", features = ["formatting"] }
tokio = { version = "1.40.0", features = ["full", "time"] }
tokio = { version = "1.38.1", features = ["full", "time"] }
tokio-stream = { version = "0.1.16", features = ["sync"] }
tokio-util = { version = "0.7.12", features = ["full"] }
toml = "0.8.19"
tracing = "0.1.40"
tracing-opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics", "tracing-log"] }
tracing-opentelemetry = { version = "0.26.0", default-features = false, features = ["metrics", "tracing-log"] }
tracing-subscriber = { version = "0.3.18", features = [
"env-filter",
"std",
Expand Down
6 changes: 3 additions & 3 deletions worker/crates/action-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ once_cell.workspace = true
serde.workspace = true
serde_json.workspace = true
slog.workspace = true
slog-async = "2.8.0"
slog-term = "2.9.1"
sloggers = { version = "2.2.0", default-features = false }
slog-async.workspace = true
slog-term.workspace = true
sloggers.workspace = true
thiserror.workspace = true
time.workspace = true
tokio.workspace = true
Expand Down
1 change: 1 addition & 0 deletions worker/crates/action-processor/src/geometry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub mod area_on_area_overlayer;
pub mod bounds_extractor;
pub mod bufferer;
pub mod center_point_replacer;
pub mod city_gml_geometry_lod_filter;
pub mod clipper;
pub mod closed_curve_filter;
pub mod coercer;
Expand Down
Loading

0 comments on commit bae9fb2

Please sign in to comment.