From 64f493676b56274288c0dfb70fb3610f959ac0fb Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Tue, 31 May 2011 09:40:06 +0200
Subject: [PATCH] merging changes

---
 source/Ox.UI/js/Map/Ox.MapMarker.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js
index 6143cee5..761df4e4 100644
--- a/source/Ox.UI/js/Map/Ox.MapMarker.js
+++ b/source/Ox.UI/js/Map/Ox.MapMarker.js
@@ -21,13 +21,13 @@ Ox.MapMarker = function(options) {
 
     var that = this,
         typeColor = {
-            country: [64, 64, 255],
-            region: [128, 0, 255],
+            country: [0, 255, 255],
+            region: [255, 0, 255],
             city: [255, 0, 0],
             borough: [255, 128, 0],
             street: [255, 255, 0],
-            premise: [128, 255, 0],
-            feature: [0, 192, 0],
+            premise: [0, 192, 0],
+            feature: [64, 64, 255],
             other: [128, 128, 128]
         },
         areaSize = {