Skip to content

fix: correct tile size calculation and adjust loop boundaries for inc… #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CL-SHLOMIKONCHA merged 2 commits into from
May 19, 2026
Merged

fix: correct tile size calculation and adjust loop boundaries for inc… #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ee482
fix: correct tile size calculation and adjust loop boundaries for inc…
razbroc May 18, 2026
169fbbb
fix: update tile count assertions in unit tests for TMS, WMTS, and XYZ
razbroc May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MergerLogic/Batching/TileBounds.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public TileBounds(int zoom, int minX, int maxX, int minY, int maxY)

public long Size()
{
return (this.MaxX - this.MinX) * (this.MaxY - this.MinY);
return (this.MaxX - this.MinX + 1) * (this.MaxY - this.MinY + 1);
}

public void Print()
Expand Down
4 changes: 2 additions & 2 deletions MergerLogicUnitTests/DataTypes/TMSTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MergerLogic.Batching;
using MergerLogic.Batching;
using MergerLogic.Clients;
using MergerLogic.DataTypes;
using MergerLogic.Monitoring.Metrics;
Expand Down Expand Up @@ -510,7 +510,7 @@ public void TileCount(bool isOneXOne, GridOrigin origin)
Grid grid = isOneXOne ? Grid.OneXOne : Grid.TwoXOne;
var tmsSource = new TMS(this._serviceProviderMock.Object, "test", 10, extent, grid, origin, 3, 0);

Assert.AreEqual(10, tmsSource.TileCount());
Assert.AreEqual(26, tmsSource.TileCount());
this._geoUtilsMock.Verify(utils => utils.ExtentToTileRange(It.IsAny<Extent>(), It.IsAny<int>(), It.IsAny<GridOrigin>()), Times.Exactly(4));
this.VerifyAll();
}
Expand Down
4 changes: 2 additions & 2 deletions MergerLogicUnitTests/DataTypes/WMTSTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MergerLogic.Batching;
using MergerLogic.Batching;
using MergerLogic.Clients;
using MergerLogic.DataTypes;
using MergerLogic.Monitoring.Metrics;
Expand Down Expand Up @@ -512,7 +512,7 @@ public void TileCount(bool isOneXOne, GridOrigin origin)
Grid grid = isOneXOne ? Grid.OneXOne : Grid.TwoXOne;
var wmtsSource = new WMTS(this._serviceProviderMock.Object, "test", 10, extent, grid, origin, 3, 0);

Assert.AreEqual(10, wmtsSource.TileCount());
Assert.AreEqual(26, wmtsSource.TileCount());
this._geoUtilsMock.Verify(utils => utils.ExtentToTileRange(It.IsAny<Extent>(), It.IsAny<int>(), It.IsAny<GridOrigin>()), Times.Exactly(4));
this.VerifyAll();
}
Expand Down
4 changes: 2 additions & 2 deletions MergerLogicUnitTests/DataTypes/XYZTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MergerLogic.Batching;
using MergerLogic.Batching;
using MergerLogic.Clients;
using MergerLogic.DataTypes;
using MergerLogic.Monitoring.Metrics;
Expand Down Expand Up @@ -511,7 +511,7 @@ public void TileCount(bool isOneXOne, GridOrigin origin)
Grid grid = isOneXOne ? Grid.OneXOne : Grid.TwoXOne;
var xyzSource = new XYZ(this._serviceProviderMock.Object, "test", 10, extent, grid, origin, 3, 0);

Assert.AreEqual(10, xyzSource.TileCount());
Assert.AreEqual(26, xyzSource.TileCount());
this._geoUtilsMock.Verify(utils => utils.ExtentToTileRange(It.IsAny<Extent>(), It.IsAny<int>(), It.IsAny<GridOrigin>()), Times.Exactly(4));
this.VerifyAll();
}
Expand Down
4 changes: 2 additions & 2 deletions MergerService/Runners/TaskExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ public void ExecuteTask(MergeTask task, ITaskUtils taskUtils, string? managerCal
{
var batchWorkTimeStopwatch = Stopwatch.StartNew();

for (int x = bounds.MinX; x < bounds.MaxX; x++)
for (int x = bounds.MinX; x <= bounds.MaxX; x++)
{
for (int y = bounds.MinY; y < bounds.MaxY; y++)
for (int y = bounds.MinY; y <= bounds.MaxY; y++)
{
this._logger.LogDebug($"[{methodName}] Handle tile z:{bounds.Zoom}, x:{x}, y:{y}");
Coord coord = new Coord(bounds.Zoom, x, y);
Expand Down
Loading