From d212c501fa3f95982050f66f5a70bbc9861d96c5 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 14 Jun 2015 19:10:46 +0200
Subject: [PATCH] Add wiki types for download

---
 OsmAnd-java/src/net/osmand/data/Amenity.java  |   4 +-
 .../res/drawable-hdpi/ic_action_wikipedia.png | Bin 0 -> 1195 bytes
 .../res/drawable-mdpi/ic_action_wikipedia.png | Bin 0 -> 729 bytes
 .../drawable-xhdpi/ic_action_wikipedia.png    | Bin 0 -> 1749 bytes
 .../drawable-xxhdpi/ic_action_wikipedia.png   | Bin 0 -> 2673 bytes
 OsmAnd/res/layout/download.xml                |  40 +++++---
 .../plus/download/BaseDownloadActivity.java   |  52 ++++++----
 .../plus/download/DownloadActivity.java       |  89 +++++++++++++++++-
 .../plus/download/DownloadIndexFragment.java  |   3 +-
 .../plus/download/DownloadIndexesThread.java  |   7 +-
 .../download/DownloadOsmandIndexesHelper.java |   2 +-
 .../plus/download/UpdatesIndexFragment.java   |   3 +-
 .../net/osmand/plus/views/POIMapLayer.java    |   4 +-
 13 files changed, 158 insertions(+), 46 deletions(-)
 create mode 100755 OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png
 create mode 100755 OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png
 create mode 100755 OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png
 create mode 100755 OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png

diff --git a/OsmAnd-java/src/net/osmand/data/Amenity.java b/OsmAnd-java/src/net/osmand/data/Amenity.java
index 3a3474a381..cc9cd573d9 100644
--- a/OsmAnd-java/src/net/osmand/data/Amenity.java
+++ b/OsmAnd-java/src/net/osmand/data/Amenity.java
@@ -200,11 +200,13 @@ public class Amenity extends MapObject  {
 		return "";
 	}
 	
-	public List<String> getNames(String tag) {
+	public List<String> getNames(String tag, String defTag) {
 		List<String> l = new ArrayList<String>();
 		for (String nm : getAdditionalInfo().keySet()) {
 			if (nm.startsWith(tag+":")) {
 				l.add(nm.substring(tag.length() +1));
+			} else if(nm.equals(tag)) {
+				l.add(defTag);
 			}
 		}
 		return l;
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png
new file mode 100755
index 0000000000000000000000000000000000000000..47977801416f4525e01e368b29379713d5761079
GIT binary patch
literal 1195
zcmV;c1XTNpP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DXNkl<ZXhZFn
zYsh6|6vu!6Tt5(sMk&SzhWMgflSyJ+CYP7om7$2n<TA*(luI*0#t`EYCbv=47?Hc=
z5<*eF$b?2C%4mpknOOQyYrpMx&pz)td+&o@o#)Hx>}Ne|t^fM3%kzjSzBI-CX9VEC
zW^ly7h=Gm~7^P6h0Cqk;VxV&fJ1Y49G7u4O1KUj!pw*IQN5nK>8L)GW>?%oP5pf!D
zZ4X^n0dD{g1AFz5Stsd`y1kwZM8x;N_LBgxbGt{xF6qFoHL{;enh_E6fV+C=IvaR4
zb?nnaX04<hngZAc*c><jcoNtu6?_GZ0bfY^#or=gTi^uXL12@V^O*}J{S*<K0hT!y
zcpzo21MUZYl(aq~3VY`P3xPj@bAXqCKdh$_fI>JT%+h1PnI#2tB`qy0jEF6PXMm&f
z`#NBjq>mD$_g4T%10VWV(hn6K4$=#N)5VUDN&0QFIv=QrBf?JEIXmIyoSiM{*NOwq
z^~Xyr+%D<z1TZJ_{4d~KNsm??i-^;KC-VE8I+^O3K>;`|o&rux1*Z38Nd`5(YFJp4
z#qIQPWDm;Uld6%8h)sc~GZo)ShBl;VX9hBY&U=HfA+P0<%4xOXV|JV}3o`*1=beDl
z!N8xdiT<oCX0z<txv!t|-XDm8QVy4M+(k7_((ip(SPATwEz)V@^f7}IRzy7HJ>Zk9
z9e2ULYhVBg;w->U6z5zAPK~NF)mreri~1Nz@7Kuh2fUJ<>Pkts_4PajngVc_cn&x;
z&o7hYs8s<}JCgSoOPXKjSVY_kTmh^C4wK~C8E7>EkSv^^{o8-t29J>RaSe!~>)3|7
z)!~xft&#J-XNw2o4U(=O$n!P~BmfVjmx29L$0AAB)Ht?dw%a{&?`lam*T}gu8Q3=o
z^0R*wK!UggxFZeOplScMY&ar3MO~N$%a$_>c65A2#1i0QV0>o$8vuNPdkxq-jm?vE
zcVRfM7B2z^R-Bnopb;?xcpcaxJI_X`*bhwO8YnsGTV#<E6DD&+6b!8gUUm1$a}!!*
zMEE{*qiagi1^t|@+wTHkI`Czti2M2}l2$~-PU-ZXc?tC8&7G^b3|=Z}Nkq6t%%ZQ*
zGbQ=@-gvbJkhSopji=S+faiqo{f_F-dHZ}T-wVDrdwl>L37i4k1AGlkmlTb?Z!(GN
zlt+YVzc=?hnJ)rvvO~a9NplmZ=SG<Y_x$7X)_IF0r(>(tl>xulJVEzO>yG-?z;{`c
zpC$m?@vE(1!E?dGZf(lBHd?Jt0MfZ~OD&vOC~3kIG9s!hSazJHR^E3_p#<QfbuktL
z%hv%<=hbDW@?lhF!71lQ&3kQ~_qomtB!~sTqI6`wq{TgIrp&@4eloT#-a`Md0Qf=g
zf#jUt=&4v3E3t4YaJ(efPp35$0Lj8-z#2(@^z>X2aj=~S7Sz29nxYvRfTo6rB|ic%
ztVp)iGh(1^<c4)_#K5p3*;dbpfwqww*0~V_!-`~EJyV{6zX6$8hd`2j&%FQu002ov
JPDHLkV1gTTGpzss

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png
new file mode 100755
index 0000000000000000000000000000000000000000..d5a3ee1b4c29735fd1e16bc4d12c7d9ba1d15f24
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007@Nkl<ZSV!%Z
zUC7U87{@=K1Cr9j331?H!U2&Lg>5LFZR8Q6wU$Xro2G}Q=h1USl9#rmIq_1)fifbs
z)>dp-Ip9Efjfj;}V?|2n(p9(m_2+s1e{Ve}|NG=u_jUiS@AvxN*Y~=mhnGE!Pm@4X
zfu;g4DG(8tfqpgiyrX^;5$l0(DzSgn2@!D&7+2Zf0{jCUs>$;}9a-Ib6@lfzFkmIn
z8#o2*QFlkgRG<x*1v~^g)t@3_5%3l81+WX)3ET!20<(cnfNj7Pbw{@ZG8hp_EE8q5
zSAmJ@{Sq4jTm$+5Kd4(GVi0f=xDL!wAD6Sae+D=UEKr}-4!$m%Fd`<Gqya2e_rCZ!
zA`Sxcfb+mu;JZ>`i~4)z+>%mAt9s;BQ@2|eL_}7VM9!(>D~ZPde*yi01X-Kat1~NS
z^7{S+1^}bgEaatCk3c5R`^+^;y;1?#4}1ya)$|4Cs=rm@Gk|Q)wd&@s-kf>_vWh=|
zkAa`nZz}*(N`-l5m%6kH5)pY7gMmrvgEt~j8Y$iIBX9?ppk{YxqxJ$4B%QHcT~Q%7
zv^3-<wX-Ym+^;(cBVu5&V*0mT-B<`z`{4hynwm|S<Te3c7x&zJD*`29JFo%x8<?&>
zjff<&8n^*`m@27l5s|W|^$x4wcL&~(0)@Z_Kvt69Y`jar3E)>C?UmmrWq{@ESO*MO
zZ@m)&g~aYMm=f?VFdvu(Tr9otDX<D?1s<s_^}riepb!`VoG#u^Pj6N`N^Aje0LV%A
z6!=^{{!R%LpkK<&zn9ijFO>a!yb>^nRSuuevQORzffwHIP`B3jJ|CT<z#=u(XlT{7
zVGT%nKVP#o>VGw{97y|sWop{8q4in>8p`;ZhnfVM3N#hyaRr_OGG6f^1B8XD00000
LNkvXXu0mjf1KdQR

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png
new file mode 100755
index 0000000000000000000000000000000000000000..79fdc08156f1cd3fecb342c09e94a187b3fc5446
GIT binary patch
literal 1749
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png
new file mode 100755
index 0000000000000000000000000000000000000000..aba973d2d4a6c0b624ee7c87d09fac175c1a500b
GIT binary patch
literal 2673
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
U@FFhYCrSdGz1zv!6M^af0aXtJzyJUM

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout/download.xml b/OsmAnd/res/layout/download.xml
index dec78e18ce..7969bbd7d8 100644
--- a/OsmAnd/res/layout/download.xml
+++ b/OsmAnd/res/layout/download.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical" >
 
     <net.osmand.plus.views.controls.PagerSlidingTabStrip
         android:id="@+id/sliding_tabs"
@@ -17,7 +17,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:visibility="gone"
-        tools:visibility="visible">
+        tools:visibility="visible" >
 
         <RelativeLayout
             android:layout_width="fill_parent"
@@ -25,7 +25,7 @@
             android:layout_marginLeft="3dp"
             android:layout_marginRight="5dp"
             android:gravity="center_vertical|left"
-            android:orientation="horizontal">
+            android:orientation="horizontal" >
 
             <ProgressBar
                 android:id="@+id/IndeterminateProgressBar"
@@ -71,7 +71,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="horizontal" >
 
             <ProgressBar
                 android:id="@+id/memory_progress"
@@ -88,21 +88,35 @@
         </LinearLayout>
     </LinearLayout>
 
-
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <Button
-        android:id="@+id/DownloadButton"
+    <LinearLayout
         android:layout_width="fill_parent"
+        android:id="@+id/DownloadLayout"
         android:layout_height="@dimen/list_item_height"
-        android:background="?attr/downloadButtonBackground"
-        android:gravity="center"
-        android:text="@string/shared_string_download"
-        android:textColor="?attr/pstsTextColor"
-        android:visibility="gone" />
+        android:orientation="horizontal" >
 
-</LinearLayout>
+        <Button
+            android:id="@+id/DownloadButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/list_item_height"
+            android:layout_weight="1"
+            android:background="?attr/downloadButtonBackground"
+            android:gravity="center"
+            android:text="@string/shared_string_download"
+            android:textColor="?attr/pstsTextColor"/>
+
+        <ImageView
+            android:id="@+id/WikiButton"
+            android:layout_width="@dimen/list_item_height"
+            android:layout_height="@dimen/list_item_height"
+            android:scaleType="centerInside"
+            android:background="?attr/downloadButtonBackground"
+            android:gravity="center"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
index 36343a7872..12bbb5e693 100644
--- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
@@ -120,7 +120,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 		return true;
 	}
 
-	private void addToDownload(IndexItem item) {
+	protected void addToDownload(IndexItem item) {
 		List<DownloadEntry> download = item.createDownloadEntry(getMyApplication(), item.getType(), new ArrayList<DownloadEntry>());
 		getEntriesToDownload().put(item, download);
 	}
@@ -152,22 +152,8 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 	protected void downloadFilesCheckFreeVersion() {
 		if (Version.isFreeVersion(getMyApplication())) {
 			int total = settings.NUMBER_OF_FREE_DOWNLOADS.get();
-			boolean wiki = false;
-			for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) {
-				if (es.getBasename() != null && es.getBasename().contains("_wiki")) {
-					wiki = true;
-					break;
-				} else if (DownloadActivityType.isCountedInDownloads(es)) {
-					total++;
-				}
-			}
-			if (total > MAXIMUM_AVAILABLE_FREE_DOWNLOADS || wiki) {
-				String msgTx = getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS + "");
-				AlertDialog.Builder msg = new AlertDialog.Builder(this);
-				msg.setTitle(R.string.free_version_title);
-				msg.setMessage(msgTx);
-				msg.setPositiveButton(R.string.shared_string_ok, null);
-				msg.show();
+			if (total > MAXIMUM_AVAILABLE_FREE_DOWNLOADS) {
+				dialogToInstallPaid();
 			} else {
 				downloadFilesCheckInternet();
 			}
@@ -176,6 +162,31 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 		}
 	}
 
+	protected void dialogToInstallPaid() {
+		String msgTx = getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS + "");
+		AlertDialog.Builder msg = new AlertDialog.Builder(this);
+		msg.setTitle(R.string.free_version_title);
+		msg.setMessage(msgTx);
+		if (Version.isMarketEnabled(getMyApplication())) {
+			msg.setPositiveButton(R.string.install_paid, new DialogInterface.OnClickListener() {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix(getMyApplication())
+							+ "net.osmand.plus"));
+					try {
+						startActivity(intent);
+					} catch (ActivityNotFoundException e) {
+					}
+				}
+			});
+			msg.setNegativeButton(R.string.shared_string_cancel, null);
+		} else {
+			msg.setNeutralButton(R.string.shared_string_ok, null);
+		}
+		msg.show();
+	}
+
 	protected void downloadFilesCheckInternet() {
 		if (!getMyApplication().getSettings().isWifiConnected()) {
 			if (getMyApplication().getSettings().isInternetConnectionAvailable()) {
@@ -242,7 +253,7 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 			m += getString(R.string.available_downloads_left, MAXIMUM_AVAILABLE_FREE_DOWNLOADS - settings.NUMBER_OF_FREE_DOWNLOADS.get());
 			msg.setMessage(m);
 			if (Version.isMarketEnabled(getMyApplication())) {
-				msg.setNeutralButton(R.string.install_paid, new DialogInterface.OnClickListener() {
+				msg.setPositiveButton(R.string.install_paid, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Version.marketPrefix(getMyApplication()) + "net.osmand.plus"));
@@ -252,8 +263,11 @@ public class BaseDownloadActivity extends ActionBarProgressActivity {
 						}
 					}
 				});
+				msg.setNegativeButton(R.string.shared_string_cancel, null);
+			} else {
+				msg.setNeutralButton(R.string.shared_string_ok, null);
 			}
-			msg.setPositiveButton(R.string.shared_string_ok, null);
+			
 			msg.show();
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index 11c3c81f18..89ffccdd1e 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -3,8 +3,10 @@ package net.osmand.plus.download;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import net.osmand.IndexConstants;
 import net.osmand.plus.OsmandApplication;
@@ -19,6 +21,7 @@ import net.osmand.plus.base.BasicProgressAsyncTask;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.controls.PagerSlidingTabStrip;
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -137,6 +140,14 @@ public class DownloadActivity extends BaseDownloadActivity {
 			}
 
 		});
+		findViewById(R.id.WikiButton).setOnClickListener(new View.OnClickListener(){
+
+			@Override
+			public void onClick(View v) {
+				downloadWikiFiles();
+			}
+		});
+		((ImageView)findViewById(R.id.WikiButton)).setImageResource(R.drawable.ic_action_wikipedia);
 
 		downloadTypes = createDownloadTypes();
 		final Intent intent = getIntent();
@@ -158,9 +169,8 @@ public class DownloadActivity extends BaseDownloadActivity {
 		changeType(downloadTypes.get(0));
 	}
 
-
-
-
+	
+	
 	public Map<String, String> getIndexActivatedFileNames() {
 		return downloadListIndexThread != null ? downloadListIndexThread.getIndexActivatedFileNames() : null;
 	}
@@ -299,6 +309,36 @@ public class DownloadActivity extends BaseDownloadActivity {
 
 	}
 
+	protected void downloadWikiFiles() {
+
+		if (Version.isFreeVersion(getMyApplication())) {
+			dialogToInstallPaid();
+		} else {
+			Builder bld = new AlertDialog.Builder(this);
+			// TODO message
+			String countries = "";
+			final List<IndexItem> wi = getWikipediaItems();
+			for(IndexItem i : wi) {
+				countries += i.getDescription() +", ";
+			}
+			bld.setMessage(countries);
+			
+			bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
+				
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					for(IndexItem i : wi) {
+						addToDownload(i);
+					}
+				}
+			});
+			bld.setPositiveButton(R.string.shared_string_cancel, null);
+			if(wi.size() > 0) {
+				bld.show();
+			}
+		}
+	}
+	
 	@Override
 	public void updateDownloadButton() {
 //		View view = getView();
@@ -308,7 +348,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 //		int x = getExpandableListView().getScrollX();
 //		int y = getExpandableListView().getScrollY();
 		if (getEntriesToDownload().isEmpty()) {
-			findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+			findViewById(R.id.DownloadLayout).setVisibility(View.GONE);
 		} else {
 			BasicProgressAsyncTask<?, ?, ?> task = DownloadActivity.downloadListIndexThread.getCurrentRunningTask();
 			boolean running = task instanceof DownloadIndexesThread.DownloadIndexesAsyncTask;
@@ -320,7 +360,7 @@ public class DownloadActivity extends BaseDownloadActivity {
 			} else {
 				text = getString(R.string.shared_string_downloading) + "  (" + downloads + ")"; //$NON-NLS-1$
 			}
-			findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+			findViewById(R.id.DownloadLayout).setVisibility(View.VISIBLE);
 			if (Version.isFreeVersion(getMyApplication())) {
 				int left = DownloadActivity.MAXIMUM_AVAILABLE_FREE_DOWNLOADS - settings.NUMBER_OF_FREE_DOWNLOADS.get() - downloads;
 				boolean excessLimit = left < 0;
@@ -331,6 +371,8 @@ public class DownloadActivity extends BaseDownloadActivity {
 				}
 			}
 			((Button) findViewById(R.id.DownloadButton)).setText(text);
+			List<IndexItem> wikipediaItems = getWikipediaItems();
+			findViewById(R.id.WikiButton).setVisibility(wikipediaItems.size() == 0 ? View.GONE : View.VISIBLE);
 		}
 		
 		for(WeakReference<Fragment> ref : fragList) {
@@ -354,6 +396,38 @@ public class DownloadActivity extends BaseDownloadActivity {
 //			getExpandableListView().scrollTo(x, y);
 //		}
 	}
+
+
+
+	private List<IndexItem> getWikipediaItems() {
+		Set<String> wikipediaItems = new HashSet<String>();
+		Map<String, String> indexed = getMyApplication().getResourceManager().getIndexFileNames();
+		for(IndexItem i : getEntriesToDownload().keySet()) {
+			if(i.getType() == DownloadActivityType.NORMAL_FILE) {
+				boolean fit = true;
+				fit = fit && i.getFileName().contains("obf");
+				fit = fit && !i.getFileName().contains("world");
+				String fname = i.getBasename();
+				if(fit && !indexed.containsKey(fname+".wiki.obf") ) {
+					wikipediaItems.add(fname);
+				}
+			} else if(i.getType() == DownloadActivityType.WIKIPEDIA_FILE) {
+				wikipediaItems.remove(i.getBasename());
+			}
+		}
+		List<IndexItem> res = new ArrayList<IndexItem>();
+		IndexFileList list = downloadListIndexThread.getIndexFiles();
+		if (list != null) {
+			List<IndexItem> indexFiles = list.getIndexFiles();
+			for(IndexItem i : indexFiles) {
+				if(i.getType() == DownloadActivityType.WIKIPEDIA_FILE && 
+						wikipediaItems.contains(i.getBasename())) {
+					res.add(i);
+				}
+			}
+		}
+		return res;
+	}
 	
 	
 	public List<DownloadActivityType> getDownloadTypes() {
@@ -436,4 +510,9 @@ public class DownloadActivity extends BaseDownloadActivity {
 	}
 
 
+
+
+	
+
+
 }
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
index a438892963..d31cbe2a02 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexFragment.java
@@ -171,8 +171,7 @@ public class DownloadIndexFragment extends OsmandExpandableListFragment {
 	public void deselectAll() {
 		DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
 		listAdapter.notifyDataSetInvalidated();
-		
-		getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+		getDownloadActivity().updateDownloadButton();
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 64613ecd41..e38ce430a9 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -96,6 +96,11 @@ public class DownloadIndexesThread {
 		return indexFiles != null ? indexFiles.getIndexFiles() : null;
 	}
 
+	
+	public IndexFileList getIndexFiles() {
+		return indexFiles;
+	}
+	
 	public Map<String, String> getIndexFileNames(){
 		return indexFileNames;
 	}
@@ -424,7 +429,7 @@ public class DownloadIndexesThread {
 							AccessibleToast.makeText(uiActivity, R.string.basemap_was_selected_to_download,
 									Toast.LENGTH_LONG).show();
 							if (uiActivity instanceof DownloadActivity){
-								uiActivity.findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
+								((DownloadActivity)uiActivity).updateDownloadButton();
 							}
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java
index d99ae02e0f..6690e10860 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java
@@ -117,7 +117,7 @@ public class DownloadOsmandIndexesHelper {
 						DownloadActivityType tp = DownloadActivityType.getIndexType(parser.getAttributeValue(null, "type"));
 						if (tp != null) {
 							IndexItem it = tp.parseIndexItem(ctx, parser);
-							if(it != null) {
+							if(it != null && !it.getFileName().contains("_wiki")) {
 								result.add(it);
 							}
 						} else if ("osmand_regions".equals(parser.getName())) {
diff --git a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
index 515dec8975..b73529bdde 100644
--- a/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
@@ -226,8 +226,7 @@ public class UpdatesIndexFragment extends OsmAndListFragment {
 	public void deselectAll() {
 		DownloadActivity.downloadListIndexThread.getEntriesToDownload().clear();
 		listAdapter.notifyDataSetInvalidated();
-
-		getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.GONE);
+		getDownloadActivity().updateDownloadButton();
 	}
 
 	private void filterExisting() {
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index 10a1a94439..0234171fd4 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -465,8 +465,8 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 			final OsmandApplication app, final Amenity a, final Dialog dialog) {
 		final PopupMenu optionsMenu = new PopupMenu(ctx, tb, Gravity.RIGHT);
 		Set<String> names = new TreeSet<String>(); 
-		names.addAll(a.getNames("content"));
-		names.addAll(a.getNames("description"));
+		names.addAll(a.getNames("content", "en"));
+		names.addAll(a.getNames("description", "en"));
 		
 		for (final String n : names) {
 			String vn = FileNameTranslationHelper.getVoiceName(ctx, n);