From f90778023eecb8d80fc32c4735958f749cb1c9f0 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 31 Jul 2016 19:39:45 +0200
Subject: [PATCH] Rename strings and delete unused

---
 .../src/net/osmand/binary/BinaryMapPoiReaderAdapter.java   | 7 ++++---
 OsmAnd/res/values-az/strings.xml                           | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
index 16d5f810cf..368658eb2a 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
@@ -795,7 +795,7 @@ public class BinaryMapPoiReaderAdapter {
 //				break;
 			case OsmandOdb.OsmAndPoiCategories.CATEGORIES_FIELD_NUMBER:
 				PoiCategory type = poiTypes.getOtherPoiCategory();
-				String subcat = "";
+				String subtype = "";
 				int cat = codedIS.readUInt32();
 				int subcatId = cat >> SHIFT_BITS_CATEGORY;
 				int catId = cat & CATEGORY_MASK;
@@ -803,10 +803,11 @@ public class BinaryMapPoiReaderAdapter {
 					type = region.categoriesType.get(catId);
 					List<String> subcats = region.subcategories.get(catId);
 					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());
 					return true;
 				}
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 14d4f1bddf..dd56ff72e9 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -1 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources/>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+</resources>
\ No newline at end of file