Load OSM map from file function added.

Author: RuedigerLunde

aimax-osm/src/main/java/aimax/osm/gui/fx/viewer/MapPaneCtrl.java

@@ -15,6 +15,7 @@
 import javafx.scene.input.*;
 import javafx.scene.layout.StackPane;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +59,11 @@ public void loadMap(InputStream stream) {
         scaleToFit = true;
     }
 
+    public void loadMap(File file) {
+        mapDrawer.loadMap(file);
+        scaleToFit = true;
+    }
+
     public AbstractEntityRenderer getRenderer() {
         return mapDrawer.getRenderer();
     }

aimax-osm/src/main/java/aimax/osm/viewer/UnifiedMapDrawer.java

@@ -8,6 +8,7 @@
 import aimax.osm.reader.Bz2OsmReader;
 import aimax.osm.reader.MapReader;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.List;
 
@@ -48,6 +49,14 @@ public void loadMap(InputStream stream) {
         builder.buildMap();
     }
 
+    public void loadMap(File file) {
+        MapBuilder builder = map.getBuilder();
+        builder.setEntityClassifier(new MapStyleFactory().createDefaultClassifier());
+        MapReader mapReader = new Bz2OsmReader();
+        mapReader.readMap(file, builder);
+        builder.buildMap();
+    }
+
     public AbstractEntityRenderer getRenderer() {
         return renderer;
     }