GeoJSON load and save.

OSMBonusPackDemo/res/menu/option_menu.xml

@@ -72,7 +72,10 @@
 			        android:title="Edit..."/>
 				<item
 				      android:id="@+id/menu_kml_save"
-				      android:title="Save"/>
+				      android:title="Save as KML"/>
+				<item
+				      android:id="@+id/menu_geojson_save"
+				      android:title="Save as GeoJSON"/>
 				<item
 				      android:id="@+id/menu_kml_clear"
 				      android:title="Clear"/>

OSMBonusPackDemo/src/com/osmbonuspackdemo/MapActivity.java

@@ -322,7 +322,7 @@ public void onClick(View v) {
 			Intent onCreateIntent = getIntent();
 			if (onCreateIntent.getAction().equals(Intent.ACTION_VIEW)){
 				String uri = onCreateIntent.getDataString();
-				getKml(uri, true);
+				openFile(uri, true);
 			}
 		}
 	}
@@ -937,7 +937,7 @@ void openKMLUrlDialog(){
 				ed.putString("KML_URI", uri);
 				ed.commit();
 				dialog.cancel();
-				getKml(uri, false);
+				openFile(uri, false);
 			}
 		});
 		builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
@@ -948,14 +948,17 @@ void openKMLUrlDialog(){
 		builder.show();
 	}
 
-	void getKml(String uri, boolean onCreate){
+	void openFile(String uri, boolean onCreate){
 		//TODO: use an Async task
 		mKmlDocument = new KmlDocument();
 		boolean ok;
 		if (uri.startsWith("file:/")){
 			uri = uri.substring("file:/".length());
 			File file = new File(uri);
-			ok = mKmlDocument.parseFile(file);
+			if (uri.endsWith(".json"))
+				ok = mKmlDocument.parseGeoJSON(file);
+			else //assume KML
+				ok = mKmlDocument.parseFile(file);
 		} else  {
 			ok = mKmlDocument.parseUrl(uri);
 		}
@@ -980,6 +983,14 @@ void saveKml(String fileName){
 			Toast.makeText(this, "Unable to save "+fileName, Toast.LENGTH_SHORT).show();
 	}
 
+	void saveGeoJSON(String fileName){
+		boolean result = mKmlDocument.saveAsGeoJSON(mKmlDocument.getDefaultPathForAndroid(fileName));
+		if (result)
+			Toast.makeText(this, fileName + " saved", Toast.LENGTH_SHORT).show();
+		else 
+			Toast.makeText(this, "Unable to save "+fileName, Toast.LENGTH_SHORT).show();
+	}
+
 	void updateUIWithKml(){
 		if (kmlOverlay != null)
 			map.getOverlays().remove(kmlOverlay);
@@ -1135,7 +1146,7 @@ else if (map.getTileProvider().getTileSource() == MAPBOXSATELLITELABELLED)
 		case R.id.menu_kml_file:
 			//TODO : openKMLFileDialog();
 			File file = mKmlDocument.getDefaultPathForAndroid("current.kml");
-			getKml("file:/"+file.toString(), false);
+			openFile("file:/"+file.toString(), false);
 			return true;
 		case R.id.menu_kml_get_overlays:
 			insertOverlaysInKml();
@@ -1150,9 +1161,13 @@ else if (map.getTileProvider().getTileSource() == MAPBOXSATELLITELABELLED)
 			startActivityForResult(myIntent, KML_TREE_REQUEST);
 			return true;
 		case R.id.menu_kml_save:
-			//TODO: openKMLSaveDialog();
+			//TODO: openSaveDialog();
 			saveKml("current.kml");
 			return true;
+		case R.id.menu_geojson_save:
+			//TODO: openSaveDialog();
+			saveGeoJSON("current.json");
+			return true;
 		case R.id.menu_kml_clear:
 			mKmlDocument = new KmlDocument();
 			updateUIWithKml();