build.xml

@@ -59,7 +59,7 @@
 	</tstamp>
 
 	<!-- ivy dependency support -->
-	<property name="ivy.version" value="2.2.0"/>
+	<property name="ivy.version" value="2.4.0"/>
 	<property name="ivy.lib.dir" value="${basedir}/lib" />
 	<property name="ivy.jar.dir" value="${ivy.lib.dir}/build" />
 	<property name="ivy.retrieve.pattern" value="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" />

debian/changelog

-mkgmap (0.0.0+svn4262-2) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn4287-1) unstable; urgency=medium
 
+  * New upstream SVN snapshot.
   * Update gbp.conf to use --source-only-changes by default.
   * Bump Standards-Version to 4.4.0, no changes.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 08:44:13 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 01 Aug 2019 16:16:51 +0200
 
 mkgmap (0.0.0+svn4262-1) unstable; urgency=medium
 

doc/options.txt

@@ -34,7 +34,10 @@ also be used for Windows programs.
 ;--read-config=filename
 : 	Each line of the named file contains a command option in the form
 option=value or option:value.  The options are included as arguments of
-the executed command as if they had been specified on the command line.
+the executed command as if they had been specified on the command line with one
+exception: a relative path given with option input-file is assumed to be relative
+to the location of the file.
+<p>
 Lines beginning with a # character are ignored and can be used as
 comments.  Any command line option can be specified, however the
 leading '--' must be omitted.  The short option names with a single
@@ -102,15 +105,9 @@ also given, then the index is generated within the resulting
 gmapsupp.img file so that address search will work on a GPS
 device.
 <p>
-If instead the --tdbfile option is given then the index consists
-of two files named osmmap.mdx and osmmap_mdr.img which can be used
-with MapSource.  The --overview-mapname option can be used to change
-these names.  (For compatibility, you do not need the tdbfile
-option if gmapsupp is not given).
-<p>
-If both the --gmapsupp and --tdbfile options are given alongside
-the --index option, then both indexes will be created. Note that
-this will require roughly twice as much memory.
+If both the --gmapsupp and any of --tdbfile, --gmapi, or --nsis options 
+are given alongside the --index option, then both indexes will be created.
+Note that this will require roughly twice as much memory.
 <p>
 If the map is sent to the device by MapSource, it will enable
 find by name and address search on the GPS.
@@ -797,7 +794,7 @@ compared with these patterns and those that match are deleted.
 <p>
 ;--tdbfile
 : 	Write files that are essential to running with MapSource, a .tdb file and
-an overview map.
+an overview map. The options --nsis and --gmapi imply --tdbfile.
 <p>
 ;--show-profiles=1
 : 	Sets a flag in tdb file. The meaning depends on the availability of DEM 

doc/styles/internal-tags.txt

@@ -117,6 +117,7 @@ is used to assign the country location.
 | +mkgmap:area2poi+  | The value is +true+ if the POI is derived from a polygon | 'add-pois-to-areas'    
 | +mkgmap:line2poi+  | The value is +true+ if the POI is derived from a line | 'add-pois-to-lines'    
 | +mkgmap:line2poitype+  | The tag is set for each POI generated from a line. Possible values are: +start+, +end+, +mid+, +inner+. | 'add-pois-to-lines'    
+| +mkgmap:way-length+  | The tag is set for each POI generated from a line. It gives the way length rounded to meters. | 'add-pois-to-lines'
 | +mkgmap:exit_hint+  | +true+ for the part on link roads that should contain information about the exit | 'process-exits'    
 | +mkgmap:exit_hint_name+  | The +name+ tag value of the links exit node | 'process-exits'    
 | +mkgmap:exit_hint_ref+  | The +ref+ tag value of the links exit node | 'process-exits'    

ivy.xml

@@ -29,6 +29,10 @@
 				conf="compile->default(*)"
 				/>
 
+		<dependency org="javax.xml.bind" name="jaxb-api"
+				rev="2.3.0"
+				conf="test->default(*)"/>
+
 		<dependency org="junit" name="junit"
 			    rev="4.11"
 			    conf="test->runtime(*),master(*)" />

resources/help/en/options

@@ -32,7 +32,9 @@ filename
 --read-config=filename
 	Each line of the named file contains a command option in the form
 	option=value or option:value.  The options are included as arguments of
-	the executed command as if they had been specified on the command line.
+	the executed command as if they had been specified on the command line with
+	one exception: a relative path given with option input-file is assumed to be
+	relative to the location of the file.
 	Lines beginning with a # character are ignored and can be used as
 	comments.  Any command line option can be specified, however the
 	leading '--' must be omitted.  The short option names with a single
@@ -101,15 +103,9 @@ Address search options:
 	gmapsupp.img file so that address search will work on a GPS
 	device.
 
-	If instead the --tdbfile option is given then the index consists
-	of two files named osmmap.mdx and osmmap_mdr.img which can be used
-	with MapSource.  The --overview-mapname option can be used to change
-	these names.  (For compatibility, you do not need the tdbfile
-	option if gmapsupp is not given).
-
-	If both the --gmapsupp and --tdbfile options are given alongside
-	the --index option, then both indexes will be created. Note that
-	this will require roughly twice as much memory.
+	If both the --gmapsupp and any of --tdbfile, --gmapi, or --nsis options 
+	are given alongside the --index option, then both indexes will be created. 
+	Note that this will require roughly twice as much memory.
 
 	If the map is sent to the device by MapSource, it will enable
 	find by name and address search on the GPS.
@@ -810,7 +806,7 @@ Miscellaneous options:
 
 --tdbfile
 	Write files that are essential to running with MapSource, a .tdb file and
-	an overview map.
+	an overview map. The options --nsis and --gmapi imply --tdbfile.
 
 --show-profiles=1
 	Sets a flag in tdb file. The meaning depends on the availability of DEM 

resources/mkgmap-version.properties

-svn.version: 4262
-build.timestamp: 2019-01-11T09:35:26+0000
+svn.version: 4287
+build.timestamp: 2019-06-05T14:49:17+0100

resources/styles/default/lines

@@ -117,9 +117,11 @@ highway=path & snowplowing!=no & (bicycle=designated | bicycle=permissive | bicy
 highway=path & foot=designated
     {set highway=footway}
 
-leisure=track & area!=yes {add highway=footway; name '${name} (${sport})' | '${name}'}
+leisure=track & area!=yes {name '${name} (${sport})' | '${sport}'} [0x30 resolution 22]
 man_made=pier | man_made=piste:halfpipe {add highway=footway; name '${ref} ${name}' | '${ref}' | '${name}'}
 
+man_made=breakwater & is_closed()=false & mkgmap:mp_created!=true [0x17 resolution 22 default_name 'Breakwater']
+
 # Roundabouts
 junction=roundabout & (highway=trunk | highway=trunk_link) [0x0c road_class=4 road_speed=2 resolution 24 continue]
 junction=roundabout & (highway=trunk | highway=trunk_link) [0x10801 resolution 18]
@@ -155,18 +157,18 @@ highway=* & disused=yes & maxspeed!=* {add mkgmap:road-speed='-2'}
 # Ways sorted roughly by descending order of class
 highway=motorway & mkgmap:fast_road=yes [0x01 road_class=4 road_speed=7 resolution 14]
 highway=motorway [0x01 road_class=4 road_speed=7 resolution 15]
-highway=motorway_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=4 road_speed=2 resolution 20]
+highway=motorway_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x0b road_class=4 road_speed=2 resolution 20]
 highway=motorway_link [0x09 road_class=4 road_speed=2 resolution 20]
 
 highway=trunk & mkgmap:fast_road=yes [0x02 road_class=4 road_speed=5 resolution 15]
 highway=trunk [0x02 road_class=4 road_speed=5 resolution 18]
-highway=trunk_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=4 road_speed=2 resolution 20]
+highway=trunk_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x0b road_class=4 road_speed=2 resolution 20]
 highway=trunk_link [0x09 road_class=4 road_speed=2 resolution 20]
 highway=* & motorroad=yes [0x02 road_class=4 road_speed=4 resolution 18]
 highway=primary & mkgmap:fast_road=yes [0x03 road_class=4 road_speed=4 resolution 17]
 highway=primary [0x03 road_class=3 road_speed=4 resolution 19]
-highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) & mkgmap:fast_road=yes [0x06 road_class=4 road_speed=1 resolution 21]
-highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x06 road_class=3 road_speed=1 resolution 21]
+highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) & mkgmap:fast_road=yes [0x0b road_class=4 road_speed=1 resolution 21]
+highway=primary_link & (mkgmap:exit_hint=true | mkgmap:dest_hint=*) [0x0b road_class=3 road_speed=1 resolution 21]
 highway=primary_link & mkgmap:fast_road=yes [0x08 road_class=4 road_speed=1 resolution 21]
 highway=primary_link [0x08 road_class=3 road_speed=1 resolution 21]
 highway=secondary & mkgmap:fast_road=yes [0x04 road_class=3 road_speed=3 resolution 18]
@@ -198,7 +200,7 @@ highway=service & service=parking_aisle [0x07 road_class=0 road_speed=1 resoluti
 highway=service & (service=alley | service=driveway) [0x07 road_class=0 road_speed=0 resolution 23]
 highway=service [0x07 road_class=0 road_speed=2 resolution 22]
 
-highway=cycleway [0x07 road_class=0 road_speed=1 resolution 23]
+highway=cycleway [0x11 road_class=0 road_speed=1 resolution 23]
 
 # highway=footway is often an area as well, continue for polygon processing
 highway=footway {set tmp:stopMopUp=yes} [0x16 road_class=0 road_speed=0 resolution 23 continue with_actions]
@@ -251,13 +253,15 @@ boundary=administrative [0x1c resolution 22]
 boundary=national [0x1e resolution 17]
 boundary=political [0x1c resolution 19]
 
+barrier=wall | barrier=fence | barrier=hedge | barrier=ditch {add name='${barrier|subst:"_=> "}'} [0x17 resolution 24]
+
 route=ferry & (toll=no | toll=false) {set mkgmap:toll=no}
 route=ferry {set mkgmap:numbers=false; set mkgmap:ferry=1; add mkgmap:toll=yes}
 route=ferry & (motorcar=no | motor_vehicle=no) [0x1b road_class=0 road_speed=0 resolution 23]
-route=ferry [0x1b road_class=3 road_speed=0 resolution 19]
+route=ferry [0x1a road_class=3 road_speed=0 resolution 19]
 
 (waterway=river | waterway=canal) & intermittent=yes [0x26 resolution 20]
-(waterway=stream | waterway=drain) & intermittent=yes [0x10A02 resolution 22]
+(waterway=stream | waterway=drain) & intermittent=yes [0x26 resolution 22]
 
 waterway=canal [0x1f resolution 21]
 waterway=river [0x1f resolution 18]

resources/styles/default/points

@@ -156,8 +156,7 @@ amenity=supermarket [0x2e02 resolution 24]
 amenity=taxi [0x2f17 resolution 24]
 amenity=telephone [0x2f12 resolution 24 default_name 'Telephone']
 amenity=theatre [0x2d01 resolution 24]
-amenity=toilets & highway=rest_area [0x2f0c resolution 24]
-amenity=toilets [0x4e00 resolution 24 default_name 'Toilets']
+amenity=toilets [0x2f0c resolution 24 default_name 'Toilets']
 amenity=townhall [0x3003 resolution 24]
 amenity=university [0x2c05 resolution 24]
 # amenity=zoo is superceded by tourism=zoo
@@ -266,6 +265,7 @@ tourism=lean_to [0x2b05 resolution 24 default_name 'lean-to']
 tourism=wilderness_hut [0x2b07 resolution 24 default_name 'wilderness hut']
 tourism=museum [0x2c02 resolution 24]
 tourism=picnic_site [0x4a00 resolution 24]
+tourism=resort [0x2b04 resolution 24]
 tourism=theme_park [0x2c01 resolution 24]
 tourism=viewpoint {name '${name} - ${description}' | '${name}'} [0x2c04 resolution 24]
 tourism=wine_cellar [0x2c0a resolution 24]
@@ -329,8 +329,9 @@ amenity=restaurant {add name='${cuisine|subst:"_=> "}'}
 #amenity=fast_food & cuisine=* {add name='${cuisine|subst:"_=> "}'} [0x2a07 resolution 24]
 #amenity=fast_food [0x2a07 resolution 24]
 
-barrier=bollard | barrier=bus_trap | barrier=gate [0x660f resolution 24]
-barrier=block | barrier=cycle_barrier | barrier=stile | barrier=kissing_gate [0x660f resolution 24]
+barrier=bollard | barrier=bus_trap | barrier=gate | barrier=block | barrier=cycle_barrier |
+    barrier=stile | barrier=kissing_gate | barrier=lift_gate | barrier=swing_gate
+    {add name='${barrier|subst:"_=> "}'} [0x3200 resolution 24]
 
 landuse=basin | landuse=reservoir [0x650f resolution 24]
 

resources/styles/default/polygons

@@ -37,8 +37,8 @@ amenity=university [0x0a resolution 21]
 healthcare=hospital | amenity=hospital | amenity=clinic [0x0b resolution 22]
 healthcare=* | amenity=dentist | amenity=doctors | amenity=nursing_home [0x0b resolution 23]
 
-leisure=common [0x17 resolution 21]
-leisure=garden [0x17 resolution 21]
+leisure=common [0x1d resolution 21]
+leisure=garden [0x20 resolution 21]
 leisure=golf_course [0x18 resolution 21]
 leisure=ice_rink [0x19 resolution 22]
 leisure=nature_reserve [0x16 resolution 19]
@@ -57,18 +57,18 @@ place=suburb [0x02 resolution 19]
 shop=* {add name='${shop|subst:"_=> "}'} [0x08 resolution 22]
 
 # squares and plazas
-place=square [0x17 resolution 22]
-highway=pedestrian & (area=yes | mkgmap:mp_created=true) [0x17 resolution 22]
+place=square [0x25 resolution 22]
+highway=pedestrian & (area=yes | mkgmap:mp_created=true) [0x25 resolution 22]
 # following rule also renders a closed way without area attribute as a plaza
-highway=pedestrian & area!=no [0x17 resolution 22]
+highway=pedestrian & area!=no [0x25 resolution 22]
 
 # footways areas are similar, but should be explicity marked as such
-highway=footway & area=yes [0x17 resolution 24]
+highway=footway & area=yes [0x25 resolution 24]
 
-# other highways that have area=yes are probably parking lots, eg services/rest_area
-(highway=services | highway=rest_area) & area!=no [0x05 resolution 22]
+highway=services [0x12 resolution 22]  # service station complex; show as retail
+highway=rest_area & area!=no [0x05 resolution 22]  # show as parking lot
 
-historic=* & historic!=no & historic!=yes & boundary!=* {add name='${historic|subst:"_=> "}'} [0x1e resolution 21]
+historic=* & historic!=no & historic!=yes & boundary!=* {add name='${historic|subst:"_=> "}'} [0x22 resolution 21]
 
 landuse=basin [0x3f resolution 20]
 landuse=reservoir | (natural=water & water=reservoir) [0x3f resolution 20]
@@ -78,7 +78,9 @@ dock=drydock [0x4c resolution 22]  # might also have natural=water
 natural=bay [0x3d resolution 18]
 natural=glacier [0x4d resolution 18]
 natural=marsh [0x51 resolution 20]
+natural=tundra [0x52 resolution 18]
 natural=mud [0x51 resolution 20]
+natural=beach | natural=sand [0x53 resolution 20]
 natural=wetland [0x51 resolution 20]
 natural=water & water=canal [0x48 resolution 22]
 natural=water & water=lock [0x4c resolution 22 default_name 'Lock']
@@ -94,39 +96,40 @@ waterway=* & waterway!=no & area!=no {add name='${waterway|subst:"_=> "}'} [0x3b
 
 landuse=allotments [0x4e resolution 21]
 landuse=cemetery | landuse=cemetary | amenity=grave_yard [0x1a resolution 21]
-landuse=commercial [0x0c resolution 19]
+landuse=commercial [0x0f resolution 19]
 landuse=construction [0x0c resolution 21]
-landuse=farm | landuse=farmland [0x4e resolution 20]
-landuse=farmyard [0x10 resolution 22]
+landuse=farm [0x26 resolution 22]
+landuse=farmland [0x1c resolution 20]
+landuse=farmyard [0x26 resolution 22]
 landuse=forest | landuse=wood [0x50 resolution 20]
-landuse=greenfield [0x17 resolution 20]
-landuse=meadow | landuse=grass [0x17 resolution 19]
+landuse=greenfield [0x1c resolution 20]
+landuse=meadow | landuse=grass [0x1c resolution 19]
 landuse=military [0x04 resolution 19]
 landuse=quarry [0x0c resolution 19]
 landuse=recreation_ground [0x19 resolution 19]
 # dedicate resolution 24 for building=* instead of related landuse=*
 landuse=industrial [0x0c resolution 19-23]
 landuse=residential [0x10 resolution 19-23]
-landuse=retail [0x08 resolution 20-23]
-landuse=village_green [0x17 resolution 20]
+landuse=retail [0x12 resolution 20-23]
+landuse=village_green [0x15 resolution 20]
 landuse=vineyard [0x4e resolution 20]
 landuse=orchard [0x4e resolution 20]
 
 military=airfield [0x04 resolution 20]
 military=barracks [0x04 resolution 23]
-military=danger_area [0x04 resolution 20]
+military=danger_area [0x11 resolution 20]
 military=range [0x04 resolution 20]
 
 natural=scrub [0x4f resolution 20]
 natural=wood [0x50 resolution 20]
 
 # building tag should be last
-amenity=* & area!=no & amenity!=grave_yard {add name='${amenity|subst:"_=> "}'} [0x13 resolution 24]
+amenity=* & area!=no & amenity!=grave_yard {add name='${amenity|subst:"_=> "}'} [0x23 resolution 24]
 building=* & building!=no [0x13 resolution 24]
-tourism=* & area!=no & waterway!=* {add name='${tourism|subst:"_=> "}'} [0x1f resolution 24]
+tourism=* & area!=no & waterway!=* {add name='${tourism|subst:"_=> "}'} [0x21 resolution 24]
 
 # man_made can be used on areas or lines
-man_made=* & area!=no {add name='${man_made|subst:"_=> "}'} [0x13 resolution 24]
+man_made=* & area!=no {add name='${man_made|subst:"_=> "}'} [0x24 resolution 24]
 
 # render small named islands
 place=island & name=* & area_size() < 1000000 [0x53 resolution 19]

src/uk/me/parabola/imgfmt/app/FileBackedImgFileWriter.java

@@ -207,6 +207,7 @@ public class FileBackedImgFileWriter implements ImgFileWriter, Sized {
 	 * @param val The value to write. Unsigned
 	 */
 	public void putNu(int nBytes, int val) {
+		assert nBytes >= 1 && nBytes <= 4: nBytes;
 		try {
 			file.write(val);
 			if (nBytes <= 1) {

src/uk/me/parabola/imgfmt/app/mdr/Mdr5.java

@@ -36,6 +36,7 @@ public class Mdr5 extends MdrMapSection {
 	private List<Mdr5Record> cities = new ArrayList<>();
 	private int maxCityIndex;
 	private int localCitySize;
+	private int mdr20PointerSize = 0; // bytes for mdr20 pointer, or 0 if no mdr20
 
 	public Mdr5(MdrConfig config) {
 		setConfig(config);
@@ -188,7 +189,6 @@ public class Mdr5 extends MdrMapSection {
 	}
 
 	public void writeSectData(ImgFileWriter writer) {
-		int size20 = getSizes().getMdr20Size();
 		Mdr5Record lastCity = null;
 		boolean hasString = hasFlag(0x8);
 		boolean hasRegion = hasFlag(0x4);
@@ -217,7 +217,8 @@ public class Mdr5 extends MdrMapSection {
 				writer.put2u(region);
 			if (hasString)
 				putStringOffset(writer, city.getStringOffset());
-			writer.putNu(size20, city.getMdr20());
+			if (mdr20PointerSize > 0)
+				writer.putNu(mdr20PointerSize, city.getMdr20());
 		}
 	}
 
@@ -239,7 +240,7 @@ public class Mdr5 extends MdrMapSection {
 		int size = sizes.getMapSize()
 				+ localCitySize
 				+ 3
-				+ sizes.getMdr20Size();
+				+ mdr20PointerSize;
 		if (hasFlag(0x4))
 			size += 2;
 		if (hasFlag(0x8))
@@ -252,10 +253,15 @@ public class Mdr5 extends MdrMapSection {
 	}
 
 	/**
-	 * Known structure:
-	 * bits 0-1: size of local city index - 1 (all values appear to work)
-	 * bit  3: has region
-	 * bit  4: has string
+	 * Known structure bits/masks:
+	 * 0x0003 size of local city index - 1 (all values appear to work)
+	 * 0x0004 has region/country
+	 * 0x0008 has string
+	 * 0x0010 ? set unconditionally ?
+	 * 0x0040 mdr17 sub section
+	 * 0x0100 mdr20 present
+	 * 0x0400 28_29 offset
+	 * 0x0800 mdr20 offset
 	 * @return The value to be placed in the header.
 	 */
 	public int getExtraValue() {
@@ -269,7 +275,10 @@ public class Mdr5 extends MdrMapSection {
 			val |= 0x08; // string
 		}
 		val |= 0x10;
+		if (getSizes().getNumberOfItems(20) > 0) { 
+			mdr20PointerSize = getSizes().getMdr20Size();
 			val |= 0x100; // mdr20 present
+		}
 		return val;
 	}
 

src/uk/me/parabola/imgfmt/app/mdr/MdrSection.java

@@ -215,5 +215,9 @@ public abstract class MdrSection extends ConfigBase {
 		public int getSize(int sect) {
 			return sections[sect].getSizeForRecord();
 		}
+
+		public int getNumberOfItems(int sect) {
+			return sections[sect].getNumberOfItems();
+		}
 	}
 }

src/uk/me/parabola/imgfmt/app/net/NumberPreparer.java

@@ -13,7 +13,6 @@
 package uk.me.parabola.imgfmt.app.net;
 
 import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
 import java.util.List;
 
 import uk.me.parabola.imgfmt.Utils;
@@ -116,11 +115,7 @@ public class NumberPreparer {
 	private int setup() {
 		// Should we use the swapped default numbering style EVEN/ODD rather than
 		// ODD/EVEN and the initialValue.
-		for (Iterator<Numbers> iterator = numbers.listIterator(); iterator.hasNext(); ) {
-			Numbers n = iterator.next();
-			if (n.getLeftNumberStyle() == NONE && n.getRightNumberStyle() == NONE)
-				iterator.remove();
-		}
+		numbers.removeIf(Numbers::isEmpty);
 		if (numbers.isEmpty())
 			throw new Abandon("no numbers");
 

src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java

@@ -381,7 +381,7 @@ public class RoadNetwork {
 		// a bit more complex: determine the to-node and arc(s) 
 		RouteNode tn = null;
 		int toId = 0; 
-		List<RouteArc> toArcs = new ArrayList<>();
+		List<RouteArc> toArcs;
 		if (grr.getToNode() != null){ 
 			// polish input data provides id
 			toId = grr.getToNode().getId();
@@ -390,6 +390,7 @@ public class RoadNetwork {
 				log.error(sourceDesc, "can't locate 'to' RouteNode with id", toId);
 				return 0; 
 			}
+			toArcs = lastViaNode.getDirectArcsTo(tn, grr.getToWayId()); 
 		} else {
 			// we can have multiple arcs between last via node and to node. The 
 			// arcs can be on the same OSM way or on different OSM ways.

src/uk/me/parabola/mkgmap/CommandArgsReader.java

@@ -124,7 +124,7 @@ public class CommandArgsReader {
 		for (ArgType a : arglist) {
 			a.processArg();
 		}
-
+		if (arglist.getFilenameCount() > 0)
 			proc.endOptions(new CommandArgs(this.args));
 	}
 

src/uk/me/parabola/mkgmap/build/MapBuilder.java

@@ -981,10 +981,12 @@ public class MapBuilder implements Configurable {
 	private void processInfo(Map map, LoadableMapDataSource src) {
 		// The bounds of the map.
 		map.setBounds(src.getBounds());
-		if (src instanceof OverviewMapDataSource == false)
+		if (!(src instanceof OverviewMapDataSource))
 			poiDisplayFlags |= TREHeader.POI_FLAG_DETAIL;
 			
-		if(poiDisplayFlags != 0)					// POI requested alternate address notation
+		poiDisplayFlags |= src.getPoiDispFlag();
+
+		if(poiDisplayFlags != 0)
 			map.addPoiDisplayFlags(poiDisplayFlags);
 
 		// You can add anything here.

src/uk/me/parabola/mkgmap/combiners/NsisBuilder.java

@@ -24,6 +24,7 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import uk.me.parabola.imgfmt.Utils;
 import uk.me.parabola.mkgmap.CommandArgs;
@@ -39,12 +40,16 @@ public class NsisBuilder implements Combiner {
 	private String id;
 	private int productId;
 
-	private boolean hasIndex;
+	private final boolean hasIndex;
 	private boolean hasTyp;
 
 	private final List<String> mapList = new ArrayList<>();
 	private String typName;
 
+	public NsisBuilder(Map<String, Combiner> combinerMap) {
+		this.hasIndex = combinerMap.containsKey("mdx");
+	}
+
 	public void init(CommandArgs args) {
 		int familyId = args.get("family-id", CommandArgs.DEFAULT_FAMILYID);
 		productId = args.get("product-id", 1);
@@ -60,8 +65,6 @@ public class NsisBuilder implements Combiner {
 		licenseFilename = baseFilename + "_license.txt";
 		
 		outputDir = args.getOutputDir();
-		
-		hasIndex = args.exists("index");
 	}
 
 	public void onMapEnd(FileInfo info) {
@@ -74,12 +77,7 @@ public class NsisBuilder implements Combiner {
 			File typFile = new File(info.getFilename());
 			typName = typFile.getName();
 			break;
-		case MDR_KIND:
-			hasIndex = true;
-			break;
-		case APP_KIND:
-		case GMAPSUPP_KIND:
-		case UNKNOWN_KIND:
+		default:
 			break;
 		}
 	}

src/uk/me/parabola/mkgmap/combiners/OverviewBuilder.java

@@ -425,11 +425,11 @@ public class OverviewBuilder implements Combiner {
 	/**
 	 * Add the prefix to the file name.
 	 * @param name filename 
-	 * @return filename of the corresponding overview img file
+	 * @return filename of the corresponding overview img file (without a path)
 	 */
 	public static String getOverviewImgName (String name){
 		File f = new File(name);
-		return new File(f.getParent(),OverviewBuilder.OVERVIEW_PREFIX + f.getName()).getAbsolutePath();
+		return OverviewBuilder.OVERVIEW_PREFIX + f.getName();
 	}
 
 	public static String getMapName(String name) {

src/uk/me/parabola/mkgmap/general/LoadableMapDataSource.java

@@ -96,4 +96,5 @@ public interface LoadableMapDataSource extends MapDataSource, Configurable {
 	 */
 	public String[] copyrightMessages();
 
+	public int getPoiDispFlag();
 }