From 7e1d77fa9380f077e70530f54fc930e4285c2f53 Mon Sep 17 00:00:00 2001
From: toepoke <956482+toepoke@users.noreply.github.com>
Date: Tue, 20 Feb 2024 08:00:07 +0000
Subject: [PATCH 1/2] feat(#22): Allow "template" customisation "hooks"

Added notion of "templateOptions" that allow the user to define headers and footers for each type of "marker".  Rational being that they may wish to convey a different message for each type, or only have a header/footer for one type of "marker".

The lack of a "templateOption" for a given type of "marker" means it's not used, giving us some nice flexibility.
---
 README.md                           | 28 ++++++++++++++++++
 examples/02-place-picker-example.js | 11 +++++--
 examples/06-full-example.js         | 45 ++++++++++++++++++++++++++++-
 index.html                          | 25 +++++++++++-----
 mapsed.js                           | 40 ++++++++++++++++++++++---
 5 files changed, 135 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index f176def..868bba2 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,34 @@ As part of the callback *mapsed* typically passes the data for the place the eve
   <tr><td>url</td><td>More info url</td></tr>
 </table>
 
+## Template Customisations
+
+Allows custom text/html to be injected as a header and/or footer to the tooltip window which 
+appears when the end-user selects or adds a new _place_.
+
+````js
+templateOptions: {
+  custom: {
+    view: {
+      header: "<center>custom view header</center>",
+      footer: "<center>custom view footer</center>",
+    },
+    edit: {
+      header: "<center>custom edit header</center>",
+      footer: "<center>custom edit footer</center>"
+    }
+  }
+}
+````
+
+The above customisation will show a header and footer to the map tooltip when and end-user selects a _custom_ place.
+
+Custom headers & footers can be set for:
+ - _Custom_ places as above
+ - _New_ places (when your end-user clicks the [+](#onAdd) button
+ - _Google_ places where a map _marker_ is derived from [Google Places API](#Google-Place)
+
+[See full-window example](examples/06-full-example.js)
 
 ## Events / Callbacks
 
diff --git a/examples/02-place-picker-example.js b/examples/02-place-picker-example.js
index 11f3af1..fb6f1f8 100644
--- a/examples/02-place-picker-example.js
+++ b/examples/02-place-picker-example.js
@@ -30,9 +30,16 @@ function runExample2() {
 				lat: 53.798823,
 				lng:-1.5426760000000286,
 				place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+			},
+		templateOptions: {
+			google: {
+				view: {
+					footer: "<center>I came from Google Places</center>",
+				}
 			}
-		
-	});
+		}
+
+	}); // mapsed
 }
 
 $(document).ready(function() {
diff --git a/examples/06-full-example.js b/examples/06-full-example.js
index e8d0159..d8a5625 100644
--- a/examples/06-full-example.js
+++ b/examples/06-full-example.js
@@ -178,7 +178,50 @@ function fullWindowExample(e) {
 			// indicate tip should be closed
 			return true;
 		},
-		
+
+		// Defines header and footers to be applied to the 
+		// ... select/edit/delete tooltips shown to the user
+		templateOptions: {
+			// You can have a different header or footer for
+			// each "markerType".  Supported customisations are:
+			// "custom" - Where your user has previously added a marker
+			// "add" - Where your user has click "add" to create a new marker
+			// "google" - Where your user has clicked on a marker found via Google Places APi
+			custom: {
+				view: {
+					header: "<center>custom view header</center>",
+					footer: "<center>custom view footer</center>",
+				},
+				edit: {
+					header: "<center>custom edit header</center>",
+					footer: "<center>custom edit footer</center>"
+				}
+			},
+
+			add: {
+				view: {
+					header: "<center>add view header</center>",
+					footer: "<center>add view footer</center>",
+				},
+				edit: {
+					header: "<center>add edit header</center>",
+					footer: "<center>add edit footer</center>"
+				}
+			},
+
+			google: {
+				view: {
+					header: "<center>google view header</center>",
+					footer: "<center>google view footer</center>",
+				},
+				edit: {
+					header: "<center>google edit header</center>",
+					footer: "<center>google edit footer</center>"
+				}
+			}
+
+		},
+
 		// Enables edit of new places (to your web application, not Google Maps!)
 		// ... again the presence of the callback enables the functionality
 		onSave: function(m, newPlace) {
diff --git a/index.html b/index.html
index 3c1ac08..0cf9717 100644
--- a/index.html
+++ b/index.html
@@ -187,14 +187,22 @@ <h3 class="text-center">Place Picker</h3>
   },
   
   showOnLoad: 
-    // City Varieties - note there's only one place here, we don't need an array
-    {
-      // flag that this place should have the tooltip shown when the map is first loaded
-      autoShow: true,
-      lat: 53.798823,
-      lng:-1.5426760000000286,
-      place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+  // City Varieties
+  {
+    // flag that this place should have the tooltip shown when the map is first loaded
+    autoShow: true,
+    lat: 53.798823,
+    lng:-1.5426760000000286,
+    place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+  },
+  templateOptions: {
+    google: {
+      view: {
+        footer: '&lt;center&gt;I came from Google Places&lt;/center&gt;',
+      }
     }
+  }
+
 });
 								</pre>
 							</div>
@@ -203,6 +211,9 @@ <h3 class="text-center">Place Picker</h3>
 								the <a href="https://github.com/toepoke/mapsed/blob/master/README.md#onselect">onSelect</a> 
 								callback.
 							</p>
+							<p>
+								Note you can also add your own <a href="https://github.com/toepoke/mapsed/blob/master/README.md#Template-Customisations">headers &amp; footers</a> too.
+							</p>
 						</div>
 					</div>
 				</div>
diff --git a/mapsed.js b/mapsed.js
index b70a4b5..1fcabca 100644
--- a/mapsed.js
+++ b/mapsed.js
@@ -910,7 +910,8 @@
 		/// Quick and dirty template function, just does a replacement
 		/// according to our model ... nothing more advanced than that!
 		/// </summary>
-		function applyTemplate(tmpl, model, $ctx) {
+		function applyTemplate(tmpl, model, renderOptions, $ctx) {
+			var header = "", footer = "";
 			tmpl = replaceAll("{NAME}", model.name, tmpl);
 			tmpl = replaceAll("{SHORT_NAME}", shorten(model.name, 25), tmpl);
 			tmpl = replaceAll("{STREET}", model.street, tmpl);
@@ -930,9 +931,18 @@
 			if (model.addInfo) {
 				tmpl = replaceAll("{ADD_INFO}", model.addInfo, tmpl);
 			}
+			if (renderOptions?.header) header = renderOptions.header;
+			if (renderOptions?.footer) footer = renderOptions.footer;
+			tmpl = replaceAll("{HEADER}", header, tmpl);
+			tmpl = replaceAll("{FOOTER}", footer, tmpl);
 
 			$ctx.html(tmpl);
 
+			// The edit template is a table so if there's no content we need to hide the row
+			// ... we don't know which template we're dealing with so just apply to both
+			$ctx.find(".mapsed-view-header").toggle( header !== '' );
+			$ctx.find(".mapsed-view-footer").toggle( footer !== '' );
+
 		} // applyTemplate
 
 
@@ -1412,15 +1422,25 @@
 			// ensure we have a _clean_ model to play with
 			sanitise(model);
 
+			// Do we have any header/footer customisation for _this_ typeof marker
+			var renderOptions = null;
+			if (settings.templateOptions && settings.templateOptions[marker.markerType]) {
+				if (inRwMode) {
+					renderOptions = settings.templateOptions[marker.markerType].edit;
+				} else {
+					renderOptions = settings.templateOptions[marker.markerType].view;
+				}
+			}
+
 			if (inRwMode) {
 				// re-apply template
 				var tmpl = getEditTemplate();
-				applyTemplate(tmpl, model, $rw);
+				applyTemplate(tmpl, model, renderOptions, $rw);
 
 			} else {
 				// re-apply template
 				var tmpl = getViewTemplate();
-				applyTemplate(tmpl, model, $ro);
+				applyTemplate(tmpl, model, renderOptions, $ro);
 				hideEmpty(model, $ro);
 			}
 
@@ -1439,6 +1459,11 @@
 			// proved to be too unreliable when used with map tooltips!
 			var html =
 				"<table class='mapsed-container mapsed-view'>"
+				+ "<tr class='mapsed-view-header'>"
+				+ "<td colspan='3'>"
+				+ "{HEADER}"
+				+ "</td>"
+				+ "</tr>"
 				+ "<tr>"
 				+ "<td colspan='3'>"
 				+ "<h1 class='mapsed-name' title='{NAME}'>{SHORT_NAME}</h1>"
@@ -1471,8 +1496,13 @@
 				+ "<button class='mapsed-delete-button'>" + settings.ActionButtons.Delete + "</button>"
 				+ "</td>"
 				+ "</tr>"
+				+ "<tr class='mapsed-view-footer'>"
+				+ "<td colspan='3'>"
+				+ "{FOOTER}"
+				+ "</td>"
+				+ "</tr>"
 				+ "</table>"
-				;
+			;
 
 			return html;
 
@@ -1485,6 +1515,7 @@
 		function getEditTemplate() {
 			var html =
 				"<div class='mapsed-container mapsed-address-entry mapsed-edit'>"
+				+ "{HEADER}"
 				+ "<h1>Place details:</h1>"
 				+ "<ul>"
 				+ "<li>"
@@ -1538,6 +1569,7 @@
 				// placeholder for error messages
 				+ "<span class='mapsed-error'>&nbsp;</span>"
 				+ "</div>"
+				+ "{FOOTER}"
 				+ "</div>"  // mapsed-address-entry
 				;
 

From 5e7b0734f46b4687cfc27d793895b09d22ea56ba Mon Sep 17 00:00:00 2001
From: toepoke <956482+toepoke@users.noreply.github.com>
Date: Tue, 20 Feb 2024 08:00:07 +0000
Subject: [PATCH 2/2] feat(#22): Allow "template" customisation "hooks"

Added notion of "templateOptions" that allow the user to define headers and footers for each type of "marker".  Rational being that they may wish to convey a different message for each type, or only have a header/footer for one type of "marker".

The lack of a "templateOption" for a given type of "marker" means it's not used, giving us some nice flexibility.

Close #20
---
 README.md                           | 28 ++++++++++++++++++
 examples/02-place-picker-example.js | 11 +++++--
 examples/06-full-example.js         | 45 ++++++++++++++++++++++++++++-
 index.html                          | 25 +++++++++++-----
 mapsed.js                           | 40 ++++++++++++++++++++++---
 5 files changed, 135 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index f176def..868bba2 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,34 @@ As part of the callback *mapsed* typically passes the data for the place the eve
   <tr><td>url</td><td>More info url</td></tr>
 </table>
 
+## Template Customisations
+
+Allows custom text/html to be injected as a header and/or footer to the tooltip window which 
+appears when the end-user selects or adds a new _place_.
+
+````js
+templateOptions: {
+  custom: {
+    view: {
+      header: "<center>custom view header</center>",
+      footer: "<center>custom view footer</center>",
+    },
+    edit: {
+      header: "<center>custom edit header</center>",
+      footer: "<center>custom edit footer</center>"
+    }
+  }
+}
+````
+
+The above customisation will show a header and footer to the map tooltip when and end-user selects a _custom_ place.
+
+Custom headers & footers can be set for:
+ - _Custom_ places as above
+ - _New_ places (when your end-user clicks the [+](#onAdd) button
+ - _Google_ places where a map _marker_ is derived from [Google Places API](#Google-Place)
+
+[See full-window example](examples/06-full-example.js)
 
 ## Events / Callbacks
 
diff --git a/examples/02-place-picker-example.js b/examples/02-place-picker-example.js
index 11f3af1..fb6f1f8 100644
--- a/examples/02-place-picker-example.js
+++ b/examples/02-place-picker-example.js
@@ -30,9 +30,16 @@ function runExample2() {
 				lat: 53.798823,
 				lng:-1.5426760000000286,
 				place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+			},
+		templateOptions: {
+			google: {
+				view: {
+					footer: "<center>I came from Google Places</center>",
+				}
 			}
-		
-	});
+		}
+
+	}); // mapsed
 }
 
 $(document).ready(function() {
diff --git a/examples/06-full-example.js b/examples/06-full-example.js
index e8d0159..d8a5625 100644
--- a/examples/06-full-example.js
+++ b/examples/06-full-example.js
@@ -178,7 +178,50 @@ function fullWindowExample(e) {
 			// indicate tip should be closed
 			return true;
 		},
-		
+
+		// Defines header and footers to be applied to the 
+		// ... select/edit/delete tooltips shown to the user
+		templateOptions: {
+			// You can have a different header or footer for
+			// each "markerType".  Supported customisations are:
+			// "custom" - Where your user has previously added a marker
+			// "add" - Where your user has click "add" to create a new marker
+			// "google" - Where your user has clicked on a marker found via Google Places APi
+			custom: {
+				view: {
+					header: "<center>custom view header</center>",
+					footer: "<center>custom view footer</center>",
+				},
+				edit: {
+					header: "<center>custom edit header</center>",
+					footer: "<center>custom edit footer</center>"
+				}
+			},
+
+			add: {
+				view: {
+					header: "<center>add view header</center>",
+					footer: "<center>add view footer</center>",
+				},
+				edit: {
+					header: "<center>add edit header</center>",
+					footer: "<center>add edit footer</center>"
+				}
+			},
+
+			google: {
+				view: {
+					header: "<center>google view header</center>",
+					footer: "<center>google view footer</center>",
+				},
+				edit: {
+					header: "<center>google edit header</center>",
+					footer: "<center>google edit footer</center>"
+				}
+			}
+
+		},
+
 		// Enables edit of new places (to your web application, not Google Maps!)
 		// ... again the presence of the callback enables the functionality
 		onSave: function(m, newPlace) {
diff --git a/index.html b/index.html
index 3c1ac08..0cf9717 100644
--- a/index.html
+++ b/index.html
@@ -187,14 +187,22 @@ <h3 class="text-center">Place Picker</h3>
   },
   
   showOnLoad: 
-    // City Varieties - note there's only one place here, we don't need an array
-    {
-      // flag that this place should have the tooltip shown when the map is first loaded
-      autoShow: true,
-      lat: 53.798823,
-      lng:-1.5426760000000286,
-      place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+  // City Varieties
+  {
+    // flag that this place should have the tooltip shown when the map is first loaded
+    autoShow: true,
+    lat: 53.798823,
+    lng:-1.5426760000000286,
+    place_id: "ChIJQd3IwBtceUgRha6laiANoro"
+  },
+  templateOptions: {
+    google: {
+      view: {
+        footer: '&lt;center&gt;I came from Google Places&lt;/center&gt;',
+      }
     }
+  }
+
 });
 								</pre>
 							</div>
@@ -203,6 +211,9 @@ <h3 class="text-center">Place Picker</h3>
 								the <a href="https://github.com/toepoke/mapsed/blob/master/README.md#onselect">onSelect</a> 
 								callback.
 							</p>
+							<p>
+								Note you can also add your own <a href="https://github.com/toepoke/mapsed/blob/master/README.md#Template-Customisations">headers &amp; footers</a> too.
+							</p>
 						</div>
 					</div>
 				</div>
diff --git a/mapsed.js b/mapsed.js
index b70a4b5..1fcabca 100644
--- a/mapsed.js
+++ b/mapsed.js
@@ -910,7 +910,8 @@
 		/// Quick and dirty template function, just does a replacement
 		/// according to our model ... nothing more advanced than that!
 		/// </summary>
-		function applyTemplate(tmpl, model, $ctx) {
+		function applyTemplate(tmpl, model, renderOptions, $ctx) {
+			var header = "", footer = "";
 			tmpl = replaceAll("{NAME}", model.name, tmpl);
 			tmpl = replaceAll("{SHORT_NAME}", shorten(model.name, 25), tmpl);
 			tmpl = replaceAll("{STREET}", model.street, tmpl);
@@ -930,9 +931,18 @@
 			if (model.addInfo) {
 				tmpl = replaceAll("{ADD_INFO}", model.addInfo, tmpl);
 			}
+			if (renderOptions?.header) header = renderOptions.header;
+			if (renderOptions?.footer) footer = renderOptions.footer;
+			tmpl = replaceAll("{HEADER}", header, tmpl);
+			tmpl = replaceAll("{FOOTER}", footer, tmpl);
 
 			$ctx.html(tmpl);
 
+			// The edit template is a table so if there's no content we need to hide the row
+			// ... we don't know which template we're dealing with so just apply to both
+			$ctx.find(".mapsed-view-header").toggle( header !== '' );
+			$ctx.find(".mapsed-view-footer").toggle( footer !== '' );
+
 		} // applyTemplate
 
 
@@ -1412,15 +1422,25 @@
 			// ensure we have a _clean_ model to play with
 			sanitise(model);
 
+			// Do we have any header/footer customisation for _this_ typeof marker
+			var renderOptions = null;
+			if (settings.templateOptions && settings.templateOptions[marker.markerType]) {
+				if (inRwMode) {
+					renderOptions = settings.templateOptions[marker.markerType].edit;
+				} else {
+					renderOptions = settings.templateOptions[marker.markerType].view;
+				}
+			}
+
 			if (inRwMode) {
 				// re-apply template
 				var tmpl = getEditTemplate();
-				applyTemplate(tmpl, model, $rw);
+				applyTemplate(tmpl, model, renderOptions, $rw);
 
 			} else {
 				// re-apply template
 				var tmpl = getViewTemplate();
-				applyTemplate(tmpl, model, $ro);
+				applyTemplate(tmpl, model, renderOptions, $ro);
 				hideEmpty(model, $ro);
 			}
 
@@ -1439,6 +1459,11 @@
 			// proved to be too unreliable when used with map tooltips!
 			var html =
 				"<table class='mapsed-container mapsed-view'>"
+				+ "<tr class='mapsed-view-header'>"
+				+ "<td colspan='3'>"
+				+ "{HEADER}"
+				+ "</td>"
+				+ "</tr>"
 				+ "<tr>"
 				+ "<td colspan='3'>"
 				+ "<h1 class='mapsed-name' title='{NAME}'>{SHORT_NAME}</h1>"
@@ -1471,8 +1496,13 @@
 				+ "<button class='mapsed-delete-button'>" + settings.ActionButtons.Delete + "</button>"
 				+ "</td>"
 				+ "</tr>"
+				+ "<tr class='mapsed-view-footer'>"
+				+ "<td colspan='3'>"
+				+ "{FOOTER}"
+				+ "</td>"
+				+ "</tr>"
 				+ "</table>"
-				;
+			;
 
 			return html;
 
@@ -1485,6 +1515,7 @@
 		function getEditTemplate() {
 			var html =
 				"<div class='mapsed-container mapsed-address-entry mapsed-edit'>"
+				+ "{HEADER}"
 				+ "<h1>Place details:</h1>"
 				+ "<ul>"
 				+ "<li>"
@@ -1538,6 +1569,7 @@
 				// placeholder for error messages
 				+ "<span class='mapsed-error'>&nbsp;</span>"
 				+ "</div>"
+				+ "{FOOTER}"
 				+ "</div>"  // mapsed-address-entry
 				;