Merge pull request #2 from hove-io/improve_github_actions

datanel · web-flow · commit b867ffdb54d5 · 2026-01-08T10:49:38.000+01:00
chore: Improve GitHub-Actions, bump Geo and fix Clippy
diff --git a/.github/workflows/auto-tagging.yml b/.github/workflows/auto-tagging.yml
@@ -0,0 +1,30 @@
+name: Auto-tagging major/minor version
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  tag-major-minor:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - uses: actions/checkout@v6
+      - name: Fetch existing tags
+        run: git fetch --tags
+      - name: Generate tag
+        run: |
+          export MAJOR_VERSION=$( echo "${GITHUB_REF_NAME}" | cut --delimiter '.' --fields=1 )
+          export MINOR_VERSION=$( echo "${GITHUB_REF_NAME}" | cut --delimiter '.' --fields=2 )
+
+          export MAJOR_TAG="${MAJOR_VERSION}"
+          echo "Creating tag '${MAJOR_TAG}' from '${GITHUB_REF_NAME}'"
+          git tag --force ${MAJOR_TAG} ${GITHUB_REF_NAME}
+          echo "Pushing new tag '${MAJOR_TAG}'"
+
+          export MINOR_TAG="${MAJOR_VERSION}.${MINOR_VERSION}"
+          echo "Creating tag '${MINOR_TAG}' from '${GITHUB_REF_NAME}'"
+          git tag --force ${MINOR_TAG} ${GITHUB_REF_NAME}
+          echo "Pushing new tag '${MINOR_TAG}'"
+
+          git push origin --force ${MAJOR_TAG} ${MINOR_TAG}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,20 +1,26 @@
-on: [push, pull_request]
+name: Continuous Integration
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+permissions:
+  contents: read
+  pull-requests: write
 
 jobs:
-  build:
+  ci:
+    name: CI
     runs-on: ubuntu-latest
-    container:
-      image: rust:1
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      
-      - run: rustup component add rustfmt
-      - run: cargo test
-      - run: cargo fmt --all -- --check
-
-      - name: Publish crate
-        if: github.ref == 'refs/heads/master'
-        run: cargo publish
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATESIO_TOKEN }}
+    - uses: actions/checkout@v4
+    - name: Install Rust stable
+      uses: dtolnay/rust-toolchain@stable
+      with:
+          components: rustfmt, clippy
+    - name: Run cargo fmt
+      run: cargo fmt --all -- --check
+    - name: Run cargo clippy
+      run: cargo clippy -- -D warnings
+    - name: Run tests with all features
+      run: cargo test
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "osm_boundaries_utils"
-version = "0.11.0"
+version = "0.12.1"
 authors = ["dt.ro <dt.ro@canaltp.fr>", "Antoine Desbordes <antoine.desbordes@gmail.com>"]
 description = "utilities to help reading OpenStreetMap boundaries in rust."
 repository = "https://github.com/hove-io/osm_boundaries_utils"
 keywords = ["openstreetmap", "osm", "boundaries"]
 license = "WTFPL"
 readme = "README.md"
+edition = "2024"
 
 [dependencies]
-log = "0.4"
-osmpbfreader = "0.16"
-geo-types = "^0.7"
-geo = "0.18"
+geo = "0.32"
+tracing = "0.1"
+osmpbfreader = "0.19"
diff --git a/src/boundaries.rs b/src/boundaries.rs
@@ -1,6 +1,6 @@
-extern crate osmpbfreader;
+use tracing::{debug, warn};
 
-use geo_types::{Coordinate, LineString, MultiPolygon, Point, Polygon};
+use geo::{Coord, LineString, MultiPolygon, Point, Polygon};
 use std::borrow::Borrow;
 use std::collections::BTreeMap;
 
@@ -129,29 +129,29 @@ pub fn build_boundary<T: Borrow<osmpbfreader::OsmObj>>(
     let mut outer_polys = build_boundary_parts(relation, objects, vec!["outer", "enclave", ""]);
     let inner_polys = build_boundary_parts(relation, objects, vec!["inner"]);
 
-    if let Some(ref mut outers) = outer_polys {
-        if let Some(inners) = inner_polys {
-            inners.into_iter().for_each(|inner| {
-                /*
-                    It's assumed here that the 'inner' ring is contained into
-                    exactly ONE outer ring. To find it among all 'outers', all
-                    we need is to find a candidate 'outer' area that shares a point
-                    point with (i.e 'intersects') all 'inner' segments.
-                    Using 'contains' is not suitable here, as 'inner' may touch its outer
-                    ring at a single point.
-
-                    NB: this algorithm cannot handle "donut inside donut" boundaries
-                    (where 'inner' would be contained into multiple concentric outer rings).
-                */
-                let (exterior, _) = inner.into_inner();
-                for ref mut outer in outers.0.iter_mut() {
-                    if exterior.lines().all(|line| outer.intersects(&line)) {
-                        outer.interiors_push(exterior);
-                        break;
-                    }
+    if let Some(ref mut outers) = outer_polys
+        && let Some(inners) = inner_polys
+    {
+        inners.into_iter().for_each(|inner| {
+            /*
+                It's assumed here that the 'inner' ring is contained into
+                exactly ONE outer ring. To find it among all 'outers', all
+                we need is to find a candidate 'outer' area that shares a point
+                point with (i.e 'intersects') all 'inner' segments.
+                Using 'contains' is not suitable here, as 'inner' may touch its outer
+                ring at a single point.
+
+                NB: this algorithm cannot handle "donut inside donut" boundaries
+                (where 'inner' would be contained into multiple concentric outer rings).
+            */
+            let (exterior, _) = inner.into_inner();
+            for ref mut outer in outers.0.iter_mut() {
+                if exterior.lines().all(|line| outer.intersects(&line)) {
+                    outer.interiors_push(exterior);
+                    break;
                 }
-            })
-        }
+            }
+        })
     }
     outer_polys
 }
@@ -185,7 +185,7 @@ pub fn build_boundary_parts<T: Borrow<osmpbfreader::OsmObj>>(
     let mut append_ring = |nodes: &[osmpbfreader::Node]| {
         let poly_geom = nodes
             .iter()
-            .map(|n| Coordinate {
+            .map(|n| Coord {
                 x: n.lon(),
                 y: n.lat(),
             })
@@ -257,22 +257,24 @@ pub fn build_boundary_parts<T: Borrow<osmpbfreader::OsmObj>>(
                 }
             }
             if !added_part {
-                use geo::haversine_distance::HaversineDistance;
+                use geo::{Distance, Haversine};
                 let p = |n: &osmpbfreader::Node| {
-                    Point(Coordinate {
+                    Point(Coord {
                         x: n.lon(),
                         y: n.lat(),
                     })
                 };
 
                 if added_nodes.len() > 1 {
-                    let distance = p(added_nodes.first().unwrap())
-                        .haversine_distance(&p(added_nodes.last().unwrap()));
+                    let distance = Haversine.distance(
+                        p(added_nodes.first().unwrap()),
+                        p(added_nodes.last().unwrap()),
+                    );
                     if distance < WARN_UNCLOSED_RING_MAX_DISTANCE {
                         warn!(
                             "boundary: relation/{} ({}): unclosed polygon, dist({:?}, {:?}) = {}",
                             relation.id.0,
-                            relation.tags.get("name").map_or("", |s| &s),
+                            relation.tags.get("name").map_or("", |s| s),
                             added_nodes.first().unwrap().id,
                             added_nodes.last().unwrap().id,
                             distance
@@ -327,7 +329,7 @@ fn test_build_boundary_not_closed() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        assert!(build_boundary(&relation, &builder.objects).is_none());
+        assert!(build_boundary(relation, &builder.objects).is_none());
     } else {
         unreachable!()
     }
@@ -350,7 +352,7 @@ fn test_build_boundary_closed() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -376,7 +378,7 @@ fn test_build_boundary_closed_reverse() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -399,7 +401,7 @@ fn test_build_one_boundary_closed() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -431,14 +433,14 @@ fn test_build_two_opposite_clockwise_boundaries() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 2);
         let centroid = multipolygon.centroid();
         let centroid = centroid.unwrap();
-        assert!(centroid.lng().abs() < f64::EPSILON);
-        assert!(centroid.lat().abs() < f64::EPSILON);
+        assert!(centroid.x().abs() < f64::EPSILON);
+        assert!(centroid.y().abs() < f64::EPSILON);
     } else {
         unreachable!()
     }
@@ -464,7 +466,7 @@ fn test_build_two_boundaries_closed() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 2);
@@ -496,7 +498,7 @@ fn test_build_one_donut_boundary() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -536,7 +538,7 @@ fn test_build_two_boundaries_with_one_hole() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 2);
@@ -576,7 +578,7 @@ fn test_build_one_boundary_with_two_holes() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -624,7 +626,7 @@ fn test_build_two_boundaries_with_two_holes() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 2);
@@ -663,7 +665,7 @@ fn test_build_inner_touching_outer_at_one_point() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 1);
@@ -705,7 +707,7 @@ fn test_build_two_touching_rings() {
         .relation_id
         .into();
     if let osmpbfreader::OsmObj::Relation(ref relation) = builder.objects[&rel_id] {
-        let multipolygon = build_boundary(&relation, &builder.objects);
+        let multipolygon = build_boundary(relation, &builder.objects);
         assert!(multipolygon.is_some());
         let multipolygon = multipolygon.unwrap();
         assert_eq!(multipolygon.0.len(), 2);
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,10 +1,4 @@
-extern crate geo_types;
-#[macro_use]
-extern crate log;
-extern crate geo;
-extern crate osmpbfreader;
-
 mod boundaries;
 pub mod osm_builder;
 
-pub use crate::boundaries::build_boundary;
+pub use boundaries::build_boundary;
diff --git a/src/osm_builder.rs b/src/osm_builder.rs
@@ -1,5 +1,4 @@
-extern crate osmpbfreader;
-use geo_types::Point;
+use geo::Point;
 use std::collections::BTreeMap;
 
 pub fn named_node(lon: f64, lat: f64, name: &'static str) -> (Point<f64>, Option<String>) {
@@ -12,9 +11,9 @@ pub struct Relation<'a> {
 }
 
 impl<'a> Relation<'a> {
-    pub fn outer(&mut self, coords: Vec<(Point<f64>, Option<String>)>) -> &'a mut Relation {
+    pub fn outer(&mut self, coords: Vec<(Point<f64>, Option<String>)>) -> &'a mut Relation<'_> {
         let id = self.builder.way(coords);
-        if let osmpbfreader::OsmObj::Relation(ref mut rel) = self
+        if let osmpbfreader::OsmObj::Relation(rel) = self
             .builder
             .objects
             .get_mut(&self.relation_id.into())
@@ -30,9 +29,9 @@ impl<'a> Relation<'a> {
 }
 
 impl<'a> Relation<'a> {
-    pub fn inner(&mut self, coords: Vec<(Point<f64>, Option<String>)>) -> &'a mut Relation {
+    pub fn inner(&mut self, coords: Vec<(Point<f64>, Option<String>)>) -> &'a mut Relation<'_> {
         let id = self.builder.way(coords);
-        if let osmpbfreader::OsmObj::Relation(ref mut rel) = self
+        if let osmpbfreader::OsmObj::Relation(rel) = self
             .builder
             .objects
             .get_mut(&self.relation_id.into())
@@ -47,6 +46,7 @@ impl<'a> Relation<'a> {
     }
 }
 
+#[derive(Default)]
 pub struct OsmBuilder {
     node_id: i64,
     way_id: i64,
@@ -55,24 +55,12 @@ pub struct OsmBuilder {
     named_nodes: BTreeMap<String, osmpbfreader::NodeId>,
 }
 
-impl Default for OsmBuilder {
-    fn default() -> Self {
-        Self {
-            node_id: 0,
-            way_id: 0,
-            relation_id: 0,
-            objects: BTreeMap::new(),
-            named_nodes: BTreeMap::new(),
-        }
-    }
-}
-
 impl OsmBuilder {
     pub fn new() -> OsmBuilder {
         Self::default()
     }
 
-    pub fn relation(&mut self) -> Relation {
+    pub fn relation(&mut self) -> Relation<'_> {
         let id = osmpbfreader::RelationId(self.relation_id);
         let r = osmpbfreader::Relation {
             id,
@@ -110,8 +98,8 @@ impl OsmBuilder {
         let id = osmpbfreader::NodeId(self.node_id);
         let n = osmpbfreader::Node {
             id,
-            decimicro_lat: (coord.lat() * 1e7) as i32,
-            decimicro_lon: (coord.lng() * 1e7) as i32,
+            decimicro_lat: (coord.y() * 1e7) as i32,
+            decimicro_lon: (coord.x() * 1e7) as i32,
             tags: osmpbfreader::Tags::new(),
         };
         self.node_id += 1;
