Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -28,10 +28,16 @@
 button.fitMarkers  =Fit Markers
 button.go  =Go!
 
+label.createdBy  =Created By:
+label.latitudeLongitude  =Latitude-Longitude:
+label.newInfoWindowText  =New Info Window Text:
+button.edit  =Edit
+button.remove  =Remove
+
 advanced.editingOptions  =Editing Options
 advanced.lockOnFinished  =Lock when finished
-advanced.allowEditMarkers  =Allow users to edit their own saved markers
-advanced.allowShowAllMarkers  =Allow users to see markers from other users
+advanced.allowEditMarkers  =Allow learners to edit their own saved markers
+advanced.allowShowAllMarkers  =Allow learners to see markers from other learners
 advanced.limitMarkers =Marker Limits
 advanced.markerLimitsMessage =Limit the number of markers
 advanced.mapOptions  =Map Options
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java	(.../IGmapAttachmentDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java	(.../IGmapAttachmentDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java	(.../IGmapDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java	(.../IGmapDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -20,6 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
+
 /* $$Id$$ */
 
 package org.lamsfoundation.lams.tool.gmap.dao;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java	(.../IGmapMarkerDAO.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java	(.../IGmapMarkerDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,3 +1,27 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
 package org.lamsfoundation.lams.tool.gmap.dao;
 
 import java.util.List;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java	(.../IGmapSessionDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java	(.../IGmapSessionDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java	(.../IGmapUserDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java	(.../IGmapUserDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java	(.../GmapAttachmentDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java	(.../GmapAttachmentDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java	(.../GmapDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java	(.../GmapDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java	(.../GmapSessionDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java	(.../GmapSessionDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java	(.../GmapUserDAO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java	(.../GmapUserDAO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java	(.../GmapAttachmentDTO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java	(.../GmapAttachmentDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.HashSet;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -81,7 +82,7 @@
 	
 	public String mapType;
 	
-	public Set<GmapMarkerDTO> gmapMarkers = new TreeSet<GmapMarkerDTO>();
+	public Set<GmapMarkerDTO> gmapMarkers = new HashSet<GmapMarkerDTO>();
 	
 	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java	(.../GmapMarkerDTO.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java	(.../GmapMarkerDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,3 +1,27 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
 package org.lamsfoundation.lams.tool.gmap.dto;
 
 import java.util.Date;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java	(.../GmapSessionDTO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java	(.../GmapSessionDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	(.../GmapUserDTO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java	(.../GmapUserDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java	(.../NotebookEntryDTO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/NotebookEntryDTO.java	(.../NotebookEntryDTO.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,3 +1,27 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id$$ */
+
 package org.lamsfoundation.lams.tool.gmap.dto;
 
 import java.util.Date;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java	(.../GmapAttachment.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.java	(.../GmapAttachment.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.gmap.model;
 
 import java.util.Date;
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java	(.../GmapSession.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java	(.../GmapSession.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java	(.../GmapUser.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapUser.java	(.../GmapUser.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java	(.../GmapServiceProxy.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapServiceProxy.java	(.../GmapServiceProxy.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	(.../GmapConstants.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java	(.../GmapConstants.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java	(.../GmapToolContentHandler.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapToolContentHandler.java	(.../GmapToolContentHandler.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -466,40 +466,34 @@
 				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
 
 				String markerState = markerNode.getNamedItem("state").getNodeValue();
+				
+				if (markerState.equals("remove"))
+				{
+					gmap.removeMarker(uid);
+					return;
+				}
+
+				GmapMarker marker = null;
 				if (markerState.equals("save"))
 				{
-					GmapMarker marker = new GmapMarker();
-					marker.setTitle(markerTitle);
-					marker.setInfoWindowMessage(infoMessage);
-					marker.setLatitude(latitude);
-					marker.setLongitude(longitude);
-					marker.setGmap(gmap);
-					marker.setCreated(new Date());
-					marker.setUpdated(new Date());
-					marker.setAuthored(true);
+					marker = new GmapMarker();
 					marker.setCreatedBy(guser);
-					marker.setUpdatedBy(guser);
-					gmapService.saveOrUpdateGmapMarker(marker);
-					
+					marker.setCreated(new Date());
 				}
 				else if (markerState.equals("update"))
 				{
-					
-					GmapMarker marker = gmap.getMarkerByUid(uid);
-					marker.setTitle(markerTitle);
-					marker.setInfoWindowMessage(infoMessage);
-					marker.setLatitude(latitude);
-					marker.setLongitude(longitude);
-					marker.setGmap(gmap);
-					marker.setUpdated(new Date());
-					marker.setUpdatedBy(guser);
-					marker.setAuthored(true);
-					gmapService.saveOrUpdateGmapMarker(marker);
+					marker = gmap.getMarkerByUid(uid);
 				}
-				else if (markerState.equals("remove"))
-				{
-					gmap.removeMarker(uid);
-				}
+				
+				marker.setTitle(markerTitle);
+				marker.setInfoWindowMessage(infoMessage);
+				marker.setLatitude(latitude);
+				marker.setLongitude(longitude);
+				marker.setGmap(gmap);
+				marker.setUpdated(new Date());
+				marker.setUpdatedBy(guser);
+				marker.setAuthored(true);
+				gmapService.saveOrUpdateGmapMarker(marker);
 			}
 		}
 		catch (Exception e)
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -25,9 +25,14 @@
 package org.lamsfoundation.lams.tool.gmap.web.actions;
 
 import java.io.IOException;
+import java.io.StringReader;
+import java.util.Date;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -42,6 +47,7 @@
 import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO;
 import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
 import org.lamsfoundation.lams.tool.gmap.service.IGmapService;
@@ -54,6 +60,11 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 /**
  * @author
@@ -202,19 +213,29 @@
 
 			gmapUser.setFinishedActivity(true);
 			gmapService.saveOrUpdateGmapUser(gmapUser);
+			
+			
+			// Retrieve the session and content.
+			GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID);
+			if (gmapSession == null) {
+				throw new GmapException("Cannot retreive session with toolSessionID"+ toolSessionID);
+			}
+			
+			// update the marker list
+			Gmap gmap = gmapSession.getGmap();
+			updateMarkerListFromXML(learningForm.getMarkersXML(), gmap, gmapUser);
+
 		} else {
 			log.error("finishActivity(): couldn't find GmapUser with id: "
 					+ gmapUser.getUserId() + "and toolSessionID: "
 					+ toolSessionID);
 		}
 
-		ToolSessionManager sessionMgrService = GmapServiceProxy
-				.getGmapSessionManager(getServlet().getServletContext());
 
+		ToolSessionManager sessionMgrService = GmapServiceProxy.getGmapSessionManager(getServlet().getServletContext());
 		String nextActivityUrl;
 		try {
-			nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,
-					gmapUser.getUserId());
+			nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,gmapUser.getUserId());
 			response.sendRedirect(nextActivityUrl);
 		} catch (DataMissingException e) {
 			throw new GmapException(e);
@@ -226,4 +247,69 @@
 
 		return null; // TODO need to return proper page.
 	}
+
+	private void updateMarkerListFromXML(String markerXML, Gmap gmap, GmapUser guser)
+	{
+		//Set<GmapMarker> newMarkers = new HashSet<GmapMarker>();
+		Set<GmapMarker> existingMarkers = gmap.getGmapMarkers();
+		try 
+		{
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			Document document = db.parse(new InputSource(new StringReader(markerXML)));
+			NodeList list = document.getElementsByTagName("marker");
+			
+			for (int i =0; i<list.getLength(); i++)
+			{
+				NamedNodeMap markerNode = ((Node)list.item(i)).getAttributes();
+				
+				Long uid  = Long.parseLong(markerNode.getNamedItem("markerUID").getNodeValue());
+				String markerTitle = markerNode.getNamedItem("title").getNodeValue();
+				String infoMessage = markerNode.getNamedItem("infoMessage").getNodeValue();
+				Double latitude = Double.parseDouble(markerNode.getNamedItem("latitude").getNodeValue());
+				Double longitude = Double.parseDouble(markerNode.getNamedItem("longitude").getNodeValue());
+
+				String markerState = markerNode.getNamedItem("state").getNodeValue();
+				
+				if (markerState.equals("remove"))
+				{
+					gmap.removeMarker(uid);
+					return;
+				}
+
+				GmapMarker marker = null;
+				if (markerState.equals("save"))
+				{
+					marker = new GmapMarker();
+					marker.setCreatedBy(guser);
+					marker.setCreated(new Date());
+				}
+				else if (markerState.equals("update"))
+				{
+					marker = gmap.getMarkerByUid(uid);
+				}
+				
+				marker.setTitle(markerTitle);
+				marker.setInfoWindowMessage(infoMessage);
+				marker.setLatitude(latitude);
+				marker.setLongitude(longitude);
+				marker.setGmap(gmap);
+				marker.setUpdated(new Date());
+				marker.setUpdatedBy(guser);
+				marker.setAuthored(false);
+				gmapService.saveOrUpdateGmapMarker(marker);
+					
+				
+			}
+		}
+		catch (Exception e)
+		{
+			// TODO: improve error handling
+			log.error("Could not get marker xml object to update", e);
+		}
+	}
+	
+	
+	
+	
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
===================================================================
diff -u -re916c6bbc8b343903809292a192c892fa78c5607 -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
@@ -29,7 +29,7 @@
 
 /**
  * 
- * @author Anthony Sukkar
+ * @author lfoxton
  * 
  * @struts.form name="learningForm"
  */
@@ -45,7 +45,17 @@
 	String mode;
 	
 	String entryText;
+	
+	String markersXML;
 
+	public String getMarkersXML() {
+		return markersXML;
+	}
+
+	public void setMarkersXML(String markersXML) {
+		this.markersXML = markersXML;
+	}
+
 	public String getMode() {
 		return mode;
 	}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,5 +1,5 @@
 /****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
  * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -19,17 +19,29 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-	
+	<!--  
 	<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
+	-->
 	<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsLearning.js"></script>
 
+	<%@ include file="/includes/jsp/mapFunctions.jsp"%>
+
+
 	<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script>
 	<script type="text/javascript">
 	<!--
 		var webAppUrl = "${tool}";
 		var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
-		var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>'
-		var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>'
+		var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>';
+		var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
+		var createdByMsg = '<fmt:message key="label.createdBy"/>';
+		var latitudeLongitudeMsg = '<fmt:message key="label.latitudelongitude"/>';
+		var titleMsg = '<fmt:message key="label.authoring.basic.title"/>';
+		var newInfoWindowTextMsg = '<fmt:message key="label.newInfoWindowText"/>';
+		var editMsg = '<fmt:message key="button.Edit"/>';
+		var saveMsg = '<fmt:message key="button.Save"/>';
+		var removeMsg = '<fmt:message key="button.Remove"/>';
+		var cancelMsg = '<fmt:message key="button.Cancel"/>';
 		var map;
 		var markers;
 		var geocoder = null;
@@ -52,36 +64,49 @@
 				map.setZoom(${gmapDTO.mapZoom});
 
 				currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
-
-				if (${gmapDTO.allowEditMarkers})
-				{
 				
-				}
-				
 				// Set up map controls
 				map.addControl(new GMapTypeControl());
+				
+				<c:if test="${gmapDTO.allowZoom == true}">
+				map.addControl(new GLargeMapControl());
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowTerrain == true}">
+				map.addMapType(G_PHYSICAL_MAP);
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowSatellite == false}">
+				map.removeMapType(G_SATELLITE_MAP);
+				</c:if>
+				
+				<c:if test="${gmapDTO.allowHybrid == false}">
+				   map.removeMapType(G_HYBRID_MAP);
+				</c:if>
+				
+				/*
 				if (${gmapDTO.allowZoom}) {map.addControl(new GLargeMapControl());}
 				if (${gmapDTO.allowTerrain}) {map.addMapType(G_PHYSICAL_MAP);}
 				if (!${gmapDTO.allowSatellite}) {map.removeMapType(G_SATELLITE_MAP);}
 				if (!${gmapDTO.allowHybrid}) {map.removeMapType(G_HYBRID_MAP);}
+				*/
 				map.setMapType(${gmapDTO.mapType});
 		    	
 		    	<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">
-					if (${marker.isAuthored})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-					}
-					else if ("${marker.createdBy.loginName}" == "${gmapUserDTO.loginName}" && !${marker.isAuthored})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-						userMarkerCount ++;
-					}
-					else if (${gmapDTO.allowShowAllMarkers})
-					{
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
-					}
+					<c:choose>
+						<c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}">
+						    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
+							userMarkerCount ++;
+						</c:when>
+						<c:otherwise>
+							<c:if  test="${marker.isAuthored || gmapDTO.allowShowAllMarkers}">
+							    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}' );
+							</c:if>
+						</c:otherwise>
+					</c:choose>
 				</c:forEach>
 
+		    	refreshSideBar();
 		    }
 		}
 	//-->
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,43 +1,22 @@
 
 
-var map;
-var markers;
-var geocoder = null;
-var currUser;
-function init() {
+function init()
+{
+	initGmap();
+	initPage();
+}
+
+function initPage() {
 	// open the current tab    
 	var tag = document.getElementById("currentTab");
 	if (tag.value != "") {
 		selectTab(tag.value);
 	} else {
 		selectTab(1);
 	}
-
+	
 }
 
-function initGmap()
-{
-	if (GBrowserIsCompatible()) 
-	{
-		//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
-		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
-		//map.setCenter(new GLatLng(-33.774322, 151.111988), 13);
-    	map.addControl(new GLargeMapControl());
-    	map.addControl(new GMapTypeControl());
-    	map.addMapType(G_PHYSICAL_MAP); 
-    	
-    	/*
-		G_NORMAL_MAP 	This map type (which is the default) displays a normal street map.
-		G_SATELLITE_MAP 	This map type displays satellite images.
-		G_HYBRID_MAP
-    	*/
-    	markers = new Array();
-    	geocoder = new GClientGeocoder();
-    }
-}
-
-
-
 function doSelectTab(tabId) {
 	var tag = document.getElementById("currentTab");
 	tag.value = tabId;
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -64,7 +64,7 @@
 	var i=0;
 	for (;i<markers.length; i++)
 	{
-		if (markers[i].state != "remove")
+		if (markers[i].state != "remove" && markers[i].state != "unsaved")
 		{
 			sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
 		}
@@ -156,10 +156,10 @@
 	if (markerIn.editingOn)
 	{
 		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
-		markerIn.inputForm = "Title:<br><input tupe='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
-		markerIn.inputForm += "New Info Window Text:<br><textarea wrap='hard' id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
+		markerIn.inputForm =titleMsg + <br><input tupe='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
+		markerIn.inputForm += newInfoWindowTextMsg + "<br><textarea wrap='hard' id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
 		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
-		markerIn.markerMetaData += "<nobr>Latitude-Longitude: (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "<nobr>" + latitudeLongitudeMsg + " (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
 		markerIn.markerMetaData += "</font>";
 		markerIn.infoWindowHtml =  markerIn.inputForm + "<br />" +markerIn.markerMetaData + markerIn.linksBar;
 	}
@@ -171,18 +171,50 @@
 			markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
 		}
 		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
-		markerIn.markerMetaData += "Created By: " + markerIn.createdBy + "<br />";
-		markerIn.markerMetaData += "<nobr>Latitude-Longitude: (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += createdByMsg + " " + markerIn.createdBy + "<br />";
+		markerIn.markerMetaData += "<nobr>" + latitudeLongitudeMsg + " (" + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
 		markerIn.markerMetaData += "</font>";
 		markerIn.infoWindowHtml = "" + "<h4>" + markerIn.title + "</h4><div style='overflow:auto;width:400px;height:80px'>" +  markerIn.infoMessage.replace(/\n/g, "<br />") + "</div>"+ markerIn.markerMetaData  + markerIn.linksBar;
 	}	
 }
 
+function serialiseMarkers()
+{
+	var xmlString = '<?xml version="1.0"?><markers>';
+	var i =0;
+	for (;i<markers.length;i++)
+	{
+		if (markers[i].state == "unchanged")
+		{
+			var ans = confirm("You have unsaved markers, do you wish to continue?");
+			if (!ans)
+			{
+				return false;
+			}
+		}
+		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
+		{
+			var markerString = '<marker'+
+			' latitude="'+ markers[i].getPoint().lat()+ '"'+
+			' longitude="'+ markers[i].getPoint().lng()+ '"'+
+			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
+			' markerUID="'+ markers[i].uid + '"' +
+			' title="'+ markers[i].title + '"' +
+			' state="'+ markers[i].state + '"' +
+			' />';
+			xmlString += markerString;
+		}	
+	}
+	xmlString += "</markers>"
+	document.getElementById("markersXML").value=xmlString;
+	return true;
+}
 
 
 
 
 
 
 
+
 	
\ No newline at end of file
Index: lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(.../mapFunctionsAuthoring.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js	(.../mapFunctionsAuthoring.js)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -62,42 +62,6 @@
 }
 
 
-
-
-function serialiseMarkers()
-{
-	var xmlString = '<?xml version="1.0"?><markers>';
-	var i =0;
-	
-	for (;i<markers.length;i++)
-	{
-		if (markers[i].state == "unchanged")
-		{
-			var ans = confirm("You have unsaved markers, do you wish to continue?");
-			if (!ans)
-			{
-				return false;
-			}
-		}
-		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
-		{
-			var markerString = '<marker'+
-			' latitude="'+ markers[i].getPoint().lat()+ '"'+
-			' longitude="'+ markers[i].getPoint().lng()+ '"'+
-			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
-			' markerUID="'+ markers[i].uid + '"' +
-			' title="'+ markers[i].title + '"' +
-			' state="'+ markers[i].state + '"' +
-			' />';
-			xmlString += markerString;
-		}	
-	}
-	xmlString += "</markers>"
-	//document.authoringForm.markersXML.value=xmlString;
-	document.getElementById("markersXML").value=xmlString;
-	return true;
-}
-
 // TODO: This method should only be included for the authoring pages, put them in another file
 function saveMapState()
 {
Index: lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(.../mapFunctionsLearning.js)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js	(.../mapFunctionsLearning.js)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -66,27 +66,3 @@
 }
 
 
-function serialiseMarkers()
-{
-	var xmlString = '<?xml version="1.0"?><markers>';
-	var i =0;
-	
-	for (;i<markers.length;i++)
-	{
-		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
-		{
-			var markerString = '<marker'+
-			' latitude="'+ markers[i].getPoint().lat()+ '"'+
-			' longitude="'+ markers[i].getPoint().lng()+ '"'+
-			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
-			' markerUID="'+ markers[i].uid + '"' +
-			' title="'+ markers[i].title + '"' +
-			' state="'+ markers[i].state + '"' +
-			' />';
-			xmlString += markerString;
-		}	
-	}
-	xmlString += "</markers>"
-	document.getElementById("markersXML").value=xmlString;
-}
-
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(revision 0)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -0,0 +1,226 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<script type="text/javascript">
+<!--
+// add a marker at the given point
+function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy)
+{
+	map.closeInfoWindow();
+	var marker;
+	
+	if(editAble) 	{marker = new GMarker(point, {draggable: true});}
+	else 			{marker = new GMarker(point, {draggable: false})};
+	
+	marker.editAble = editAble;
+	marker.createdBy = createdBy;
+	
+    map.addOverlay(marker);
+    
+    GEvent.addListener(marker, "dragstart", function() {
+    	map.closeInfoWindow();
+    });
+
+    GEvent.addListener(marker, "dragend", function() {
+		if (marker.state == "unchanged") {marker.state = "update";}
+		updateMarkerInfoWindowHtml(marker);	
+    });
+    
+    GEvent.addListener(marker, "click", function() {
+    	marker.openInfoWindowHtml(marker.infoWindowHtml);
+    });
+    
+    GEvent.addListener(marker, "infowindowclose", function() {
+    	updateMarkerInfoWindowHtml(marker);
+    });
+    
+    if (infoMessage!=null)
+    {
+    	marker.infoMessage = unescape(infoMessage);
+    }
+    else
+    {
+    	marker.infoMessage = "";
+    }
+    marker.title = title;
+
+    
+    // set the state of the marker
+    marker.editingOn = !isSaved;
+    marker.uid = uid;
+    if (isSaved){marker.state = "unchanged";}
+    else {marker.state="unsaved";}
+    
+	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'";
+    marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'><fmt:message key='button.remove'/></a>" ;
+   	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'><fmt:message key='button.edit'/></a>";
+   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'><fmt:message key='button.save'/></a>";
+   	marker.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'><fmt:message key='button.cancel'/></a>";
+    updateMarkerInfoWindowHtml(marker);
+    markers[markers.length] = marker;
+    
+}
+
+
+
+function refreshSideBar()
+{
+	var sideBarText = "";
+	var i=0;
+	for (;i<markers.length; i++)
+	{
+		if (markers[i].state != "remove" && markers[i].state != "unsaved")
+		{
+			sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />";
+		}
+	}
+	document.getElementById("sidebar").innerHTML = sideBarText;
+}
+
+function cancelEditMarkerInfo(x)
+{
+	if (markers[x].state == "unsaved")
+	{
+		removeMarker(x);
+	}
+	else
+	{
+		markers[x].editingOn = false;
+		updateMarkerInfoWindowHtml(markers[x]);
+		openInfoWindow(x);
+	}
+}
+
+function openInfoWindow(x)
+{
+	markers[x].openInfoWindowHtml(markers[x].infoWindowHtml);
+}
+
+function showAddress() 
+{
+	var address = document.getElementById('address').value;
+	
+	if (geocoder) 
+	{
+		geocoder.getLatLng(address,
+			function(point) 
+			{
+				if (!point) 
+				{
+					alert('<fmt:message key="error.cantFindAddress"/> ' + address );
+				} 
+				else 
+				{
+					map.setCenter(point, 13);
+				}
+			}
+		);
+	}
+}
+
+function fitMapMarkers() 
+{
+   	var bounds = new GLatLngBounds();
+	for (var i=0; i< markers.length; i++) 
+	{
+		if (markers[i].state != "remove")
+		{
+			bounds.extend(markers[i].getPoint());	
+		}
+	}
+   	var zoom = map.getBoundsZoomLevel(bounds) - 1;
+   	if (zoom > 15) {zoom = 15;}
+   	map.setZoom(zoom);
+   	map.panTo(bounds.getCenter());
+   
+}
+
+function trim(x)
+{
+	return x.replace(/^\s+|\s+$/g, '')
+}
+
+function updateMarkerInfoWindowHtml(markerIn)
+{
+	if (markerIn.state == "unchanged")
+	{
+		markerIn.setImage("${tool}/images/blue_Marker.png");
+	}
+	else if (markerIn.state == "update" || markerIn.state == "save")
+	{
+		markerIn.setImage("${tool}/images/paleblue_Marker.png");
+	}
+	else if (markerIn.state == "unsaved")
+	{
+		markerIn.setImage("${tool}/images/red_Marker.png");
+	}
+	
+	if (markerIn.editingOn)
+	{
+		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
+		markerIn.inputForm ="<fmt:message key='label.authoring.basic.title'/><br><input type='text' maxlength='50' size='50' id='markerTitle' name='markerTitle' value='" + markerIn.title +"' /><br>";
+		markerIn.inputForm += "<fmt:message key='label.newInfoWindowText'/><br><textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
+		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
+		markerIn.markerMetaData += '<nobr><fmt:message key="label.latitudeLongitude"/> (' + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "</font>";
+		markerIn.infoWindowHtml =  markerIn.inputForm + "<br />" +markerIn.markerMetaData + markerIn.linksBar;
+	}
+	else
+	{
+		markerIn.linksBar = ""
+		if (markerIn.editAble)
+		{
+			markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
+		}
+		markerIn.markerMetaData = "<font size='tiny' color='grey'>";
+		markerIn.markerMetaData += '<fmt:message key="label.createdBy"/> ' + markerIn.createdBy + "<br />";
+		markerIn.markerMetaData += '<nobr><fmt:message key="label.latitudeLongitude"/> (' + markerIn.getPoint().lat() + "-" + markerIn.getPoint().lng() +")</nobr>";
+		markerIn.markerMetaData += "</font>";
+		markerIn.infoWindowHtml = "" + "<h4>" + markerIn.title + "</h4><div style='overflow:auto;width:400px;height:80px'>" +  markerIn.infoMessage.replace(/\n/g, "<br />") + "</div>"+ markerIn.markerMetaData  + markerIn.linksBar;
+	}	
+}
+
+function serialiseMarkers()
+{
+	var xmlString = '<?xml version="1.0"?><markers>';
+	var i =0;
+	for (;i<markers.length;i++)
+	{
+		if (markers[i].state == "unsaved")
+		{
+			var ans = confirm("You have unsaved markers, do you wish to continue?");
+			if (!ans)
+			{
+				return false;
+			}
+		}
+		if (markers[i].state != "unchanged" && markers[i].state !="unsaved")
+		{
+			var markerString = '<marker'+
+			' latitude="'+ markers[i].getPoint().lat()+ '"'+
+			' longitude="'+ markers[i].getPoint().lng()+ '"'+
+			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
+			' markerUID="'+ markers[i].uid + '"' +
+			' title="'+ markers[i].title + '"' +
+			' state="'+ markers[i].state + '"' +
+			' />';
+			xmlString += markerString;
+		}	
+	}
+	xmlString += "</markers>"
+	document.getElementById("markersXML").value=xmlString;
+	return true;
+}
+//-->
+</script>
+
+
+
+
+
+
+
+	
\ No newline at end of file
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -1,10 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
-
-<c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="formBean"value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
-
 <!-- ========== Basic Tab ========== -->
 <table cellpadding="0" border='0'>
 	<tr>
@@ -33,17 +30,14 @@
 			<!--  
 			<div id="map_canvas" style="width: 500px; height: 300px"></div> 
 			-->
-			<table cellpadding='0' cellspacing='0' border='1'>
+			<table cellpadding='0' cellspacing='0' border='0'>
 			<tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ></div></td>
-			<td><div id="sidebar" style="width:100px; 
-									overflow:auto;
-									height:320px; 
-									background:WhiteSmoke; "></div></td></tr>
-			</table>
-			
+			<td><div id="sidebar" style="width:100px; overflow:auto;height:320px; background:WhiteSmoke; "></div></td></tr>
+			<tr><td>
 			<a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a>
 			<a href="javascript:fitMapMarkers()" class="button"/><fmt:message key="button.fitMarkers"/></a>
-			<input type="button" onclick="test()"  value="Test" />
+			</td></tr>
+			</table>
 		</td>
 	</tr>
 	<tr>
@@ -56,30 +50,36 @@
 		</td>
 	</tr>
 </table>
-
+ 		
 <script type="text/javascript">
 <!--
-	initGmap();
-	currUser = '${gmapUser.firstName} ${gmapUser.lastName}';
-	map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
-	map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
-	map.setZoom(${formBean.gmap.mapZoom});
-	map.setMapType(${formBean.gmap.mapType});
+	function initGmap()
+	{
+		if (GBrowserIsCompatible()) 
+		{
+			//map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
+			map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } );
+			//map.setCenter(new GLatLng(-33.774322, 151.111988), 13);
+	    	map.addControl(new GLargeMapControl());
+	    	map.addControl(new GMapTypeControl());
+	    	map.addMapType(G_PHYSICAL_MAP); 
+	
+	    	markers = new Array();
+	    	geocoder = new GClientGeocoder();
+	    	
+	    	currUser = '${gmapUser.firstName} ${gmapUser.lastName}';
+			map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
+			map.setCenter(new GLatLng('${formBean.gmap.mapCenterLatitude}', '${formBean.gmap.mapCenterLongitude}' ));
+			map.setZoom(${formBean.gmap.mapZoom});
+			map.setMapType(${formBean.gmap.mapType});
+			
+			<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
+			addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, "${marker.createdBy.firstName} ${marker.createdBy.lastName}");
+			</c:forEach>
+			
+			refreshSideBar();
+	    }
+	}
 //-->
 </script>
 
-<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
-	<script type="text/javascript">
-	<!--
-		var savedPoint = new GLatLng('${marker.latitude}', '${marker.longitude}' );
-		addMarker(savedPoint, '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, true, "${marker.createdBy.firstName} ${marker.createdBy.lastName}");
-	//-->
-	</script>
-</c:forEach>
-   		
-<script type="text/javascript">
-<!--
-	refreshSideBar();
-//-->
-</script>
-
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -5,21 +5,34 @@
 </c:set>
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
-<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
-<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsAuthoring.js"></script>
 
 <!--  
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-latest.pack.js"></script>
-<script src="http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script>
 -->
 
+<%@ include file="/includes/jsp/mapFunctions.jsp"%>
+
+<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsAuthoring.js"></script>
 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script>
 
 <script type="text/javascript">
 <!--
-	var webAppUrl = "${tool}";
+	//var webAppUrl = "${tool}";
 	var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>';
-	var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>'
-	var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>'
+	var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>';
+	//var errorCantFindLocation = '<fmt:message key="error.cantFindAddress"/>';
+	//var createdByMsg = '<fmt:message key="label.createdBy"/>';
+	//var latitudeLongitudeMsg = '<fmt:message key="label.latitudeLongitude"/>';
+	//var titleMsg = '<fmt:message key="label.authoring.basic.title"/>';
+	//var newInfoWindowTextMsg = '<fmt:message key="label.newInfoWindowText"/>';
+	//var editMsg = '<fmt:message key="button.edit"/>';
+	//var saveMsg = '<fmt:message key="button.save"/>';
+	//var removeMsg = '<fmt:message key="button.remove"/>';
+	// var cancelMsg = '<fmt:message key="button.cancel"/>';
+	var map;
+	var markers;
+	var geocoder = null;
+	var currUser;
 //-->
 </script>
+
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
diff -u -r97ded6a90b089fe5e01c48c02f952e8b09d5a911 -r9ed689d51b8f41ba820bd7e6be8e3253703096a8
--- lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 97ded6a90b089fe5e01c48c02f952e8b09d5a911)
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
@@ -48,7 +48,7 @@
 	<html:form action="/learning" method="post" onsubmit="return validateForm();">
 		<html:hidden property="dispatch" value="finishActivity" />
 		<html:hidden property="toolSessionID" />
-
+		<html:hidden property="markersXML" value="" styleId="markersXML" />
 		<p>
 			${gmapDTO.instructions}
 		</p>
@@ -76,7 +76,7 @@
 				
 
 				<div class="space-bottom-top align-right">
-					<html:submit styleClass="button" styleId="finishButton">
+					<html:submit styleClass="button" styleId="finishButton" onclick="javascript:serialiseMarkers();">
 						<fmt:message>button.finish</fmt:message>
 					</html:submit>
 				</div>
@@ -93,14 +93,6 @@
 			initLearnerGmap();
 		//-->
 		</script>
-		
-		
-		   		
-		<script type="text/javascript">
-		<!--
-			refreshSideBar();
-		//-->
-		</script>
 
 	</html:form>
 </div>