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

Rename strings and delete unused

Browse source
This commit is contained in:
Victor Shcherb 2016-07-31 19:39:45 +02:00
parent 693be5c2b9
commit f90778023e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
View file

@ -795,7 +795,7 @@ public class BinaryMapPoiReaderAdapter {
// break; // break;
case OsmandOdb.OsmAndPoiCategories.CATEGORIES_FIELD_NUMBER: case OsmandOdb.OsmAndPoiCategories.CATEGORIES_FIELD_NUMBER:
PoiCategory type = poiTypes.getOtherPoiCategory(); PoiCategory type = poiTypes.getOtherPoiCategory();
String subcat = ""; String subtype = "";
int cat = codedIS.readUInt32(); int cat = codedIS.readUInt32();
int subcatId = cat >> SHIFT_BITS_CATEGORY; int subcatId = cat >> SHIFT_BITS_CATEGORY;
int catId = cat & CATEGORY_MASK; int catId = cat & CATEGORY_MASK;
@ -803,10 +803,11 @@ public class BinaryMapPoiReaderAdapter {
type = region.categoriesType.get(catId); type = region.categoriesType.get(catId);
List<String> subcats = region.subcategories.get(catId); List<String> subcats = region.subcategories.get(catId);
if (subcatId < subcats.size()) { if (subcatId < subcats.size()) {
subcat = subcats.get(subcatId); subtype = subcats.get(subcatId);
} }
} }
if (req.poiTypeFilter.accept(type, subcat)) { subtype = poiTypes.replaceDeprecatedSubtype(type, subtype);
if (req.poiTypeFilter.accept(type, subtype)) {
codedIS.skipRawBytes(codedIS.getBytesUntilLimit()); codedIS.skipRawBytes(codedIS.getBytesUntilLimit());
return true; return true;
} }

4
OsmAnd/res/values-az/strings.xml
View file

@ -1 +1,3 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources/> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
</resources>