close polygons implicitly when using OSciMap2 database

src/org/oscim/renderer/layer/LineLayer.java

@@ -17,6 +17,7 @@ package org.oscim.renderer.layer;
 import org.oscim.core.Tile;
 import org.oscim.renderer.GLRenderer;
 import org.oscim.theme.renderinstruction.Line;
+import org.oscim.view.MapView;
 
 import android.graphics.Paint.Cap;
 
@@ -82,6 +83,10 @@ public final class LineLayer extends Layer {
 		short v[] = si.vertices;
 		int opos = si.used;
 
+		// FIXME: remove this when switching to oscimap MapDatabase
+		if (!MapView.enableClosePolygons)
+			closed = false;
+
 		for (int i = 0, pos = 0, n = index.length; i < n; i++) {
 
 			int length = index[i];
@@ -100,9 +105,6 @@ public final class LineLayer extends Layer {
 				continue;
 			}
 
-			// FIXME: remove this when switching to oscimap MapDatabase
-			closed = false;
-
 			// amount of vertices used
 			// + 2 for drawing triangle-strip
 			// + 4 for round caps

src/org/oscim/view/MapView.java

@@ -30,6 +30,7 @@ import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.database.IMapDatabase;
 import org.oscim.database.MapDatabaseFactory;
+import org.oscim.database.MapDatabases;
 import org.oscim.database.MapInfo;
 import org.oscim.database.MapOptions;
 import org.oscim.database.OpenResult;
@@ -100,6 +101,9 @@ public class MapView extends RelativeLayout {
 
 	private boolean mClearTiles;
 
+	// FIXME: keep until old pbmap reader is removed
+	public static boolean enableClosePolygons = false;
+
 	/**
 	 * @param context
 	 *            the enclosing MapActivity instance.
@@ -369,6 +373,11 @@ public class MapView extends RelativeLayout {
 			tileGenerator.setMapDatabase(mapDatabase);
 		}
 
+		if (options.db == MapDatabases.OSCIMAP_READER)
+			MapView.enableClosePolygons = true;
+		else
+			MapView.enableClosePolygons = false;
+
 		mapWorkersProceed();
 
 		return true;