[Git][debian-gis-team/mkgmap][master] 4 commits: New upstream version 0.0.0+svn4294

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / mkgmap


Commits:
e2c742e1 by Bas Couwenberg at 2019-10-01T03:54:03Z
New upstream version 0.0.0+svn4294
- - - - -
49a90b78 by Bas Couwenberg at 2019-10-01T03:54:17Z
Update upstream source from tag 'upstream/0.0.0+svn4294'

Update to upstream version '0.0.0+svn4294'
with Debian dir 91b794900ca080d1a93fb0ee85f476acba10aa94
- - - - -
b6065eb8 by Bas Couwenberg at 2019-10-01T03:54:38Z
New upstream SVN snapshot.

- - - - -
c015c07b by Bas Couwenberg at 2019-10-01T03:55:22Z
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- resources/mkgmap-version.properties
- resources/styles/default/lines
- src/uk/me/parabola/mkgmap/osmstyle/eval/ExpressionReader.java


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-mkgmap (0.0.0+svn4289-2) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn4294-1) unstable; urgency=medium
 
+  * New upstream SVN snapshot.
   * Bump Standards-Version to 4.4.1, no changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Sep 2019 19:26:00 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 01 Oct 2019 05:55:11 +0200
 
 mkgmap (0.0.0+svn4289-1) unstable; urgency=medium
 


=====================================
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/compare/1d7141a8e4aa1b8d2ce80403c3c29e29e83654e9...c015c07b3db8da4861b693a1295eb6ccf86d5ff3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mkgmap/compare/1d7141a8e4aa1b8d2ce80403c3c29e29e83654e9...c015c07b3db8da4861b693a1295eb6ccf86d5ff3
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/20191001/b61c208a/attachment-0001.html>