Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap
Commits: c9b4d572 by Bas Couwenberg at 2021-09-01T05:44:56+02:00 Update watch file to fix filenamemangle. - - - - - b9c42c52 by Bas Couwenberg at 2021-09-01T05:45:04+02:00 New upstream version 0.0.0+svn4806 - - - - - c4308f80 by Bas Couwenberg at 2021-09-01T05:45:20+02:00 Update upstream source from tag 'upstream/0.0.0+svn4806' Update to upstream version '0.0.0+svn4806' with Debian dir fe0877384122ca21b26038efce1e3c208ed9ebe6 - - - - - dbab7fa6 by Bas Couwenberg at 2021-09-01T05:46:22+02:00 New upstream SVN snapshot. - - - - - 3f3327e7 by Bas Couwenberg at 2021-09-01T05:46:56+02:00 Set distribution to unstable. - - - - - 6 changed files: - debian/changelog - debian/watch - resources/mkgmap-version.properties - src/uk/me/parabola/imgfmt/app/net/NOD1Part.java - src/uk/me/parabola/mkgmap/main/MapMaker.java - src/uk/me/parabola/mkgmap/reader/osm/POIGeneratorHook.java Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +mkgmap (0.0.0+svn4806-1) unstable; urgency=medium + + * New upstream SVN snapshot. + * Update watch file to fix filenamemangle. + + -- Bas Couwenberg <[email protected]> Wed, 01 Sep 2021 05:46:45 +0200 + mkgmap (0.0.0+svn4802-1) unstable; urgency=medium * Move from experimental to unstable. ===================================== debian/watch ===================================== @@ -2,5 +2,5 @@ version=4 opts=\ uversionmangle=s/(\d+)/0.0.0+svn$1/,\ downloadurlmangle=s/\.zip/-src.tar.gz/,\ -filenamemangle=s/\/download\/mkgmap-r([\d]+)\.zip/mkgmap-r$1-src.tar.gz/ \ +filenamemangle=s/.*\/download\/mkgmap-r([\d]+)\.zip/mkgmap-r$1-src.tar.gz/ \ https://www.mkgmap.org.uk/download/mkgmap-r([\d]+).zip ===================================== resources/mkgmap-version.properties ===================================== @@ -1,2 +1,2 @@ -svn.version: 4802 -build.timestamp: 2021-07-08T13:19:08+0100 +svn.version: 4806 +build.timestamp: 2021-08-10T09:45:55+0100 ===================================== src/uk/me/parabola/imgfmt/app/net/NOD1Part.java ===================================== @@ -77,6 +77,11 @@ public class NOD1Part { private static final int MAX_TABB_UNSAFE = 0x100; private static final int MAX_TABB = MAX_TABB_UNSAFE - 0x2; + // Last entry in table C should not start at 0x8000 or higher, actual limit is unknown + private static final int MAX_TABC_OFFSET = 0x8000 - 1; + private int lastTabCOffset; + private int tabCSize; + // Nodes size is max 0x2000 to cope with signed 14 bit node offsets private static final int MAX_NODES_SIZE = 0x2000; private int nodesSize; @@ -230,6 +235,8 @@ public class NOD1Part { } for (RouteRestriction rr: node.getRestrictions()){ + lastTabCOffset = tabCSize; + tabCSize += rr.getSize(); List<RouteArc> arcs = rr.getArcs(); if (arcs.size() >= 3){ for (int i = 0; i < arcs.size(); i++){ @@ -309,11 +316,12 @@ public class NOD1Part { } private boolean satisfiesConstraints() { - log.debug("constraints:", bboxActual, tabA.size(), destNodes.size(), nodesSize); + log.debug("constraints:", bboxActual, tabA.size(), destNodes.size(), nodesSize, lastTabCOffset); return bboxActual.getMaxDimension() < MAX_SIZE && tabA.size() < MAX_TABA && destNodes.size() < MAX_TABB - && nodesSize < MAX_NODES_SIZE; + && nodesSize < MAX_NODES_SIZE + && lastTabCOffset <= MAX_TABC_OFFSET; } /** ===================================== src/uk/me/parabola/mkgmap/main/MapMaker.java ===================================== @@ -69,7 +69,7 @@ public class MapMaker implements MapProcessor { } return makeMap(args, src, ""); } catch (FormatException e) { - Logger.defaultLogger.error("Bad file format: " + filename); + Logger.defaultLogger.error("Bad file format: " + filename, e); return filename; } catch (FileNotFoundException e) { Logger.defaultLogger.error("Could not open file: " + filename); ===================================== src/uk/me/parabola/mkgmap/reader/osm/POIGeneratorHook.java ===================================== @@ -234,7 +234,7 @@ public class POIGeneratorHook implements OsmReadingHooks { for (int order = 0; order < poiPlacementTags.size(); order++) { Entry<String,String> poiTagDef = poiPlacementTags.get(order); String tagValue = elem.getTag(poiTagDef.getKey()); - if (tagValue != null && poiTagDef.getValue() == null || poiTagDef.getValue().equals(tagValue)) { + if (tagValue != null && (poiTagDef.getValue() == null || poiTagDef.getValue().equals(tagValue))) { return order; } } View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/a4d3d8c6e18c28c81d2aa7975b9471f79a0d4ce3...3f3327e7873237b7cca6ea0b40c0d9baeca31464 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/a4d3d8c6e18c28c81d2aa7975b9471f79a0d4ce3...3f3327e7873237b7cca6ea0b40c0d9baeca31464 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
