From 93dde790b9560ee7c25d1a6833f5f7c34e94af09 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 28 May 2012 19:41:16 +0200
Subject: [PATCH] Fix issue with polygons

---
 .../net/osmand/binary/BinaryMapIndexReader.java    |  1 +
 .../src/net/osmand/render/default.render.xml       | 14 ++++++++------
 Osmand-kernel/osmand/src/binaryRead.cpp            |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
index d56f874da3..25e4a8a9dc 100644
--- a/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
+++ b/DataExtractionOSM/src/net/osmand/binary/BinaryMapIndexReader.java
@@ -1039,6 +1039,7 @@ public class BinaryMapIndexReader {
 			dataObject.additionalTypes = new int[0];
 		}
 		dataObject.id = id;
+		dataObject.area = area;
 		dataObject.mapIndex = root;
 		return dataObject;
 	}
diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 83a016be79..51e86c72ba 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -108,6 +108,7 @@
 			<filter tag="power" value="minor_line" order="68"/>
 			<filter layer="1" tag="railway" value="" order="66"/>
 			<filter tag="railway" value="" order="58"/>
+			<filter tag="public_transport" value="" order="58"/>
 			<filter layer="1" tag="waterway" value="" order="66"/>
 			<filter tag="waterway" value="" order="18"/>
 
@@ -136,9 +137,9 @@
 				<filter tag="highway" value="road" order="52"/>
 				 <filter layer="1" tag="highway" value="unclassified" order="66"/>
 				<filter tag="highway" value="unclassified" order="52"/>
-				 <filter layer="1" tag="highway" value="residential" order="66"/>
-				<filter tag="highway" value="residential" order="51"/>
-				 <filter layer="1" tag="highway" value="service" order="66"/>
+				<filter layer="1" tag="highway" value="residential" order="66" area="false"/>
+				<filter tag="highway" value="residential" order="51" area="false"/> 
+				 <filter layer="1" tag="highway" value="service" order="66" />
 				<filter tag="highway" value="service" order="51"/>
 				 <filter layer="1" tag="highway" value="living_street" order="66"/>
 				<filter tag="highway" value="living_street" order="50"/>
@@ -783,7 +784,7 @@
 			<filter tag="highway" value="road"/>
 			<filter tag="highway" value="unclassified"/>
 			<filter tag="highway" value="residential"/>
-			<groupFilter color="#ffffff" color_2="#464646" minzoom="12" strokeWidth_2="1">
+			<groupFilter color="#ffffff" color_2="#bababa" minzoom="12" strokeWidth_2="1">
 				<filter nightMode="true" color="#9f9f9f"/>
 			</groupFilter>
 		</group>
@@ -793,8 +794,8 @@
 			<filter tag="highway" value="pedestrian"/>
 			<filter tag="highway" value="footway"/>
 			<groupFilter>
-				<filter minzoom="14" color="#ECECEC" color_2="#464646" strokeWidth_2="0.5"/>
-				<filter hmRendered="true" minzoom="13" color="#ECECEC" color_2="#464646" strokeWidth_2="0.5"/>
+				<filter minzoom="14" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
+				<filter hmRendered="true" minzoom="13" color="#ECECEC" color_2="#bababa" strokeWidth_2="0.5"/>
 			</groupFilter>
 		</group>
 
@@ -1351,6 +1352,7 @@
 		<filter tag="railway" value="funicular" minzoom="15" color="#666666" strokeWidth="2"/>
 
 		<filter tag="railway" value="platform" minzoom="15" color="#888888" strokeWidth="3"/>
+		<filter tag="public_transport" value="platform" minzoom="15" color="#888888" strokeWidth="3"/>
 
 		<!-- Aeroways -->
 		<filter tag="aeroway" value="runway" color="#bbbbcc">
diff --git a/Osmand-kernel/osmand/src/binaryRead.cpp b/Osmand-kernel/osmand/src/binaryRead.cpp
index 4331f299df..25782d2743 100644
--- a/Osmand-kernel/osmand/src/binaryRead.cpp
+++ b/Osmand-kernel/osmand/src/binaryRead.cpp
@@ -502,6 +502,7 @@ MapDataObject* readMapDataObject(CodedInputStream* input, MapTreeBounds* tree, S
 	dataObject->additionalTypes = additionalTypes;
 	dataObject->types = types;
 	dataObject->id = id;
+	dataObject->area = area;
 	dataObject->stringIds = stringIds;
 	dataObject->polygonInnerCoordinates = innercoordinates;