[Git][debian-gis-team/mkgmap][master] 5 commits: New upstream version 0.0.0+svn4565
Bas Couwenberg
gitlab at salsa.debian.org
Sat Aug 1 07:48:36 BST 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap
Commits:
11967d09 by Bas Couwenberg at 2020-08-01T08:23:32+02:00
New upstream version 0.0.0+svn4565
- - - - -
0713e9ed by Bas Couwenberg at 2020-08-01T08:23:49+02:00
Update upstream source from tag 'upstream/0.0.0+svn4565'
Update to upstream version '0.0.0+svn4565'
with Debian dir c14d38ac8a2a0d62b09a6e2eb5117666ac863dd6
- - - - -
aa8595ee by Bas Couwenberg at 2020-08-01T08:24:05+02:00
New upstream SVN snapshot.
- - - - -
45c9e3b2 by Bas Couwenberg at 2020-08-01T08:33:39+02:00
Mark patches as Forwarded: not-needed.
- - - - -
e832d5df by Bas Couwenberg at 2020-08-01T08:33:39+02:00
Set distribution to unstable.
- - - - -
12 changed files:
- debian/changelog
- debian/patches/build_xml.patch
- doc/options.txt
- resources/help/en/options
- resources/mkgmap-version.properties
- resources/styles/default/inc/roadspeed
- resources/typ-files/mapnik.txt
- src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
- src/uk/me/parabola/mkgmap/reader/osm/GType.java
- src/uk/me/parabola/mkgmap/reader/osm/OsmHandler.java
- src/uk/me/parabola/mkgmap/reader/osm/OsmMapDataSource.java
- test/func/route/SimpleRouteTest.java
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mkgmap (0.0.0+svn4565-1) unstable; urgency=medium
+
+ * New upstream SVN snapshot.
+ * Mark patches as Forwarded: not-needed.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 01 Aug 2020 08:24:34 +0200
+
mkgmap (0.0.0+svn4555-1) unstable; urgency=medium
* New upstream SVN snapshot.
=====================================
debian/patches/build_xml.patch
=====================================
@@ -9,6 +9,7 @@ Description: Leave out IVY dependency checker
https://github.com/osmandapp/OsmAnd-tools/blob/master/OsmAndMapCreator/src/crosby/binary/Osmformat.java
I need to check this out
Author: Andreas Tille <tille at debian.org>
+Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
=====================================
doc/options.txt
=====================================
@@ -207,7 +207,7 @@ It may list 'Rueben Brookins Road' if that is in the map.
;--mdr7-excl=name[,name...]
: Specify words which should be omitted from the road index.
It was added before option road-name-config and is probably no longer needed.
-: Example usage: --x-mdr7-excl="Road, Street, Weg"
+: Example usage: --mdr7-excl="Road, Street, Weg"
;--mdr7-del=name[,name...]
: Use this option if your style adds strings to the labels of roads which you
=====================================
resources/help/en/options
=====================================
@@ -205,7 +205,7 @@ filename
--mdr7-excl=name[,name...]
Specify words which should be omitted from the road index. It was added
before option road-name-config and is probably no longer needed.
- Example usage: --x-mdr7-excl="Road, Street, Weg"
+ Example usage: --mdr7-excl="Road, Street, Weg"
--mdr7-del=name[,name...]
Use this option if your style adds strings to the labels of roads which you
=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4555
-build.timestamp: 2020-06-22T17:00:46+0100
+svn.version: 4565
+build.timestamp: 2020-07-22T20:17:43+0100
=====================================
resources/styles/default/inc/roadspeed
=====================================
@@ -14,6 +14,11 @@
# 0 | 3 mph / 5 km/h
#
+maxspeed:advisory=* {set maxspeed='${maxspeed:advisory}'}
+#maxspeed:practial=* {set maxspeed='${maxspeed:practial}'}
+# maxspeed:practial is disabled here in the default style because verifiability of it is disputed.
+# see: https://wiki.openstreetmap.org/wiki/Key:maxspeed:practical
+
maxspeed=walk { set maxspeed=10 }
maxspeed~'.*:living_street' { set maxspeed=10 }
@@ -40,3 +45,9 @@ maxspeed=* & mkgmap:road-speed-max!=* & maxspeedkmh() <= 100 { set mkgmap:road-s
maxspeed=* & mkgmap:road-speed-max!=* & maxspeedkmh() <= 120 { set mkgmap:road-speed-max = 6 }
# mkgmap:road-speed-max = 7 has no effect
#maxspeed=* & mkgmap:road-speed-max!=* { set mkgmap:road-speed-max = 7 }
+
+# Experiments with Garmin devices have deduced 7/unlimited speed to be device dependent; values of 112 &
+# 132 km/h (70, 82 mph) seen: http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2014q3/021620.html
+# The following rule limits it for all countries except Germany. A few other roads elsewhere are unlimited
+# and they would be expected to have a maxspeed:* tag that will override this.
+highway=motorway & maxspeed!=* & mkgmap:road-speed-max!=* & mkgmap:country!=DEU {set mkgmap:road-speed-max=6}
=====================================
resources/typ-files/mapnik.txt
=====================================
@@ -2317,7 +2317,7 @@ DayXpm="1 1 2 1" Colormode=16
;1
[end]
[_point]
-type=0x021
+type=0x020
subtype=0x00
;GRMN_TYPE: //
String=Exit
@@ -2341,7 +2341,7 @@ DayXpm="8 4 2 1" Colormode=16
;12345678
[end]
[_point]
-type=0x021
+type=0x023
subtype=0x0f
;GRMN_TYPE: //
String=Services
=====================================
src/uk/me/parabola/mkgmap/osmstyle/StyledConverter.java
=====================================
@@ -151,6 +151,7 @@ public class StyledConverter implements OsmConverter {
private final boolean linkPOIsToWays;
private final boolean mergeRoads;
private final boolean routable;
+ private boolean forceEndNodesRoutingNodes;
private final Tags styleOptionTags;
private static final String STYLE_OPTION_PREF = "mkgmap:option:";
private final PrefixSuffixFilter prefixSuffixFilter;
@@ -224,6 +225,7 @@ public class StyledConverter implements OsmConverter {
admLevelNod3 = props.getProperty("add-boundary-nodes-at-admin-boundaries", 2);
addBoundaryNodesAtAdminBoundaries = routable && admLevelNod3 > 0;
keepBlanks = props.containsKey("keep-blanks");
+ forceEndNodesRoutingNodes = !props.getProperty("no-force-end-nodes-routing-nodes", false);
}
/**
@@ -516,6 +518,7 @@ public class StyledConverter implements OsmConverter {
/** One type result for nodes to avoid recreating one for each node. */
private NodeTypeResult nodeTypeResult = new NodeTypeResult();
+
private class NodeTypeResult implements TypeResult {
private Node node;
/** flag if the rule was fired */
@@ -967,7 +970,7 @@ public class StyledConverter implements OsmConverter {
if ("left".equals(driveOn) && numDriveOnLeftRoads == 0 && numDriveOnRightRoads > 0)
log.warn("The drive-on-left flag is set but tile contains only drive-on-right roads");
if ("right".equals(driveOn) && numDriveOnRightRoads == 0 && numDriveOnLeftRoads > 0)
- log.warn("The drive-on-left flag is NOT set used but tile contains only drive-on-left roads");
+ log.warn("The drive-on-left flag is NOT set but tile contains only drive-on-left roads");
}
assert dol != null;
return dol;
@@ -1499,6 +1502,13 @@ public class StyledConverter implements OsmConverter {
*/
private void addRoadAfterSplittingLoops(ConvertedWay cw) {
Way way = cw.getWay();
+
+ if (routable && (forceEndNodesRoutingNodes || wayRelMap.containsKey(way.getId()))) {
+ // make sure the way has nodes at each end
+ way.getPoints().get(0).incHighwayCount();
+ way.getPoints().get(way.getPoints().size() - 1).incHighwayCount();
+ }
+
// check if the way is a loop or intersects with itself
boolean wayWasSplit = true; // aka rescan required
@@ -2108,7 +2118,7 @@ public class StyledConverter implements OsmConverter {
int replType = -1;
try {
replType = Integer.decode(replTypeString);
- if (GType.isRoutableLineType(replType)) {
+ if (GType.isSpecialRoutableLineType(replType)) {
replType = -1;
log.error("type value in", tagKey, "should not be a routable type:" + replTypeString);
}
=====================================
src/uk/me/parabola/mkgmap/reader/osm/GType.java
=====================================
@@ -260,7 +260,7 @@ public class GType {
* known to cause routing errors if used for non-routable lines.
*/
public static boolean isSpecialRoutableLineType(int type){
- return type >= 0x01 && type <= 0x13 || type == 0x16 || type == 0x1a || type == 0x1b;
+ return type >= 0x01 && type <= 0x13 || type == 0x16 || type == 0x1a || type == 0x1b || type >= 0x2c && type <= 0x2f;
}
/**
=====================================
src/uk/me/parabola/mkgmap/reader/osm/OsmHandler.java
=====================================
@@ -48,6 +48,7 @@ public abstract class OsmHandler {
private long firstNodeRef;
private long lastNodeRef;
private boolean missingNodeRef;
+ private boolean removeEmptyValue = true;
/**
* Set a set of tags with values that are to be deleted on input.
@@ -101,7 +102,7 @@ public abstract class OsmHandler {
* should be discarded.
*/
protected String keepTag(String key, String val) {
- if (val.isEmpty())
+ if (removeEmptyValue && val.isEmpty())
return null;
if(deletedTags != null) {
Set<String> vals = deletedTags.get(key);
@@ -206,6 +207,14 @@ public abstract class OsmHandler {
this.removeFixme = b;
}
+ /**
+ * Enable removal of tags / value pairs where value is empty.
+ * @param b true: enable the filter
+ */
+ public void setDeleteEmptyValueTag(boolean b) {
+ this.removeEmptyValue= b;
+ }
+
public boolean isIgnoreBounds() {
return ignoreBounds;
}
@@ -234,4 +243,5 @@ public abstract class OsmHandler {
*/
public abstract void parse(InputStream is) throws FormatException;
+
}
=====================================
src/uk/me/parabola/mkgmap/reader/osm/OsmMapDataSource.java
=====================================
@@ -220,6 +220,9 @@ public class OsmMapDataSource extends MapperBasedMapDataSource implements Loadab
if (getConfig().getProperty("ignore-fixme-values", false)) {
handler.setDeleteFixmeValues(true);
}
+ if (getConfig().getProperty("keep-empty-value-tags", false)) {
+ handler.setDeleteEmptyValueTag(false);
+ }
}
protected void createElementSaver() {
=====================================
test/func/route/SimpleRouteTest.java
=====================================
@@ -71,7 +71,7 @@ public class SimpleRouteTest extends Base {
case "NOD":
count++;
System.out.println("NOD size " + size);
- assertEquals("NOD size", 146631, size);
+ assertEquals("NOD size", 170201, size);
break;
}
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/fc78e49934931b05c7692b1364b77c02bfa6fbc0...e832d5dff0e642f0a71f730723d9995d80f87a48
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/-/compare/fc78e49934931b05c7692b1364b77c02bfa6fbc0...e832d5dff0e642f0a71f730723d9995d80f87a48
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/20200801/41ff3ee4/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list