Index: src/uk/me/parabola/mkgmap/Option.java
===================================================================
--- src/uk/me/parabola/mkgmap/Option.java	(Revision 1078)
+++ src/uk/me/parabola/mkgmap/Option.java	(Arbeitskopie)
@@ -34,7 +34,7 @@
 		}
 	}
 
-	protected Option(String option, String value) {
+	public Option(String option, String value) {
 		this.option = option;
 		this.value = value;
 	}
Index: src/uk/me/parabola/mkgmap/CommandArgsReader.java
===================================================================
--- src/uk/me/parabola/mkgmap/CommandArgsReader.java	(Revision 1078)
+++ src/uk/me/parabola/mkgmap/CommandArgsReader.java	(Arbeitskopie)
@@ -129,7 +129,7 @@
 	 * @param option The option name.
 	 * @param value Its value.
 	 */
-	private void addOption(String option, String value) {
+	public void addOption(String option, String value) {
 		CommandOption opt = new CommandOption(option, value);
 		addOption(opt);
 	}
@@ -181,13 +181,21 @@
 		return arglist.iterator();
 	}
 
+        public ArgList getArgList() {
+	        return arglist;
+	}
+
+        public EnhancedProperties getArgs() {
+	    return args;
+	}
+
 	/**
 	 * Read a config file that contains more options.  When the number of
 	 * options becomes large it is more convenient to place them in a file.
 	 *
 	 * @param filename The filename to obtain options from.
 	 */
-	private void readConfigFile(String filename) {
+	public void readConfigFile(String filename) {
 		Options opts = new Options(new OptionProcessor() {
 			public void processOption(Option opt) {
 				log.debug("incoming opt", opt.getOption(), opt.getValue());
@@ -206,14 +214,14 @@
 	 * the argument to be processed in order.  Options can be intersperced with
 	 * filenames.  The options take effect where they appear.
 	 */
-	interface ArgType {
+	public interface ArgType {
 		public abstract void processArg();
 	}
 
 	/**
 	 * A filename.
 	 */
-	class Filename implements ArgType {
+	public class Filename implements ArgType {
 		private final String name;
 		private boolean useFilenameAsMapname = true;
 
@@ -270,7 +278,7 @@
 	/**
 	 * An option argument.  A key value pair.
 	 */
-	class CommandOption implements ArgType {
+	public class CommandOption implements ArgType {
 		private final Option option;
 
 		private CommandOption(Option option) {
@@ -297,7 +305,7 @@
 	/**
 	 * The arguments are held in this list.
 	 */
-	class ArgList implements Iterable<CommandArgsReader.ArgType> {
+	public class ArgList implements Iterable<CommandArgsReader.ArgType> {
 		private final List<ArgType> alist;
 
 		private int filenameCount;
Index: src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java
===================================================================
--- src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java	(Revision 1078)
+++ src/uk/me/parabola/mkgmap/reader/MapperBasedMapDataSource.java	(Arbeitskopie)
@@ -27,12 +27,14 @@
 import uk.me.parabola.imgfmt.app.Area;
 import uk.me.parabola.imgfmt.app.Coord;
 import uk.me.parabola.imgfmt.app.trergn.Overview;
+import uk.me.parabola.mkgmap.general.LoadableMapDataSource;
 import uk.me.parabola.mkgmap.general.MapDataSource;
 import uk.me.parabola.mkgmap.general.MapDetails;
 import uk.me.parabola.mkgmap.general.MapLine;
 import uk.me.parabola.mkgmap.general.MapPoint;
 import uk.me.parabola.mkgmap.general.MapShape;
 import uk.me.parabola.mkgmap.general.RoadNetwork;
+import uk.me.parabola.mkgmap.reader.dem.DEM;
 import uk.me.parabola.util.Configurable;
 import uk.me.parabola.util.EnhancedProperties;
 
@@ -118,6 +120,11 @@
 		return configProps;
 	}
 
+        public MapDetails getMapper()
+        {
+	        return mapper;
+	}
+
 	/**
 	 * We add the background polygons if the map is not transparent.
 	 */
@@ -146,5 +153,8 @@
 			// the overview section.
 			mapper.addShape(background);
 		}
+		if (getConfig().getProperty("contours", false)) {		    
+		    DEM.createContours((LoadableMapDataSource) this, getConfig());
+		}
 	}
 }
Index: src/uk/me/parabola/mkgmap/reader/osm/Way.java
===================================================================
--- src/uk/me/parabola/mkgmap/reader/osm/Way.java	(Revision 1078)
+++ src/uk/me/parabola/mkgmap/reader/osm/Way.java	(Arbeitskopie)
@@ -30,12 +30,18 @@
  */
 public class Way extends Element {
 
-	private final List<Coord> points = new ArrayList<Coord>();
+        private final List<Coord> points;
 
 	public Way(long id) {
+                points = new ArrayList<Coord>();
 		setId(id);
 	}
 
+        public Way(long id, List<Coord> points) {
+	        this.points = points;
+		setId(id);
+	}
+
 	/**
 	 * Get the points that make up the way.  We attempt to re-order the segments
 	 * and return a list of points that traces the route of the way.