From cf2f5853648a1f6a33e99c881d35b9af2fe7db2e Mon Sep 17 00:00:00 2001
From: fescen9 <fescen9@a1c9d15f-ff5a-4149-8c05-1cb7b7054cb2>
Date: Wed, 8 Dec 2010 07:32:51 +0000
Subject: [PATCH] Fixed broken consolidated show/hide code.

---
 web/map.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/map.js b/web/map.js
index da049d00..f13651b4 100644
--- a/web/map.js
+++ b/web/map.js
@@ -614,7 +614,7 @@ function makeRequest(url, func, type, fail, post, contenttype)
 					if(p[0] in markers) {
 						var m = markers[p[0]];
 							
-						if (showWarps == false) {
+						if ((p[1] == 'warp' && showWarps == false) || (p[1] == 'marker' && showMarkers == false)) {
 							m.setMap(null);
 							continue;
 						}
@@ -625,7 +625,7 @@ function makeRequest(url, func, type, fail, post, contenttype)
 						var converted = fromWorldToLatLng(p[3], p[4], p[5]);
 						m.setPosition(converted);
 					} else {
-						if (showWarps == false) {
+						if ((p[1] == 'warp' && showWarps == false) || (p[1] == 'marker' && showMarkers == false)) {
 							continue;
 						}