[Git][debian-gis-team/mkgmap][master] 15 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Jun 11 10:33:39 BST 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap
Commits:
43fcca3a by Bas Couwenberg at 2023-03-03T14:31:40+01:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
3088f31d by Bas Couwenberg at 2023-03-03T14:32:03+01:00
New upstream version 0.0.0+svn4906
- - - - -
cff3ef74 by Bas Couwenberg at 2023-03-03T14:32:22+01:00
Update upstream source from tag 'upstream/0.0.0+svn4906'
Update to upstream version '0.0.0+svn4906'
with Debian dir cc0445f9b5d4444b0818bafef5c744c94597dbdb
- - - - -
9dcc581b by Bas Couwenberg at 2023-03-03T14:32:44+01:00
New upstream SVN snapshot.
- - - - -
f63f2f0f by Bas Couwenberg at 2023-03-03T14:33:25+01:00
Set distribution to experimental.
- - - - -
529d2f0b by Bas Couwenberg at 2023-04-01T07:36:50+02:00
New upstream version 0.0.0+svn4907
- - - - -
398783d9 by Bas Couwenberg at 2023-04-01T07:37:07+02:00
Update upstream source from tag 'upstream/0.0.0+svn4907'
Update to upstream version '0.0.0+svn4907'
with Debian dir 88b730ccf5537d90caca0464c69d1449652b7494
- - - - -
d8e5e1c1 by Bas Couwenberg at 2023-04-01T07:37:27+02:00
New upstream SVN snapshot.
- - - - -
9f77691b by Bas Couwenberg at 2023-04-01T07:38:19+02:00
Set distribution to experimental.
- - - - -
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.
- - - - -
c4614843 by Bas Couwenberg at 2023-06-11T11:26:04+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 43fcca3a9b1065e395af81f62056bb5de0da7063.
- - - - -
43f6cb34 by Bas Couwenberg at 2023-06-11T11:26:20+02:00
Move from experimental to unstable.
- - - - -
7 changed files:
- debian/changelog
- resources/mkgmap-version.properties
- src/uk/me/parabola/mkgmap/build/MapBuilder.java
- src/uk/me/parabola/mkgmap/reader/osm/GType.java
- src/uk/me/parabola/mkgmap/reader/polish/PolishMapDataSource.java
- test/func/SimpleTest.java
- test/func/route/SimpleRouteTest.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,29 @@
-mkgmap (0.0.0+svn4905-2) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn4909-1) unstable; urgency=medium
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 11 Jun 2023 11:26:06 +0200
+
+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.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 01 Apr 2023 07:38:04 +0200
+
+mkgmap (0.0.0+svn4906-1~exp1) experimental; urgency=medium
+
+ * New upstream SVN snapshot.
* Add Rules-Requires-Root to control file.
* Bump Standards-Version to 4.6.2, no changes.
* Update URLs to use HTTPS.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 28 Nov 2022 13:31:10 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 03 Mar 2023 14:33:12 +0100
mkgmap (0.0.0+svn4905-1) unstable; urgency=medium
=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4905
-build.timestamp: 2022-07-13T06:18:29+0100
+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));
=====================================
src/uk/me/parabola/mkgmap/reader/osm/GType.java
=====================================
@@ -276,7 +276,7 @@ public class GType {
}
public static boolean isContourLine(MapLine line) {
- return line.getType() >= 0x20 && line.getType() <= 0x22 && !(line instanceof MapShape);
+ return line.getType() >= 0x20 && line.getType() <= 0x25 && !(line instanceof MapShape);
}
}
=====================================
src/uk/me/parabola/mkgmap/reader/polish/PolishMapDataSource.java
=====================================
@@ -574,12 +574,12 @@ public class PolishMapDataSource extends MapperBasedMapDataSource implements Loa
String h = polyline.getName();
try {
// Convert to feet.
- int n = Integer.parseInt(h);
- n *= METERS_TO_FEET;
- polyline.setName(String.valueOf(n));
+ double m = Double.parseDouble(h);
+ int feet = (int) Math.round(m * METERS_TO_FEET);
+ polyline.setName(Integer.toString(feet));
} catch (NumberFormatException e) {
- // OK it wasn't a number, leave it alone
+ log.warn(h + " doesn't seem to be a valid elevation value in m" );
}
}
}
=====================================
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/5f6f8f44fa44e39dd2aab52bab1272f1cd368fb0...43f6cb34f2900f874360adae2c03625f3dedb4e6
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/5f6f8f44fa44e39dd2aab52bab1272f1cd368fb0...43f6cb34f2900f874360adae2c03625f3dedb4e6
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/20230611/0378be54/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list