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

Fix conflicts after merge

Browse source
This commit is contained in:
Victor Shcherb 2011-05-09 21:00:16 +02:00
commit 93312e5e79
11 changed files with 428 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DataExtractionOSM/src/net/osmand/data/PostCode.java
View file

@ -26,6 +26,11 @@ public class PostCode extends MapObject {
return streets.values();
}
public void removeAllStreets()
{
streets.clear();
}
public Street registerStreet(Street street, boolean useEnglishNames){
String name = street.getName(useEnglishNames);
streets.put(name, street);

5
OsmAnd/AndroidManifest.xml
View file

@ -39,6 +39,11 @@
<activity android:name=".activities.search.SearchStreet2ByNameActivity"></activity>
<activity android:name=".activities.search.SearchBuildingByNameActivity"></activity>
<activity android:name=".activities.EditPOIFilterActivity"></activity>
<activity android:name=".activities.search.GeoIntentActivity"><intent-filter><action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<data android:scheme="geo"></data>
</intent-filter>
</activity>
<service android:process="net.osmand.plus" android:label="@string/process_navigation_service" android:name=".NavigationService">
<intent-filter><action android:name="net.osmand.plus.NavigationService"></action></intent-filter>
</service>

11
OsmAnd/res/layout/search_address_offline.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical">
<TextView android:id="@+id/TextView" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center_horizontal"
android:layout_marginTop = "5dp" android:text="@string/search_osm_offline"/>
<ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content"></ListView>
</LinearLayout>

11
OsmAnd/res/layout/search_address_offline_list_item.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:orientation="horizontal">
<TextView android:id="@+id/distance_label" android:layout_marginLeft="5dp"
android:layout_width="80dp" android:layout_height="wrap_content" android:gravity="left"
android:textSize="20sp"/>
<TextView android:id="@+id/label" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:textSize="20sp" />
</LinearLayout>

3
OsmAnd/res/values-ru/strings.xml
View file

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="create_poi_link_to_osm_doc"><u>Интернет OSM</u> классификация с картинками</string>
<string name="error_doing_search">Ошибка offline поиска</string>
<string name="search_offline_geo_error">Невозможно разобрать запрос : {0}</string>
<string name="search_osm_offline">Поиск адреса используя offline карты</string>
<string name="system_locale">Системная</string>
<string name="preferred_locale_descr">Изменить язык программы</string>
<string name="preferred_locale">Локализация</string>

33
OsmAnd/res/values-sk/strings.xml
View file

@ -1,5 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<resources>
<string name="system_locale">Systémový</string>
<string name="preferred_locale_descr">Zmeniť zobrazovaný jazyk</string>
<string name="preferred_locale">Preferovaný jazyk</string>
<string name="tip_map_switch">Zdroj mapy</string>
<string name="tip_map_switch_t">Najrýchlejšia cesta ako zmeniť zdroj mapy a vrstvy je stlačením \'Menu\'->\'Vrstvy\' na mape.
\n\tPoložkou \'Zdroj mapy...\' možete vybrať predefinovaný zdroj dlaždíc alebo ručne vytvorený s OsmAndMapCreator-om na PC.
\n\tOsmAnd podporuje užívateľské zdroje.</string>
<string name="tip_app_mode">Režim aplikácie</string>
<string name="tip_app_mode_t">OsmAnd podporuje rozličné režimy reprezentujúce mapu pre typické situácie.
\n\tMôžete zmeniť režim v \'Menu\'->\'Nastavenia\'->\'Režim aplikácie\'.</string>
<string name="tip_navigation">Navigácia</string>
<string name="tip_navigation_t">Na zapnutie navigácie musíte najskôr vybrať cieľový bod. Potom stlačte \'Menu\'->\'Pokyny\' na mape a vyberte typ navigovania.</string>
<string name="tip_select_destination_point">Výber cieľového bodu</string>
<string name="tip_select_destination_point_t">Môžete vybrať cieľový bod v kontextovom menu \'Navigovať do\' alebo v vyhľadaním.
\n\tTaktiež môžete navigovať do obľúbeného bodu dlhým stlačením v \'Obľúbené\'.</string>
<string name="tip_search">Vyhľadávanie</string>
<string name="tip_search_t">Môžete vyhľadať miesto priamo na mape alebo adresou, umiestnením, ako bod záujmu(POI) alebo vo forme obľúbeného bodu.
\n\tStlačením \'Hľadať\' na mape sa otvorí vyhľadávanie. Tam máte 2 možnosti : \'Navigovať do\' alebo \'Zobraziť na mape\'.</string>
<string name="tip_map_context_menu">Kontextové menu</string>
<string name="tip_map_context_menu_t">\tKontextové menu mapy je dostupné dlhším držaním na mape alebo stlačením track ball tlačidla.
\n\tPo kliknutí na zobrazený obdĺžnik so súradnicami sa zobrazí kontextové menu. Pre skrytie obdĺžnika ho dlhšie podržte. Kontextové menu je tiež dostupné pod tlačidlom \'Menu\' na mape.
\n\tKontextové menu mapy pozostáva z akcií, ktoré používaju umiestnenie ako vstup.</string>
<string name="tip_desctination_point">Cieľový bod</string>
<string name="tip_desctination_point_t">\tKľúčový koncept OsmAndu je cieľový bod, ktorý je označený ako červený bod na mape.
\n\tMôžete vždy vidieť vzdialenosť k nemu a smer (červený trojuholník) na mape. Na označenie akéhokoľvek bodu ako cieľového, použite \'Navigovať do\' na bod.
\n\tToto tlačidlo je dostupné vo všetkých vyhľadávacích aktivitách, v kontextovom menu mapy a medzi položkami pri dlhom stlačení na mape.
Cieľový bod je hlavne používaný na meranie vzdialenosti a napredovanú navigáciu.</string>
<string name="tip_initial">Tipy a triky</string>
<string name="tip_initial_t">\tOsmAnd je navigačná aplikácia, ktorá ma rozmanité funkcie.
\n\tNa jej lepšie využitie môžete využiť tipy a triky dostupné ako odkaz v hlavnej ponuke.</string>
<string name="next_button">Ďalší</string>
<string name="previous_button">Predošlý</string>
<string name="unit_of_length_descr">Zmena jednotiek dĺžky a rýchlosti</string>
<string name="unit_of_length">Jednotky dĺžky</string>
<string name="si_mi_foots">Míle/stopy</string>

8
OsmAnd/res/values/strings.xml
View file

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> map classification with images</string>
<string name="error_doing_search">Error occurred in offline search</string>
<string name="search_offline_geo_error">Could not parse geo intent:{0}</string>
<string name="search_osm_offline">Search address using offline maps</string>
<string name="system_locale">System</string>
<string name="preferred_locale_descr">Change display language</string>
<string name="preferred_locale">Preferred locale</string>
@ -33,7 +37,7 @@ Destination point is widely used to measure distance and to straight forward nav
\n\tTo better use them you can follow by tips and tricks available as link on main menu.</string>
<string name="next_button">Next</string>
<string name="previous_button">Previous</string>
<string name="unit_of_length_descr">Change unit of length and speed</string>
<string name="unit_of_length">Unit of length</string>
<string name="si_mi_foots">Miles/foots</string>
@ -554,4 +558,4 @@ Destination point is widely used to measure distance and to straight forward nav
<string name="edit_filter_create_message">Filter {0} has been created</string>
<string name="default_buttons_selectall">Select All</string>
</resources>
</resources>

2
OsmAnd/src/net/osmand/plus/RegionAddressRepository.java
View file

@ -64,7 +64,7 @@ public interface RegionAddressRepository {
public void fillWithSuggestedStreetsIntersectStreets(City city, Street st, List<Street> streetsToFill);
public void fillWithSuggestedStreets(MapObject cityOrPostcode, String name, List<Street> streetsToFill);
public void fillWithSuggestedStreets(MapObject cityOrPostcode, List<Street> streetsToFill, String... name);
public void fillWithSuggestedCities(String name, List<MapObject> citiesToFill, LatLon currentLocation);

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

@ -85,20 +85,22 @@ public class RegionAddressRepositoryBinary implements RegionAddressRepository {
@Override
public void fillWithSuggestedStreets(MapObject o, String name, List<Street> streetsToFill) {
public void fillWithSuggestedStreets(MapObject o, List<Street> streetsToFill, String... names) {
assert o instanceof PostCode || o instanceof City;
City city = (City) (o instanceof City ? o : null);
PostCode post = (PostCode) (o instanceof PostCode ? o : null);
name = name.toLowerCase();
preloadStreets(o);
Collection<Street> streets = post == null ? city.getStreets() : post.getStreets() ;
if(name.length() == 0){
if(names.length == 0){
streetsToFill.addAll(streets);
} else {
int ind = 0;
for (Street s : streets) {
String sName = useEnglishNames ? s.getEnName() : s.getName(); //lower case not needed, collator ensures that
return;
}
int ind = 0;
for (Street s : streets) {
String sName = useEnglishNames ? s.getEnName() : s.getName(); //lower case not needed, collator ensures that
for (String name : names) {
if (cstartsWith(collator,sName,name)) {
streetsToFill.add(ind, s);
ind++;

343
OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java Normal file
View file

@ -0,0 +1,343 @@
package net.osmand.plus.activities.search;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import net.osmand.OsmAndFormatter;
import net.osmand.data.City;
import net.osmand.data.MapObject;
import net.osmand.data.PostCode;
import net.osmand.data.Street;
import net.osmand.osm.LatLon;
import net.osmand.osm.MapUtils;
import net.osmand.osm.Node;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.RegionAddressRepository;
import net.osmand.plus.ResourceManager;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.OsmandApplication;
import android.app.ListActivity;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.DialogInterface.OnCancelListener;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
public class GeoIntentActivity extends ListActivity {
private ProgressDialog progressDlg;
private LatLon location;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.search_address_offline);
getMyApplication().checkApplicationIsBeingInitialized(this);
location = OsmandSettings.getLastKnownMapLocation(OsmandSettings
.getPrefs(this));
final Intent intent = getIntent();
if (intent != null) {
progressDlg = ProgressDialog.show(this,
getString(R.string.searching),
getString(R.string.searching_address));
final Thread searcher = new Thread(new Runnable() {
@Override
public void run() {
try {
Collection<MapObject> results = extract(
intent.getData()).execute();
// show the first result on map, and populate the list!
if (!results.isEmpty()) {
showResult(0, new ArrayList<MapObject>(results));
} else {
showResult(R.string.search_nothing_found, null);
}
} catch (Exception e) {
e.printStackTrace();
showResult(R.string.error_doing_search, null);
} finally {
progressDlg.dismiss();
}
}
}, "SearchingAddress");
searcher.start();
progressDlg.setOnCancelListener(new OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
searcher.interrupt();
}
});
progressDlg.setCancelable(true);
}
// finish();
}
private void showResult(final int warning, final List<MapObject> places) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if (places == null) {
Toast.makeText(GeoIntentActivity.this, getString(warning),
Toast.LENGTH_LONG).show();
} else {
setListAdapter(new MapObjectAdapter(places));
if (places.size() == 1) {
onListItemClick(getListView(), getListAdapter()
.getView(0, null, null), 0, getListAdapter()
.getItemId(0));
}
}
}
});
}
class MapObjectAdapter extends ArrayAdapter<MapObject> {
public MapObjectAdapter(List<MapObject> places) {
super(GeoIntentActivity.this,
R.layout.search_address_offline_list_item, places);
}
public View getView(int position, View convertView, ViewGroup parent) {
View row = convertView;
if (row == null) {
LayoutInflater inflater = getLayoutInflater();
row = inflater.inflate(
R.layout.search_address_offline_list_item, parent,
false);
}
MapObject model = getItem(position);
TextView label = (TextView) row.findViewById(R.id.label);
TextView distanceLabel = (TextView) row
.findViewById(R.id.distance_label);
if (location != null) {
int dist = (int) (MapUtils.getDistance(location, model
.getLocation().getLatitude(), model.getLocation()
.getLongitude()));
distanceLabel.setText(OsmAndFormatter.getFormattedDistance(dist,getContext()));
} else {
distanceLabel.setText(""); //$NON-NLS-1$
}
label.setText(model.toString());
return row;
}
}
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
super.onListItemClick(l, v, position, id);
MapObject item = ((MapObjectAdapter) getListAdapter())
.getItem(position);
OsmandSettings.setMapLocationToShow(this, item.getLocation()
.getLatitude(), item.getLocation().getLongitude(),
getString(R.string.address) + " : " + item.toString()); //$NON-NLS-1$
startActivity(new Intent(this, MapActivity.class));
}
@Override
protected void onStop() {
dismiss();
super.onStop();
}
private void dismiss() {
if (progressDlg != null) {
progressDlg.dismiss();
progressDlg = null;
}
}
/**
* geo:latitude,longitude<BR>
* geo:latitude,longitude?z=zoom<BR>
* geo:0,0?q=my+street+address<BR>
* geo:0,0?q=business+near+city
*
* @param data
* @return
*/
private MyService extract(Uri data) {
// it is 0,0? that means a search
if (data.getSchemeSpecificPart().indexOf("0,0?") != -1) {
return new GeoAddressSearch(data.getQuery());
} else {
return new GeoPointSearch(data.getSchemeSpecificPart());
}
}
private final class GeoAddressSearch implements MyService {
private List<String> elements;
public GeoAddressSearch(String query) {
StringTokenizer s = new StringTokenizer(query.substring(query
.indexOf("q=") + 2), ",");
elements = new ArrayList<String>(s.countTokens());
while (s.hasMoreTokens()) {
elements.add(s.nextToken().replace('+', ' ').trim());
}
}
@Override
public Collection<MapObject> execute() {
if (elements.isEmpty()) {
return Collections.emptyList();
}
// now try to search the City, Street, Etc.. if Street is not found,
// try to search POI
ResourceManager resourceManager = resourceManager();
List<RegionAddressRepository> foundCountries = new ArrayList<RegionAddressRepository>();
RegionAddressRepository country;
for (String maybeCountry : elements) {
country = resourceManager.getRegionRepository(maybeCountry);
if (country != null) {
foundCountries.add(country);
}
}
Collection<RegionAddressRepository> countriesToSearch = foundCountries;
if (foundCountries.isEmpty()) {
// there is no country, we have to search each country
countriesToSearch = resourceManager.getAddressRepositories();
}
// search cities for found countries
Map<RegionAddressRepository, List<MapObject>> citiesForRegion = new HashMap<RegionAddressRepository, List<MapObject>>();
for (RegionAddressRepository rar : countriesToSearch) {
List<MapObject> citiesFound = new ArrayList<MapObject>();
for (String maybeCity : elements) {
rar.fillWithSuggestedCities(maybeCity, citiesFound, null);
}
if (!citiesFound.isEmpty()) {
citiesForRegion.put(rar, citiesFound);
}
}
// no cities found, we should locate the country only
Map<MapObject, List<Street>> streetsForCity = new HashMap<MapObject, List<Street>>();
if (citiesForRegion.isEmpty()) {
for (RegionAddressRepository rar : countriesToSearch) {
ArrayList<MapObject> allcities = new ArrayList<MapObject>();
rar.fillWithSuggestedCities("", allcities, location);
findStreetsForCities(streetsForCity, rar, allcities);
}
} else {
// we have cities, now search for streets?
for (RegionAddressRepository rar : citiesForRegion.keySet()) {
findStreetsForCities(streetsForCity, rar,
citiesForRegion.get(rar));
}
}
// don't go deeper, now populate result list
Set<MapObject> results = new HashSet<MapObject>();
// add all found lists
for (List<Street> streets : streetsForCity.values()) {
results.addAll(streets);
}
// add all found cities for which street was not found
for (List<MapObject> cities : citiesForRegion.values()) {
cities.removeAll(streetsForCity.keySet());
results.addAll(cities);
}
// TODO add all regions for which city was not found
return results;
}
private void findStreetsForCities(
Map<MapObject, List<Street>> streetsForCity,
RegionAddressRepository rar, List<MapObject> allcities) {
for (MapObject city : allcities) {
List<Street> streets = new ArrayList<Street>();
rar.fillWithSuggestedStreets(city, streets,
elements.toArray(new String[] {}));
// we must do this, or we will fill up the whole memory (streets
// are preloaded...)
// TODO some street iterator would be better, is it possible to
// create one?
if (city instanceof City) {
((City) city).removeAllStreets();
} else if (city instanceof PostCode) {
((PostCode) city).removeAllStreets();
}
if (!streets.isEmpty()) {
streetsForCity.put(city, streets);
}
}
}
}
private ResourceManager resourceManager() {
return getMyApplication().getResourceManager();
}
private OsmandApplication getMyApplication() {
return ((OsmandApplication) getApplication());
}
private class GeoPointSearch implements MyService {
private MapObject point;
/**
* geo:latitude,longitude geo:latitude,longitude?z=zoom
*/
public GeoPointSearch(final String geo) {
int latIndex = geo.indexOf(',');
int lonIndex = geo.indexOf('?');
lonIndex = lonIndex > 0 ? lonIndex : geo.length();
if (latIndex > 0) {
try {
double latitude = Double.parseDouble(geo.substring(0,
latIndex));
double longitude = Double.parseDouble(geo.substring(
latIndex + 1, lonIndex));
// TODO zoom is omited for now
point = new MapObject(new Node(latitude, longitude, -1)) {
};
point.setName("Lat: " + latitude + ",Lon:" + longitude);
} catch (NumberFormatException e) {
runOnUiThread(new Runnable() {
public void run() {
Toast.makeText(GeoIntentActivity.this,
getString(R.string.search_offline_geo_error, geo),
Toast.LENGTH_LONG);
}
});
}
}
}
@Override
public Collection<MapObject> execute() {
if (point != null) {
return Collections.singletonList(point);
} else {
return Collections.emptyList();
}
}
}
private interface MyService {
public Collection<MapObject> execute();
}
}

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

@ -36,7 +36,7 @@ public class SearchStreetByNameActivity extends SearchByNameAbstractActivity<Str
public List<Street> getObjects(String filter) {
List<Street> l = new ArrayList<Street>();
if (city != null || postcode != null) {
region.fillWithSuggestedStreets(postcode == null ? city : postcode, filter, l);
region.fillWithSuggestedStreets(postcode == null ? city : postcode, l, filter);
}
return l;
}