@bmlt-enabled/croutonjs 3.20.12 → 3.21.0

package/crouton-map.js

@@ -46,7 +46,7 @@ function MeetingMap(inConfig) {
 	 *	\brief Load the map and set it up.													*
 	 ****************************************************************************************/
 
-	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null) {
+	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null,hide=false) {
 		if (inDiv) {
 			crouton_Handlebars.registerPartial("markerContentsTemplate", config['marker_contents_template']);
 			gInDiv = inDiv;
@@ -66,7 +66,7 @@ function MeetingMap(inConfig) {
 			}
 			let loc = {latitude: config.lat, longitude: config.lng, zoom: config.zoom};
 			if (handlebarMapOptions) loc = {latitude: handlebarMapOptions.lat, longitude: handlebarMapOptions.lng};
-			if (gDelegate.createMap(inDiv, loc)) {
+			if (gDelegate.createMap(inDiv, loc, hide)) {
 				gDelegate.addListener('zoomend', function (ev) {
 					if (shouldRedrawMarkers() && gAllMeetings) {
 						if (listOnlyVisible) {
@@ -92,12 +92,19 @@ function MeetingMap(inConfig) {
 		};
 	};
 	var gSearchModal;
-	function createSearchButton(menuContext) {
-		var template = hbs_Crouton.templates['mapSearch'];
-		var controlDiv = document.createElement('div');
-		controlDiv.innerHTML = template();
+	function createSearchButton() {
+		const template = hbs_Crouton.templates['mapSearch'];
+		const controlDiv = document.createElement('div');
+		const params = {'hasClickSearch': gDelegate.hasClickSearch()}
+		controlDiv.innerHTML = template(params);
 		controlDiv.querySelector("#map-search-button").addEventListener('click', showBmltSearchDialog);
 		controlDiv.querySelector("#bmltsearch-nearbyMeetings").addEventListener('click', nearMeSearch);
+		controlDiv.querySelector("#bmltsearch-goto-text").addEventListener('keypress', function (event) {
+			if (event.key === "Enter") {
+				event.preventDefault();
+				document.getElementById("bmltsearch-text-button").click();
+			}
+		});
 		controlDiv.querySelector("#bmltsearch-text-button").addEventListener('click', function () {
 			let text = document.getElementById("bmltsearch-goto-text").value.trim();
 			if (text === "") return;
@@ -105,7 +112,35 @@ function MeetingMap(inConfig) {
 			gDelegate.callGeocoder(text, null, mapSearchGeocode);
 			closeModalWindow(gSearchModal);
 		});
-		controlDiv.querySelector("#bmltsearch-clicksearch").addEventListener('click', clickSearch);
+		controlDiv.querySelector("#modal-seach-parameters").style.display = 'none';
+		controlDiv.querySelector("#show-search-parameters").addEventListener('click', function (e) {
+			const controlDiv = e.target.parentElement.parentElement;
+			let w = config.map_search.width;
+			let checked = '#search_radius';
+			if (w < 0) {
+				w = -w;
+				checked = '#search_count';
+			}
+			controlDiv.querySelector(checked).checked = true;
+			controlDiv.querySelector('#search_parameter').value = w;
+			controlDiv.querySelector("#modal-seach-parameters").style.display = 'block';
+			controlDiv.querySelector("#modal-search-page").style.display = 'none';
+			controlDiv.querySelector("#search_radius_label").innerHTML = crouton.localization.getWord('Radius of search in $$').replace('$$', crouton.config.distance_units);
+		});
+		controlDiv.querySelector("#show-search-page").addEventListener('click', function (e) {
+			const controlDiv = e.target.parentElement.parentElement;
+			let w = controlDiv.querySelector('#search_parameter').value;
+			if (controlDiv.querySelector('#search_count')) {
+				w = -Math.round(w);
+				if (w == 0) w = -1;
+			}
+			config.map_search.width = w;
+			controlDiv.querySelector("#modal-seach-parameters").style.display = 'none';
+			controlDiv.querySelector("#modal-search-page").style.display = 'block';
+		});
+
+
+		if (gDelegate.hasClickSearch()) controlDiv.querySelector("#bmltsearch-clicksearch").addEventListener('click', clickSearch);
 		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
 		gSearchModal = controlDiv.querySelector("#bmltsearch_modal");
 		gSearchModal.parentElement.removeChild(gSearchModal);
@@ -200,14 +235,14 @@ function MeetingMap(inConfig) {
 	function hasMapSearch() {
 		return 'map_search' in config;
 	}
-	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback) {
+	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback, hide) {
 		if (!gDelegate.isApiLoaded()) {
-			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback]);
+			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback, hide]);
 			gDelegate.loadApi();
 			return;
 		}
 		let inDiv = document.getElementById(inDiv_id);
-		loadMap(inDiv, menuContext, handlebarMapOptions,callback);
+		loadMap(inDiv, menuContext, handlebarMapOptions, callback, hide);
 		loadAllMeetings(meetings_responseObject, fitBounds, true);
 	};
 	function loadPopupMap(inDiv_id, meeting, handlebarMapOptions = null) {
@@ -282,10 +317,14 @@ function MeetingMap(inConfig) {
 		};
 	};
 	function mapSearchGeocode(resp) {
-		let latlng = gDelegate.getGeocodeCenter(resp);
+		showThrobber();
 		if (document.getElementById("bmltsearch-goto-text"))
 			document.getElementById("bmltsearch-goto-text").value = "";
-		showThrobber();
+		let latlng = gDelegate.getGeocodeCenter(resp);
+		if (!latlng) {
+			hideThrobber();
+			return;
+		}
 		crouton.searchByCoordinates(latlng.lat, latlng.lng, config.map_search.width);
 	}
 	function loadAllMeetings(meetings_responseObject, fitBounds=true, fitAll=false) {
@@ -773,8 +812,15 @@ function MapDelegate(config) {
 	var gMainMap;
 	var gTileLayer;
 	var gClusterLayer = null;
-    function createMap(inDiv, inCenter) {
+    function createMap(inDiv, inCenter, inHidden = false) {
 		if (! inCenter ) return null;
+		if ( inHidden ) {
+			gDiv = inDiv;
+			gDiv.style.height = 'auto';
+			gDiv.style.marginBottom = '10px';
+			gMainMap = null;
+			return gDiv;
+		}
 		myOptions = {
                 'minZoom': config.minZoom,
                 'maxZoom': config.maxZoom,
@@ -804,6 +850,7 @@ function MapDelegate(config) {
         return gMainMap;
     }
     function addListener(ev,f,once) {
+		if (!gMainMap) return;
 		if (ev=='idle') {
 			ev = 'moveend';
 		}
@@ -821,9 +868,11 @@ function MapDelegate(config) {
 		return {'event': ev, 'f': f};
     }
 	function removeListener(o) {
+		if (!gMainMap) return;
 		gMainMap.off(o.event, o.f);
 	}
     function setViewToPosition(position, filterMeetings, extra=null) {
+		if (!gMainMap) return;
         var latlng = L.latLng(position.latitude, position.longitude);
 		gMainMap.flyTo(latlng);
         gMainMap.once('moveend', function(ev) {
@@ -845,10 +894,12 @@ function MapDelegate(config) {
 	}
 	function clearAllMarkers ( )
 	{
+		if (!gMainMap) return;
 		gAllMarkers && gAllMarkers.forEach((m) => {m.marker.closePopup(); gMainMap.removeLayer(m.marker)});
 		gAllMarkers = [];
 	};
 	function getZoom() {
+		if (!gMainMap) return null;
 		return gMainMap.getZoom();
 	}
 	function getZoomAdjust(only_out,filterMeetings) {
@@ -891,12 +942,15 @@ function MapDelegate(config) {
 		return ret;
 	}
     function setZoom(filterMeetings, force=0) {
+		if (!gMainMap) return;
 		(force > 0) ? gMainMap.setZoom(force) : gMainMap.setZoom(getZoomAdjust(false,filterMeetings));
 	}
 	function zoomOut(filterMeetings) {
+		if (!gMainMap) return;
         gMainMap.setZoom(getZoomAdjust(true,filterMeetings));
 	}
 	function fromLatLngToPoint(lat, lng) {
+		if (!gMainMap) return null;
 		return gMainMap.latLngToLayerPoint(L.latLng(lat,lng));
     }
 	function createMarker (	inCoords,		///< The long/lat for the marker.
@@ -906,6 +960,7 @@ function MapDelegate(config) {
 		in_ids
 )
 {
+	if (!gMainMap) return;
     var in_main_icon = (multi ? g_icon_image_multi : g_icon_image_single);
 
 	let highlightRow = function(target) {
@@ -937,6 +992,7 @@ function MapDelegate(config) {
     gAllMarkers.push( {ids: in_ids, marker: marker} );
 }
 function openMarker(id) {
+	if (!gMainMap) return;
 	marker = gAllMarkers.find((m) => m.ids.includes(id));
 	if (marker) {
 		marker.marker.openPopup();
@@ -947,6 +1003,10 @@ function openMarker(id) {
 	jQuery("#meeting-data-row-" + id + " > td").addClass("rowHighlight");
 }
 function addControl(div,pos,cb) {
+	if (!gMainMap) {
+        gDiv.appendChild(div);
+        return;
+    }
 		var ControlClass =  L.Control.extend({
 	  		onAdd: function (map) {
 				return div;
@@ -1090,25 +1150,32 @@ function addControl(div,pos,cb) {
         geocode(in_loc, geoCodeParams, callback, filterMeetings);
     }
 	function contains(bounds, lat, lng) {
+		if (!gMainMap) return true;
 		return bounds.contains(L.latLng ( lat, lng ));
 	}
 	function getBounds() {
+		if (!gMainMap) return null;
 		return gMainMap.getBounds();
 	}
 	function invalidateSize() {
+		if (!gMainMap) return;
 		gMainMap.invalidateSize();
 	}
 	function fitBounds(locations) {
+		if (!gMainMap) return;
 		const bounds = locations.reduce(function(b,lat_lng) {b.extend(lat_lng); return b;}, L.latLngBounds());
 		gMainMap.fitBounds(bounds);
 	}
 	function createClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer = L.markerClusterGroup();
 	}
 	function addClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer && gMainMap.addLayer(gClusterLayer);
 	}
 	function removeClusterLayer() {
+		if (!gMainMap) return;
 		gClusterLayer && gMainMap.removeLayer(gClusterLayer);
 		gClusterLayer = null;
 	}
@@ -1131,6 +1198,9 @@ function addControl(div,pos,cb) {
 		f();
 	}
 	function returnTrue() {return true;}
+	function hasClickSearch() {
+		return gMainMap != null;
+	}
     this.createMap = createMap;
     this.addListener = addListener;
 	this.removeListener = removeListener;
@@ -1157,6 +1227,7 @@ function addControl(div,pos,cb) {
 	this.modalOn = modalOn;
 	this.modalOff = modalOff;
 	this.afterInit = afterInit;
+	this.hasClickSearch = hasClickSearch;
 }
 MapDelegate.prototype.createMap = null;
 MapDelegate.prototype.addListener = null;
@@ -1184,6 +1255,7 @@ MapDelegate.prototype.getGeocodeCenter = null;
 MapDelegate.prototype.modalOn = null;
 MapDelegate.prototype.modalOff = null;
 MapDelegate.prototype.afterInit = null;
+MapDelegate.prototype.hasClickSearch = null;
 
 /* @preserve
  * Leaflet 1.5.1+Detached: 2e3e0ffbe87f246eb76d86d2633ddd59b262830b.2e3e0ff, a JS library for interactive maps. http://leafletjs.com