[Git][debian-gis-team/mkgmap][experimental] 4 commits: New upstream version 0.0.0+svn4909
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Jun 6 12:06:56 BST 2023
Bas Couwenberg pushed to branch experimental at Debian GIS Project / mkgmap
Commits:
9dd3fe96 by Bas Couwenberg at 2023-06-06T12:58:42+02:00
New upstream version 0.0.0+svn4909
- - - - -
abecbbdd by Bas Couwenberg at 2023-06-06T12:58:57+02:00
Update upstream source from tag 'upstream/0.0.0+svn4909'
Update to upstream version '0.0.0+svn4909'
with Debian dir 9c522aeb476a351b065793068275b60a29561138
- - - - -
82376a0c by Bas Couwenberg at 2023-06-06T12:59:20+02:00
New upstream SVN snapshot.
- - - - -
d604acca by Bas Couwenberg at 2023-06-06T13:00:34+02:00
Set distribution to experimental.
- - - - -
5 changed files:
- debian/changelog
- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/build/MapBuilder.java
- test/func/SimpleTest.java
- test/func/route/SimpleRouteTest.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mkgmap (0.0.0+svn4909-1~exp1) experimental; urgency=medium
+
+ * New upstream SVN snapshot.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 06 Jun 2023 13:00:23 +0200
+
mkgmap (0.0.0+svn4907-1~exp1) experimental; urgency=medium
* New upstream SVN snapshot.
=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4907
-build.timestamp: 2023-03-06T06:03:09+0000
+svn.version: 4909
+build.timestamp: 2023-06-05T10:28:55+0100
=====================================
src/uk/me/parabola/mkgmap/build/MapBuilder.java
=====================================
@@ -1245,6 +1245,7 @@ public class MapBuilder implements Configurable {
LayerFilterChain normalFilters = new LayerFilterChain(config);
LayerFilterChain keepParallelFilters = new LayerFilterChain(config);
+ DouglasPeuckerFilter dp = null;
if (enableLineCleanFilters && (res < 24)) {
MapFilter rounder = new RoundCoordsFilter();
MapFilter sizeFilter = new SizeFilter(MIN_SIZE_LINE);
@@ -1252,17 +1253,20 @@ public class MapBuilder implements Configurable {
normalFilters.addFilter(sizeFilter);
double errorForRes = dpFilterLineResMap.ceilingEntry(res).getValue();
if(errorForRes > 0) {
- DouglasPeuckerFilter dp = new DouglasPeuckerFilter(errorForRes);
- normalFilters.addFilter(dp);
+ dp = new DouglasPeuckerFilter(errorForRes);
keepParallelFilters.addFilter(dp);
}
keepParallelFilters.addFilter(rounder);
keepParallelFilters.addFilter(sizeFilter);
}
+ RemoveObsoletePointsFilter removeObsolete = new RemoveObsoletePointsFilter();
+ normalFilters.addFilter(removeObsolete);
+ keepParallelFilters.addFilter(removeObsolete);
+ if (dp != null)
+ normalFilters.addFilter(dp);
for (MapFilter filter : Arrays.asList(
- new LineSplitterFilter(),
new RemoveEmpty(),
- new RemoveObsoletePointsFilter(),
+ new LineSplitterFilter(),
new LinePreparerFilter(div),
new LineAddFilter(div, map))) {
normalFilters.addFilter(filter);
@@ -1310,6 +1314,9 @@ public class MapBuilder implements Configurable {
filters.addFilter(new PolygonSplitterFilter());
if (enableLineCleanFilters && (res < 24)) {
filters.addFilter(new RoundCoordsFilter());
+ }
+ filters.addFilter(new RemoveObsoletePointsFilter());
+ if (enableLineCleanFilters && (res < 24)) {
int sizefilterVal = getMinSizePolygonForResolution(res);
if (sizefilterVal > 0)
filters.addFilter(new SizeFilter(sizefilterVal));
@@ -1319,7 +1326,6 @@ public class MapBuilder implements Configurable {
if(errorForRes > 0)
filters.addFilter(new DouglasPeuckerFilter(errorForRes));
}
- filters.addFilter(new RemoveObsoletePointsFilter());
filters.addFilter(new RemoveEmpty());
filters.addFilter(new LinePreparerFilter(div));
filters.addFilter(new ShapeAddFilter(div, map));
=====================================
test/func/SimpleTest.java
=====================================
@@ -95,13 +95,13 @@ public class SimpleTest extends Base {
case "RGN":
count++;
System.out.println("RGN size " + size);
- assertThat("RGN size", size, new RangeMatcher(2632,3));
+ assertThat("RGN size", size, new RangeMatcher(2631,3));
break;
case "TRE":
count++;
System.out.println("TRE size " + size);
// Size varies depending on svn modified status
- assertThat("TRE size", size, new RangeMatcher(770, 2));
+ assertThat("TRE size", size, new RangeMatcher(769, 2));
break;
case "LBL":
count++;
=====================================
test/func/route/SimpleRouteTest.java
=====================================
@@ -52,13 +52,13 @@ public class SimpleRouteTest extends Base {
case "RGN":
count++;
System.out.println("RGN size " + size);
- assertThat("RGN size", size, new RangeMatcher(127579));
+ assertThat("RGN size", size, new RangeMatcher(126084));
break;
case "TRE":
count++;
System.out.println("TRE size " + size);
// Size varies depending on svn modified status
- assertThat("TRE size", size, new RangeMatcher(1414, 2));
+ assertThat("TRE size", size, new RangeMatcher(1413, 2));
break;
case "LBL":
count++;
@@ -66,7 +66,7 @@ public class SimpleRouteTest extends Base {
break;
case "NET":
count++;
- assertEquals("NET size", 66587, size);
+ assertEquals("NET size", 66591, size);
break;
case "NOD":
count++;
@@ -90,13 +90,13 @@ public class SimpleRouteTest extends Base {
case "RGN":
count++;
System.out.println("RGN size " + size);
- assertThat("RGN size", size, new RangeMatcher(2744,3));
+ assertThat("RGN size", size, new RangeMatcher(2746,3));
break;
case "TRE":
count++;
System.out.println("TRE size " + size);
// Size varies depending on svn modified status
- assertThat("TRE size", size, new RangeMatcher(770, 2));
+ assertThat("TRE size", size, new RangeMatcher(769, 2));
break;
case "LBL":
count++;
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/9f77691b4ebf1b2e9b60b1f2fd4e90f5dd7757da...d604accab6ec24cf0345261739f891587422c626
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/9f77691b4ebf1b2e9b60b1f2fd4e90f5dd7757da...d604accab6ec24cf0345261739f891587422c626
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230606/bd2ad52c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list