Bump the version to 0.2.11

Also somebody seems to have slightly moved Eindhoven.

.gitea/workflows/release.yml

@@ -108,5 +108,5 @@ jobs:
           DEB_REPO_TOKEN: '${{ secrets.DEB_REPO_TOKEN }}'
         run: |
           curl --config <(printf "user=%s:%s" paul "${DEB_REPO_TOKEN}") \
-            --upload-file target/debian/sandbox*.deb \
+            --upload-file target/debian/sinoptik*.deb \
             https://git.luon.net/api/packages/paul/debian/pool/bookworm/main/upload

CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.11] - 2024-02-27
+
+### Security
+
+* Updated dependencies, fixes security advisories:
+  * [RUSTSEC-2024-0003](https://rustsec.org/advisories/RUSTSEC-2024-0003)
+  * [RUSTSEC-2023-0072](https://rustsec.org/advisories/RUSTSEC-2024-0072)
+
+### Fixed
+
+* Fix clippy issue
+* Tweak/fix tests; reduce required accuracy for geocoded coordinates
+
+## [0.2.10] - 2023-11-03
+
+### Security
+
+* Update dependencies
+  ([RUSTSEC-2020-0071](https://rustsec.org/advisories/RUSTSEC-2020-0071.html),
+  [RUSTSEC-2023-0044](https://rustsec.org/advisories/RUSTSEC-2023-0044.html))
+
+### Changed
+
+* Switch to Rocket 0.5 RC4
+* Update dependency on `cached`
+
+### Fixed
+
+* Fix clippy issues
+
 ## [0.2.9] - 2023-08-25
 
 ### Changed
@@ -142,7 +172,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release.
 
-[Unreleased]: https://git.luon.net/paul/sinoptik/compare/v0.2.9...HEAD
+[Unreleased]: https://git.luon.net/paul/sinoptik/compare/v0.2.11...HEAD
+[0.2.11]: https://git.luon.net/paul/sinoptik/compare/v0.2.10...v0.2.11
+[0.2.10]: https://git.luon.net/paul/sinoptik/compare/v0.2.9...v0.2.10
 [0.2.9]: https://git.luon.net/paul/sinoptik/compare/v0.2.8...v0.2.9
 [0.2.8]: https://git.luon.net/paul/sinoptik/compare/v0.2.7...v0.2.8
 [0.2.7]: https://git.luon.net/paul/sinoptik/compare/v0.2.6...v0.2.7

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sinoptik"
-version = "0.2.9"
+version = "0.2.11"
 authors = [
   "Admar Schoonen <admar@luon.net",
   "Paul van Tilburg <paul@luon.net>"
@@ -12,7 +12,7 @@ repository = "https://git.luon.net/paul/sinoptik"
 license = "MIT"
 
 [dependencies]
-cached = { version = "0.44.0", features = ["async"] }
+cached = { version = "0.46.0", features = ["async"] }
 chrono = "0.4.19"
 chrono-tz = "0.8.1"
 csv = "1.1.6"

src/lib.rs

@@ -263,8 +263,8 @@ mod tests {
         let response = client.get("/forecast?address=eindhoven").dispatch();
         assert_eq!(response.status(), Status::Ok);
         let json = response.into_json::<JsonValue>().expect("Not valid JSON");
-        assert_float_absolute_eq!(json["lat"].as_f64().unwrap(), 51.4392648, 1e-8);
-        assert_float_absolute_eq!(json["lon"].as_f64().unwrap(), 5.478633, 1e-8);
+        assert_float_absolute_eq!(json["lat"].as_f64().unwrap(), 51.448557, 1e-5);
+        assert_float_absolute_eq!(json["lon"].as_f64().unwrap(), 5.450123, 1e-5);
         assert_matches!(json["time"], JsonValue::Number(_));
         assert_matches!(json.get("AQI"), None);
         assert_matches!(json.get("NO2"), None);
@@ -281,8 +281,8 @@ mod tests {
             .dispatch();
         assert_eq!(response.status(), Status::Ok);
         let json = response.into_json::<JsonValue>().expect("Not valid JSON");
-        assert_float_absolute_eq!(json["lat"].as_f64().unwrap(), 51.4392648, 1e-8);
-        assert_float_absolute_eq!(json["lon"].as_f64().unwrap(), 5.478633, 1e-8);
+        assert_float_absolute_eq!(json["lat"].as_f64().unwrap(), 51.448557, 1e-5);
+        assert_float_absolute_eq!(json["lon"].as_f64().unwrap(), 5.450123, 1e-5);
         assert_matches!(json["time"], JsonValue::Number(_));
         assert_matches!(json.get("AQI"), Some(JsonValue::Array(_)));
         assert_matches!(json.get("NO2"), Some(JsonValue::Array(_)));
@@ -366,7 +366,7 @@ mod tests {
 
         // No metric selected, don't know which map to show?
         let response = client.get("/map?address=eindhoven").dispatch();
-        assert_eq!(response.status(), Status::NotFound);
+        assert_eq!(response.status(), Status::UnprocessableEntity);
     }
 
     #[test]
@@ -375,10 +375,6 @@ mod tests {
         let maps_handle_clone = Arc::clone(&maps_handle);
         let client = Client::tracked(rocket(maps_handle)).expect("Not a valid Rocket instance");
 
-        // No metric passed, don't know which map to show?
-        let response = client.get("/map?lat=51.4&lon=5.5").dispatch();
-        assert_eq!(response.status(), Status::NotFound);
-
         // No maps available yet.
         let response = client.get("/map?lat=51.4&lon=5.5&metric=pollen").dispatch();
         assert_eq!(response.status(), Status::ServiceUnavailable);
@@ -395,8 +391,12 @@ mod tests {
         assert_eq!(response.status(), Status::Ok);
         assert_eq!(response.content_type(), Some(ContentType::PNG));
 
+        // ... but not if it is out of bounds.
+        let response = client.get("/map?lat=0.0&lon=0.0&metric=pollen").dispatch();
+        assert_eq!(response.status(), Status::NotFound);
+
         // No metric passed, don't know which map to show?
         let response = client.get("/map?lat=51.4&lon=5.5").dispatch();
-        assert_eq!(response.status(), Status::NotFound);
+        assert_eq!(response.status(), Status::UnprocessableEntity);
     }
 }

src/maps.rs

@@ -8,7 +8,7 @@ use std::f64::consts::PI;
 use std::sync::{Arc, Mutex};
 
 use chrono::serde::ts_seconds;
-use chrono::{DateTime, Duration, NaiveDateTime, Utc};
+use chrono::{DateTime, Duration, NaiveDateTime, TimeZone, Utc};
 use image::{
     DynamicImage, GenericImage, GenericImageView, ImageError, ImageFormat, Pixel, Rgb, Rgba,
 };
@@ -449,7 +449,7 @@ async fn retrieve_image(url: Url) -> Result<RetrievedMaps> {
             .ok_or_else(|| Error::InvalidImagePath(path.to_owned()))?;
         let timestamp = NaiveDateTime::parse_from_str(timestamp_str, "%Y%m%d%H%M")?;
 
-        DateTime::<Utc>::from_utc(timestamp, Utc)
+        Utc.from_utc_datetime(&timestamp)
     };
     let bytes = response.bytes().await?;
 

src/position.rs

@@ -109,7 +109,7 @@ pub(crate) async fn resolve_address(address: String) -> Result<Position> {
         let points: Vec<Point<f64>> = osm.forward(&address)?;
 
         points
-            .get(0)
+            .first()
             .ok_or(Error::NoPositionFound)
             .map(Position::from)
     })