Finish 1411

Freizeitkarte-Entwicklung/style/indexsearch-master → Freizeitkarte-Entwicklung/style/fzk/indexsearch-master

@@ -1,4 +1,4 @@
-# Stand: 2014/5/05
+# Stand: 2014/5/05
 # -----------------
 # Version : 0.01 - 26.08.2012: Basic functionalities
 # Version : 0.02 - 05.05.2014: Adapted Details about AUT: there was something different to the default style files provided with new mkgmap version

Freizeitkarte-Entwicklung/style/info-master → Freizeitkarte-Entwicklung/style/fzk/info-master

@@ -1,4 +1,4 @@
-# ---------------------------------------
+# ---------------------------------------
 # Zweck   : Informationen bezüglich des Regelsatzes.
 # Version : 0.1 - 23.09.2011
 #

Freizeitkarte-Entwicklung/style/lines-master → Freizeitkarte-Entwicklung/style/fzk/lines-master

@@ -49,6 +49,8 @@
 # Version : 0.26  17.06.2014 - Adding some map features:
 #                              - barrier = hedge and barrier = hedge_bank
 #                              - natural = tree_row
+# Version : 0.27  31.10.2014 - Fixing Routing issue with trunks/motorway/motorroad restrictions
+#                            - Fixing problems with includes: clearly defining what is done by PPP (no include needed here) and what by mkgmap includes
 
 
 
@@ -289,7 +291,7 @@
 # -------------------------------------------------
 # Adress- / Indexsuche:
 # -------------------------------------------------
-#include "indexsearch"
+include "indexsearch";
 
 
 # ------------------------------------------------------------------
@@ -533,8 +535,11 @@ bicycle = designated                     {set bicycle = yes; set bfdesignated =
 highway = proposed | highway = raceway | highway = no | highway = crossing | highway =  traffic_signals | highway = platform | highway = streetlamp | highway = emergency_access_point | highway = stop | highway = passing_place| highway = incline_steep | highway = incline | highway = milestone | highway = access_ramp {set access = no; set motorcar = no; set bicycle = no; set foot = no}
 highway = via_ferrata | highway = construction  {set access = no; set motorcar = no; set bicycle = no; set foot = no}
 
+# Motorroad (Kraftfahrstrasse): generell gesperrt fuer Fussganeger und Radfahrer
+motorroad = yes {add foot = no; add bicycle = no}
+
 # Autobahnen: generell gesperrt fuer Fussgaenger und Radfahrer
-highway = motorway | highway = trunk {add foot = no; add bicycle = no}
+highway = motorway {add foot = no; add bicycle = no}
 
 # Pfade, Radwege, Feld-/Waldwege: generell gesperrt fuer Autos
 highway = path | highway = cycleway | highway = track {add motorcar = no}
@@ -1901,4 +1906,3 @@ goods=yes | goods=permissive | goods=official | goods=designated { set mkgmap:de
 
 # Reintroduce the old carpool handling which allows access only for bus and emergency plus setting the carpool bit
 mkgmap:carpool_compat=yes  { setaccess=no; set mkgmap:bus=yes; set mkgmap:emergency=yes; set mkgmap:carpool=yes }
-

Freizeitkarte-Entwicklung/style/options-master → Freizeitkarte-Entwicklung/style/fzk/options-master

@@ -1,4 +1,4 @@
-# ---------------------------------------
+# ---------------------------------------
 # Zweck   : mkgmap-Optionen
 # Version : 0.1 - 23.09.2011
 # Version : 0.2 - 04.09.2013: Preparations for upgrade to mkgmap r2617 (adding overviewmaps)

Freizeitkarte-Entwicklung/style/polygons-master → Freizeitkarte-Entwicklung/style/fzk/polygons-master

@@ -1,4 +1,4 @@
-# ------------------------------------------------------------
+# ------------------------------------------------------------
 # Zweck   : mkgmap-Regeln für Polygone (Flächen)
 # Version : 0.1 - 23.09.2011
 # Version : 0.2 - 02.10.2011: Adresssuche
@@ -22,6 +22,7 @@
 #                             Change handling of Marina from filled polygone to outline only
 # Version : 0.15 -14.03.2014: Adapting things regarding power = * (station / plant / substation / sub_station)
 # Version : 0.16 -05.05.2014: Adapting finalize section to support new mkgmap version 2096 and newer
+# Version : 0.17 -31.10.2014: Fixing issues with different includes: clarify what is done by PPP and what is done by mkgmap
 
 #
 # Copyright (C) 2011, 2013 Projekt Freizeitkarte <[email protected]>
@@ -347,7 +348,7 @@ areoway = runway {set aeroway=aerodrome}
 # -------------------------------------------------
 # Adress- / Indexsuche:
 # -------------------------------------------------
-#include "indexsearch"
+include "indexsearch";
 
 
 # ------------------------------------------------------------
@@ -924,7 +925,7 @@ zoo = enclosure {name "${name} ($__COMPOUND__)" | "$__COMPOUND__"} [0x41 resolut
 # ------------------------------------------------
 # add the following lines to your lines file
 <finalize>
-# include 'compat_polygons'; 
+# deactivated include 'compat_polygons'; 
 name=* { name '${name}' }
 mkgmap:default_name=* { name '${mkgmap:default_name}' }
 mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }

Freizeitkarte-Entwicklung/style/fzk/version

@@ -0,0 +1,2 @@
+1
+

Freizeitkarte-Entwicklung/style/swisspopo/compat_lines

@@ -0,0 +1,125 @@
+include 'roadspeed';
+
+name=* { name '${name}' }
+mkgmap:default_name=* { name '${mkgmap:default_name}' }
+mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }
+
+mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
+mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
+mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
+mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }
+
+ref=*     { addlabel '${ref|part:;:1}';     addlabel '${ref|part:;:2}';     addlabel '${ref|part:;:3}'     }
+int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
+nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
+reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }
+
+highway=* & mkgmap:label:1=* & mkgmap:street!=* { add mkgmap:street='${mkgmap:label:1}' }
+
+toll=* { set mkgmap:toll='${toll}' }
+
+#		new AccessMapping("access",     RoadNetwork.NO_MAX), // must be first in list
+#		new AccessMapping("bicycle",    RoadNetwork.NO_BIKE),
+#		new AccessMapping("carpool",    RoadNetwork.NO_CARPOOL),
+#		new AccessMapping("foot",       RoadNetwork.NO_FOOT),
+#		new AccessMapping("hgv",        RoadNetwork.NO_TRUCK),
+#		new AccessMapping("motorcar",   RoadNetwork.NO_CAR),
+#		new AccessMapping("motorcycle", RoadNetwork.NO_CAR),
+#		new AccessMapping("psv",        RoadNetwork.NO_BUS),
+#		new AccessMapping("taxi",       RoadNetwork.NO_TAXI),
+#		new AccessMapping("emergency",  RoadNetwork.NO_EMERGENCY),
+#		new AccessMapping("delivery",   RoadNetwork.NO_DELIVERY),
+#		new AccessMapping("goods",      RoadNetwork.NO_DELIVERY),
+#		for (AccessMapping anAccessMap : accessMap) {
+#			int index = anAccessMap.index;
+#			String type = anAccessMap.type;
+#			String accessTagValue = way.getTag(type);
+#			if (accessTagValue == null)
+#				continue;
+#			if (accessExplicitlyDenied(accessTagValue)) {
+#				if (index == RoadNetwork.NO_MAX) {
+#					// everything is denied access
+#					for (int j = 1; j < accessMap.length; ++j)
+#						noAccess[accessMap[j].index] = true;
+#				} else {
+#					// just the specific vehicle class is denied
+#					// access
+#					noAccess[index] = true;
+#				}
+#				log.debug(type + " is not allowed in " + highwayType + " " + debugWayName);
+#			} else if (accessExplicitlyAllowed(accessTagValue)) {
+#				if (index == RoadNetwork.NO_MAX) {
+#					// everything is allowed access
+#					for (int j = 1; j < accessMap.length; ++j)
+#						noAccess[accessMap[j].index] = false;
+#				} else {
+#					// just the specific vehicle class is allowed
+#					// access
+#					noAccess[index] = false;
+#				}
+#				log.debug(type + " is allowed in " + highwayType + " " + debugWayName);
+#			}
+#			else if (accessTagValue.equalsIgnoreCase("destination")) {
+#				if (type.equals("motorcar") ||
+#				    type.equals("motorcycle")) {
+#					road.setNoThroughRouting();
+#				} else if (type.equals("access")) {
+#					log.info("access=destination only affects routing for cars in " + highwayType + " " + debugWayName);
+#					road.setNoThroughRouting();
+#				} else {
+#					log.info(type + "=destination ignored in " + highwayType + " " + debugWayName);
+#				}
+#			} else if (accessTagValue.equalsIgnoreCase("unknown")) {
+#				// implicitly allow access
+#			} else {
+#				log.info("Ignoring unsupported access tag value " + type + "=" + accessTagValue + " in " + highwayType + " " + debugWayName);
+#			}
+#		}
+#
+
+# mkgmap:carpool tag is set but before new access handling was introduced it had a
+# different meaning. Copy it to keep its value which is handled in the old behaviour last.
+mkgmap:carpool=* { set mkgmap:carpool_compat='${mkgmap:carpool}'; delete mkgmap:carpool }
+
+access=private | access=no { setaccess no; set mkgmap:carpool=yes; }
+access=yes | access=permissive | access=official | access=designated { setaccess yes; set mkgmap:carpool=no; }
+access=destination { set mkgmap:throughroute=no }
+
+bicycle=private | bicycle=no { set mkgmap:bicycle=no; }
+bicycle=yes | bicycle=permissive | bicycle=official | bicycle=designated { set mkgmap:bicycle=yes; }
+
+carpool=private | carpool=no { set mkgmap:carpool=no; }
+carpool=yes | carpool=permissive | carpool=official | carpool=designated { set mkgmap:carpool=yes; }
+
+foot=private | foot=no { set mkgmap:foot=no; }
+foot=yes | foot=permissive | foot=official | foot=designated { set mkgmap:foot=yes; }
+
+hgv=private | hgv=no { set mkgmap:truck=no; }
+hgv=yes | hgv=permissive | hgv=official | hgv=designated { set mkgmap:truck=yes; }
+
+motorcar=private | motorcar=no { set mkgmap:car=no; }
+motorcar=yes | motorcar=permissive | motorcar=official | motorcar=designated { set mkgmap:car=yes; }
+motorcar=destination { set mkgmap:throughroute=no }
+
+motorcycle=private | motorcycle=no { set mkgmap:car=no; }
+motorcycle=yes | motorcycle=permissive | motorcycle=official | motorcycle=designated { set mkgmap:car=yes; }
+motorcycle=destination { set mkgmap:throughroute=no }
+
+psv=private | psv=no { set mkgmap:bus=no; }
+psv=yes | psv=permissive | psv=official | psv=designated { set mkgmap:bus=yes; }
+
+taxi=private | taxi=no { set mkgmap:taxi=no; }
+taxi=yes | taxi=permissive | taxi=official | taxi=designated { set mkgmap:taxi=yes; }
+
+emergency=private | emergency=no { set mkgmap:emergency=no; }
+emergency=yes | emergency=permissive | emergency=official | emergency=designated { set mkgmap:emergency=yes; }
+
+delivery=private | delivery=no { set mkgmap:delivery=no; }
+delivery=yes | delivery=permissive | delivery=official | delivery=designated { set mkgmap:delivery=yes; }
+
+goods=private | goods=no { set mkgmap:delivery=no; }
+goods=yes | goods=permissive | goods=official | goods=designated { set mkgmap:delivery=yes; }
+
+# Reintroduce the old carpool handling which allows access only for bus and emergency plus setting the carpool bit
+mkgmap:carpool_compat=yes  { setaccess=no; set mkgmap:bus=yes; set mkgmap:emergency=yes; set mkgmap:carpool=yes }
+

Freizeitkarte-Entwicklung/style/swisspopo/compat_points

@@ -0,0 +1,13 @@
+name=* { name '${name}' }
+mkgmap:default_name=* { name '${mkgmap:default_name}' }
+mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }
+
+mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
+mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
+mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
+mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }
+
+ref=*     { addlabel '${ref|part:;:1}';     addlabel '${ref|part:;:2}';     addlabel '${ref|part:;:3}'     }
+int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
+nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
+reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }

Freizeitkarte-Entwicklung/style/swisspopo/compat_polygons

@@ -0,0 +1,13 @@
+name=* { name '${name}' }
+mkgmap:default_name=* { name '${mkgmap:default_name}' }
+mkgmap:display_name=* { addlabel '${mkgmap:display_name|subst:;=>/}' }
+
+mkgmap:label:1!=* & ref=* { addlabel '${ref|part:;:1}' }
+mkgmap:label:1!=* & int_ref=* { addlabel '${int_ref|part:;:1}' }
+mkgmap:label:1!=* & nat_ref=* { addlabel '${nat_ref|part:;:1}' }
+mkgmap:label:1!=* & reg_ref=* { addlabel '${reg_ref|part:;:1}' }
+
+ref=*     { addlabel '${ref|part:;:1}';     addlabel '${ref|part:;:2}';     addlabel '${ref|part:;:3}'     }
+int_ref=* { addlabel '${int_ref|part:;:1}'; addlabel '${int_ref|part:;:2}'; addlabel '${int_ref|part:;:3}' }
+nat_ref=* { addlabel '${nat_ref|part:;:1}'; addlabel '${nat_ref|part:;:2}'; addlabel '${nat_ref|part:;:3}' }
+reg_ref=* { addlabel '${reg_ref|part:;:1}'; addlabel '${reg_ref|part:;:2}'; addlabel '${reg_ref|part:;:3}' }

Freizeitkarte-Entwicklung/style/swisspopo/indexsearch-master

@@ -0,0 +1,109 @@
+# Stand: 2014/5/05
+# -----------------
+# Version : 0.01 - 26.08.2012: Basic functionalities
+# Version : 0.02 - 05.05.2014: Adapted Details about AUT: there was something different to the default style files provided with new mkgmap version
+
+# first set the country code
+mkgmap:country!=* & mkgmap:admin_level2=* { set mkgmap:country='${mkgmap:admin_level2}' }
+mkgmap:country!=* & addr:country=* { set mkgmap:country='${addr:country}' }
+mkgmap:country!=* & is_in:country=* { set mkgmap:country='${is_in:country}' }
+
+# country specific rules first
+
+# Netherlands = NLD
+mkgmap:country=NLD & mkgmap:region!=* & mkgmap:admin_level4=* { set mkgmap:region='${mkgmap:admin_level4}' }
+mkgmap:country=NLD & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
+mkgmap:country=NLD & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+
+# Germany = DEU cities (Wichtig: Die Abarbeitungsreihenfolge (von oben nach unten) ist relevant.)
+
+# Hamburg (Sonderfall):
+# Die Bezeichnung "Hamburg" gibt es nur im "admin_level=4".
+# Im "admin_level=9" gibt es "Hamburg-Mitte" und "Hamburg-Nord".
+# Für die Adresssuche wird deshalb das "admin_level=4" verwendet.
+mkgmap:country=DEU & mkgmap:admin_level4=Hamburg {set mkgmap:city='${mkgmap:admin_level4}' }
+
+# Berlin (Sonderfall):
+# Die Bezeichnung "Berlin" gibt es nur im "admin_level=4".
+mkgmap:country=DEU & mkgmap:admin_level4=Berlin {set mkgmap:city='${mkgmap:admin_level4}' }
+
+# Bremen (kein Sonderfall):
+# Im "admin_level=4" gibt es die Bezeichnung "Freie Hansestadt Bremen (Landmasse)".
+# Im "admin_level=6" gibt es die Bezeichnungen "Bremen".
+# Nachfolgend greift die Regel für "admin_level=6".
+
+# Diverse Verwaltungseinheiten im "admin_level 8" tragen ein Bezeichnungspräfix.
+# Am häufigsten in Deutschland kommen folgende Präfixe vor (Stand 12/2011):
+# - "Gemeinde "        (658x, Beispiele: "Gemeinde Spalt", "Gemeinde Maxdorf")
+# - "Bad "             (135x, Beispiele: "Bad Brambach", "Bad Ems")
+# - "Stadt "            (67x, Beispiele: "Stadt Linz am Rhein", "Stadt Rodgau")
+# - "Groß "             (46x, Beispiele: "Groß Dratow", "Groß Wittensee")
+# - "Gemeindefreies "   (29x, Beispiele: "Gemeindefreies Gebiet Harz", "Gemeindefreies Gebiet Soos")
+# - "Klein "            (25x, Beispiele: "Klein Luckow", "Klein Vielen")
+# - "Sankt "            (25x, Beispiele: "Sankt Goarshausen", "Sankt Peter-Ording")
+# Die Präfixe "Gemeinde " und "Stadt " stellen keinen Namensbestandteil dar und werden entfernt.
+
+# Rostock (Sonderfall):
+### mkgmap:country=DEU & mkgmap:admin_level6=Rostock {set mkgmap:city='${mkgmap:admin_level6}' }
+
+mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8|subst:Gemeinde |subst:Stadt }' }
+### ohne admin_level 7 (Verbandsgemeinden, Verwaltungsgemeinschaften, etc.)
+### mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
+mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level6=* { set mkgmap:city='${mkgmap:admin_level6}' }
+mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=DEU & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
+
+# Österreich = AUT
+# Das Präfix "Gemeinde " stellt keinen Namensbestandteil dar und wird entfernt.
+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 }' }
+
+mkgmap:country=BEL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=CZE & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=CZE & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
+mkgmap:country=DNK & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=DNK & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
+mkgmap:country=FIN & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=FIN & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=FRA & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=FRA & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=ISL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=ITA & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=LUX & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=NOR & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=POL & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
+mkgmap:country=POL & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=PRT & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=PRT & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=SVN & mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
+mkgmap:country=ESP & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:country=SWE & mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:country=SWE & mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
+mkgmap:country=CHE & mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+
+# common rules for all the rest of countries
+mkgmap:region!=* & mkgmap:admin_level6=* { set mkgmap:region='${mkgmap:admin_level6}' }
+mkgmap:region!=* & mkgmap:admin_level5=* { set mkgmap:region='${mkgmap:admin_level5}' }
+mkgmap:region!=* & mkgmap:admin_level4=* { set mkgmap:region='${mkgmap:admin_level4}' }
+mkgmap:region!=* & mkgmap:admin_level3=* { set mkgmap:region='${mkgmap:admin_level3}' }
+mkgmap:region!=* & is_in:county=* { set mkgmap:region='${is_in:county}' }
+
+mkgmap:city!=* & mkgmap:admin_level8=* { set mkgmap:city='${mkgmap:admin_level8}' }
+mkgmap:city!=* & mkgmap:admin_level7=* { set mkgmap:city='${mkgmap:admin_level7}' }
+mkgmap:city!=* & mkgmap:admin_level9=* { set mkgmap:city='${mkgmap:admin_level9}' }
+mkgmap:city!=* & mkgmap:admin_level10=* { set mkgmap:city='${mkgmap:admin_level10}' }
+mkgmap:city!=* & is_in:city=* { set mkgmap:city='${is_in:city}' }
+mkgmap:city!=* & addr:city=* { set mkgmap:city='${addr:city}' }
+
+mkgmap:postal_code!=* & mkgmap:postcode=* { set mkgmap:postal_code='${mkgmap:postcode}' }
+mkgmap:postal_code!=* & addr:postcode=* { set mkgmap:postal_code='${addr:postcode}' }
+
+mkgmap:street!=* & addr:street=* { set mkgmap:street='${addr:street}' }
+mkgmap:street!=* & addr:housename=* { set mkgmap:street='${addr:housename}' }
+
+mkgmap:housenumber!=* & addr:housenumber=* { set mkgmap:housenumber='${addr:housenumber}' }
+
+mkgmap:phone!=* & phone=* { set mkgmap:phone='${phone}' }
+mkgmap:phone!=* & contact:phone=* { add mkgmap:phone='${contact:phone}' }
+
+mkgmap:is_in!=* & is_in=* { set mkgmap:is_in='${is_in}' }