Index: lams_tool_gmap/.classpath
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/.classpath	(.../.classpath)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/.classpath	(.../.classpath)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -5,8 +5,13 @@
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
-	<classpathentry sourcepath="/lams_contentrepository" kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
-	<classpathentry sourcepath="/lams_learning" kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
-	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar" sourcepath="/lams_contentrepository"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-learning.jar" sourcepath="/lams_learning"/>
+	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar" sourcepath="/lams_central/src"/>
+	<classpathentry kind="lib" path="/lams_build/lib/jakarta-commons/commons-logging.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/struts/struts.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/log4j/log4j-1.2.13.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/axis/axis.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_tool_gmap/build.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/build.xml	(.../build.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/build.xml	(.../build.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -470,7 +470,7 @@
 		</delete>
 	</target>
 
-	<target name="explode-tool" depends="" description="explode tool jar and war package to a war folder">
+	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" description="explode tool jar and war package to a war folder">
 		<!-- rename war file to avoid name conflict -->
 		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war" />
 		<!-- explode the ear -->
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -180,9 +180,8 @@
 
         <set
             name="gmapMarkers"
-            lazy="true"
-            inverse="true"
-            cascade="none"
+            lazy="false"
+            cascade="all-delete-orphan"
             sort="unsorted"
         >
 
Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml	(.../GmapMarker.hbm.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -27,45 +27,21 @@
 
         <property
             name="longitude"
-            type="java.lang.Long"
+            type="java.lang.Double"
             update="true"
             insert="true"
             column="longitude"
         />
 
         <property
             name="latitude"
-            type="java.lang.Long"
+            type="java.lang.Double"
             update="true"
             insert="true"
             column="latitude"
         />
 
         <property
-            name="address"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="address"
-        />
-
-        <property
-            name="colour"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="colour"
-        />
-
-        <property
-            name="markerDisplayCharacter"
-            type="char"
-            update="true"
-            insert="true"
-            column="marker_display_charater"
-        />
-
-        <property
             name="infoWindowMessage"
             type="java.lang.String"
             update="true"
@@ -74,14 +50,6 @@
         />
 
         <property
-            name="mouseoverText"
-            type="java.lang.String"
-            update="true"
-            insert="true"
-            column="mouseover_text"
-        />
-
-        <property
             name="created"
             type="java.util.Date"
             update="true"
@@ -106,45 +74,18 @@
         />
 
         <many-to-one
-            name="toolSession"
-            class="org.lamsfoundation.lams.tool.gmap.model.GmapSession"
-            cascade="none"
-            outer-join="auto"
-            update="true"
-            insert="true"
-            column="gmap_session_uid"
-        />
-
-        <many-to-one
             name="gmap"
             class="org.lamsfoundation.lams.tool.gmap.model.Gmap"
             cascade="none"
             outer-join="auto"
             update="true"
             insert="true"
-            column="gmap_uid"
-        />
+        >
+            <column
+                name="gmap_uid" 
+            />
+        </many-to-one>
 
-        <many-to-one
-            name="createdBy"
-            class="org.lamsfoundation.lams.tool.gmap.model.GmapUser"
-            cascade="none"
-            outer-join="auto"
-            update="true"
-            insert="true"
-            column="create_by"
-        />
-
-        <many-to-one
-            name="modifiedBy"
-            class="org.lamsfoundation.lams.tool.gmap.model.GmapUser"
-            cascade="none"
-            outer-join="auto"
-            update="true"
-            insert="true"
-            column="modified_by"
-        />
-
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-GmapMarker.xml
Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -8,14 +8,11 @@
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
-create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude bigint, latitude bigint, address varchar(255), colour varchar(255), marker_display_charater char(1), info_window_message varchar(255), mouseover_text varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_session_uid bigint, gmap_uid bigint, create_by bigint, modified_by bigint, primary key (uid));
+create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
-alter table tl_lagmap10_marker add index FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
-alter table tl_lagmap10_marker add index FK10F2274924A6353F (create_by), add constraint FK10F2274924A6353F foreign key (create_by) references tl_lagmap10_user (uid);
-alter table tl_lagmap10_marker add index FK10F22749A4F16452 (modified_by), add constraint FK10F22749A4F16452 foreign key (modified_by) references tl_lagmap10_user (uid);
 alter table tl_lagmap10_session add index FK519D516774028C80 (gmap_uid), add constraint FK519D516774028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_user add index FK7CB3F69AC5F056D9 (gmap_session_uid), add constraint FK7CB3F69AC5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
 
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -1,8 +1,5 @@
 alter table tl_lagmap10_attachment drop foreign key FKBA2ECCB274028C80;
 alter table tl_lagmap10_marker drop foreign key FK10F2274974028C80;
-alter table tl_lagmap10_marker drop foreign key FK10F22749C5F056D9;
-alter table tl_lagmap10_marker drop foreign key FK10F2274924A6353F;
-alter table tl_lagmap10_marker drop foreign key FK10F22749A4F16452;
 alter table tl_lagmap10_session drop foreign key FK519D516774028C80;
 alter table tl_lagmap10_user drop foreign key FK7CB3F69AC5F056D9;
 drop table if exists tl_lagmap10_attachment;
@@ -12,13 +9,10 @@
 drop table if exists tl_lagmap10_user;
 create table tl_lagmap10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_gmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid));
-create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude bigint, latitude bigint, address varchar(255), colour varchar(255), marker_display_charater char(1), info_window_message varchar(255), mouseover_text varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_session_uid bigint, gmap_uid bigint, create_by bigint, modified_by bigint, primary key (uid));
+create table tl_lagmap10_marker (uid bigint not null auto_increment, longitude double precision, latitude double precision, info_window_message varchar(255), create_date datetime, update_date datetime, is_authored bit, gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), gmap_uid bigint, primary key (uid));
 create table tl_lagmap10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, gmap_session_uid bigint, entry_uid bigint, primary key (uid));
 alter table tl_lagmap10_attachment add index FKBA2ECCB274028C80 (gmap_uid), add constraint FKBA2ECCB274028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_marker add index FK10F2274974028C80 (gmap_uid), add constraint FK10F2274974028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
-alter table tl_lagmap10_marker add index FK10F22749C5F056D9 (gmap_session_uid), add constraint FK10F22749C5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
-alter table tl_lagmap10_marker add index FK10F2274924A6353F (create_by), add constraint FK10F2274924A6353F foreign key (create_by) references tl_lagmap10_user (uid);
-alter table tl_lagmap10_marker add index FK10F22749A4F16452 (modified_by), add constraint FK10F22749A4F16452 foreign key (modified_by) references tl_lagmap10_user (uid);
 alter table tl_lagmap10_session add index FK519D516774028C80 (gmap_uid), add constraint FK519D516774028C80 foreign key (gmap_uid) references tl_lagmap10_gmap (uid);
 alter table tl_lagmap10_user add index FK7CB3F69AC5F056D9 (gmap_session_uid), add constraint FK7CB3F69AC5F056D9 foreign key (gmap_session_uid) references tl_lagmap10_session (uid);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
===================================================================
diff -u
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java	(revision 0)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -0,0 +1,12 @@
+package org.lamsfoundation.lams.tool.gmap.dao;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.tool.gmap.model.Gmap;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
+
+public interface IGmapMarkerDAO extends IBaseDAO
+{
+	void saveOrUpdate(GmapMarker toContent);
+}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
===================================================================
diff -u
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java	(revision 0)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -0,0 +1,20 @@
+package org.lamsfoundation.lams.tool.gmap.dao.hibernate;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.gmap.dao.IGmapMarkerDAO;
+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.dao.hibernate.BaseDAO;
+
+public class GmapMarkerDAO extends BaseDAO implements IGmapMarkerDAO
+{
+	private static final String FIND_MARKER_BY_CONTENTID = "from GmapMarker gmapMarker where gmapMarker.toolContentId=?";
+	
+	public void saveOrUpdate(GmapMarker gmapMarker) 
+	{
+		this.getHibernateTemplate().saveOrUpdate(gmapMarker);
+		this.getHibernateTemplate().flush();
+	}
+}
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -18,7 +18,8 @@
 				<value>org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml</value>
 				<value>org/lamsfoundation/lams/tool/gmap/model/GmapSession.hbm.xml</value>
 				<value>org/lamsfoundation/lams/tool/gmap/model/GmapUser.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml</value> 
+				<value>org/lamsfoundation/lams/tool/gmap/model/GmapAttachment.hbm.xml</value> 		
+				<value>org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml</value>
 			</list>
 		</property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
@@ -33,6 +34,7 @@
 				<property name="gmapSessionDAO"><ref bean="gmapSessionDAO"/></property>
 				<property name="gmapUserDAO"><ref bean="gmapUserDAO"/></property>
 				<property name="gmapDAO"><ref bean="gmapDAO"/></property>
+				<property name="gmapMarkerDAO"><ref bean="gmapMarkerDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
@@ -68,6 +70,10 @@
 	<bean id="gmapDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapDAO">
 		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
 	</bean>  
+	
+	<bean id="gmapMarkerDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapMarkerDAO">
+		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
+	</bean>  
 
 	<bean id="gmapSessionDAO" class="org.lamsfoundation.lams.tool.gmap.dao.hibernate.GmapSessionDAO">
 		<property name="sessionFactory"><ref local="gmapSessionFactory"/></property>
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -42,7 +42,7 @@
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 579733009969321015L;
+	private static final long serialVersionUID = 938457189932877382L;
 
 	static Logger log = Logger.getLogger(GmapService.class.getName());
 
@@ -386,6 +386,8 @@
 		toContent = (Gmap) fromContent.clone();
 		toContent.setToolContentId(toContentId);
 		toContent.setCreateDate(new Date());
+		Set<GmapMarker> set = new HashSet<GmapMarker>();
+		toContent.setGmapMarkers(set);
 		return toContent;
 	}
 
@@ -402,12 +404,23 @@
 				Set<GmapAttachment> set = new HashSet<GmapAttachment>();
 				while (iter.hasNext()) {
 					GmapAttachment originalFile = (GmapAttachment) iter.next();
-					GmapAttachment newFile = (GmapAttachment) originalFile
-							.clone();
+					GmapAttachment newFile = (GmapAttachment) originalFile.clone();
 					set.add(newFile);
 				}
 				gmap.gmapAttachments = set;
 			}
+			
+			if (gmapMarkers != null) {
+				// create a copy of the attachments
+				Iterator iter = gmapMarkers.iterator();
+				Set<GmapMarker> set = new HashSet<GmapMarker>();
+				while (iter.hasNext()) {
+					GmapMarker originalMarker = (GmapMarker) iter.next();
+					GmapMarker newMarker = (GmapMarker) originalMarker.clone();
+					set.add(newMarker);
+				}
+				gmap.gmapAttachments = set;
+			}
 			// create an empty set for the gmapSession
 			gmap.gmapSessions = new HashSet();
 
@@ -426,10 +439,12 @@
 	}
 
 	/**
-	 * @hibernate.set lazy="true" inverse="true" cascade="none"
+	 * @hibernate.set lazy="false"
+	 *                cascade="all-delete-orphan"
 	 * @hibernate.collection-key column="gmap_uid"
 	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.gmap.model.GmapMarker"
 	 * 
+	 * @return
 	 */
 	public Set<GmapMarker> getGmapMarkers() {
 		return gmapMarkers;
@@ -438,6 +453,45 @@
 	public void setGmapMarkers(Set<GmapMarker> gmapMarkers) {
 		this.gmapMarkers = gmapMarkers;
 	}
+	
+	public void addMarker(GmapMarker marker)
+	{
+		gmapMarkers.add(marker);
+	}
+	
+	public GmapMarker getMarkerByUid(Long uid)
+	{
+		Iterator it = gmapMarkers.iterator();
+		GmapMarker ret = null;
+		while (it.hasNext())
+		{
+			GmapMarker marker = (GmapMarker)it.next();
+			if (marker.getUid().equals(uid))
+			{
+				ret =  marker;
+				break;
+			}
+		}
+		return ret;
+	}
+	
+	public void removeMarker(Long uid)
+	{
+		Iterator it = gmapMarkers.iterator();
+		GmapMarker ret = null;
+		while (it.hasNext())
+		{
+			GmapMarker marker = (GmapMarker)it.next();
+			if (marker.getUid().equals(uid))
+			{
+				gmapMarkers.remove(marker);
+				break;
+			}
+		}
+	}
+	
+	
+	
 
 
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java	(.../GmapMarker.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -25,8 +25,8 @@
 package org.lamsfoundation.lams.tool.gmap.model;
 
 import java.util.Date;
+import org.apache.log4j.Logger;
 
-
 /**
  * @author lfoxton
  * 
@@ -35,33 +35,35 @@
  * 
  * @hibernate.class table="tl_lagmap10_marker"
  */
-public class GmapMarker{
+public class GmapMarker implements java.io.Serializable, Cloneable{
 
-	// Fields
-
+	private static final long serialVersionUID = 54263746982364732L;
+	
+	private static final Logger log = Logger.getLogger(GmapMarker.class);
+	
 	// Unique identifier
 	private Long uid;		
 	
 	// Longitude of marker position
-	private Long longitude;
+	private Double longitude;
 	
-	// Lattitude of marker position
-	private Long latitude;
+	// Latitude of marker position
+	private Double latitude;
 	
 	// String address of marker if given
-	private String address;
+	//private String address;
 	
 	// Marker colour, can be: ORANGE, PURPLE, YELLOW, GREEN, BLUE, RED, AQUA, WHITE, or GRAY
-	private String colour;
+	//private String colour;
 	
 	// A character that will display on the marker
-	private char markerDisplayCharacter;
+	//private char markerDisplayCharacter;
 	
 	// Info windo message that appears when you click the marker (in HTML)
 	private String infoWindowMessage;
 	
 	// Text that appears when the user mouseovers the marker
-	private String mouseoverText;
+	//private String mouseoverText;
 	
 	// The date the marker was created
 	private Date created;
@@ -73,50 +75,55 @@
 	private boolean isAuthored;
 	
 	// The gmap tool session if in learner, null if in author 
-	private GmapSession toolSession;
+	//private GmapSession toolSession;
 	
 	// The gmap instance that this marker is part of
 	private Gmap gmap;
+	//private Long gmapID;
 	
 	// The user who created the marker
-	private GmapUser createBy;
+	//private GmapUser createBy;
 	
 	// The last user to modify the marker
-	private GmapUser modifiedBy;
+	//private GmapUser modifiedBy;
 
+
 	/**
 	 * Generic POJO constructor
 	 */
 	public GmapMarker() {}
 
-	
-	/**
-	 * Full Constructor
-	 */
-	public GmapMarker(Long uid, Long longitude, Long latitude, String address,
-			String colour, char markerDisplayCharacter,
-			String infoWindowMessage, String mouseoverText, Date created,
-			Date updated, boolean isAuthored, GmapSession toolSession,
-			Gmap gmap, GmapUser createBy, GmapUser modifiedBy) {
+
+	public GmapMarker(Long uid, Double longitude, Double latitude,
+			String infoWindowMessage, Date created, Date updated,
+			boolean isAuthored) {
+		super();
 		this.uid = uid;
 		this.longitude = longitude;
 		this.latitude = latitude;
-		this.address = address;
-		this.colour = colour;
-		this.markerDisplayCharacter = markerDisplayCharacter;
 		this.infoWindowMessage = infoWindowMessage;
-		this.mouseoverText = mouseoverText;
 		this.created = created;
 		this.updated = updated;
 		this.isAuthored = isAuthored;
-		this.toolSession = toolSession;
-		this.gmap = gmap;
-		this.createBy = createBy;
-		this.modifiedBy = modifiedBy;
 	}
+	
+	public Object clone() {
+		Object obj = null;
+		try {
+			obj = super.clone();
+			((GmapMarker) obj).setUid(null);
+		} catch (CloneNotSupportedException e) {
+			log.error("Failed to clone " + GmapMarker.class);
+		}
 
+		return obj;
+	}
 
 
+
+
+
+
 	/**
 	 * 
 	 * @return
@@ -135,11 +142,11 @@
 	 * @return
 	 * @hibernate.property column="longitude"
 	 */
-	public Long getLongitude() {
+	public Double getLongitude() {
 		return longitude;
 	}
 
-	public void setLongitude(Long longitude) {
+	public void setLongitude(Double longitude) {
 		this.longitude = longitude;
 	}
 
@@ -148,56 +155,17 @@
 	 * @return
 	 * @hibernate.property column="latitude"
 	 */
-	public Long getLatitude() {
+	public Double getLatitude() {
 		return latitude;
 	}
 
-	public void setLatitude(Long latitude) {
+	public void setLatitude(Double latitude) {
 		this.latitude = latitude;
 	}
 
 	/**
 	 * 
 	 * @return
-	 * @hibernate.property column="address"
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	/**
-	 * 
-	 * @return
-	 * @hibernate.property column="colour"
-	 */
-	public String getColour() {
-		return colour;
-	}
-
-	public void setColour(String colour) {
-		this.colour = colour;
-	}
-
-	/**
-	 * 
-	 * @return
-	 * @hibernate.property column="marker_display_charater"
-	 */
-	public char getMarkerDisplayCharacter() {
-		return markerDisplayCharacter;
-	}
-
-	public void setMarkerDisplayCharacter(char markerDisplayCharacter) {
-		this.markerDisplayCharacter = markerDisplayCharacter;
-	}
-
-	/**
-	 * 
-	 * @return
 	 * @hibernate.property column="info_window_message"
 	 */
 	public String getInfoWindowMessage() {
@@ -208,20 +176,7 @@
 		this.infoWindowMessage = infoWindowMessage;
 	}
 
-	/**
-	 * 
-	 * @return
-	 * @hibernate.property column="mouseover_text"
-	 */
-	public String getMouseoverText() {
-		return mouseoverText;
-	}
 
-
-	public void setMouseoverText(String mouseoverText) {
-		this.mouseoverText = mouseoverText;
-	}
-
 	/**
 	 * 
 	 * @return
@@ -262,70 +217,20 @@
 		this.isAuthored = isAuthored;
 	}
 
+	
 	/**
-     *
-     * @hibernate.many-to-one cascade="none"
-     *	class="org.lamsfoundation.lams.tool.gmap.model.GmapSession"
-     *	column="gmap_session_uid"
-     *
-     */
-	public GmapSession getToolSession() {
-		return toolSession;
-	}
-
-
-	public void setToolSession(GmapSession toolSession) {
-		this.toolSession = toolSession;
-	}
-
-	/**
-	 * @hibernate.many-to-one column="gmap_uid"
-	 * 			  cascade="none"
+	 * @hibernate.many-to-one	cascade="none"
+	 * 							not-null="true"
+	 * @hibernate.column name="gmap_uid"
 	 * @return
 	 */
 	public Gmap getGmap() {
 		return gmap;
 	}
 
-
 	public void setGmap(Gmap gmap) {
 		this.gmap = gmap;
 	}
 
 
-    /**
-     *
-     * @hibernate.many-to-one
-     * 		column="create_by"
-     *  	cascade="none"
-     *
-     */
-	public GmapUser getCreatedBy() {
-		return createBy;
-	}
-
-
-	public void setCreateBy(GmapUser createBy) {
-		this.createBy = createBy;
-	}
-
-	/**
-     * @hibernate.many-to-one
-     * 		column="modified_by"
-     * 		cascade="none"
-     * 
-     * @return Returns the userid of the user who modified the posting.
-     */
-	public GmapUser getModifiedBy() {
-		return modifiedBy;
-	}
-
-
-	public void setModifiedBy(GmapUser modifiedBy) {
-		this.modifiedBy = modifiedBy;
-	}
-	
-	
-
-
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -67,10 +67,12 @@
 import org.lamsfoundation.lams.tool.gmap.dao.IGmapDAO;
 import org.lamsfoundation.lams.tool.gmap.dao.IGmapSessionDAO;
 import org.lamsfoundation.lams.tool.gmap.dao.IGmapUserDAO;
+import org.lamsfoundation.lams.tool.gmap.dao.IGmapMarkerDAO;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.util.GmapConstants;
 import org.lamsfoundation.lams.tool.gmap.util.GmapException;
 import org.lamsfoundation.lams.tool.gmap.util.GmapToolContentHandler;
@@ -92,6 +94,8 @@
 	static Logger logger = Logger.getLogger(GmapService.class.getName());
 
 	private IGmapDAO gmapDAO = null;
+	
+	private IGmapMarkerDAO gmapMarkerDAO = null;
 
 	private IGmapSessionDAO gmapSessionDAO = null;
 
@@ -444,7 +448,11 @@
 	public void saveOrUpdateGmap(Gmap gmap) {
 		gmapDAO.saveOrUpdate(gmap);
 	}
-
+	
+	public void saveOrUpdateGmapMarker(GmapMarker gmapMarker) {
+		gmapMarkerDAO.saveOrUpdate(gmapMarker);
+	}
+	
 	public void saveOrUpdateGmapSession(GmapSession gmapSession) {
 		gmapSessionDAO.saveOrUpdate(gmapSession);
 	}
@@ -649,4 +657,12 @@
 	public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
 		this.coreNotebookService = coreNotebookService;
 	}
+
+	public IGmapMarkerDAO getGmapMarkerDAO() {
+		return gmapMarkerDAO;
+	}
+
+	public void setGmapMarkerDAO(IGmapMarkerDAO gmapMarkerDAO) {
+		this.gmapMarkerDAO = gmapMarkerDAO;
+	}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java	(.../IGmapService.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
 import org.lamsfoundation.lams.tool.gmap.model.GmapSession;
 import org.lamsfoundation.lams.tool.gmap.model.GmapUser;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.util.GmapException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 
@@ -93,8 +94,14 @@
 	 * @param gmap
 	 */
 	public void saveOrUpdateGmap(Gmap gmap);
-
+	
+	
 	/**
+	 * @param gmapMarker
+	 */
+	public void saveOrUpdateGmapMarker(GmapMarker gmapMarker);
+	
+	/**
 	 * @param toolSessionId
 	 * @return
 	 */
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -30,10 +30,15 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
+import java.io.PrintWriter;
+import java.io.StringReader;
+import org.xml.sax.InputSource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -46,6 +51,7 @@
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 import org.lamsfoundation.lams.tool.gmap.model.GmapAttachment;
+import org.lamsfoundation.lams.tool.gmap.model.GmapMarker;
 import org.lamsfoundation.lams.tool.gmap.service.IGmapService;
 import org.lamsfoundation.lams.tool.gmap.service.GmapServiceProxy;
 import org.lamsfoundation.lams.tool.gmap.util.GmapConstants;
@@ -55,6 +61,10 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.w3c.dom.NamedNodeMap;
 
 /**
  * @author
@@ -140,7 +150,8 @@
 		SessionMap<String, Object> map = createSessionMap(gmap,
 				getAccessMode(request), contentFolderID, toolContentID);
 		authForm.setSessionMapID(map.getSessionID());
-
+		authForm.setGmap(gmap);
+		
 		// add the sessionMap to HTTPSession.
 		request.getSession().setAttribute(map.getSessionID(), map);
 		request.setAttribute(GmapConstants.ATTR_SESSION_MAP, map);
@@ -155,10 +166,11 @@
 		// get authForm and session map.
 		AuthoringForm authForm = (AuthoringForm) form;
 		SessionMap<String, Object> map = getSessionMap(request, authForm);
-
+		Long toolContentID = (Long) map.get(KEY_TOOL_CONTENT_ID);
+		
+		
 		// get gmap content.
-		Gmap gmap = gmapService.getGmapByContentId((Long) map
-				.get(KEY_TOOL_CONTENT_ID));
+		Gmap gmap = gmapService.getGmapByContentId(toolContentID);
 
 		// update gmap content using form inputs.
 		ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
@@ -169,6 +181,12 @@
 		if (attachments == null) {
 			attachments = new HashSet<GmapAttachment>();
 		}
+		
+		// do the same for the gmap markers
+		Set<GmapMarker> markers = gmap.getGmapMarkers();
+		if (markers == null) {
+			markers = new HashSet<GmapMarker>();
+		}
 
 		for (GmapAttachment att : getAttList(KEY_DELETED_FILES, map)) {
 			// remove from db, leave in repository
@@ -360,25 +378,92 @@
 		return mapping.findForward("success");
 	}
 
+
 	/**
 	 * Updates Gmap content using AuthoringForm inputs.
 	 * 
 	 * @param authForm
 	 * @param mode
 	 * @return
 	 */
-	private void updateGmap(Gmap gmap, AuthoringForm authForm,
-			ToolAccessMode mode) {
+	private void updateGmap(Gmap gmap, AuthoringForm authForm, ToolAccessMode mode)
+	{
 		gmap.setTitle(authForm.getTitle());
 		gmap.setInstructions(authForm.getInstructions());
+		
+		updateMarkerListFromXML(authForm.getMarkersXML(), gmap);
+		
 		if (mode.isAuthor()) { // Teacher cannot modify following
 			gmap.setOfflineInstructions(authForm.getOnlineInstruction());
 			gmap.setOnlineInstructions(authForm.getOfflineInstruction());
 			gmap.setLockOnFinished(authForm.isLockOnFinished());
 			gmap.setAllowRichEditor(authForm.isAllowRichEditor());
 		}
 	}
+	
+	private void updateMarkerListFromXML(String markerXML, Gmap gmap)
+	{
+		//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 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("save"))
+				{
+					GmapMarker marker = new GmapMarker();
+					marker.setInfoWindowMessage(infoMessage);
+					marker.setLatitude(latitude);
+					marker.setLongitude(longitude);
+					marker.setGmap(gmap);
+					marker.setCreated(new Date());
+					marker.setUpdated(new Date());
+					marker.setAuthored(true);
+					//gmap.addMarker(marker);
+					gmapService.saveOrUpdateGmapMarker(marker);
+					
+				}
+				else if (markerState.equals("update"))
+				{
+					
+					GmapMarker marker = gmap.getMarkerByUid(uid);
+					marker.setInfoWindowMessage(infoMessage);
+					marker.setLatitude(latitude);
+					marker.setLongitude(longitude);
+					marker.setGmap(gmap);
+					marker.setUpdated(new Date());
+					marker.setAuthored(true);
+					gmapService.saveOrUpdateGmapMarker(marker);
+					//gmap.updateMarker(marker, uid);
+				}
+				else if (markerState.equals("remove"))
+				{
+					gmap.removeMarker(uid);
+					//GmapMarker marker = gmap.getMarkerByUid(uid);
+					//gmapService.deleteGmapMarker(marker);
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			// TODO: improve error handling
+			log.error("Could not get marker xml object to update", e);
+		}
+	}
+
 	/**
 	 * Updates AuthoringForm using Gmap content.
 	 * 
@@ -464,15 +549,15 @@
 	}
 
 	/**
-	 * Retrieve the SessionMap from the HttpSession.
+	 * Retrieve the SessionMap from the HttpSession using the author form.
 	 * 
 	 * @param request
 	 * @param authForm
 	 * @return
 	 */
 	private SessionMap<String, Object> getSessionMap(
 			HttpServletRequest request, AuthoringForm authForm) {
-		return (SessionMap<String, Object>) request.getSession().getAttribute(
-				authForm.getSessionMapID());
+		return (SessionMap<String, Object>) request.getSession().getAttribute(authForm.getSessionMapID());
 	}
+	
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -34,7 +34,9 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.web.util.SessionMap;
+import org.lamsfoundation.lams.tool.gmap.model.Gmap;
 
+
 /**
  * @struts.form name="authoringForm"
  */
@@ -69,7 +71,27 @@
 	Long deleteFileUuid;
 
 	SessionMap sessionMap;
+	
+	Gmap gmap;
+	
+	String markersXML;
 
+	public String getMarkersXML() {
+		return markersXML;
+	}
+
+	public void setMarkersXML(String markersXML) {
+		this.markersXML = markersXML;
+	}
+
+	public Gmap getGmap() {
+		return gmap;
+	}
+
+	public void setGmap(Gmap gmap) {
+		this.gmap = gmap;
+	}
+
 	@Override
 	public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
 		ActionErrors ac = new ActionErrors();
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -68,6 +68,7 @@
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
+    	serialiseMarkers();
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
Index: lams_tool_gmap/web/images/blue_Marker.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_gmap/web/images/paleblue_Marker.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_gmap/web/images/red_Marker.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -2,6 +2,8 @@
 
 var map;
 var markers;
+var geocoder = null;
+var markerManager = null;
 function init() {
 	// open the current tab    
 	var tag = document.getElementById("currentTab");
@@ -10,16 +12,26 @@
 	} else {
 		selectTab(1);
 	}
-	
+
+}
+
+function initGmap()
+{
 	if (GBrowserIsCompatible()) 
 	{
 		map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } );
-		map.setCenter(new GLatLng(37.4419, -122.1419), 13);
+		map.setCenter(new GLatLng(-33.774322, 151.111988), 13);
     	map.addControl(new GLargeMapControl());
     	map.addControl(new GMapTypeControl());
     	markers = new Array();
+    	geocoder = new GClientGeocoder();
+    	var mgrOptions = { trackMarkers: true };
+    	//markerManager = new GMarkerManager(map, mgrOptions);
     }
 }
+
+
+
 function doSelectTab(tabId) {
 	var tag = document.getElementById("currentTab");
 	tag.value = tabId;
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -1,9 +1,8 @@
 
-function addMarkerToCenter()
+// add a marker at the given point
+function addMarker(point, infoMessage, uid, isSaved)
 {
-	var bounds = map.getBounds();
-	var point = bounds.getCenter();
-	
+	map.closeInfoWindow();
 	var marker = new GMarker(point, {draggable: true})
     map.addOverlay(marker);
     
@@ -12,74 +11,71 @@
     });
 
     GEvent.addListener(marker, "dragend", function() {
-    	//marker.infoWindowHtml = "Latitude: " + marker.getLatLng().lat() + "<br>Longitude: " + marker.getLatLng().lng() + marker.removeButton ;;
-    	//marker.openInfoWindowHtml(marker.infoWindowHtml);
+		if (marker.state == "unchanged") {marker.state = "update";}
+		//serialiseMarkers();
+		updateMarkerInfoWindowHtml(marker);	
     });
     
-   	
     GEvent.addListener(marker, "click", function() {
     	marker.openInfoWindowHtml(marker.infoWindowHtml);
     });
     
     GEvent.addListener(marker, "infowindowclose", function() {
-    	marker.editingOn = false;
-    	updateMarkerInfoWindowHtml(marker)
+    	updateMarkerInfoWindowHtml(marker);
     });
     
+    if (infoMessage!=null)
+    {
+    	marker.infoMessage = unescape(infoMessage);
+    }
+    else
+    {
+    	marker.infoMessage = "";
+    }
     
+    // set the state of the marker
+    marker.editingOn = !isSaved;
+    marker.uid = uid;
+    if (isSaved){marker.state = "unchanged";}
+    else {marker.state="save";}
     
-    
-    
-    marker.infoMessage = "<i>No message</i><br />";
 
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'>Remove</a>" ;
     //marker.editLink = "<a href='pages/authoring/map.jsp' class='thickbox'>Edit</a>";
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'>Edit</a>";
    	
-   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ")'>Save</a>";
+   	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + "); openInfoWindow("+ markers.length +");'>Save</a>";
    	marker.cancelLink = "<a href='javascript:cancelEditMarkerInfo(" + markers.length + ")'>Cancel</a>";
    	
+   	//markerManager.addMarkers(marker,  5);
    	
-   	marker.editingOn = false;
-    
     updateMarkerInfoWindowHtml(marker);
-    //alert(marker.infoMessage);
-    //alert(marker.inputForm);
-    //alert(marker.linksBar);
-    
-    //marker.infoWindowHtml = "Latitude: " + marker.getLatLng().lat() + "<br>Longitude: " + marker.getLatLng().lng() + marker.removeButton ;
     markers[markers.length] = marker;
+}
 
+// Add a new marker to the center of the map
+function addMarkerToCenter()
+{
+	var bounds = map.getBounds();
+	var point = bounds.getCenter();
+	addMarker(point, "", -1, false)
 }
 
-
-//<a href="images/single.jpg" title="add a caption to title attribute / or leave blank" class="thickbox"><img src="images/single_t.jpg" alt="Single Image"/></a>
-
 function test()
 {
-	var string = "";
-	var i;
-	for (i=0; i<markers.length; i++)
-	{
-		//string += "Latitude: " + markers[i].getLatLng().lat() + "\n";
-		//string += "Longitude: " + markers[i].getLatLng().lng() + "\n\n";
-		
-		if (markers[i]!=null)
-		{
-			string += "infoWindow: " + markers[i].infoWindowHtml + "\n\n";
-		}
-	}
-	
-	alert(string);
+	serialiseMarkers();
+	alert(document.authoringForm.markersXML.value);
 }
 
 function removeMarker(x)
 {
 	var ans = confirm("Are you sure you want to remove this marker?");
 	if (ans)
 	{
-		map.removeOverlay(markers[x]);
-		markers[x] = null;
+		try{map.removeOverlay(markers[x]);}
+		catch (e){}
+		markers[x].state = "remove";
+		//serialiseMarkers();
 	}
 }
 
@@ -90,20 +86,6 @@
 	openInfoWindow(x);
 }	
 
-function saveMarkerInfo(x)
-{
-
-	if (markers[x] != null)
-	{
-		var info=document.getElementById("infoWindow");
-		markers[x].infoMessage = info.value + "<br />";
-		markers[x].editingOn = false;
-		updateMarkerInfoWindowHtml(markers[x]);
-		//markers[x].openInfoWindowHtml(markers[x].infoWindowHtml);
-		openInfoWindow(x);
-	}
-}
-
 function cancelEditMarkerInfo(x)
 {
 	markers[x].editingOn = false;
@@ -113,24 +95,185 @@
 
 function updateMarkerInfoWindowHtml(markerIn)
 {
+	markerIn.locationMessage = "<font size='small'><i>";
+	markerIn.locationMessage += "Latitude: " + markerIn.getPoint().lat() + "<br />";
+	markerIn.locationMessage += "Longitude: " + markerIn.getPoint().lng() + "<br /><br />";
+	markerIn.locationMessage += "</i></font>";
+	markerIn.infoWindowHtml = markerIn.locationMessage;
+	
+	if (markerIn.state == "unchanged")
+	{
+		markerIn.setImage(webAppUrl + "/images/blue_Marker.png");
+	}
+	else if (markerIn.state == "update")
+	{
+		markerIn.setImage(webAppUrl + "/images/paleblue_Marker.png");
+	}
+	else
+	{
+		markerIn.setImage(webAppUrl + "/images/red_Marker.png");
+	}
+	
 	if (markerIn.editingOn)
 	{
 		markerIn.linksBar = "<br/ >" + markerIn.saveLink + "&nbsp;" + markerIn.cancelLink;
-		markerIn.infoWindowTextarea = "<textarea id='infoWindow' name='infoWindow' rows='3' cols='30'>" + markerIn.infoMessage + "</textarea>";
+		
+		//markerIn.inputForm = "New Info Window Text: <br>";
+		//markerIn.inputForm += "<lams:FCKEditor id='infoWindow'";
+		//markerIn.inputForm += "value='"+markerIn.infoMessage+"'";
+		//markerIn.inputForm += "contentFolderID='${sessionMap.contentFolderID}'>";
+		//markerIn.inputForm += "</lams:FCKEditor>";
+		
+		markerIn.infoWindowTextarea = "<textarea id='infoWindow' name='infoWindow' rows='5' cols='50'>" + markerIn.infoMessage + "</textarea>";
 		markerIn.inputForm = "New Info Window Text: <br>" + markerIn.infoWindowTextarea;
-		markerIn.infoWindowHtml = markerIn.inputForm + markerIn.linksBar;
+		markerIn.infoWindowHtml += markerIn.inputForm + markerIn.linksBar;
 	}
 	else
 	{
 		markerIn.linksBar = "<br/ >" + markerIn.removeLink + "&nbsp;" + markerIn.editLink;
 		markerIn.inputForm = "";
-		markerIn.infoWindowHtml = markerIn.infoMessage + markerIn.inputForm + markerIn.linksBar;
-	}
-
-	
+		markerIn.infoWindowHtml += markerIn.infoMessage + "<br />" + markerIn.inputForm + markerIn.linksBar;
+	}	
 }
 
 function openInfoWindow(x)
 {
 	markers[x].openInfoWindowHtml(markers[x].infoWindowHtml);
-}
\ No newline at end of file
+}
+
+function showAddress() 
+{
+	var address = document.getElementById('address').value;
+	
+	if (geocoder) 
+	{
+		geocoder.getLatLng(address,
+			function(point) 
+			{
+				if (!point) 
+				{
+					alert(address + " not found");
+				} 
+				else 
+				{
+					map.setCenter(point, 13);
+					//var marker = new GMarker(point);
+					//map.addOverlay(marker);
+					//marker.openInfoWindowHtml(address);
+				}
+			}
+		);
+	}
+}
+
+function fitMapMarkers() 
+{
+   var bounds = new GLatLngBounds();
+   for (var i=0; i< markers.length; i++) {
+      bounds.extend(markers[i].getPoint());
+   }
+   map.setZoom(map.getBoundsZoomLevel(bounds));
+   map.setCenter(bounds.getCenter());
+}
+
+function saveMarkerInfo(x)
+{
+	if (markers[x] != null)
+	{
+		var info=document.getElementById("infoWindow");
+		markers[x].infoMessage = info.value;
+		markers[x].editingOn = false;
+		
+		// change the state to update if it is a pre-existing marker
+		if (markers[x].state == "unchanged") {markers[x].state = "update";}
+		
+		//markers[x].isSaved = persistMarker(markers[x], "createMarker");
+		updateMarkerInfoWindowHtml(markers[x]);
+
+	}
+}
+
+/*
+function getAjaxObject()
+{
+	var req=null;
+	if ( window.XMLHttpRequest ) {req = new XMLHttpRequest();} 
+	else {req = new ActiveXObject("MSXML2.XMLHTTP");} 
+	return req;	
+}
+*/
+
+/*
+function persistMarker(marker, method)
+{
+	var ajax = getAjaxObject();
+	var result = null;
+	ajax.onreadystatechange = function() 
+	{ 
+	    if(ajax.readyState == 4) 
+	    {
+	    	result = ajax.responseText;
+	    }
+	}
+	
+ 	var url = webAppUrl + "/marker.do?" +
+ 		"&method="  + method +
+ 		"&toolContentID=" + toolContentID + 
+ 		"&latitude=" + marker.getPoint().lat() +
+ 		"&longitude=" + marker.getPoint().lng() +
+ 		"&infoMessage=" + marker.infoMessage;
+ 		
+ 	try
+ 	{
+		ajax.open("GET",url,false);
+		ajax.send(null);
+	
+		if (result=="success")
+		{
+			alert("yay!");
+			return true;
+		}
+		else
+		{
+			//TODO: handle marker save failure
+			alert("boo!");
+			return false;
+		}
+	}
+	catch(e)
+	{
+		return e;
+		//alert("An error occurred: " + e);
+	}
+}*/	
+
+
+function serialiseMarkers()
+{
+	var xmlString = '<?xml version="1.0"?><markers>';
+	var i =0;
+	
+	for (;i<markers.length;i++)
+	{
+		if (markers[i].state != "unchanged")
+		{
+			var markerString = '<marker'+
+			' latitude="'+ markers[i].getPoint().lat()+ '"'+
+			' longitude="'+ markers[i].getPoint().lng()+ '"'+
+			' infoMessage="'+ escape(markers[i].infoMessage)+ '"' +
+			' markerUID="'+ markers[i].uid + '"' +
+			' state="'+ markers[i].state + '"' +
+			' />';
+			xmlString += markerString;
+		}	
+	}
+	xmlString += "</markers>"
+	document.authoringForm.markersXML.value=xmlString;
+}
+
+
+
+
+
+
+	
\ No newline at end of file
Index: lams_tool_gmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -3,19 +3,24 @@
 <%@ page
 	import="org.lamsfoundation.lams.tool.gmap.util.GmapConstants"%>
 
+
 <html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 
-	<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="defineLater" value="no" />
 	<c:if test="${sessionMap.mode == 'teacher'}">
 		<c:set var="defineLater" value="yes" />
 	</c:if>
+	
+	<script type="text/javascript">
+	<!--
+		var toolContentID = "${sessionMap.toolContentID}";
+	//-->
+	</script>
 
 	<div id="header">
-
 		<!--  TITLE KEY PAGE GOES HERE -->
 		<lams:Tabs control="true">
 			<lams:Tab id="1" key="button.basic" />
@@ -24,7 +29,6 @@
 				<lams:Tab id="3" key="button.instructions" />
 			</c:if>
 		</lams:Tabs>
-
 	</div>
 	<!--closes header-->
 
@@ -33,7 +37,9 @@
 		<html:hidden property="currentTab" styleId="currentTab" />
 		<html:hidden property="dispatch" value="updateContent" />
 		<html:hidden property="sessionMapID" />
+		<html:hidden property="markersXML" value=""/>
 
+
 		<div id="message" style="text-align: center;">
 			<c:if test="${unsavedChanges}">
 				<fmt:message key="message.unsavedChanges" />
@@ -59,10 +65,13 @@
 		</c:if>
 
 		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do" toolSignature="lagmap10"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+			clearSessionActionUrl="/clearsession.do" 
+			toolSignature="lagmap10"
+			cancelButtonLabelKey="button.cancel" 
+			saveButtonLabelKey="button.save"
 			toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+			accessMode="${sessionMap.mode}" 
+			defineLater="${defineLater}"
 			customiseSessionID="${sessionMap.sessionID}" 
 			contentFolderID="${sessionMap.contentFolderID}" />
 	</div>
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -20,13 +20,55 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 			</div>
-			
-			
+			<lams:FCKEditor id="instructions"
+				value="${formBean.instructions}"
+				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
+		</td>		
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name">
+				Map:
+			</div>
 			<div id="map_canvas" style="width: 500px; height: 300px"></div>
 			
 			<input type="button" onclick="addMarkerToCenter()"  value="Add Marker" />
+			<input type="button" onclick="fitMapMarkers()" value="Fit Markers" />
 			<input type="button" onclick="test()"  value="Test" />
 			<a href='map.jsp' class='thickbox'>Edit</a>
 		</td>
 	</tr>
+	
+	<tr>
+		<td>
+			<div class="field-name">
+				Center map on address:
+			</div>
+			<input type="text" size="60" name="address" id="address" value="Macquarie University, Sydney NSW" />
+       		<input type="button" onclick="showAddress()" value="Go!" />
+       		
+       		
+       		
+       		<script type="text/javascript">
+			<!--
+	       		initGmap();
+       		//-->
+			</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.uid}', true);
+				//-->
+				</script>
+      		</c:forEach>
+      		<script type="text/javascript">
+			<!--
+	       		fitMapMarkers();
+       		//-->
+			</script>
+
+		</td>
+	</tr>
 </table>
+
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r866dc94326b7624341331da05940cfe57a8d9ccd
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
@@ -12,3 +12,10 @@
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox-compressed.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 src="http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/release/src/markermanager.js"></script>
+
+<script type="text/javascript">
+<!--
+	var webAppUrl = "${tool}";
+//-->
+</script>