FIX: The maps now take URL parameters into account (e.g. filtering by…

… location). This also includes an IE11 polyfill.
symbiote-library · Mar 5, 2019 · 353d200 · 353d200
1 parent 1b8933a
commit 353d200
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/code/widget/ListFilterWidgetGoogleMap.php b/code/widget/ListFilterWidgetGoogleMap.php
@@ -139,9 +139,8 @@ public function getFeatureCollection() {
 
 		$list = $this->getList();
 		if (!$list) {
-			// NOTE(Jake): Ensures if any filters are applied with no user input, that they
-			//			   still get applied for map markers.
-			$list = $this->FilteredList(array());
+			// When filtering has been applied, fetch the filtered result set
+			$list = $this->FilteredList($this->getRequest()->getVars());
 			if (!$list) {
 				throw new Exception('No form or record configured against '.__CLASS__.'.');
 			}
@@ -289,6 +288,7 @@ public function getPopupTemplate(ViewableData $record) {
 	 */
 	public function onBeforeRender() {
 		parent::onBeforeRender();
+		Requirements::javascript(ListFilterUtility::MODULE_DIR.'/javascript/thirdparty/url-search-params-polyfill.min.js');
 		Requirements::javascript(ListFilterUtility::MODULE_DIR.'/javascript/ListFilterWidgetGoogleMap.js');
 	}
 

diff --git a/javascript/ListFilterWidgetGoogleMap.js b/javascript/ListFilterWidgetGoogleMap.js
@@ -32,7 +32,7 @@
 					cacheAjaxURL[url] = false;
 					$.ajax({
 						type: 'GET',
-						url: url,
+						url: url + new URLSearchParams(window.location).get('search'),
 						async: true,
 						crossDomain: true,
 						headers: {

diff --git a/javascript/thirdparty/url-search-params-polyfill.min.js b/javascript/thirdparty/url-search-params-polyfill.min.js