Commit abecbbdd546075e0eaf8d11083e95c465de3d3ab - mkgmap

Update upstream source from tag 'upstream/0.0.0+svn4909' Update to upstream version '0.0.0+svn4909' with Debian dir 9c522aeb476a351b065793068275b60a29561138 Bas Couwenberg 10 months ago

4 changed file(s) with 20 addition(s) and 14 deletion(s). Raw diff Collapse all Expand all

-2

resources/mkgmap-version.properties less more

0		svn.version: 4907
1		build.timestamp: 2023-03-06T06:03:09+0000
	0	svn.version: 4909
	1	build.timestamp: 2023-06-05T10:28:55+0100

+11

-5

src/uk/me/parabola/mkgmap/build/MapBuilder.java less more

1244	1244
1245	1245	LayerFilterChain normalFilters = new LayerFilterChain(config);
1246	1246	LayerFilterChain keepParallelFilters = new LayerFilterChain(config);
	1247	DouglasPeuckerFilter dp = null;
1247	1248	if (enableLineCleanFilters && (res < 24)) {
1248	1249	MapFilter rounder = new RoundCoordsFilter();
1249	1250	MapFilter sizeFilter = new SizeFilter(MIN_SIZE_LINE);

1251	1252	normalFilters.addFilter(sizeFilter);
1252	1253	double errorForRes = dpFilterLineResMap.ceilingEntry(res).getValue();
1253	1254	if(errorForRes > 0) {
1254		DouglasPeuckerFilter dp = new DouglasPeuckerFilter(errorForRes);
1255		normalFilters.addFilter(dp);
	1255	dp = new DouglasPeuckerFilter(errorForRes);
1256	1256	keepParallelFilters.addFilter(dp);
1257	1257	}
1258	1258	keepParallelFilters.addFilter(rounder);
1259	1259	keepParallelFilters.addFilter(sizeFilter);
1260	1260	}
	1261	RemoveObsoletePointsFilter removeObsolete = new RemoveObsoletePointsFilter();
	1262	normalFilters.addFilter(removeObsolete);
	1263	keepParallelFilters.addFilter(removeObsolete);
	1264	if (dp != null)
	1265	normalFilters.addFilter(dp);
1261	1266	for (MapFilter filter : Arrays.asList(
	1267	new RemoveEmpty(),
1262	1268	new LineSplitterFilter(),
1263		new RemoveEmpty(),
1264		new RemoveObsoletePointsFilter(),
1265	1269	new LinePreparerFilter(div),
1266	1270	new LineAddFilter(div, map))) {
1267	1271	normalFilters.addFilter(filter);

1309	1313	filters.addFilter(new PolygonSplitterFilter());
1310	1314	if (enableLineCleanFilters && (res < 24)) {
1311	1315	filters.addFilter(new RoundCoordsFilter());
	1316	}
	1317	filters.addFilter(new RemoveObsoletePointsFilter());
	1318	if (enableLineCleanFilters && (res < 24)) {
1312	1319	int sizefilterVal = getMinSizePolygonForResolution(res);
1313	1320	if (sizefilterVal > 0)
1314	1321	filters.addFilter(new SizeFilter(sizefilterVal));

1318	1325	if(errorForRes > 0)
1319	1326	filters.addFilter(new DouglasPeuckerFilter(errorForRes));
1320	1327	}
1321		filters.addFilter(new RemoveObsoletePointsFilter());
1322	1328	filters.addFilter(new RemoveEmpty());
1323	1329	filters.addFilter(new LinePreparerFilter(div));
1324	1330	filters.addFilter(new ShapeAddFilter(div, map));

-2

test/func/SimpleTest.java less more

94	94	case "RGN":
95	95	count++;
96	96	System.out.println("RGN size " + size);
97		assertThat("RGN size", size, new RangeMatcher(2632,3));
	97	assertThat("RGN size", size, new RangeMatcher(2631,3));
98	98	break;
99	99	case "TRE":
100	100	count++;
101	101	System.out.println("TRE size " + size);
102	102	// Size varies depending on svn modified status
103		assertThat("TRE size", size, new RangeMatcher(770, 2));
	103	assertThat("TRE size", size, new RangeMatcher(769, 2));
104	104	break;
105	105	case "LBL":
106	106	count++;

-5

test/func/route/SimpleRouteTest.java less more

51	51	case "RGN":
52	52	count++;
53	53	System.out.println("RGN size " + size);
54		assertThat("RGN size", size, new RangeMatcher(127579));
	54	assertThat("RGN size", size, new RangeMatcher(126084));
55	55	break;
56	56	case "TRE":
57	57	count++;
58	58	System.out.println("TRE size " + size);
59	59	// Size varies depending on svn modified status
60		assertThat("TRE size", size, new RangeMatcher(1414, 2));
	60	assertThat("TRE size", size, new RangeMatcher(1413, 2));
61	61	break;
62	62	case "LBL":
63	63	count++;

65	65	break;
66	66	case "NET":
67	67	count++;
68		assertEquals("NET size", 66587, size);
	68	assertEquals("NET size", 66591, size);
69	69	break;
70	70	case "NOD":
71	71	count++;

89	89	case "RGN":
90	90	count++;
91	91	System.out.println("RGN size " + size);
92		assertThat("RGN size", size, new RangeMatcher(2744,3));
	92	assertThat("RGN size", size, new RangeMatcher(2746,3));
93	93	break;
94	94	case "TRE":
95	95	count++;
96	96	System.out.println("TRE size " + size);
97	97	// Size varies depending on svn modified status
98		assertThat("TRE size", size, new RangeMatcher(770, 2));
	98	assertThat("TRE size", size, new RangeMatcher(769, 2));
99	99	break;
100	100	case "LBL":
101	101	count++;