[mkgmap] 01/05: Imported Upstream version 0.0.0+svn3652

[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 303ea4be1bc7fd314b948d7df400ada6c5b6deb4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 1 22:58:58 2015 +0100

    Imported Upstream version 0.0.0+svn3652
---
 resources/mkgmap-version.properties             | 4 ++--
 resources/styles/default/inc/address            | 1 +
 resources/styles/default/lines                  | 6 +++++-
 src/uk/me/parabola/mkgmap/build/MapBuilder.java | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/mkgmap-version.properties b/resources/mkgmap-version.properties
index b3ec584..354f413 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 3649
-build.timestamp: 2015-10-27T06:51:19+0000
+svn.version: 3652
+build.timestamp: 2015-11-26T07:46:02+0000
diff --git a/resources/styles/default/inc/address b/resources/styles/default/inc/address
index d75e32f..f71333b 100644
--- a/resources/styles/default/inc/address
+++ b/resources/styles/default/inc/address
@@ -27,6 +27,7 @@ mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='
 
 
 # Austria = AUT
+mkgmap:country=AUT & mkgmap:city!=* & mkgmap:admin_level4=Wien {set mkgmap:city='${mkgmap:admin_level4}' }
 mkgmap:country=AUT & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10|subst:Gemeinde |subst:Stadt }' }
 mkgmap:country=AUT & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8|subst:Gemeinde |subst:Stadt }' }
 
diff --git a/resources/styles/default/lines b/resources/styles/default/lines
index 2b3dedd..65b1633 100644
--- a/resources/styles/default/lines
+++ b/resources/styles/default/lines
@@ -18,10 +18,14 @@ highway=* & name=* { set mkgmap:street='${name}' }
 # Mark highways with the toll flag
 highway=* & (toll=yes|toll=true) { set mkgmap:toll=yes }
 
-# Hide proposed ways 
+# Hide proposed ways
 (highway=proposed | highway=proposal | highway=planned | highway ~ '.*proposed.*') {delete highway;delete junction}
 # Hide removed ways
 (highway=razed | highway=dismantled) {deletealltags}
+# Hide abandoned ways. Abandoned highways have some evidence of their former existence but are no longer used. These
+# abandoned highways could be useful in topographical maps.
+# https://wiki.openstreetmap.org/wiki/Key:abandoned:
+((abandoned:highway=* & highway!=*) | highway=abandoned) {deletealltags}
 # Hide other non-existent ways
 (highway=unbuilt | highway=neverbuilt | highway=rejected | highway ~ 'x-.*') {delete highway;delete junction}
 
diff --git a/src/uk/me/parabola/mkgmap/build/MapBuilder.java b/src/uk/me/parabola/mkgmap/build/MapBuilder.java
index ed482e0..e002acd 100644
--- a/src/uk/me/parabola/mkgmap/build/MapBuilder.java
+++ b/src/uk/me/parabola/mkgmap/build/MapBuilder.java
@@ -450,7 +450,7 @@ public class MapBuilder implements Configurable {
 	private City calcCity(LBLFile lbl, String city, String region, String country){
 		if (city == null && region == null && country == null)
 			return null;
-		Country cc = (country == null)? getDefaultCountry() : lbl.createCountry(country, locator.getCountryISOCode(country));
+		Country cc = (country == null)? getDefaultCountry() : lbl.createCountry(locator.normalizeCountry(country), locator.getCountryISOCode(country));
 		Region cr = (region == null)? getDefaultRegion(cc) : lbl.createRegion(cc, region, null);
 		if (city == null && (country != null || region != null)) {
 			// if city name is unknown and region and/or country is known 

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