changeset 204:2a2a5e992b9f gmap2

Fix some errors of accessing nonexisting elements.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 12 Mar 2014 14:28:02 +0200
parents 06a62216428f
children 653c3355bb1f
files markers.js
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/markers.js	Wed Mar 12 14:27:35 2014 +0200
+++ b/markers.js	Wed Mar 12 14:28:02 2014 +0200
@@ -39,7 +39,7 @@
 var pmapMMgr;
 var pmapAreas = [];
 var pmapMarkers = [];
-var pmapMIndex = 0;
+var pmapMIndex;
 var pmapMarkerInfo = [];
 var pmapSideBuiltinHTML, pmapSidePublicHTML, pmapSidePrivateHTML;
 var pmapInfoWindow;
@@ -143,6 +143,7 @@
 
 function pmapLoadMarkers()
 {
+  pmapMIndex = 0;
   pmapInfoWindow = new google.maps.InfoWindow;
 
   google.maps.event.addListener(pmap, 'click', function()
@@ -290,9 +291,13 @@
 {
   for (var i = 0; i < pmapMarkerInfo.length; i++)
   {
-    var show = markerVisStates[pmapMarkerInfo[i][0]] && markerVisStates[pmapMarkerInfo[i][1]];
-    document.getElementById("marker" + i).style.display = show ? "block" : "none";
-    pmapMarkers[i].setVisible(show);
+    var elem = document.getElementById("marker" + i);
+    if (elem)
+    {
+      var show = markerVisStates[pmapMarkerInfo[i][0]] && markerVisStates[pmapMarkerInfo[i][1]];
+      elem.style.display = show ? "block" : "none";
+      pmapMarkers[i].setVisible(show);
+    }
   }
 }