Merge branch 'main' of github.com:geo-engine/geoengine into limit-1

Author: ChristianBeilschmidt

Cargo.lock

@@ -76,7 +76,7 @@ assert_cmd = "2.0"
 async-stream = "0.3"
 async-trait = "0.1"
 base64 = "0.22"
-bb8-postgres = { version = "0.8", features = [
+bb8-postgres = { version = "0.9", features = [
     "with-uuid-1",
     "with-chrono-0_4",
     "with-serde_json-1",
@@ -85,20 +85,20 @@ bytes = "1.5" # for postgres-types impls
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.5", features = ["derive"] }
 clap_derive = "4.5"
-config = "0.14"
+config = "0.14.1"
 convert_case = "0.6.0"
 criterion = "0.5"
 csv = "1.3"
 erased-serde = "0.4"
 fallible-iterator = "0.2" # only for postgres-protocol
 flexi_logger = { version = "0.29", features = ["trc"] }
-float-cmp = "0.9.0"
+float-cmp = "0.10"
 futures = "0.3"
 futures-util = "0.3"
 gdal = "0.17"
 gdal-sys = "0.10"
 # when changing geo version also adapt the Cargo.toml in the expression "deps-workspace"!
-geo = "0.29.1"
+geo = "0.29.3"
 geo-rand = { git = "https://github.com/lelongg/geo-rand", tag = "v0.3.0" }
 geojson = { version = "0.24", features = ["geo-types"] }
 httptest = "0.16.1"
@@ -109,19 +109,19 @@ log = "0.4"
 lru = "0.12"
 lz4_flex = "0.11"
 mime = "0.3"
-ndarray = { version = "0.16", features = ["approx"] }                      # has to match with `ort`
+ndarray = { version = "0.16", features = ["approx"] }  # has to match with `ort`
 num = "0.4"
 num-traits = "0.2"
 oauth2 = "4.4.2"
 openidconnect = "3.4"
 # `opentelemetry` version has to be compatible with `tracing-opentelemetry` & `opentelemetry-*`
-opentelemetry = { version = "0.24", default-features = false, features = [
+ordered-float = { version = "4.6", features = ["serde"] }
+opentelemetry = { version = "0.27", default-features = false, features = [
     "trace",
 ] }
-opentelemetry-otlp = "0.17"
-opentelemetry_sdk = "0.24"
-ordered-float = { version = "4.2", features = ["serde"] }
-ort = "2.0.0-rc.2"
+opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.27"
+ort = "2.0.0-rc.9"
 ouroboros = "0.18"
 paste = "1.0"
 pbkdf2 = "0.12.2"
@@ -140,7 +140,7 @@ prettyplease = "0.2"
 proc-macro2 = "1.0"
 proj = "0.22" # needs to stay fixed to use fixed proj version
 proj-sys = "0.19" # needs to stay fixed to use fixed proj version
-prost = "0.12.3"
+prost = "0.12.6"
 pwhash = "1.0"
 quote = "1.0"
 rand = "0.8"
@@ -150,15 +150,15 @@ reqwest = { version = "0.11", features = [
     "multipart",
     "stream",
 ] } # has to match with `oauth`
-rustc-hash = { version = "2.0", default-features = false }
+rustc-hash = { version = "2.1", default-features = false }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 serde_urlencoded = "0.7"
 serde_with = "3.6"
 serial_test = "3.0"
 sha2 = "0.10.8"
 snafu = "0.8"
-stac = "0.7"
+stac = "0.10"
 stream-cancel = "0.8"
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"
@@ -180,7 +180,7 @@ tonic = { version = "0.11.0", features = [
 ] } # must be compatible with `aruna-rust-api`
 tracing = "0.1"
 tracing-actix-web = "0.7"
-tracing-opentelemetry = "0.25"
+tracing-opentelemetry = "0.28" # As of 0.26, tracing-opentelemetry is one version ahead of the opentelemetry crates
 tracing-subscriber = { version = "0.3", features = [
     "local-time",
     "ansi",
@@ -204,6 +204,6 @@ validator = { version = "0.19.0", features = ["derive"] }
 vergen = "9.0"
 vergen-gitcl = "1.0"
 walkdir = "2.4"
-wkt = "0.11"
+wkt = "0.12"
 xml-rs = "0.8"
-zip = "2.2.0"
+zip = "2.2.2"

Cargo.toml

@@ -314,7 +314,7 @@ impl VectorDataTyped for TypedFeatureCollectionRef<'_> {
     }
 }
 
-impl<'c> TypedFeatureCollectionRef<'c> {
+impl TypedFeatureCollectionRef<'_> {
     pub fn try_into_points(&self) -> Result<&MultiPointCollection> {
         self.try_into()
     }
@@ -372,7 +372,7 @@ impl FeatureCollectionInfos for TypedFeatureCollection {
     impl_function_by_forwarding_ref!(fn column_names(&self) -> Keys<String, FeatureDataType>);
 }
 
-impl<'c> FeatureCollectionInfos for TypedFeatureCollectionRef<'c> {
+impl FeatureCollectionInfos for TypedFeatureCollectionRef<'_> {
     impl_function_by_forwarding_ref2!(fn len(&self) -> usize);
     impl_function_by_forwarding_ref2!(fn is_simple(&self) -> bool);
     impl_function_by_forwarding_ref2!(fn column_type(&self, column_name: &str) -> Result<FeatureDataType>);
@@ -388,7 +388,7 @@ impl ToGeoJson<'_> for TypedFeatureCollection {
     impl_function_by_forwarding_ref!(fn to_geo_json(&self) -> String);
 }
 
-impl<'c> ToGeoJson<'_> for TypedFeatureCollectionRef<'c> {
+impl ToGeoJson<'_> for TypedFeatureCollectionRef<'_> {
     impl_function_by_forwarding_ref2!(fn to_geo_json(&self) -> String);
 }
 
@@ -482,7 +482,7 @@ impl FeatureCollectionModifications for TypedFeatureCollection {
     impl_mod_function_by_forwarding_ref!(fn replace_time(&self, time_intervals: &[TimeInterval]) -> Result<Self::Output>);
 }
 
-impl<'c> FeatureCollectionModifications for TypedFeatureCollectionRef<'c> {
+impl FeatureCollectionModifications for TypedFeatureCollectionRef<'_> {
     type Output = TypedFeatureCollection;
 
     impl_mod_function_by_forwarding_ref2!(fn filter<M>(&self, mask: M) -> Result<Self::Output> where M: FilterArray);

datatypes/src/collections/data_types.rs

@@ -831,7 +831,7 @@ pub struct FeatureCollectionRow<'a, GeometryRef> {
     row_num: usize,
 }
 
-impl<'a, GeometryRef> FeatureCollectionRow<'a, GeometryRef> {
+impl<GeometryRef> FeatureCollectionRow<'_, GeometryRef> {
     pub fn get(&self, column_name: &str) -> Option<FeatureDataValue> {
         self.data
             .get(column_name)

datatypes/src/collections/feature_collection.rs

@@ -167,7 +167,7 @@ impl<'l> Iterator for MultiLineStringIterator<'l> {
     }
 }
 
-impl<'l> DoubleEndedIterator for MultiLineStringIterator<'l> {
+impl DoubleEndedIterator for MultiLineStringIterator<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         if self.index >= self.length {
             return None;
@@ -203,7 +203,7 @@ impl<'l> DoubleEndedIterator for MultiLineStringIterator<'l> {
     }
 }
 
-impl<'l> ExactSizeIterator for MultiLineStringIterator<'l> {}
+impl ExactSizeIterator for MultiLineStringIterator<'_> {}
 
 impl<'l> IntoParallelIterator for MultiLineStringIterator<'l> {
     type Item = MultiLineStringRef<'l>;
@@ -269,7 +269,7 @@ impl<'l> Producer for MultiLineStringParIterator<'l> {
     }
 }
 
-impl<'l> IndexedParallelIterator for MultiLineStringParIterator<'l> {
+impl IndexedParallelIterator for MultiLineStringParIterator<'_> {
     fn len(&self) -> usize {
         self.0.len()
     }

datatypes/src/collections/multi_line_string_collection.rs

@@ -109,7 +109,7 @@ impl<'l> Iterator for MultiPointIterator<'l> {
     }
 }
 
-impl<'l> DoubleEndedIterator for MultiPointIterator<'l> {
+impl DoubleEndedIterator for MultiPointIterator<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         if self.index >= self.length {
             return None;
@@ -136,7 +136,7 @@ impl<'l> DoubleEndedIterator for MultiPointIterator<'l> {
     }
 }
 
-impl<'l> ExactSizeIterator for MultiPointIterator<'l> {}
+impl ExactSizeIterator for MultiPointIterator<'_> {}
 
 impl<'l> IntoParallelIterator for MultiPointIterator<'l> {
     type Item = MultiPointRef<'l>;
@@ -202,7 +202,7 @@ impl<'l> Producer for MultiPointParIterator<'l> {
     }
 }
 
-impl<'l> IndexedParallelIterator for MultiPointParIterator<'l> {
+impl IndexedParallelIterator for MultiPointParIterator<'_> {
     fn len(&self) -> usize {
         self.0.len()
     }

datatypes/src/collections/multi_point_collection.rs

@@ -193,7 +193,7 @@ impl<'l> Iterator for MultiPolygonIterator<'l> {
     }
 }
 
-impl<'l> DoubleEndedIterator for MultiPolygonIterator<'l> {
+impl DoubleEndedIterator for MultiPolygonIterator<'_> {
     fn next_back(&mut self) -> Option<Self::Item> {
         if self.index >= self.length {
             return None;
@@ -239,7 +239,7 @@ impl<'l> DoubleEndedIterator for MultiPolygonIterator<'l> {
     }
 }
 
-impl<'l> ExactSizeIterator for MultiPolygonIterator<'l> {}
+impl ExactSizeIterator for MultiPolygonIterator<'_> {}
 
 impl<'l> IntoParallelIterator for MultiPolygonIterator<'l> {
     type Item = MultiPolygonRef<'l>;
@@ -305,7 +305,7 @@ impl<'l> Producer for MultiPolygonParIterator<'l> {
     }
 }
 
-impl<'l> IndexedParallelIterator for MultiPolygonParIterator<'l> {
+impl IndexedParallelIterator for MultiPolygonParIterator<'_> {
     fn len(&self) -> usize {
         self.0.len()
     }

datatypes/src/collections/multi_polygon_collection.rs

@@ -325,7 +325,7 @@ impl NamedDataDeserializeVisitor {
     }
 }
 
-impl<'de> Visitor<'de> for NamedDataDeserializeVisitor {
+impl Visitor<'_> for NamedDataDeserializeVisitor {
     type Value = NamedData;
 
     /// always keep in sync with [`is_allowed_name_char`]

datatypes/src/dataset.rs

@@ -64,7 +64,7 @@ impl<'de> Deserialize<'de> for MlModelName {
 
 struct MlModelNameDeserializeVisitor;
 
-impl<'de> Visitor<'de> for MlModelNameDeserializeVisitor {
+impl Visitor<'_> for MlModelNameDeserializeVisitor {
     type Value = MlModelName;
 
     /// always keep in sync with [`is_allowed_name_char`]

datatypes/src/machine_learning.rs

@@ -551,7 +551,7 @@ pub enum ColorMapper<'c> {
 }
 
 // TODO: use Fn-trait once it is stable
-impl<'c> ColorMapper<'c> {
+impl ColorMapper<'_> {
     /// Map a raster value to a color from the colorizer
     pub fn call<T>(&self, value: T) -> RgbaColor
     where