From be1bb81e05b909a1f6b6f80976b2fba006c0b186 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Sat, 26 Apr 2014 16:13:51 +0200 Subject: [PATCH] Rename to follow file name convention --- .gitignore | 1 + OsmAnd-java/src/net/osmand/map/OsmandRegions.java | 1 + OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30f7f4ac5f..f309e74dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.render.xml +*.map_style_presets.xml routing*.xml rendering_types.xml countries.reginfo diff --git a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java index 81db96e7ae..2012bbb02b 100644 --- a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java +++ b/OsmAnd-java/src/net/osmand/map/OsmandRegions.java @@ -24,6 +24,7 @@ import net.osmand.binary.BinaryMapIndexReader.MapIndex; import net.osmand.binary.BinaryMapIndexReader.TagValuePair; import net.osmand.data.QuadRect; import net.osmand.data.QuadTree; +import net.osmand.util.Algorithms; import net.osmand.util.MapAlgorithms; import net.osmand.util.MapUtils; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java index ecb1574c6f..7d3503156c 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java @@ -96,7 +96,7 @@ public class DownloadActivityType { } public boolean isZipStream(OsmandApplication ctx, IndexItem indexItem) { - return true; + return HILLSHADE_FILE != this; } public boolean isZipFolder(OsmandApplication ctx, IndexItem indexItem) { @@ -222,7 +222,7 @@ public class DownloadActivityType { " "+ ctx.getString(R.string.index_item_nation_addresses); } - return osmandRegions.getLocaleName(lc); + return osmandRegions.getLocaleName(bn); } private String getStandardMapName(Context ctx, String basename) {