Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap-splitter
Commits: f8f7d9eb by Bas Couwenberg at 2022-07-01T06:22:28+02:00 New upstream version 0.0.0+svn652 - - - - - db703563 by Bas Couwenberg at 2022-07-01T06:22:30+02:00 Update upstream source from tag 'upstream/0.0.0+svn652' Update to upstream version '0.0.0+svn652' with Debian dir b271b53d30d630dde60b814ef07503fe715dfe32 - - - - - 763bd3a9 by Bas Couwenberg at 2022-07-01T06:22:46+02:00 New upstream SVN snapshot. - - - - - 46047ddd by Bas Couwenberg at 2022-07-01T06:23:20+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - resources/splitter-version.properties - src/uk/me/parabola/splitter/solver/SplittableDensityArea.java Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,9 @@ -mkgmap-splitter (0.0.0+svn651-2) UNRELEASED; urgency=medium +mkgmap-splitter (0.0.0+svn652-1) unstable; urgency=medium + * New upstream SVN snapshot. * Bump Standards-Version to 4.6.1, no changes. - -- Bas Couwenberg <[email protected]> Tue, 21 Jun 2022 07:13:30 +0200 + -- Bas Couwenberg <[email protected]> Fri, 01 Jul 2022 06:23:11 +0200 mkgmap-splitter (0.0.0+svn651-1) unstable; urgency=medium ===================================== resources/splitter-version.properties ===================================== @@ -1,2 +1,2 @@ -svn.version: 651 -build.timestamp: 2022-04-04T13:33:59+0100 +svn.version: 652 +build.timestamp: 2022-06-17T08:25:16+0100 ===================================== src/uk/me/parabola/splitter/solver/SplittableDensityArea.java ===================================== @@ -483,7 +483,7 @@ public class SplittableDensityArea { * @param depth recursion depth * @param tile the tile to split * @param rasteredPolygonArea an area describing a rectilinear shape - * @return a solution (maybe empty), or null if rasteredPolygon is not rectangular + * @return a solution (maybe empty), or null if rasteredPolygon is not singular */ private Solution findSolutionWithSinglePolygon(int depth, final Tile tile, java.awt.geom.Area rasteredPolygonArea) { if (!rasteredPolygonArea.isSingular()) { @@ -537,15 +537,13 @@ public class SplittableDensityArea { area = new java.awt.geom.Area(r2); area.intersect(rasteredPolygonArea); part1Sol = findSolutionWithSinglePolygon(depth + 1, tile, area); - if (part1Sol != null && !part1Sol.isEmpty()) - break; - } + if (part1Sol != null && !part1Sol.isEmpty()) { + part0Sol.merge(part1Sol); + return part0Sol; + } + } } } - if (part0Sol != null && part1Sol != null) { - part0Sol.merge(part1Sol); - return part0Sol; - } } return new Solution(maxNodes); } View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/compare/bec6594f277aba8541ea3aed5b11c734b3cefe3e...46047ddd9faba927e998e1189bcb22400d25ee71 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap-splitter/-/compare/bec6594f277aba8541ea3aed5b11c734b3cefe3e...46047ddd9faba927e998e1189bcb22400d25ee71 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
