Merge branch 'master' into dtt-c-render

2011-04-10 04:43:02 -04:00
parent a2b1f238d9 dfe30a0d0f
commit cc6b4bc022
2 changed files with 14 additions and 9 deletions
--- a/web_assets/functions.js
+++ b/web_assets/functions.js
@@ -160,7 +160,12 @@ function initMarkers() {
    if (markersInit) { return; }

    markersInit = true;
-
+    
+    // first, give all collections an empty array to work with
+    for (i in signGroups) {
+        markerCollection[signGroups[i].label] = [];
+    }
+    
    for (i in markerData) {
        var item = markerData[i];

@@ -202,11 +207,8 @@ function initMarkers() {
                        icon: iconURL,
                        visible: false
                        });
-                if (markerCollection[label]) {
-                    markerCollection[label].push(marker);
-                } else {
-                    markerCollection[label] = [marker];
-                }
+                
+                markerCollection[label].push(marker);

                if (item.type == 'sign') {
                    prepareSignMarker(marker, item);