From b5975af3a9523877a9240bce224092cf68101c9e Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 17 Nov 2014 22:05:09 +0100
Subject: [PATCH] Fix merge

---
 OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java b/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
index feca02e3cf..103698823b 100644
--- a/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
+++ b/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java
@@ -349,7 +349,7 @@ public class OsmMapUtils {
      */
     public static double polygonAreaPixels(List<Node> nodes, int zoom) {
         double area = 0.;
-        double mult = 1 / MapUtils.getPowZoom(Math.max(31 - (zoom + 8), 0));
+        double mult = 1 / MapUtils.getPowZoom((double)Math.max(31 - (zoom + 8), 0));
         int j = nodes.size() - 1;
         for (int i = 0; i < nodes.size(); i++) {
             Node x = nodes.get(i);