Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -r34ac5d49ece05c89ab6baee0eb9ed255f3e5f7cd -rb6d9cc3b373ee8a9b7b9be20c821f337538beec4
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision 34ac5d49ece05c89ab6baee0eb9ed255f3e5f7cd)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision b6d9cc3b373ee8a9b7b9be20c821f337538beec4)
@@ -25,10 +25,12 @@
 	map.closeInfoWindow();
 	var marker;
 	
+
 	if(editAble) 	
 	{
 		marker = new GMarker(point, {draggable: true, zIndexProcess:importanceOrder});
-		marker.importance = 1;
+		if (isSaved) 	{marker.importance = 1;}
+		else 			{marker.importance = 2;}
 	}
 	else 			
 	{
@@ -56,7 +58,7 @@
     	marker.openInfoWindowHtml(marker.infoWindowHtml);
     	showSelectedMarkerSideBar(marker.sideBarIndex);
     	currentOpenMarkerImportance = marker.importance;
-    	marker.importance = 2;
+    	marker.importance = 3;
     });
     
     GEvent.addListener(marker, "infowindowclose", function() {
@@ -208,7 +210,7 @@
 		sideBarText += "<div style='display:none;' id='userdiv" + users[j].id + "'>";
 		for (i=0;i<markers.length; i++)
 		{
-			if (markers[i].createdById == users[j].id && markers[i].state != "remove")
+			if (markers[i].createdById == users[j].id && markers[i].state != "remove" && markers[i].state != "unsaved")
 			{
 				sideBarText += "&nbsp;&nbsp;&nbsp;&nbsp;<span id='markerSpan" + markers[i].sideBarIndex + "'><nobr>";
 				sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\");' ";
@@ -266,13 +268,16 @@
 function fitMapMarkers() 
 {
    	var bounds = new GLatLngBounds();
+	
 	for (var i=0; i< markers.length; i++) 
 	{
-		if (markers[i].state != "remove")
+		if (markers[i] && markers[i].getPoint() && markers[i].state != "remove")
 		{
+			
 			bounds.extend(markers[i].getPoint());	
 		}
 	}
+	
    	var zoom = map.getBoundsZoomLevel(bounds) - 1;
    	if (zoom > 15) {zoom = 15;}
    	map.setZoom(zoom);