From e507bb6b069b22250c81134ad3a470ec0b5fc37d Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 22 May 2013 12:43:28 +0200 Subject: [PATCH] - rename MAP_READER -> MAPSFORGE_FILE - add new databases to factory --- src/org/oscim/database/MapDatabaseFactory.java | 2 +- src/org/oscim/database/MapDatabases.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/org/oscim/database/MapDatabaseFactory.java b/src/org/oscim/database/MapDatabaseFactory.java index ccb57ec7..83ffdabb 100644 --- a/src/org/oscim/database/MapDatabaseFactory.java +++ b/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: diff --git a/src/org/oscim/database/MapDatabases.java b/src/org/oscim/database/MapDatabases.java index 7e0861a7..1be4bbc6 100644 --- a/src/org/oscim/database/MapDatabases.java +++ b/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, + }