From ed20e4e90a2c33b3f577ed7f7177ecea2fd17766 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 21 Aug 2017 10:00:08 +0200
Subject: [PATCH] Fix compile errors

---
 .../plus/render/MapRenderRepositories.java    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
index 5c04d13d75..3c58062b1f 100644
--- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
+++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
@@ -344,7 +344,8 @@ public class MapRenderRepositories {
 							coordinantes[2 * k] = r.getPoint31XTile(k);
 							coordinantes[2 * k + 1] = r.getPoint31YTile(k);
 						}
-						BinaryMapDataObject mo = new BinaryMapDataObject(coordinantes, roTypes, new int[0][], r.getId());
+						BinaryMapDataObject mo = new BinaryMapDataObject( r.getId(), coordinantes, new int[0][],
+								RenderingRulesStorage.LINE_RULES, true, roTypes, null);
 						TIntObjectHashMap<String> names = r.getNames();
 						if(names != null) {
 							TIntObjectIterator<String> it = names.iterator();
@@ -446,8 +447,11 @@ public class MapRenderRepositories {
 			coastlineTime = "(coastline " + (System.currentTimeMillis() - ms) + " ms )";
 		}
 		if (addBasemapCoastlines && mi != null) {
-			BinaryMapDataObject o = new BinaryMapDataObject(new int[]{leftX, topY, rightX, topY, rightX, bottomY, leftX, bottomY, leftX,
-					topY}, new int[]{ocean[0] && !land[0] ? mi.coastlineEncodingType : (mi.landEncodingType)}, null, -1);
+			int[] coordinates = new int[]{leftX, topY, rightX, topY, rightX, bottomY, leftX, bottomY, leftX,
+					topY};
+			BinaryMapDataObject o = new BinaryMapDataObject(-1, coordinates, new int[0][],  
+					RenderingRulesStorage.POLYGON_RULES, true,
+					new int[]{ocean[0] && !land[0] ? mi.coastlineEncodingType : (mi.landEncodingType)}, null);
 			o.setMapIndex(mi);
 			tempResult.add(o);
 		}
@@ -940,7 +944,8 @@ public class MapRenderRepositories {
 				coordinates[j * 2] = (int) (ring.get(j) >> 32);
 				coordinates[j * 2 + 1] = (int) (ring.get(j) & mask);
 			}
-			BinaryMapDataObject o = new BinaryMapDataObject(coordinates, new int[] { mapIndex.coastlineBrokenEncodingType }, null, dbId);
+			BinaryMapDataObject o = new BinaryMapDataObject(dbId, coordinates,  
+					new int[0][], RenderingRulesStorage.POLYGON_RULES, true, new int[] { mapIndex.coastlineBrokenEncodingType }, null);
 			o.setMapIndex(mapIndex);
 			result.add(o);
 		}
@@ -958,8 +963,9 @@ public class MapRenderRepositories {
 			}
 			boolean clockwise = MapAlgorithms.isClockwiseWay(ring);
 			clockwiseFound = clockwiseFound || clockwise;
-			BinaryMapDataObject o = new BinaryMapDataObject(coordinates, new int[] { clockwise ? mapIndex.coastlineEncodingType
-					: mapIndex.landEncodingType }, null, dbId);
+			BinaryMapDataObject o = new BinaryMapDataObject(dbId, coordinates, 
+					new int[0][], RenderingRulesStorage.POLYGON_RULES, true,  new int[] { clockwise ? mapIndex.coastlineEncodingType
+					: mapIndex.landEncodingType }, null);
 			o.setMapIndex(mapIndex);
 			o.setArea(true);
 			result.add(o);
@@ -967,8 +973,9 @@ public class MapRenderRepositories {
 		
 		if (!clockwiseFound && uncompletedRings.size() == 0) {
 			// add complete water tile
-			BinaryMapDataObject o = new BinaryMapDataObject(new int[] { leftX, topY, rightX, topY, rightX, bottomY, leftX, bottomY, leftX,
-					topY }, new int[] { mapIndex.coastlineEncodingType }, null, dbId);
+			BinaryMapDataObject o = new BinaryMapDataObject(dbId,
+					new int[] { leftX, topY, rightX, topY, rightX, bottomY, leftX, bottomY, leftX, topY }, 
+					new int[0][], RenderingRulesStorage.POLYGON_RULES, true, new int[] { mapIndex.coastlineEncodingType }, null);
 			o.setMapIndex(mapIndex);
 			log.info("!!! Isolated islands !!!"); //$NON-NLS-1$
 			result.add(o);