From: <zo...@us...> - 2011-02-28 20:18:09
|
Revision: 4260 http://navit.svn.sourceforge.net/navit/?rev=4260&view=rev Author: zoff99 Date: 2011-02-28 20:18:03 +0000 (Mon, 28 Feb 2011) Log Message: ----------- Fix:Android:search small bugfix Modified Paths: -------------- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java Modified: trunk/navit/navit/android/src/org/navitproject/navit/Navit.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2011-02-28 20:05:47 UTC (rev 4259) +++ trunk/navit/navit/android/src/org/navitproject/navit/Navit.java 2011-02-28 20:18:03 UTC (rev 4260) @@ -61,7 +61,7 @@ { public static final class Navit_Address_Result_Struct { - String result_type; // TWN,STR,SHN + String result_type; // TWN,STR,SHN float lat; float lon; String addr; @@ -95,9 +95,9 @@ public static int download_map_id = 0; ProgressThread progressThread_pri = null; ProgressThread progressThread_sec = null; - public static int search_results_towns=0; - public static int search_results_streets=0; - public static int search_results_streets_hn=0; + public static int search_results_towns = 0; + public static int search_results_streets = 0; + public static int search_results_streets_hn = 0; SearchResultsThread searchresultsThread = null; SearchResultsThreadSpinnerThread spinner_thread = null; public static Boolean NavitAddressSearchSpinnerActive = false; @@ -1108,9 +1108,9 @@ // clear results Navit.NavitAddressResultList_foundItems.clear(); - Navit.search_results_towns=0; - Navit.search_results_streets=0; - Navit.search_results_streets_hn=0; + Navit.search_results_towns = 0; + Navit.search_results_streets = 0; + Navit.search_results_streets_hn = 0; if (addr.equals("")) { Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java 2011-02-28 20:05:47 UTC (rev 4259) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitAddressResultListActivity.java 2011-02-28 20:18:03 UTC (rev 4260) @@ -45,26 +45,26 @@ Navit.Navit_Address_Result_Struct tmp = new Navit.Navit_Address_Result_Struct(); - //Log.e("Navit", "###########11111111"); + Log.e("Navit", "########### full result count: " + + Navit.NavitAddressResultList_foundItems.size()); + // show "town names" as results only when we dont have any street names in resultlist - if ((Navit.search_results_streets > 0)||(Navit.search_results_streets_hn > 0)) + if ((Navit.search_results_streets > 0) || (Navit.search_results_streets_hn > 0)) { - //Log.e("Navit", "###########22222222"); // clear out towns from result list for (Iterator<Navit.Navit_Address_Result_Struct> k = Navit.NavitAddressResultList_foundItems .iterator(); k.hasNext();) { - //Log.e("Navit", "###########333333333"); tmp = k.next(); if (tmp.result_type.equals("TWN")) { - //Log.e("Navit", "###########444444444"); k.remove(); } } } - Log.e("Navit", "########### "+Navit.NavitAddressResultList_foundItems.size()); + Log.e("Navit", "########### final result count: " + + Navit.NavitAddressResultList_foundItems.size()); this.result_list = new String[Navit.NavitAddressResultList_foundItems.size()]; int j = 0; Modified: trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java =================================================================== --- trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2011-02-28 20:05:47 UTC (rev 4259) +++ trunk/navit/navit/android/src/org/navitproject/navit/NavitGraphics.java 2011-02-28 20:18:03 UTC (rev 4260) @@ -1240,7 +1240,8 @@ tmp_addr.lat = Float.parseFloat(tmp_s[1]); tmp_addr.lon = Float.parseFloat(tmp_s[2]); // the rest ist address - tmp_addr.addr = s.substring(3 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length(), s.length()); + tmp_addr.addr = s.substring(3 + tmp_s[0].length() + tmp_s[1].length() + tmp_s[2].length(), s + .length()); Navit.NavitAddressResultList_foundItems.add(tmp_addr); if (tmp_addr.result_type.equals("TWN")) @@ -1263,7 +1264,8 @@ b.putInt("cur", Navit.NavitAddressResultList_foundItems.size() % (Navit.ADDRESS_RESULTS_DIALOG_MAX + 1)); b.putString("title", "loading search results"); - b.putString("text", "towns:"+Navit.search_results_towns+" streets:"+(int)(Navit.search_results_streets+Navit.search_results_streets_hn)); + b.putString("text", "towns:" + Navit.search_results_towns + " streets:" + + (int) (Navit.search_results_streets + Navit.search_results_streets_hn)); Navit.msg_to_msg_handler(b, 10); } public void SearchResultList(int i, int partial_match, String text) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |