[mkgmap] 01/04: Imported Upstream version 0.0.0+svn3656

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mkgmap.

commit cf7dba452f0d4f0b1fd85076b215ae647443bbde
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 1 00:27:45 2016 +0100

    Imported Upstream version 0.0.0+svn3656
---
 resources/mkgmap-version.properties                            | 4 ++--
 resources/styles/default/inc/landuse_polygons                  | 4 ++--
 resources/styles/default/lines                                 | 6 +++++-
 resources/styles/default/points                                | 2 +-
 src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/mkgmap-version.properties b/resources/mkgmap-version.properties
index 354f413..d713e45 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 3652
-build.timestamp: 2015-11-26T07:46:02+0000
+svn.version: 3656
+build.timestamp: 2015-12-19T07:08:56+0000
diff --git a/resources/styles/default/inc/landuse_polygons b/resources/styles/default/inc/landuse_polygons
index 7e7e627..7c6a7f4 100644
--- a/resources/styles/default/inc/landuse_polygons
+++ b/resources/styles/default/inc/landuse_polygons
@@ -2,8 +2,8 @@ landuse=allotments [0x4e resolution 21]
 landuse=cemetery|landuse=cemetary|amenity=grave_yard [0x1a resolution 21]
 landuse=commercial [0x0c resolution 19]
 landuse=construction [0x0c resolution 21]
-landuse=farm [0x4e resolution 20]
-landuse=farmyard [0x4e resolution 22]
+landuse=farm |landuse=farmland [0x4e resolution 20]
+landuse=farmyard [0x10 resolution 22]
 landuse=forest|landuse=wood [0x50 resolution 20]
 landuse=greenfield [0x17 resolution 20]
 landuse=meadow [0x17 resolution 19]
diff --git a/resources/styles/default/lines b/resources/styles/default/lines
index 65b1633..9223f9f 100644
--- a/resources/styles/default/lines
+++ b/resources/styles/default/lines
@@ -28,7 +28,11 @@ highway=* & (toll=yes|toll=true) { set mkgmap:toll=yes }
 ((abandoned:highway=* & highway!=*) | highway=abandoned) {deletealltags}
 # Hide other non-existent ways
 (highway=unbuilt | highway=neverbuilt | highway=rejected | highway ~ 'x-.*') {delete highway;delete junction}
-
+# Remove highway tag from ways which are not suitable for routing
+highway=traffic_signals | highway=junction | highway=island | highway=centre_line | highway=traffic_island  {delete highway} 
+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}
diff --git a/resources/styles/default/points b/resources/styles/default/points
index fcf5688..aab7eb0 100644
--- a/resources/styles/default/points
+++ b/resources/styles/default/points
@@ -261,7 +261,7 @@ shop=tyres [0x2f07 resolution 24]
 shop=* [0x2e0c resolution 24]
 
 sport=9pin [0x2d07 resolution 24]
-sport=10pin [0x2d07 resolution 24]
+sport=10pin | leisure=bowling_alley [0x2d07 resolution 24]
 sport=airport [0x2d0b resolution 24]
 sport=multi [0x2d0a resolution 24]
 sport=skating [0x2d08 resolution 24]
diff --git a/src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java b/src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java
index 733d104..f43c5c0 100644
--- a/src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java
+++ b/src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java
@@ -320,7 +320,7 @@ public class ExtNumbers {
 				if (zipCodeInfo.getZipCode() != null){
 					if (zipCodeInfo.equals(housenumberRoad.getRoadZipCode()) == false){
 						// we found a zip code and the road doesn't yet have one, use it for the whole road
-						if (getRoad().getZip() == null){
+						if (housenumberRoad.getRoadZipCode() == null){ 
 							housenumberRoad.setZipCodeInfo(zipCodeInfo);
 						} else
 							numbers.setZipCode(left, zipCodeInfo);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git