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

bugfix

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@527 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-09-27 14:14:39 +00:00
parent ca47dc056f
commit 173815a3d7
3 changed files with 30 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DataExtractionOSM/src/net/osmand/ToDoConstants.java
View file

@ -13,12 +13,14 @@ public class ToDoConstants {
// FOR 0.4 beta RELEASE // FOR 0.4 beta RELEASE
// ! 89. Transport redesign UI (enable run from context menu, switch go to goal/not) ! // ! 89. Transport redesign UI (enable run from context menu, switch go to goal/not) !
// ! 95. Show progress while map rendered and loaded // ! 95. Show progress while map rendered and loaded
// 90. Use Junidecode library on the client for english translation (for map rendering and other save disk space) // ! 90. Use Junidecode library on the client for english translation (for map rendering and other save disk space)
// //
// !_25. Add all attributes needed for routing (highway attributes, turn_restrictions) // !_25. Add all attributes needed for routing (highway attributes, turn_restrictions)
// !_22. Verify all POI has a point_type (in order to search them) // !_22. Verify all POI has a point_type (in order to search them)
// !_1 . VELCOM // !_1 . VELCOM
// !_26. Download voice data (Issue)
// !_18. Fix loading map data in rotated mode (check properly boundaries) +/- // !_18. Fix loading map data in rotated mode (check properly boundaries) +/-
// !_28. Rotate crash (progress dialog)
// not required // not required
// ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation) // ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation)

66
DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java
View file

@ -11,7 +11,6 @@ import java.net.HttpURLConnection;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@ -29,51 +28,36 @@ public class DownloaderIndexFromGoogleCode {
* @throws IOException * @throws IOException
*/ */
public static void main(String[] args) throws URISyntaxException, IOException { public static void main(String[] args) throws URISyntaxException, IOException {
// Map<String, String> indexFiles = DownloaderIndexFromGoogleCode.getIndexFiles(
// new String[] { IndexConstants.ADDRESS_INDEX_EXT, IndexConstants.POI_INDEX_EXT, IndexConstants.TRANSPORT_INDEX_EXT,
// IndexConstants.ADDRESS_INDEX_EXT_ZIP, IndexConstants.POI_INDEX_EXT_ZIP, IndexConstants.TRANSPORT_INDEX_EXT_ZIP,},
// new String[] { IndexConstants.ADDRESS_TABLE_VERSION + "", IndexConstants.POI_TABLE_VERSION + "", //$NON-NLS-1$//$NON-NLS-2$
// IndexConstants.TRANSPORT_TABLE_VERSION + "" , //$NON-NLS-1$
// IndexConstants.ADDRESS_TABLE_VERSION + "", IndexConstants.POI_TABLE_VERSION + "", //$NON-NLS-1$//$NON-NLS-2$
// IndexConstants.TRANSPORT_TABLE_VERSION + "" }); //$NON-NLS-1$
Map<String, String> indexFiles = DownloaderIndexFromGoogleCode.getIndexFiles( Map<String, String> indexFiles = DownloaderIndexFromGoogleCode.getIndexFiles(
new String[] { IndexConstants.TRANSPORT_INDEX_EXT, IndexConstants.TRANSPORT_INDEX_EXT_ZIP,}, new String[] { IndexConstants.ADDRESS_INDEX_EXT, IndexConstants.POI_INDEX_EXT, IndexConstants.TRANSPORT_INDEX_EXT,
new String[] { IndexConstants.TRANSPORT_TABLE_VERSION + "", //$NON-NLS-1$ IndexConstants.ADDRESS_INDEX_EXT_ZIP, IndexConstants.POI_INDEX_EXT_ZIP, IndexConstants.TRANSPORT_INDEX_EXT_ZIP,},
new String[] { IndexConstants.ADDRESS_TABLE_VERSION + "", IndexConstants.POI_TABLE_VERSION + "", //$NON-NLS-1$//$NON-NLS-2$
IndexConstants.TRANSPORT_TABLE_VERSION + "" , //$NON-NLS-1$
IndexConstants.ADDRESS_TABLE_VERSION + "", IndexConstants.POI_TABLE_VERSION + "", //$NON-NLS-1$//$NON-NLS-2$
IndexConstants.TRANSPORT_TABLE_VERSION + "" }); //$NON-NLS-1$ IndexConstants.TRANSPORT_TABLE_VERSION + "" }); //$NON-NLS-1$
System.out.println(indexFiles); System.out.println(indexFiles);
// put your cookies and personal information for delete // put your cookies and personal information for delete
Map<String, String> cookies = new HashMap<String, String>(); // Map<String, String> cookies = new HashMap<String, String>();
cookies.put("__utmb", ""); //$NON-NLS-1$//$NON-NLS-2$ // cookies.put("__utmz", ""); //$NON-NLS-1$ //$NON-NLS-2$ // ?
cookies.put("__utmz", ""); //$NON-NLS-1$ //$NON-NLS-2$ // cookies.put("__utma", ""); //$NON-NLS-1$ //$NON-NLS-2$ // ?
cookies.put("__utma", ""); //$NON-NLS-1$ //$NON-NLS-2$ // cookies.put("HSID", ""); //$NON-NLS-1$//$NON-NLS-2$
cookies.put("__utmc", ""); //$NON-NLS-1$//$NON-NLS-2$ // cookies.put("SID", ""); //$NON-NLS-1$ //$NON-NLS-2$
cookies.put("PREF", ""); //$NON-NLS-1$ //$NON-NLS-2$ // cookies.put("NID", ""); //$NON-NLS-1$ //$NON-NLS-2$
cookies.put("HSID", ""); //$NON-NLS-1$//$NON-NLS-2$ // String pagegen = ""; //$NON-NLS-1$
cookies.put("SID", ""); //$NON-NLS-1$ //$NON-NLS-2$ // String token = ""; //$NON-NLS-1$
cookies.put("NID", ""); //$NON-NLS-1$ //$NON-NLS-2$ //
cookies.put("__qca", ""); //$NON-NLS-1$ //$NON-NLS-2$ // StringBuilder cookieString = new StringBuilder();
String pagegen = ""; //$NON-NLS-1$ // int size = cookies.size();
String token = ""; //$NON-NLS-1$ // for (String c : cookies.keySet()) {
// size--;
StringBuilder cookieString = new StringBuilder(); // cookieString.append(c).append("=").append(cookies.get(c)); //$NON-NLS-1$
int size = cookies.size(); // if (size > 0) {
for (String c : cookies.keySet()) { // cookieString.append("; "); //$NON-NLS-1$
size--; // }
cookieString.append(c).append("=").append(cookies.get(c)); //$NON-NLS-1$ // }
if (size > 0) { // deleteFileFromGoogleDownloads(odb, token, pagegen,
cookieString.append("; "); //$NON-NLS-1$ // cookieString.toString());
}
}
for(String s : indexFiles.keySet()){
String description = indexFiles.get(s);
if(description.contains("0 MB")){ //$NON-NLS-1$
deleteFileFromGoogleDownloads(s, token, pagegen,
cookieString.toString());
}
}
} }

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

@ -211,9 +211,9 @@ See osmand.net</string>
<string name="user_password_descr">Input osm password</string> <string name="user_password_descr">Input osm password</string>
<string name="user_password">User password</string> <string name="user_password">User password</string>
<string name="osm_settings_descr">Specify osm settings : osm login</string> <string name="osm_settings_descr">Specify osm settings : osm login</string>
<string name="monitor_preferences_descr">Specify monitor settings : save track</string> <string name="monitor_preferences_descr">Specify monitoring settings : save track</string>
<string name="data_settings_descr">Specify data settings : language, update data</string> <string name="data_settings_descr">Specify data settings : language, update data</string>
<string name="map_preferences_descr">Specify map settings : rotation, poi filter</string> <string name="map_preferences_descr">Specify map settings : map source, rotation, center position, screen orientation</string>
<string name="data_settings">Data</string> <string name="data_settings">Data</string>
<string name="osm_settings">Osm</string> <string name="osm_settings">Osm</string>
<string name="auto_zoom_map_descr">Auto zoom map according to the speed</string> <string name="auto_zoom_map_descr">Auto zoom map according to the speed</string>