From 44d2c694eeefb45a5589b3555f6306a626852439 Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Tue, 27 Aug 2013 09:46:25 +0200
Subject: [PATCH] Keep order & don't overwrite conflict in map rendering types

---
 OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
index 655e7069b0..74beacb972 100644
--- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
+++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
@@ -128,8 +128,10 @@ public class MapRenderingTypes {
 					if (t != null) {
 						if (amenityNameToType.containsKey(t)) {
 							System.err.println("Conflict " + t + " " + amenityNameToType.get(t) + " <> " + e.getKey());
-						}
-						amenityNameToType.put(t, e.getKey());
+						} else {
+                            amenityNameToType.put(t, e.getKey());
+                        }
+
 					}
 				}
 			}