Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java

@@ -56,6 +56,10 @@ public class BinaryMapAddressReaderAdapter {
 			return cities;
 		}
 		
+		public List<String> getAttributeTagsTable() {
+			return attributeTagsTable;
+		}
+		
 		public int getIndexNameOffset() {
 			return indexNameOffset;
 		}

OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java

@@ -98,6 +98,9 @@ public class CachedOsmandIndexes {
 				cblock.setType(mr.type);
 				addr.addCities(cblock);
 			}
+			for(String s : index.getAttributeTagsTable()) {
+				addr.addAdditionalTags(s);
+			}
 			fileIndex.addAddressIndex(addr);
 		}
 		
@@ -235,6 +238,9 @@ public class CachedOsmandIndexes {
 				cblock.type = mr.getType();
 				mi.cities.add(cblock);
 			}
+			for(String s : index.getAdditionalTagsList()) {
+				mi.attributeTagsTable.add(s);
+			}
 			reader.addressIndexes.add(mi);
 			reader.indexes.add(mi);
 		}