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

Fix small issues with address data loading

Browse source
This commit is contained in:
Victor Shcherb 2011-09-21 19:15:55 +02:00
parent f571feaf68
commit bbcf0e344c
7 changed files with 245 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DataExtractionOSM/src/net/osmand/Algoritms.java
View file

@ -125,6 +125,8 @@ public class Algoritms {
return o;
}
public static void putLongToBytes(byte[] bytes, int offset, long l){
bytes[offset] = (byte) (l & 0xff);
l >>= 8;

13
DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexWriter.java
View file

@ -84,6 +84,7 @@ public class BinaryMapIndexWriter {
private final static int TRANSPORT_ROUTES = 11;
private final static int POI_INDEX_INIT = 12;
private final static int POI_BOX = 13;
public BinaryMapIndexWriter(final RandomAccessFile raf) throws IOException{
this.raf = raf;
@ -770,6 +771,18 @@ public class BinaryMapIndexWriter {
return catIndexes;
}
public void startWritePoiBox(int zoom) throws IOException {
pushState(POI_BOX, POI_INDEX_INIT);
codedOutStream.writeTag(OsmandOdb.OsmAndTransportIndex.ROUTES_FIELD_NUMBER, WireFormat.WIRETYPE_FIXED32_LENGTH_DELIMITED);
preserveInt32Size();
}
public void endWritePoiBox() throws IOException {
popState(POI_BOX);
writeInt32Size();
}
public void endWritePOIIndex() throws IOException {
popState(POI_INDEX_INIT);
int len = writeInt32Size();

253
DataExtractionOSM/src/net/osmand/binary/OsmandOdb.java
View file

@ -11919,34 +11919,34 @@ public final class OsmandOdb {
public boolean hasLeft() { return hasLeft; }
public int getLeft() { return left_; }
// required sint32 right = 3;
public static final int RIGHT_FIELD_NUMBER = 3;
private boolean hasRight;
private int right_ = 0;
public boolean hasRight() { return hasRight; }
public int getRight() { return right_; }
// required sint32 top = 4;
public static final int TOP_FIELD_NUMBER = 4;
// required sint32 top = 3;
public static final int TOP_FIELD_NUMBER = 3;
private boolean hasTop;
private int top_ = 0;
public boolean hasTop() { return hasTop; }
public int getTop() { return top_; }
// required sint32 bottom = 5;
public static final int BOTTOM_FIELD_NUMBER = 5;
private boolean hasBottom;
private int bottom_ = 0;
public boolean hasBottom() { return hasBottom; }
public int getBottom() { return bottom_; }
// optional .OsmAndPoiCategories categories = 6;
public static final int CATEGORIES_FIELD_NUMBER = 6;
// optional .OsmAndPoiCategories categories = 4;
public static final int CATEGORIES_FIELD_NUMBER = 4;
private boolean hasCategories;
private net.osmand.binary.OsmandOdb.OsmAndPoiCategories categories_;
public boolean hasCategories() { return hasCategories; }
public net.osmand.binary.OsmandOdb.OsmAndPoiCategories getCategories() { return categories_; }
// optional .StringTable includeNamesList = 5;
public static final int INCLUDENAMESLIST_FIELD_NUMBER = 5;
private boolean hasIncludeNamesList;
private net.osmand.binary.OsmandOdb.StringTable includeNamesList_;
public boolean hasIncludeNamesList() { return hasIncludeNamesList; }
public net.osmand.binary.OsmandOdb.StringTable getIncludeNamesList() { return includeNamesList_; }
// optional .StringTable excludeNamesList = 6;
public static final int EXCLUDENAMESLIST_FIELD_NUMBER = 6;
private boolean hasExcludeNamesList;
private net.osmand.binary.OsmandOdb.StringTable excludeNamesList_;
public boolean hasExcludeNamesList() { return hasExcludeNamesList; }
public net.osmand.binary.OsmandOdb.StringTable getExcludeNamesList() { return excludeNamesList_; }
// repeated .OsmAndPoiBox subBoxes = 7;
public static final int SUBBOXES_FIELD_NUMBER = 7;
private java.util.List<net.osmand.binary.OsmandOdb.OsmAndPoiBox> subBoxes_ =
@ -11968,13 +11968,13 @@ public final class OsmandOdb {
private void initFields() {
categories_ = net.osmand.binary.OsmandOdb.OsmAndPoiCategories.getDefaultInstance();
includeNamesList_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
excludeNamesList_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
}
public final boolean isInitialized() {
if (!hasZoom) return false;
if (!hasLeft) return false;
if (!hasRight) return false;
if (!hasTop) return false;
if (!hasBottom) return false;
for (net.osmand.binary.OsmandOdb.OsmAndPoiBox element : getSubBoxesList()) {
if (!element.isInitialized()) return false;
}
@ -11990,17 +11990,17 @@ public final class OsmandOdb {
if (hasLeft()) {
output.writeSInt32(2, getLeft());
}
if (hasRight()) {
output.writeSInt32(3, getRight());
}
if (hasTop()) {
output.writeSInt32(4, getTop());
}
if (hasBottom()) {
output.writeSInt32(5, getBottom());
output.writeSInt32(3, getTop());
}
if (hasCategories()) {
output.writeMessage(6, getCategories());
output.writeMessage(4, getCategories());
}
if (hasIncludeNamesList()) {
output.writeMessage(5, getIncludeNamesList());
}
if (hasExcludeNamesList()) {
output.writeMessage(6, getExcludeNamesList());
}
for (net.osmand.binary.OsmandOdb.OsmAndPoiBox element : getSubBoxesList()) {
output.writeMessage(7, element);
@ -12025,21 +12025,21 @@ public final class OsmandOdb {
size += com.google.protobuf.CodedOutputStream
.computeSInt32Size(2, getLeft());
}
if (hasRight()) {
size += com.google.protobuf.CodedOutputStream
.computeSInt32Size(3, getRight());
}
if (hasTop()) {
size += com.google.protobuf.CodedOutputStream
.computeSInt32Size(4, getTop());
}
if (hasBottom()) {
size += com.google.protobuf.CodedOutputStream
.computeSInt32Size(5, getBottom());
.computeSInt32Size(3, getTop());
}
if (hasCategories()) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getCategories());
.computeMessageSize(4, getCategories());
}
if (hasIncludeNamesList()) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getIncludeNamesList());
}
if (hasExcludeNamesList()) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(6, getExcludeNamesList());
}
for (net.osmand.binary.OsmandOdb.OsmAndPoiBox element : getSubBoxesList()) {
size += com.google.protobuf.CodedOutputStream
@ -12217,18 +12217,18 @@ public final class OsmandOdb {
if (other.hasLeft()) {
setLeft(other.getLeft());
}
if (other.hasRight()) {
setRight(other.getRight());
}
if (other.hasTop()) {
setTop(other.getTop());
}
if (other.hasBottom()) {
setBottom(other.getBottom());
}
if (other.hasCategories()) {
mergeCategories(other.getCategories());
}
if (other.hasIncludeNamesList()) {
mergeIncludeNamesList(other.getIncludeNamesList());
}
if (other.hasExcludeNamesList()) {
mergeExcludeNamesList(other.getExcludeNamesList());
}
if (!other.subBoxes_.isEmpty()) {
if (result.subBoxes_.isEmpty()) {
result.subBoxes_ = new java.util.ArrayList<net.osmand.binary.OsmandOdb.OsmAndPoiBox>();
@ -12272,18 +12272,10 @@ public final class OsmandOdb {
break;
}
case 24: {
setRight(input.readSInt32());
break;
}
case 32: {
setTop(input.readSInt32());
break;
}
case 40: {
setBottom(input.readSInt32());
break;
}
case 50: {
case 34: {
net.osmand.binary.OsmandOdb.OsmAndPoiCategories.Builder subBuilder = net.osmand.binary.OsmandOdb.OsmAndPoiCategories.newBuilder();
if (hasCategories()) {
subBuilder.mergeFrom(getCategories());
@ -12292,6 +12284,24 @@ public final class OsmandOdb {
setCategories(subBuilder.buildPartial());
break;
}
case 42: {
net.osmand.binary.OsmandOdb.StringTable.Builder subBuilder = net.osmand.binary.OsmandOdb.StringTable.newBuilder();
if (hasIncludeNamesList()) {
subBuilder.mergeFrom(getIncludeNamesList());
}
input.readMessage(subBuilder, extensionRegistry);
setIncludeNamesList(subBuilder.buildPartial());
break;
}
case 50: {
net.osmand.binary.OsmandOdb.StringTable.Builder subBuilder = net.osmand.binary.OsmandOdb.StringTable.newBuilder();
if (hasExcludeNamesList()) {
subBuilder.mergeFrom(getExcludeNamesList());
}
input.readMessage(subBuilder, extensionRegistry);
setExcludeNamesList(subBuilder.buildPartial());
break;
}
case 58: {
net.osmand.binary.OsmandOdb.OsmAndPoiBox.Builder subBuilder = net.osmand.binary.OsmandOdb.OsmAndPoiBox.newBuilder();
input.readMessage(subBuilder, extensionRegistry);
@ -12343,25 +12353,7 @@ public final class OsmandOdb {
return this;
}
// required sint32 right = 3;
public boolean hasRight() {
return result.hasRight();
}
public int getRight() {
return result.getRight();
}
public Builder setRight(int value) {
result.hasRight = true;
result.right_ = value;
return this;
}
public Builder clearRight() {
result.hasRight = false;
result.right_ = 0;
return this;
}
// required sint32 top = 4;
// required sint32 top = 3;
public boolean hasTop() {
return result.hasTop();
}
@ -12379,25 +12371,7 @@ public final class OsmandOdb {
return this;
}
// required sint32 bottom = 5;
public boolean hasBottom() {
return result.hasBottom();
}
public int getBottom() {
return result.getBottom();
}
public Builder setBottom(int value) {
result.hasBottom = true;
result.bottom_ = value;
return this;
}
public Builder clearBottom() {
result.hasBottom = false;
result.bottom_ = 0;
return this;
}
// optional .OsmAndPoiCategories categories = 6;
// optional .OsmAndPoiCategories categories = 4;
public boolean hasCategories() {
return result.hasCategories();
}
@ -12434,6 +12408,80 @@ public final class OsmandOdb {
return this;
}
// optional .StringTable includeNamesList = 5;
public boolean hasIncludeNamesList() {
return result.hasIncludeNamesList();
}
public net.osmand.binary.OsmandOdb.StringTable getIncludeNamesList() {
return result.getIncludeNamesList();
}
public Builder setIncludeNamesList(net.osmand.binary.OsmandOdb.StringTable value) {
if (value == null) {
throw new NullPointerException();
}
result.hasIncludeNamesList = true;
result.includeNamesList_ = value;
return this;
}
public Builder setIncludeNamesList(net.osmand.binary.OsmandOdb.StringTable.Builder builderForValue) {
result.hasIncludeNamesList = true;
result.includeNamesList_ = builderForValue.build();
return this;
}
public Builder mergeIncludeNamesList(net.osmand.binary.OsmandOdb.StringTable value) {
if (result.hasIncludeNamesList() &&
result.includeNamesList_ != net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance()) {
result.includeNamesList_ =
net.osmand.binary.OsmandOdb.StringTable.newBuilder(result.includeNamesList_).mergeFrom(value).buildPartial();
} else {
result.includeNamesList_ = value;
}
result.hasIncludeNamesList = true;
return this;
}
public Builder clearIncludeNamesList() {
result.hasIncludeNamesList = false;
result.includeNamesList_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
return this;
}
// optional .StringTable excludeNamesList = 6;
public boolean hasExcludeNamesList() {
return result.hasExcludeNamesList();
}
public net.osmand.binary.OsmandOdb.StringTable getExcludeNamesList() {
return result.getExcludeNamesList();
}
public Builder setExcludeNamesList(net.osmand.binary.OsmandOdb.StringTable value) {
if (value == null) {
throw new NullPointerException();
}
result.hasExcludeNamesList = true;
result.excludeNamesList_ = value;
return this;
}
public Builder setExcludeNamesList(net.osmand.binary.OsmandOdb.StringTable.Builder builderForValue) {
result.hasExcludeNamesList = true;
result.excludeNamesList_ = builderForValue.build();
return this;
}
public Builder mergeExcludeNamesList(net.osmand.binary.OsmandOdb.StringTable value) {
if (result.hasExcludeNamesList() &&
result.excludeNamesList_ != net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance()) {
result.excludeNamesList_ =
net.osmand.binary.OsmandOdb.StringTable.newBuilder(result.excludeNamesList_).mergeFrom(value).buildPartial();
} else {
result.excludeNamesList_ = value;
}
result.hasExcludeNamesList = true;
return this;
}
public Builder clearExcludeNamesList() {
result.hasExcludeNamesList = false;
result.excludeNamesList_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
return this;
}
// repeated .OsmAndPoiBox subBoxes = 7;
public java.util.List<net.osmand.binary.OsmandOdb.OsmAndPoiBox> getSubBoxesList() {
return java.util.Collections.unmodifiableList(result.subBoxes_);
@ -13636,16 +13684,17 @@ public final class OsmandOdb {
".OsmAndCategoryTable\022\034\n\005boxes\030\006 \003(\0132\r.Os" +
"mAndPoiBox\022\"\n\007poiData\030\007 \003(\0132\021.OsmAndPoiB" +
"oxData\">\n\023OsmAndCategoryTable\022\020\n\010categor",
"y\030\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"\266\001\n\014OsmAn" +
"dPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004left\030\002 \002(\021\022\r\n\005r" +
"ight\030\003 \002(\021\022\013\n\003top\030\004 \002(\021\022\016\n\006bottom\030\005 \002(\021\022" +
"(\n\ncategories\030\006 \001(\0132\024.OsmAndPoiCategorie" +
"s\022\037\n\010subBoxes\030\007 \003(\0132\r.OsmAndPoiBox\022\023\n\013sh" +
"iftToData\030\n \001(\r\")\n\023OsmAndPoiCategories\022\022" +
"\n\ncategories\030\003 \003(\r\":\n\020OsmAndPoiBoxData\022&" +
"\n\007poiData\030\003 \003(\0132\025.OsmAndPoiBoxDataAtom\"\026" +
"\n\024OsmAndPoiBoxDataAtomB\023\n\021net.osmand.bin" +
"ary"
"y\030\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"\347\001\n\014OsmAn" +
"dPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004left\030\002 \002(\021\022\013\n\003t" +
"op\030\003 \002(\021\022(\n\ncategories\030\004 \001(\0132\024.OsmAndPoi" +
"Categories\022&\n\020includeNamesList\030\005 \001(\0132\014.S" +
"tringTable\022&\n\020excludeNamesList\030\006 \001(\0132\014.S" +
"tringTable\022\037\n\010subBoxes\030\007 \003(\0132\r.OsmAndPoi" +
"Box\022\023\n\013shiftToData\030\n \001(\r\")\n\023OsmAndPoiCat" +
"egories\022\022\n\ncategories\030\003 \003(\r\":\n\020OsmAndPoi" +
"BoxData\022&\n\007poiData\030\003 \003(\0132\025.OsmAndPoiBoxD" +
"ataAtom\"\026\n\024OsmAndPoiBoxDataAtomB\023\n\021net.o",
"smand.binary"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -13849,7 +13898,7 @@ public final class OsmandOdb {
internal_static_OsmAndPoiBox_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAndPoiBox_descriptor,
new java.lang.String[] { "Zoom", "Left", "Right", "Top", "Bottom", "Categories", "SubBoxes", "ShiftToData", },
new java.lang.String[] { "Zoom", "Left", "Top", "Categories", "IncludeNamesList", "ExcludeNamesList", "SubBoxes", "ShiftToData", },
net.osmand.binary.OsmandOdb.OsmAndPoiBox.class,
net.osmand.binary.OsmandOdb.OsmAndPoiBox.Builder.class);
internal_static_OsmAndPoiCategories_descriptor =

62
DataExtractionOSM/src/net/osmand/data/preparation/IndexPoiCreator.java
View file

@ -9,39 +9,25 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import net.osmand.Algoritms;
import net.osmand.IProgress;
import net.osmand.binary.BinaryMapIndexWriter;
import net.osmand.binary.OsmandOdb;
import net.osmand.binary.OsmandOdb.OsmAndCategoryTable;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.IndexConstants;
import net.osmand.data.Street;
import net.osmand.data.City.CityType;
import net.osmand.impl.ConsoleProgressImplementation;
import net.osmand.osm.Entity;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.osm.OSMSettings.OSMTagKey;
import net.osmand.swing.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -53,6 +39,8 @@ public class IndexPoiCreator extends AbstractIndexPartCreator {
private Connection poiConnection;
private File poiIndexFile;
private PreparedStatement poiPreparedStatement;
private static final int ZOOM_TO_SAVE_END = 14;
private static final int ZOOM_TO_SAVE_START = 6;
private List<Amenity> tempAmenityList = new ArrayList<Amenity>();
@ -169,8 +157,7 @@ public class IndexPoiCreator extends AbstractIndexPartCreator {
}
poiConnection.commit();
Statement categoriesAndSubcategories = poiConnection.createStatement();
ResultSet rs = categoriesAndSubcategories.executeQuery("SELECT DISTINCT type, subtype FROM poi");
ResultSet rs = poiConnection.createStatement().executeQuery("SELECT DISTINCT type, subtype FROM poi");
Map<String, Map<String, Integer>> categories = new LinkedHashMap<String, Map<String, Integer>>();
while (rs.next()) {
String category = rs.getString(1);
@ -187,17 +174,48 @@ public class IndexPoiCreator extends AbstractIndexPartCreator {
categories.get(category).put(subcategory.trim(), 0);
}
}
Statement stat = rs.getStatement();
rs.close();
categoriesAndSubcategories.close();
stat.close();
// 1. write header
writer.startWritePOIIndex(regionName);
// 2. write categories table
Map<String, Integer> catIndexes = writer.writePOICategoriesTable(categories);
for (String s : categories.keySet()) {
System.out.println(s + " " + categories.get(s).size());
// 3. write boxes
String selectZm = (31 - ZOOM_TO_SAVE_END) +"";
rs = poiConnection.createStatement().executeQuery("SELECT DISTINCT x>>"+selectZm +", y>>"+selectZm + " from poi");
Set<Long>[] zooms = new Set[ZOOM_TO_SAVE_END + 1];
int zoomToStart = ZOOM_TO_SAVE_START;
for(int i=zoomToStart; i<=ZOOM_TO_SAVE_END; i++){
zooms[i] = new TreeSet<Long>();
}
while(rs.next()){
int x = rs.getInt(1);
int y = rs.getInt(2);
for(int i=zoomToStart; i<=ZOOM_TO_SAVE_END; i++){
int shift = ZOOM_TO_SAVE_END - i;
long l = (((long)x >> shift) << 31) | ((long)y >> shift);
zooms[i].add(l);
}
}
for (int i = zoomToStart; i < ZOOM_TO_SAVE_END; i++) {
if (zooms[i].size() > 4) {
break;
}
zoomToStart = i;
}
for (int i = zoomToStart; i <= ZOOM_TO_SAVE_END; i++) {
System.out.println(i + " " + zooms[i].size());
}
stat = rs.getStatement();
rs.close();
stat.close();
writer.endWritePOIIndex();
@ -206,12 +224,14 @@ public class IndexPoiCreator extends AbstractIndexPartCreator {
public static void main(String[] args) throws SQLException, FileNotFoundException, IOException {
long time = System.currentTimeMillis();
IndexPoiCreator poiCreator = new IndexPoiCreator();
poiCreator.poiConnection = (Connection) DBDialect.SQLITE.getDatabaseConnection("/home/victor/projects/OsmAnd/data/osm-gen/POI/Ru-mow.poi.odb", log);
BinaryMapIndexWriter writer = new BinaryMapIndexWriter(new RandomAccessFile("/home/victor/projects/OsmAnd/data/osm-gen/POI/Test-Ru.poi.obf", "rw"));
poiCreator.poiConnection.setAutoCommit(false);
poiCreator.writeBinaryPoiIndex(writer, "Ru-mow", new ConsoleProgressImplementation());
writer.close();
System.out.println("TIME " + (System.currentTimeMillis() - time));
}
}

21
DataExtractionOSM/src/osmand_odb.proto
View file

@ -263,7 +263,6 @@ message OsmAndTransportIndex {
message OsmAndPoiIndex {
required string name = 1;
repeated OsmAndCategoryTable categoriesTable = 3;
// leave space for other indexes
@ -284,16 +283,20 @@ message OsmAndCategoryTable {
message OsmAndPoiBox {
required uint32 zoom = 1; // delta encoded to parent
// size is one tile
required sint32 left = 2; // delta encoded (zoom)
required sint32 right = 3; // delta encoded (zoom)
required sint32 top = 4; // delta encoded (zoom)
required sint32 bottom = 5; // delta encoded (zoom)
optional OsmAndPoiCategories categories = 6;
// encoded as fixed32 length delimited
repeated OsmAndPoiBox subBoxes = 7;
required sint32 top = 3; // delta encoded (zoom)
optional uint32 shiftToData = 10; // shift to OsmAndPoiBoxDataAtom
optional OsmAndPoiCategories categories = 4;
optional StringTable includeNamesList = 5;
optional StringTable excludeNamesList = 6;
// encoded as fixed32 length delimited
repeated OsmAndPoiBox subBoxes = 10;
optional uint32 shiftToData = 14; // shift to OsmAndPoiBoxDataAtom
// TODO
// TransportStop.Message.start - sizeof(TransportStop.Message.length) - routes[i]
// = TransportRoute.Message.start - sizeof(TransportRoute.Message.length)

24
OsmAnd/src/net/osmand/plus/RegionAddressRepositoryBinary.java
View file

@ -259,12 +259,34 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
}
@Override
public City getCityById(Long id) {
public City getCityById(final Long id) {
if(id == -1){
// do not preload cities for that case
return null;
}
preloadCities(null);
if (!cities.containsKey(id)) {
try {
file.getVillages(region, new ResultMatcher<MapObject>() {
boolean canceled = false;
@Override
public boolean isCancelled() {
return canceled;
}
@Override
public boolean publish(MapObject object) {
if (object.getId().longValue() == id.longValue()) {
addCityToPreloadedList((City) object);
canceled = true;
}
return false;
}
}, null, useEnglishNames);
} catch (IOException e) {
log.error("Disk operation failed", e); //$NON-NLS-1$
}
}
return cities.get(id);
}

3
OsmAnd/src/net/osmand/plus/activities/search/SearchStreetByNameActivity.java
View file

@ -46,6 +46,9 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
postcode = region.getPostcode(settings.getLastSearchedPostcode());
if (postcode == null) {
city = region.getCityById(settings.getLastSearchedCity());
if(city == null){
return null;
}
}
region.preloadStreets(postcode == null ? city : postcode, new ResultMatcher<Street>() {
@Override