- rename MAP_READER -> MAPSFORGE_FILE

- add new databases to factory

src/org/oscim/database/MapDatabaseFactory.java

@@ -45,7 +45,7 @@ public final class MapDatabaseFactory {
 			case TEST_READER:
 				return new org.oscim.database.test.MapDatabase();
 			case PBMAP_READER:
-				return new org.oscim.database.pbmap.MapDatabase();
+				return new org.oscim.database.oscimap.MapDatabase();
 			case OSCIMAP_READER:
 				return new org.oscim.database.oscimap2.MapDatabase();
 			case OPENSCIENCEMAP4:

src/org/oscim/database/MapDatabases.java

@@ -21,7 +21,7 @@ public enum MapDatabases {
 	/**
 	 * ...
 	 */
-	MAP_READER,
+	MAPSFORGE_FILE,
 
 	/**
 	 * ...
@@ -41,4 +41,15 @@ public enum MapDatabases {
 	 * ...
 	 */
 	OSCIMAP_READER,
+
+	/**
+	 * ...
+	 */
+	OPENSCIENCEMAP4,
+
+	/**
+	 * ...
+	 */
+	MAPNIK_VECTOR,
+
 }