From 780274071d284ab90de2839d58a135f7e9647f3b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 8 Jan 2012 15:35:44 +0100
Subject: [PATCH] Add new categories

---
 OsmAnd/res/values/strings.xml              | 2 ++
 OsmAnd/src/net/osmand/OsmAndFormatter.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 12d2d8a539..b576b0acca 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+    <string name="amenity_type_wikiosm">Wikipedia</string>
+	<string name="amenity_type_user_defined">User defined</string>
 	<string name="fav_export_confirmation">File with previously exported favorites already exist. Do you want to replace it? </string>
 <!-- this block re-worked for new menu structure -->
 	<string name="profile_settings">Profile Specific Settings</string>
diff --git a/OsmAnd/src/net/osmand/OsmAndFormatter.java b/OsmAnd/src/net/osmand/OsmAndFormatter.java
index 176364f476..b06f151d3d 100644
--- a/OsmAnd/src/net/osmand/OsmAndFormatter.java
+++ b/OsmAnd/src/net/osmand/OsmAndFormatter.java
@@ -139,6 +139,10 @@ public class OsmAndFormatter {
 			return ctx.getString(R.string.amenity_type_historic);
 		case NATURAL:
 			return ctx.getString(R.string.amenity_type_natural);
+		case USER_DEFINED:
+			return ctx.getString(R.string.amenity_type_user_defined);
+		case OSMWIKI :
+			return ctx.getString(R.string.amenity_type_wikiosm);
 		case SHOP:
 			return ctx.getString(R.string.amenity_type_shop);
 		case LEISURE: