Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml	(.../Gmap.hbm.xml)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -87,15 +87,6 @@
         />
 
         <property
-            name="allowRichEditor"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="allow_rich_editor"
-            length="1"
-        />
-
-        <property
             name="onlineInstructions"
             type="java.lang.String"
             update="true"
@@ -196,6 +187,110 @@
 
         </set>
 
+        <property
+            name="allowEditMarkers"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_edit_markers"
+            length="1"
+        />
+
+        <property
+            name="allowShowAllMarkers"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="show_all_markers"
+            length="1"
+        />
+
+        <property
+            name="limitMarkers"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="limit_markers"
+            length="1"
+        />
+
+        <property
+            name="maxMarkers"
+            type="int"
+            update="true"
+            insert="true"
+            column="max_markers"
+        />
+
+        <property
+            name="allowZoom"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_zoom"
+            length="1"
+        />
+
+        <property
+            name="allowTerrain"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_terrain"
+            length="1"
+        />
+
+        <property
+            name="allowSatellite"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_satellite"
+            length="1"
+        />
+
+        <property
+            name="allowHybrid"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="allow_hybrid"
+            length="1"
+        />
+
+        <property
+            name="mapCenterLatitude"
+            type="java.lang.Double"
+            update="true"
+            insert="true"
+            column="map_center_latitude"
+        />
+
+        <property
+            name="mapCenterLongitude"
+            type="java.lang.Double"
+            update="true"
+            insert="true"
+            column="map_center_longitude"
+        />
+
+        <property
+            name="mapZoom"
+            type="int"
+            update="true"
+            insert="true"
+            column="map_zoom"
+        />
+
+        <property
+            name="mapType"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="map_type"
+            length="20"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Gmap.xml
Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -17,8 +17,31 @@
 label.authoring.basic.title  =Title:
 label.authoring.basic.content  =Content:
 label.authoring.basic.instructions  =Instructions:
+
+label.authoring.basic.map  =Map:
+label.authoring.basic.centerMap =Center map on location:
+label.authoring.basic.sampleAddress  =Macquarie University, Sydney NSW
+label.authoring.basic.confirmDelete  =Are you sure you want to remove this marker?
+error.missingMarkerTitle  =Title is required for marker.
+error.cantFindAddress  =Unable to find location:
+button.addMarker  =Add Marker
+button.fitMarkers  =Fit Markers
+button.go  =Go!
+
+advanced.editingOptions  =Editing Options
 advanced.lockOnFinished  =Lock when finished
-advanced.allowRichEditor  =Allow rich text editor
+advanced.allowEditMarkers  =Allow users to edit their own saved markers
+advanced.allowShowAllMarkers  =Allow users to see markers from other users
+advanced.limitMarkers =Marker Limits
+advanced.markerLimitsMessage =Limit the number of markers
+advanced.mapOptions  =Map Options
+advanced.allowZoom =Allow zoom control
+advanced.allowTerrain  =Allow terrain map type
+advanced.allowSatellite  =Allow satellite map type
+advanced.allowHybrid  =Allow hybrid map type
+
+
+
 instructions.onlineInstructions  =Online Instructions:
 instructions.offlineInstructions  =Offline Instructions:
 instructions.uploadOnlineInstr  =Online Instructions File:
Index: lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/db/sql/create_lams_tool_gmap.sql	(.../create_lams_tool_gmap.sql)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -7,7 +7,7 @@
 drop table if exists tl_lagmap10_session;
 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_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, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), 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, title varchar(255), 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));
@@ -26,7 +26,19 @@
 	lock_on_finished,
 	content_in_use,
 	define_later,
-	allow_rich_editor) 
+	allow_edit_markers, 
+	show_all_markers,
+	limit_markers, 
+	max_markers, 
+	allow_zoom, 
+	allow_terrain, 
+	allow_satellite, 
+	allow_hybrid, 
+	map_center_latitude,
+	map_center_longitude, 
+	map_zoom,
+	map_type
+) 
 VALUES(
 	"Gmap",
 	"Instructions",
@@ -37,7 +49,18 @@
 	0,
 	0,
 	0,
-	0
+	1,
+	1,
+	0,
+	1,
+	1,
+	0,
+	1,
+	1,
+	-33.774322,
+	151.111988,
+	13,
+	"G_NORMAL_MAP"
 );
 
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_gmap/db/sql/table-schema.sql
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/db/sql/table-schema.sql	(.../table-schema.sql)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -8,7 +8,7 @@
 drop table if exists tl_lagmap10_session;
 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_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, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, allow_edit_markers bit, show_all_markers bit, limit_markers bit, max_markers integer, allow_zoom bit, allow_terrain bit, allow_satellite bit, allow_hybrid bit, map_center_latitude double precision, map_center_longitude double precision, map_zoom integer, map_type varchar(20), 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, title varchar(255), 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));
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java	(.../GmapDTO.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -53,7 +53,7 @@
 	
 	public boolean contentInUse;
 	
-	public boolean allowRichEditor;
+	//public boolean allowRichEditor;
 	
 	public Set<GmapAttachmentDTO> onlineInstructionsFiles;
 
@@ -71,7 +71,7 @@
 		onlineInstructions = gmap.getOnlineInstructions();
 		offlineInstructions = gmap.getOfflineInstructions();
 		contentInUse = gmap.isContentInUse();
-		allowRichEditor = gmap.isAllowRichEditor();
+		//allowRichEditor = gmap.isAllowRichEditor();
 
 		onlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
 		offlineInstructionsFiles = new TreeSet<GmapAttachmentDTO>();
@@ -175,11 +175,11 @@
 		this.contentInUse = contentInUse;
 	}
 
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
+	//public boolean isAllowRichEditor() {
+	//	return allowRichEditor;
+	//}
 
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
+	//public void setAllowRichEditor(boolean allowRichEditor) {
+	//	this.allowRichEditor = allowRichEditor;
+	//}
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java	(.../Gmap.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -66,7 +66,29 @@
 
 	private boolean lockOnFinished;
 	
-	private boolean allowRichEditor;
+	private boolean allowEditMarkers;
+	
+	private boolean allowShowAllMarkers;
+	
+	private boolean limitMarkers;
+	
+	private int maxMarkers;
+	
+	private boolean allowZoom;
+	
+	private boolean allowTerrain;
+	
+	private boolean allowSatellite;
+	
+	private boolean allowHybrid;
+	
+	private Double mapCenterLatitude;
+	
+	private Double mapCenterLongitude;
+	
+	private int mapZoom;
+	
+	private String mapType;
 
 	private String onlineInstructions;
 
@@ -230,19 +252,7 @@
 	public void setLockOnFinished(boolean lockOnFinished) {
 		this.lockOnFinished = lockOnFinished;
 	}
-	
-	/**
-	 * @hibernate.property column="allow_rich_editor" length="1"
-	 * @return
-	 */
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
-	}
 
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
-	}
-
 	/**
 	 * @hibernate.property column="online_instructions" length="65535"
 	 * 
@@ -489,9 +499,161 @@
 			}
 		}
 	}
+
 	
+	/**
+	 * @hibernate.property column="allow_edit_markers" length="1"
+	 * 
+	 */
 	
+	public boolean isAllowEditMarkers() {
+		return allowEditMarkers;
+	}
+
+	public void setAllowEditMarkers(boolean allowEditMarkers) {
+		this.allowEditMarkers = allowEditMarkers;
+	}
+
+	/**
+	 * @hibernate.property column="show_all_markers" length="1"
+	 * 
+	 */
 	
+	public boolean isAllowShowAllMarkers() {
+		return allowShowAllMarkers;
+	}
 
+	public void setAllowShowAllMarkers(boolean allowShowAllMarkers) {
+		this.allowShowAllMarkers = allowShowAllMarkers;
+	}
 
+	/**
+	 * @hibernate.property column="limit_markers" length="1"
+	 * 
+	 */
+	
+	public boolean isLimitMarkers() {
+		return limitMarkers;
+	}
+
+	public void setLimitMarkers(boolean limitMarkers) {
+		this.limitMarkers = limitMarkers;
+	}
+
+	/**
+	 * @hibernate.property column="max_markers"
+	 * 
+	 */
+	
+	public int getMaxMarkers() {
+		return maxMarkers;
+	}
+
+	public void setMaxMarkers(int maxMarkers) {
+		this.maxMarkers = maxMarkers;
+	}
+
+	/**
+	 * @hibernate.property column="allow_zoom" length="1"
+	 * 
+	 */
+	
+	public boolean isAllowZoom() {
+		return allowZoom;
+	}
+
+	public void setAllowZoom(boolean allowZoom) {
+		this.allowZoom = allowZoom;
+	}
+
+	/**
+	 * @hibernate.property column="allow_terrain" length="1"
+	 * 
+	 */
+	
+	public boolean isAllowTerrain() {
+		return allowTerrain;
+	}
+
+	public void setAllowTerrain(boolean allowTerrain) {
+		this.allowTerrain = allowTerrain;
+	}
+
+	/**
+	 * @hibernate.property column="allow_satellite" length="1"
+	 * 
+	 */
+	
+	public boolean isAllowSatellite() {
+		return allowSatellite;
+	}
+
+	public void setAllowSatellite(boolean allowSatellite) {
+		this.allowSatellite = allowSatellite;
+	}
+
+	/**
+	 * @hibernate.property column="allow_hybrid" length="1"
+	 * 
+	 */
+	
+	public boolean isAllowHybrid() {
+		return allowHybrid;
+	}
+
+	public void setAllowHybrid(boolean allowHybrid) {
+		this.allowHybrid = allowHybrid;
+	}
+
+	/**
+	 * 
+	 * @hibernate.property column="map_center_latitude"
+	 */
+	
+	public Double getMapCenterLatitude() {
+		return mapCenterLatitude;
+	}
+
+	public void setMapCenterLatitude(Double mapCenterLatitude) {
+		this.mapCenterLatitude = mapCenterLatitude;
+	}
+
+	/**
+	 * 
+	 * @hibernate.property column="map_center_longitude"
+	 */
+	
+	public Double getMapCenterLongitude() {
+		return mapCenterLongitude;
+	}
+
+	public void setMapCenterLongitude(Double mapCenterLongitude) {
+		this.mapCenterLongitude = mapCenterLongitude;
+	}
+
+	/**
+	 * 
+	 * @hibernate.property column="map_zoom"
+	 */
+	
+	public int getMapZoom() {
+		return mapZoom;
+	}
+
+	public void setMapZoom(int mapZoom) {
+		this.mapZoom = mapZoom;
+	}
+
+	/**
+	 * 
+	 * @hibernate.property column="map_type" length ="20"
+	 */
+	public String getMapType() {
+		return mapType;
+	}
+
+	public void setMapType(String mapType) {
+		this.mapType = mapType;
+	}
+
 }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -559,7 +559,7 @@
     	gmap.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
     	gmap.setToolContentId(toolContentId);
     	gmap.setUpdateDate(now);
-    	gmap.setAllowRichEditor(Boolean.FALSE);
+    	//gmap.setAllowRichEditor(Boolean.FALSE);
     	// leave as empty, no need to set them to anything.
     	//setGmapAttachments(Set gmapAttachments);
     	//setGmapSessions(Set gmapSessions);
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -397,7 +397,18 @@
 			gmap.setOfflineInstructions(authForm.getOnlineInstruction());
 			gmap.setOnlineInstructions(authForm.getOfflineInstruction());
 			gmap.setLockOnFinished(authForm.isLockOnFinished());
-			gmap.setAllowRichEditor(authForm.isAllowRichEditor());
+			gmap.setAllowEditMarkers(authForm.isAllowEditMarkers());
+			gmap.setAllowShowAllMarkers(authForm.isAllowShowAllMarkers());
+			gmap.setMaxMarkers(authForm.getMaxMarkers());
+			gmap.setLimitMarkers(authForm.isLimitMarkers());
+			gmap.setAllowZoom(authForm.isAllowZoom());
+			gmap.setAllowTerrain(authForm.isAllowTerrain());
+			gmap.setAllowSatellite(authForm.isAllowSatellite());
+			gmap.setAllowHybrid(authForm.isAllowHybrid());
+			gmap.setMapType(authForm.getMapType());
+			gmap.setMapZoom(authForm.getMapZoom());
+			gmap.setMapCenterLatitude(authForm.getMapCenterLatitude());
+			gmap.setMapCenterLongitude(authForm.getMapCenterLongitude());
 		}
 	}
 	
@@ -480,7 +491,19 @@
 		authForm.setOnlineInstruction(gmap.getOnlineInstructions());
 		authForm.setOfflineInstruction(gmap.getOfflineInstructions());
 		authForm.setLockOnFinished(gmap.isLockOnFinished());
-		authForm.setAllowRichEditor(gmap.isAllowRichEditor());
+		//authForm.setAllowRichEditor(gmap.isAllowRichEditor());
+		authForm.setAllowEditMarkers(gmap.isAllowEditMarkers());
+		authForm.setAllowShowAllMarkers(gmap.isAllowShowAllMarkers());
+		authForm.setMaxMarkers(gmap.getMaxMarkers());
+		authForm.setLimitMarkers(gmap.isLimitMarkers());
+		authForm.setAllowZoom(gmap.isAllowZoom());
+		authForm.setAllowTerrain(gmap.isAllowTerrain());
+		authForm.setAllowSatellite(gmap.isAllowSatellite());
+		authForm.setAllowHybrid(gmap.isAllowHybrid());
+		authForm.setMapType(gmap.getMapType());
+		authForm.setMapZoom(gmap.getMapZoom());
+		authForm.setMapCenterLatitude(gmap.getMapCenterLatitude());
+		authForm.setMapCenterLongitude(gmap.getMapCenterLongitude());
 	}
 
 	/**
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -115,7 +115,7 @@
 		GmapDTO gmapDTO = new GmapDTO();
 		gmapDTO.title = gmap.getTitle();
 		gmapDTO.instructions = gmap.getInstructions();
-		gmapDTO.allowRichEditor = gmap.isAllowRichEditor();
+		//gmapDTO.allowRichEditor = gmap.isAllowRichEditor();
 		
 		request.setAttribute("gmapDTO", gmapDTO);
 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -56,8 +56,30 @@
 
 	boolean lockOnFinished;
 	
-	boolean allowRichEditor;
+	private boolean allowEditMarkers;
 	
+	private boolean allowShowAllMarkers;
+	
+	private boolean limitMarkers;
+	
+	private int maxMarkers;
+	
+	private boolean allowZoom;
+	
+	private boolean allowTerrain;
+	
+	private boolean allowSatellite;
+	
+	private boolean allowHybrid;
+	
+	private Double mapCenterLatitude;
+	
+	private Double mapCenterLongitude;
+	
+	private int mapZoom;
+	
+	private String mapType;
+	
 	FormFile onlineFile; 
 
 	FormFile offlineFile;
@@ -196,11 +218,99 @@
 		this.deleteFileUuid = deleteFile;
 	}
 
-	public boolean isAllowRichEditor() {
-		return allowRichEditor;
+	public boolean isAllowEditMarkers() {
+		return allowEditMarkers;
 	}
 
-	public void setAllowRichEditor(boolean allowRichEditor) {
-		this.allowRichEditor = allowRichEditor;
+	public void setAllowEditMarkers(boolean allowEditMarkers) {
+		this.allowEditMarkers = allowEditMarkers;
 	}
+
+	public boolean isAllowShowAllMarkers() {
+		return allowShowAllMarkers;
+	}
+
+	public void setAllowShowAllMarkers(boolean allowShowAllMarkers) {
+		this.allowShowAllMarkers = allowShowAllMarkers;
+	}
+
+	public boolean isLimitMarkers() {
+		return limitMarkers;
+	}
+
+	public void setLimitMarkers(boolean limitMarkers) {
+		this.limitMarkers = limitMarkers;
+	}
+
+	public int getMaxMarkers() {
+		return maxMarkers;
+	}
+
+	public void setMaxMarkers(int maxMarkers) {
+		this.maxMarkers = maxMarkers;
+	}
+
+	public boolean isAllowZoom() {
+		return allowZoom;
+	}
+
+	public void setAllowZoom(boolean allowZoom) {
+		this.allowZoom = allowZoom;
+	}
+
+	public boolean isAllowTerrain() {
+		return allowTerrain;
+	}
+
+	public void setAllowTerrain(boolean allowTerrain) {
+		this.allowTerrain = allowTerrain;
+	}
+
+	public boolean isAllowSatellite() {
+		return allowSatellite;
+	}
+
+	public void setAllowSatellite(boolean allowSatellite) {
+		this.allowSatellite = allowSatellite;
+	}
+
+	public boolean isAllowHybrid() {
+		return allowHybrid;
+	}
+
+	public void setAllowHybrid(boolean allowHybrid) {
+		this.allowHybrid = allowHybrid;
+	}
+
+	public Double getMapCenterLatitude() {
+		return mapCenterLatitude;
+	}
+
+	public void setMapCenterLatitude(Double mapCenterLatitude) {
+		this.mapCenterLatitude = mapCenterLatitude;
+	}
+
+	public Double getMapCenterLongitude() {
+		return mapCenterLongitude;
+	}
+
+	public void setMapCenterLongitude(Double mapCenterLongitude) {
+		this.mapCenterLongitude = mapCenterLongitude;
+	}
+
+	public int getMapZoom() {
+		return mapZoom;
+	}
+
+	public void setMapZoom(int mapZoom) {
+		this.mapZoom = mapZoom;
+	}
+
+	public String getMapType() {
+		return mapType;
+	}
+
+	public void setMapType(String mapType) {
+		this.mapType = mapType;
+	}
 }
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -69,6 +69,7 @@
 	}
     function doSubmit_Form_Only() {
     	serialiseMarkers();
+    	saveMapState();
     	document.getElementById("${formID}").submit();
     }
     function doCancel() {
Index: lams_tool_gmap/web/includes/javascript/authoring.js
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/web/includes/javascript/authoring.js	(.../authoring.js)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -21,9 +21,16 @@
 	{
 		//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.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();
     	var mgrOptions = { trackMarkers: true };
Index: lams_tool_gmap/web/includes/javascript/mapFunctions.js
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/web/includes/javascript/mapFunctions.js	(.../mapFunctions.js)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -24,26 +24,6 @@
     	updateMarkerInfoWindowHtml(marker);
     });
     
-    GEvent.addListener(marker,'mouseover',function(){
-		//marker[i].setImage(markerImage[3]);
-		//alert("hello");
-		//document.getElementById("sidebar").getElementsByTagName("span")[markers.length].style.background ="blue";
-	});
-	
-	GEvent.addListener(marker,'mouseout',function()
-	{
-		//document.getElementById("sidebar").getElementsByTagName("span")[markers.length].style.background ="blue";
-		
-		/*if(marker[i].visited){
-			marker[i].setImage(markerImage[4]);
-			document.getElementById("sidebar").getElementsByTagName("span")[i].style.color ="gray";
-		
-		}else{
-		marker[i].setImage(markerImage[0]);
-		document.getElementById("sidebar").getElementsByTagName("span")[i].style.color ="black";
-		*/
-	});
-    
     if (infoMessage!=null)
     {
     	marker.infoMessage = unescape(infoMessage);
@@ -66,7 +46,6 @@
     else {marker.state="unsaved";}
     
 	marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'>";
-    //marker.sideBarLinkSuffix = marker.title+"</a></span><br />"
     marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'>Remove</a>" ;
    	marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'>Edit</a>";
    	marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + "); openInfoWindow("+ markers.length +");'>Save</a>";
@@ -107,7 +86,7 @@
 
 function removeMarker(x)
 {
-	var ans = confirm("Are you sure you want to remove this marker?");
+	var ans = confirm(confirmDelete);
 	if (ans)
 	{
 		try{map.removeOverlay(markers[x]);}
@@ -201,7 +180,7 @@
 			{
 				if (!point) 
 				{
-					alert(address + " not found");
+					alert(errorCantFindLocation + " " + address );
 				} 
 				else 
 				{
@@ -222,7 +201,9 @@
       bounds.extend(markers[i].getPoint());
    }
    map.setZoom(map.getBoundsZoomLevel(bounds));
-   map.setCenter(bounds.getCenter());
+   //map.setCenter(bounds.getCenter());
+   map.panTo(bounds.getCenter());
+   
 }
 
 /*
@@ -248,7 +229,7 @@
 		var title= trim(document.getElementById("markerTitle").value);
 		if (title==null || title == "")
 		{
-			alert("Title is required.");
+			alert(errorMissingTitle);
 			return false;
 		}
 		else
@@ -354,9 +335,36 @@
 	document.authoringForm.markersXML.value=xmlString;
 }
 
+// TODO: This method should only be included for the authoring pages, put them in another file
+function saveMapState()
+{
+	document.authoringForm.mapZoom.value=map.getZoom();
+	document.authoringForm.mapCenterLatitude.value=map.getCenter().lat();
+	document.authoringForm.mapCenterLongitude.value=map.getCenter().lng();
+	
+	var mapTypeName = map.getCurrentMapType().getName();
+	
+	alert("TYPE: " +mapTypeName);
+	
+	var mapType = "";	
+	if 		(mapTypeName == "Satellite") { mapType = "G_SATELLITE_MAP"; }
+	else if (mapTypeName == "Hybrid") { mapType = "G_HYBRID_MAP"; }
+	else if (mapTypeName == "Terrain") { mapType = "G_PHYSICAL_MAP"; }
+	else { mapType = "G_NORMAL_MAP"; }
+	
+	document.authoringForm.mapType.value=mapType;
+	
+	alert(document.authoringForm.mapZoom.value);
+	alert(document.authoringForm.mapCenterLatitude.value);
+	alert(document.authoringForm.mapCenterLongitude.value);
+	alert(document.authoringForm.mapType.value);
+}
 
 
 
 
 
+
+
+
 	
\ No newline at end of file
Index: lams_tool_gmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -2,6 +2,8 @@
 
 <!-- ========== Advanced Tab ========== -->
 
+<h2><fmt:message key="advanced.editingOptions" /></h2>
+
 <p class="small-space-top">
 	<html:checkbox property="lockOnFinished" value="1"
 		styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
@@ -11,10 +13,84 @@
 </p>
 
 <p>
-	<html:checkbox property="allowRichEditor" value="1"
-		styleClass="noBorder" styleId="allowRichEditor"></html:checkbox>
-	<label for="allowRichEditor">
-		<fmt:message key="advanced.allowRichEditor" />
+	<html:checkbox property="allowEditMarkers" value="1"
+		styleClass="noBorder" styleId="allowEditMarkers"></html:checkbox>
+	<label for="allowEditMarkers">
+		<fmt:message key="advanced.allowEditMarkers" />
 	</label>
 </p>
 
+<p>
+	<html:checkbox property="allowShowAllMarkers" value="1"
+		styleClass="noBorder" styleId="allowShowAllMarkers"></html:checkbox>
+	<label for="allowShowAllMarkers">
+		<fmt:message key="advanced.allowShowAllMarkers" />
+	</label>
+</p>
+
+<h2><fmt:message key="advanced.limitMarkers" /></h2>
+
+<p>
+	<html:select property="maxMarkers" styleId="maxMarkers"  >
+			<html:option value="1">1</html:option>
+			<html:option value="2">2</html:option>
+			<html:option value="3">3</html:option>
+			<html:option value="4">4</html:option>
+			<html:option value="5">5</html:option>
+			<html:option value="6">6</html:option>
+			<html:option value="7">7</html:option>
+			<html:option value="8">8</html:option>
+			<html:option value="9">9</html:option>
+			<html:option value="10">10</html:option>
+			<html:option value="10">11</html:option>
+			<html:option value="10">12</html:option>
+			<html:option value="10">13</html:option>
+			<html:option value="10">14</html:option>
+			<html:option value="10">15</html:option>
+			<html:option value="10">16</html:option>
+			<html:option value="10">17</html:option>
+			<html:option value="10">18</html:option>
+			<html:option value="10">19</html:option>
+			<html:option value="10">20</html:option>
+	</html:select>
+
+	<html:checkbox property="limitMarkers" value="1" onclick="javascript:toggleMaxMarkerMenu()" styleClass="noBorder" styleId="limitMarkers"></html:checkbox>
+	<label for="limitMarkers">
+		<fmt:message key="advanced.markerLimitsMessage" />
+	</label>
+</p>
+
+<h2><fmt:message key="advanced.mapOptions" /></h2>
+
+<p>
+	<html:checkbox property="allowZoom" value="1"
+		styleClass="noBorder" styleId="allowZoom"></html:checkbox>
+	<label for="allowZoom">
+		<fmt:message key="advanced.allowZoom" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="allowSatellite" value="1"
+		styleClass="noBorder" styleId="allowSatellite"></html:checkbox>
+	<label for="allowSatellite">
+		<fmt:message key="advanced.allowSatellite" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="allowHybrid" value="1"
+		styleClass="noBorder" styleId="allowHybrid"></html:checkbox>
+	<label for="allowHybrid">
+		<fmt:message key="advanced.allowHybrid" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="allowTerrain" value="1"
+		styleClass="noBorder" styleId="allowTerrain"></html:checkbox>
+	<label for="allowTerrain">
+		<fmt:message key="advanced.allowTerrain" />
+	</label>
+</p>
+
Index: lams_tool_gmap/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 866dc94326b7624341331da05940cfe57a8d9ccd)
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<%@ page
-	import="org.lamsfoundation.lams.tool.gmap.util.GmapConstants"%>
+<%@ page import="org.lamsfoundation.lams.tool.gmap.util.GmapConstants"%>
 
 
 <html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
@@ -38,6 +37,10 @@
 		<html:hidden property="dispatch" value="updateContent" />
 		<html:hidden property="sessionMapID" />
 		<html:hidden property="markersXML" value=""/>
+		<html:hidden property="mapZoom" value=""/>
+		<html:hidden property="mapCenterLatitude" value=""/>
+		<html:hidden property="mapCenterLongitude" value=""/>
+		<html:hidden property="mapType" value=""/>
 
 
 		<div id="message" style="text-align: center;">
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -28,7 +28,7 @@
 	<tr>
 		<td>
 			<div class="field-name">
-				Map:
+				<fmt:message key="label.authoring.basic.map"></fmt:message>
 			</div>
 			<!--  
 			<div id="map_canvas" style="width: 500px; height: 300px"></div> 
@@ -41,22 +41,29 @@
 									background:WhiteSmoke; "></div></td></tr>
 			</table>
 			
+			<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="addMarkerToCenter()"  value="Add Marker" />
 			<input type="button" onclick="fitMapMarkers()" value="Fit Markers" />
+			-->
 			<input type="button" onclick="test()"  value="Test" />
 		</td>
 	</tr>
 	
 	<tr>
 		<td>
 			<div class="field-name">
-				Center map on address:
+				<fmt:message key="label.authoring.basic.centerMap"></fmt:message>
 			</div>
-			<input type="text" size="60" name="address" id="address" value="Macquarie University, Sydney NSW" />
+			<input type="text" size="60" name="address" id="address" value="<fmt:message key="label.authoring.basic.sampleAddress"></fmt:message>" />
+       		<a href="javascript:showAddress()" class="button"/><fmt:message key="button.go"/></a>
+       		<!--  
        		<input type="button" onclick="showAddress()" value="Go!" />
+       		-->
        		
        		
-       		
        		<script type="text/javascript">
 			<!--
 	       		initGmap();
@@ -72,14 +79,10 @@
       		</c:forEach>
       		<script type="text/javascript">
 			<!--
-	       		if (markers.length == 1)
-	       		{
-	       			map.setCenter(markers[0].getPoint());
-	       		}
-	       		else if (markers.length >= 2)
-	       		{
-	       			fitMapMarkers();
-	       		}
+	       		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});
 	       		refreshSideBar();
        		//-->
 			</script>
Index: lams_tool_gmap/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r0ce24288a7982f962e62e74d254133cee8016f0a -re916c6bbc8b343903809292a192c892fa78c5607
--- lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 0ce24288a7982f962e62e74d254133cee8016f0a)
+++ lams_tool_gmap/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision e916c6bbc8b343903809292a192c892fa78c5607)
@@ -15,5 +15,8 @@
 <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"/>'
 //-->
 </script>