From be6dde27982b255da7862b1f03c2d5bb53c52105 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 26 Jun 2012 00:43:12 +0200
Subject: [PATCH] Update 0.8 strings

---
 OsmAnd/res/values/strings.xml           | 14 ++++++++++----
 Osmand-kernel/osmand/src/binaryRead.cpp | 12 ++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 8a1fe55290..6ba4310594 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -66,10 +66,16 @@
     <string name="prefs_plugins_descr">Plugins enable expert mode settings and provide extra functionality like tile maps, tracking, sleep mode operation, accessibility settings, and others.</string>
     <string name="prefs_plugins">Plugin Manager</string>
     <string name="tip_recent_changes_0_8_0_t">Changes in 0.8.0 :
-\n\t- Plugin functionality
-\n\t- New offline map data support
-\n\t- Improve usability and simplify Profile concept
-\n\t- Lots of bug fixes
+\n\t- *Plugin functionality*
+\n\t    - Most of functionality is grouped by features and could be disabled/enabled in Plugin Manager.
+You can enable Raster Map sources, Tracking settings and many other new and previously existing features.     
+\n\t- *New offline map data support*
+\n\t    - Map rendering becomes faster and more precise (coastline and flooded area problems are mainly fixed). 
+\n\t    - You need to download completely new offline data (old data will not be supported anymore)
+\n\t- *Offline Routing* 
+\n\t	- Offline routing becomes more robust
+\n\t  *Usability and UI experience*
+\n\t	- Improved in many areas		
 	</string>
     <string name="osm_editing_plugin_description">Show settings needed for OSM feedback like collecting / modifying OSM POI objects, opening / commenting OSM bugs, and contributing recorded GPX files (requires OSM credentials).</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vector maps likely display faster. May not work well on some devices.</string>
diff --git a/Osmand-kernel/osmand/src/binaryRead.cpp b/Osmand-kernel/osmand/src/binaryRead.cpp
index bdfbad2298..d5f6f362c0 100644
--- a/Osmand-kernel/osmand/src/binaryRead.cpp
+++ b/Osmand-kernel/osmand/src/binaryRead.cpp
@@ -509,7 +509,7 @@ bool acceptTypes(SearchQuery* req, std::vector<tag_value>& types, MapIndex* root
 }
 
 MapDataObject* readMapDataObject(CodedInputStream* input, MapTreeBounds* tree, SearchQuery* req,
-			MapIndex* root) {
+			MapIndex* root, uint64_t baseId) {
 	uint32_t tag = WireFormatLite::GetTagFieldNumber(input->ReadTag());
 	bool area = MapData::kAreaCoordinatesFieldNumber == tag;
 	if(!area && MapData::kCoordinatesFieldNumber != tag) {
@@ -651,8 +651,8 @@ MapDataObject* readMapDataObject(CodedInputStream* input, MapTreeBounds* tree, S
 		}
 		}
 	}
-//	if(req->cacheCoordinates.size() > 300 && types.size() > 0 && types[0].first == "admin_level") {
-//		osmand_log_print(LOG_INFO, "TODO Object is ignored %llu %s %s", id, types[0].first.c_str(), types[0].second.c_str());
+//	if(req->cacheCoordinates.size() > 100 && types.size() > 0 /*&& types[0].first == "admin_level"*/) {
+//		osmand_log_print(LOG_INFO, "TODO Object is %llu  (%llu) ignored %s %s", (id + baseId) >> 1, baseId, types[0].first.c_str(), types[0].second.c_str());
 //		return NULL;
 //	}
 
@@ -764,7 +764,7 @@ bool searchMapTreeBounds(CodedInputStream* input, MapTreeBounds* current, MapTre
 }
 
 bool readMapDataBlocks(CodedInputStream* input, SearchQuery* req, MapTreeBounds* tree, MapIndex* root) {
-	int64_t baseId = 0;
+	uint64_t baseId = 0;
 	int tag;
 	std::vector< MapDataObject* > results;
 	while ((tag = input->ReadTag()) != 0) {
@@ -774,7 +774,7 @@ bool readMapDataBlocks(CodedInputStream* input, SearchQuery* req, MapTreeBounds*
 		switch (WireFormatLite::GetTagFieldNumber(tag)) {
 		// required uint32_t version = 1;
 		case MapDataBlock::kBaseIdFieldNumber : {
-			WireFormatLite::ReadPrimitive<int64_t, WireFormatLite::TYPE_SINT64>(input, &baseId);
+			WireFormatLite::ReadPrimitive<uint64_t, WireFormatLite::TYPE_UINT64>(input, &baseId);
 			break;
 		}
 		case MapDataBlock::kStringTableFieldNumber: {
@@ -803,7 +803,7 @@ bool readMapDataBlocks(CodedInputStream* input, SearchQuery* req, MapTreeBounds*
 			uint32_t length;
 			DO_((WireFormatLite::ReadPrimitive<uint32_t, WireFormatLite::TYPE_UINT32>(input, &length)));
 			int oldLimit = input->PushLimit(length);
-			MapDataObject* mapObject = readMapDataObject(input, tree, req, root);
+			MapDataObject* mapObject = readMapDataObject(input, tree, req, root, baseId);
 			if (mapObject != NULL) {
 				mapObject->id += baseId;
 				req->publish(mapObject);