From 543e5867232dec39d2b3a31274e77b5345cf8c97 Mon Sep 17 00:00:00 2001
From: Jon Atkins <github@jonatkins.com>
Date: Sun, 8 Sep 2013 20:43:23 +0100
Subject: [PATCH] make (portals/lihnks/fields)Layers private to IITC core again
 - they're not for plugins now only some portals are drawn to the map it's OK
 to bring them all to front at the end of the render use larger squares for
 portal clustering on mobile - as the portal markers are larger

---
 code/map_data_render.js | 29 +++++++++++++----------------
 main.js                 |  4 +---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/code/map_data_render.js b/code/map_data_render.js
index 39ad70a7..4f1c569f 100644
--- a/code/map_data_render.js
+++ b/code/map_data_render.js
@@ -4,12 +4,10 @@
 
 
 window.Render = function() {
-  // below this many portals displayed, we reorder the SVG at the end of the render pass to put portals above fields/links
-  this.LOW_PORTAL_COUNT = 350;
 
   // when there are lots of portals close together, we only add some of them to the map
   // the idea is to keep the impression of the dense set of portals, without rendering them all
-  this.CLUSTER_SIZE = 8;  // the map is divited into squares of this size in pixels for clustering purposes
+  this.CLUSTER_SIZE = L.Browser.mobile ? 16 : 8;  // the map is divited into squares of this size in pixels for clustering purposes. mobile uses larger markers, so therefore larger clustering areas
   this.CLUSTER_PORTAL_LIMIT = 4; // no more than this many portals are drawn in each cluster square
 
 
@@ -134,23 +132,22 @@ window.Render.prototype.endRenderPass = function() {
     }
   }
 
-  // reorder portals to be after links/fields, but only if the number is low
-  if (Object.keys(window.portals).length <= this.LOW_PORTAL_COUNT) {
-    for (var i in window.portalsLayers) {
-      var layer = window.portalsLayers[i];
-      if (window.map.hasLayer(layer)) {
-        layer.eachLayer (function(p) {
-          p.bringToFront();
-        });
-      }
-    }
-
-  }
+  // reorder portals to be after links/fields
+  this.bringPortalsToFront();
 
   this.isRendering = false;
-
 }
 
+window.Render.prototype.bringPortalsToFront = function() {
+  for (var i in portalsLayers) {
+    var layer = portalsLayers[i];
+    if (window.map.hasLayer(layer)) {
+      layer.eachLayer (function(p) {
+        p.bringToFront();
+      });
+    }
+  }
+}
 
 
 window.Render.prototype.deleteEntity = function(guid) {
diff --git a/main.js b/main.js
index f4929e70..60fa078b 100644
--- a/main.js
+++ b/main.js
@@ -212,9 +212,7 @@ window.selectedPortal = null;
 window.portalRangeIndicator = null;
 window.portalAccessIndicator = null;
 window.mapRunsUserAction = false;
-window.portalsLayers = undefined;
-window.linksLayer = undefined;
-window.fieldsLayer = undefined;
+var portalsLayers, linksLayer, fieldsLayer;
 
 // contain references to all entities loaded from the server. If render limits are hit,
 // not all may be added to the leaflet layers