Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix dependencies

Browse source
This commit is contained in:
Victor Shcherb 2018-04-15 15:14:46 +02:00
parent 6086a3e7e1
commit 6f0b8fff09
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
View file

@ -32,6 +32,7 @@ import net.osmand.plus.myplaces.TrackPointFragment;
import net.osmand.plus.wikivoyage.WikivoyageBaseDialogFragment; import net.osmand.plus.wikivoyage.WikivoyageBaseDialogFragment;
import net.osmand.plus.wikivoyage.WikivoyageWebViewClient; import net.osmand.plus.wikivoyage.WikivoyageWebViewClient;
import net.osmand.plus.wikivoyage.data.WikivoyageArticle; import net.osmand.plus.wikivoyage.data.WikivoyageArticle;
import net.osmand.plus.wikivoyage.data.WikivoyageDbHelper;
import net.osmand.plus.wikivoyage.data.WikivoyageLocalDataHelper; import net.osmand.plus.wikivoyage.data.WikivoyageLocalDataHelper;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -168,7 +169,8 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
if (article == null || fm == null) { if (article == null || fm == null) {
return; return;
} }
File file = getMyApplication().getAppPath(IndexConstants.GPX_TRAVEL_DIR + article.getTitle() + ".gpx"); WikivoyageDbHelper dbHelper = getMyApplication().getWikivoyageDbHelper();
File file = getMyApplication().getAppPath(IndexConstants.GPX_TRAVEL_DIR + dbHelper.getGPXName(article));
GPXFile gpx = article.getGpxFile(); GPXFile gpx = article.getGpxFile();
GPXUtilities.writeGpxFile(file, gpx, getMyApplication()); GPXUtilities.writeGpxFile(file, gpx, getMyApplication());
Bundle args = new Bundle(); Bundle args = new Bundle();

19
OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageDbHelper.java
View file

@ -7,6 +7,7 @@ import net.osmand.CollatorStringMatcher;
import net.osmand.CollatorStringMatcher.StringMatcherMode; import net.osmand.CollatorStringMatcher.StringMatcherMode;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.OsmAndCollator; import net.osmand.OsmAndCollator;
import net.osmand.PlatformUtil;
import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile; import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -24,10 +25,14 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import org.apache.commons.logging.Log;
import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.map.hash.TLongObjectHashMap;
public class WikivoyageDbHelper { public class WikivoyageDbHelper {
private static final Log LOG = PlatformUtil.getLog(WikivoyageDbHelper.class);
private static final String ARTICLES_TABLE_NAME = "wikivoyage_articles"; private static final String ARTICLES_TABLE_NAME = "wikivoyage_articles";
private static final String ARTICLES_COL_ID = "article_id"; private static final String ARTICLES_COL_ID = "article_id";
private static final String ARTICLES_COL_TITLE = "title"; private static final String ARTICLES_COL_TITLE = "title";
@ -295,7 +300,7 @@ public class WikivoyageDbHelper {
try { try {
res.content = Algorithms.gzipToString(cursor.getBlob(2)); res.content = Algorithms.gzipToString(cursor.getBlob(2));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); LOG.error(e.getMessage(), e);
} }
res.isPartOf = cursor.getString(3); res.isPartOf = cursor.getString(3);
res.lat = cursor.getDouble(4); res.lat = cursor.getDouble(4);
@ -307,7 +312,13 @@ public class WikivoyageDbHelper {
res.lang = cursor.getString(10); res.lang = cursor.getString(10);
res.contentsJson = cursor.getString(11); res.contentsJson = cursor.getString(11);
res.aggregatedPartOf = cursor.getString(12); res.aggregatedPartOf = cursor.getString(12);
res.gpxFile = GPXUtilities.loadGPXFile(application, new ByteArrayInputStream(gpxFileBlob)); try {
String gpxContent = Algorithms.gzipToString(cursor.getBlob(7));
res.gpxFile = GPXUtilities.loadGPXFile(application, new ByteArrayInputStream(gpxContent.getBytes("UTF-8")));
} catch (IOException e) {
LOG.error(e.getMessage(), e);
}
return res; return res;
} }
@ -318,4 +329,8 @@ public class WikivoyageDbHelper {
String nm = tb.getName(); String nm = tb.getName();
return nm.substring(0, nm.indexOf('.')).replace('_', ' '); return nm.substring(0, nm.indexOf('.')).replace('_', ' ');
} }
public String getGPXName(WikivoyageArticle article) {
return article.getTitle().replace('/', '_').replace('\'', '_').replace('\"', '_') + ".gpx";
}
} }