Bas Couwenberg pushed to branch upstream at Debian GIS Project / mkgmap
Commits:
e2c742e1 by Bas Couwenberg at 2019-10-01T03:54:03Z
New upstream version 0.0.0+svn4294
- - - - -
3 changed files:
- resources/mkgmap-version.properties
- resources/styles/default/lines
- src/uk/me/parabola/mkgmap/osmstyle/eval/ExpressionReader.java
Changes:
=====================================
resources/mkgmap-version.properties
=====================================
@@ -1,2 +1,2 @@
-svn.version: 4289
-build.timestamp: 2019-08-23T19:00:49+0100
+svn.version: 4294
+build.timestamp: 2019-09-28T07:25:58+0100
=====================================
resources/styles/default/lines
=====================================
@@ -40,8 +40,6 @@ highway=via_ferrata {delete highway} # this shouldn't show
as routable on defau
highway=piste | highway=ski {delete highway}
highway=no | highway=none {delete highway}
-# Hide unaccessible tunnels
-highway=* & tunnel=yes & (access=private | access=no) & foot!=* & bicycle!=*
{delete highway; delete junction}
# Disable dead-end-checks for unaccessible oneways
highway=* & oneway=yes & (access=private | access=no) {add
mkgmap:dead-end-check=false}
# Validation-like checks (uncomment to enable)
@@ -282,7 +280,7 @@ include 'inc/address';
include 'inc/roadspeed';
# calculate the access rules
include 'inc/access';
-
+
#limit artificial cycleways to resolution 24
mkgmap:synthesised=yes & mkgmap:bicycle=yes {set
mkgmap:highest-resolution-only=true}
=====================================
src/uk/me/parabola/mkgmap/osmstyle/eval/ExpressionReader.java
=====================================
@@ -129,10 +129,10 @@ public class ExpressionReader {
if (result != null) {
AndOp and = new AndOp();
and.setFirst(result);
- and.setSecond(ops[0]);
+ and.setSecond(ops[0].copy());
result = and;
} else
- result = ops[0];
+ result = ops[0].copy();
}
return result;
View it on GitLab:
https://salsa.debian.org/debian-gis-team/mkgmap/commit/e2c742e1fbe42fecdc4c10516f64dd0340a3dc3e
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/mkgmap/commit/e2c742e1fbe42fecdc4c10516f64dd0340a3dc3e
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
