Merge pull request #134 from tmillenaar/update_release_workflow

tmillenaar · web-flow · commit ab179ebbdc34 · 2025-07-09T22:43:25.000+02:00
Fix intersects not properly evaluating the bottom of the tile
diff --git a/gridkit-rs/src/tile.rs b/gridkit-rs/src/tile.rs
@@ -207,10 +207,12 @@ impl TileTraits for Tile {
     }
 
     fn intersects(&self, other: &Tile) -> bool {
-        return !(self.start_id.0 >= (other.start_id.0 + other.nx as i64)
+        return !(
+                self.start_id.0 >= (other.start_id.0 + other.nx as i64)
             || (self.start_id.0 + self.nx as i64) <= other.start_id.0
-            || self.start_id.1 >= (other.start_id.1 + other.ny as i64)
-            || (self.start_id.1 + other.ny as i64) <= other.start_id.1);
+            ||  self.start_id.1 >= (other.start_id.1 + other.ny as i64)
+            || (self.start_id.1 + self.ny as i64) <= other.start_id.1
+        );
     }
 
     fn overlap(&self, other: &Tile) -> Result<Tile, String> {

Original file line number	Diff line number	Diff line change
`@@ -207,10 +207,12 @@ impl TileTraits for Tile {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`fn intersects(&self, other: &Tile) -> bool {`
`210`		`- return !(self.start_id.0 >= (other.start_id.0 + other.nx as i64)`
	`210`	`+ return !(`
	`211`	`+ self.start_id.0 >= (other.start_id.0 + other.nx as i64)`
`211`	`212`	`\|\| (self.start_id.0 + self.nx as i64) <= other.start_id.0`
`212`		`- \|\| self.start_id.1 >= (other.start_id.1 + other.ny as i64)`
`213`		`- \|\| (self.start_id.1 + other.ny as i64) <= other.start_id.1);`
	`213`	`+ \|\| self.start_id.1 >= (other.start_id.1 + other.ny as i64)`
	`214`	`+ \|\| (self.start_id.1 + self.ny as i64) <= other.start_id.1`
	`215`	`+ );`
`214`	`216`	`}`
`215`	`217`
`216`	`218`	`fn overlap(&self, other: &Tile) -> Result<Tile, String> {`