diff --git a/DataExtractionOSM/src/net/osmand/ToDoConstants.java b/DataExtractionOSM/src/net/osmand/ToDoConstants.java index c26461e126..41cbcf8bb9 100644 --- a/DataExtractionOSM/src/net/osmand/ToDoConstants.java +++ b/DataExtractionOSM/src/net/osmand/ToDoConstants.java @@ -13,12 +13,14 @@ public class ToDoConstants { // FOR 0.4 beta RELEASE // ! 89. Transport redesign UI (enable run from context menu, switch go to goal/not) ! // ! 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) // !_22. Verify all POI has a point_type (in order to search them) // !_1 . VELCOM + // !_26. Download voice data (Issue) // !_18. Fix loading map data in rotated mode (check properly boundaries) +/- + // !_28. Rotate crash (progress dialog) // not required // ! 81. Add some objects to POI category (1) to add them into OSM 2) to help navigation) diff --git a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java index 02cf8301c0..7ed9edf42b 100644 --- a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java @@ -11,7 +11,6 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; -import java.util.HashMap; import java.util.Map; import java.util.TreeMap; @@ -29,51 +28,36 @@ public class DownloaderIndexFromGoogleCode { * @throws IOException */ public static void main(String[] args) throws URISyntaxException, IOException { -// Map 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 indexFiles = DownloaderIndexFromGoogleCode.getIndexFiles( - new String[] { IndexConstants.TRANSPORT_INDEX_EXT, IndexConstants.TRANSPORT_INDEX_EXT_ZIP,}, - new String[] { IndexConstants.TRANSPORT_TABLE_VERSION + "", //$NON-NLS-1$ + 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$ System.out.println(indexFiles); - // put your cookies and personal information for delete - Map cookies = new HashMap(); - cookies.put("__utmb", ""); //$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("__utmc", ""); //$NON-NLS-1$//$NON-NLS-2$ - cookies.put("PREF", ""); //$NON-NLS-1$ //$NON-NLS-2$ - cookies.put("HSID", ""); //$NON-NLS-1$//$NON-NLS-2$ - cookies.put("SID", ""); //$NON-NLS-1$ //$NON-NLS-2$ - cookies.put("NID", ""); //$NON-NLS-1$ //$NON-NLS-2$ - cookies.put("__qca", ""); //$NON-NLS-1$ //$NON-NLS-2$ - String pagegen = ""; //$NON-NLS-1$ - String token = ""; //$NON-NLS-1$ - - StringBuilder cookieString = new StringBuilder(); - int size = cookies.size(); - for (String c : cookies.keySet()) { - size--; - cookieString.append(c).append("=").append(cookies.get(c)); //$NON-NLS-1$ - if (size > 0) { - cookieString.append("; "); //$NON-NLS-1$ - } - } - - for(String s : indexFiles.keySet()){ - String description = indexFiles.get(s); - if(description.contains("0 MB")){ //$NON-NLS-1$ - deleteFileFromGoogleDownloads(s, token, pagegen, - cookieString.toString()); - } - } +// Map cookies = new HashMap(); +// cookies.put("__utmz", ""); //$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("SID", ""); //$NON-NLS-1$ //$NON-NLS-2$ +// cookies.put("NID", ""); //$NON-NLS-1$ //$NON-NLS-2$ +// String pagegen = ""; //$NON-NLS-1$ +// String token = ""; //$NON-NLS-1$ +// +// StringBuilder cookieString = new StringBuilder(); +// int size = cookies.size(); +// for (String c : cookies.keySet()) { +// size--; +// cookieString.append(c).append("=").append(cookies.get(c)); //$NON-NLS-1$ +// if (size > 0) { +// cookieString.append("; "); //$NON-NLS-1$ +// } +// } +// deleteFileFromGoogleDownloads(odb, token, pagegen, +// cookieString.toString()); } diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 4202917cc4..1b04889ee3 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -211,9 +211,9 @@ See osmand.net Input osm password User password Specify osm settings : osm login - Specify monitor settings : save track + Specify monitoring settings : save track Specify data settings : language, update data - Specify map settings : rotation, poi filter + Specify map settings : map source, rotation, center position, screen orientation Data Osm Auto zoom map according to the speed