Added preserveOverlays and suppressInfowindows to map viz overlay opt…

…ions, as an early Christmas present for Troester. :)
Fabrik · Jun 8, 2016 · ca4cbe7 · ca4cbe7
1 parent b300ce4
commit ca4cbe7
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 3 deletions.
diff --git a/plugins/fabrik_list/email/models/email.php b/plugins/fabrik_list/email/models/email.php
@@ -639,7 +639,7 @@ private function _send($row, $mailTo)
 		$params        = $this->getParams();
 		$sendSMS       = $params->get('emailtable_email_or_sms', 'email') == 'sms';
 		$input         = $this->app->input;
-		$coverMessage  = $input->get('message', '', 'html');
+		$coverMessage  = $input->get('message', '', 'raw');
 		$coverMessage  = nl2br($coverMessage);
 		$oldStyle      = $this->_oldStyle();
 		$emailTemplate = $this->_emailTemplate();

diff --git a/plugins/fabrik_visualization/googlemap/forms/fields.xml b/plugins/fabrik_visualization/googlemap/forms/fields.xml
@@ -744,6 +744,28 @@
 				size="100"
 				type="text" />
 
+			<field
+					default="0"
+					class="btn-group"
+					description="PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_PRESERVEVIEWPORT_DESC"
+					label="PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_PRESERVEVIEWPORT_LABEL"
+					name="fb_gm_overlay_preserveviewport"
+					type="radio">
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+					default="0"
+					class="btn-group"
+					description="PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_SUPPRESSINFOWINDOWS_DESC"
+					label="PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_SUPPRESSINFOWINDOWS_LABEL"
+					name="fb_gm_overlay_suppressinfowindows"
+					type="radio">
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
 		</fieldset>
 	</fields>
 </form>
diff --git a/plugins/fabrik_visualization/googlemap/googlemap-min.js b/plugins/fabrik_visualization/googlemap/googlemap-min.js
diff --git a/plugins/fabrik_visualization/googlemap/googlemap.js b/plugins/fabrik_visualization/googlemap/googlemap.js
@@ -451,7 +451,13 @@ var FbGoogleMapViz = new Class({
 	addOverlays: function () {
 		if (this.options.use_overlays) {
 			this.options.overlay_urls.each(function (overlay_url, k) {
-				this.options.overlays[k] = new google.maps.KmlLayer(overlay_url);
+				var pv = this.options.overlay_preserveviewports[k] === '1';
+				var so = this.options.overlay_suppressinfowindows[k] === '1';
+				this.options.overlays[k] = new google.maps.KmlLayer({
+					url: overlay_url,
+					preserveViewport: pv,
+					suppressInfowindows: so
+				});
 				this.options.overlays[k].setMap(this.map);
 				this.options.overlay_events[k] = function (e) {
 					this.toggleOverlay(e);

diff --git a/...abrik_visualization/googlemap/language/en-GB/en-GB.plg_fabrik_visualization_googlemap.ini b/...abrik_visualization/googlemap/language/en-GB/en-GB.plg_fabrik_visualization_googlemap.ini
@@ -67,6 +67,10 @@ PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_LABEL_LABEL="Overlay Title"
 PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_URL_DESC="OPTIONAL - URL(s) to GeoRSS or KML file(s), will be automatically overlayed on the map"
 PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_URL_LABEL="Overlay URL"
 PLG_VISUALIZTAION_GOOGLEMAP_OVERLAY_URLS="Overlay URLs"
+PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_PRESERVEVIEWPORT_DESC="If set to No, map will zoom to the overlay when selected"
+PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_PRESERVEVIEWPORT_LABEL="Preserve Viewport"
+PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_SUPPRESSINFOWINDOWS_DESC="If set to Yes, prevents popups on overlays"
+PLG_VISUALIZATION_GOOGLEMAP_OVERLAYS_SUPPRESSINFOWINDOWS_LABEL="Suppress Info Windows"
 PLG_VISUALIZATION_GOOGLEMAP_POLYLINE_COLOUR_DESC="Hex colour of the line (e.g. #CCFFFF)"
 PLG_VISUALIZATION_GOOGLEMAP_POLYLINE_COLOUR_LABEL="Polyline colour"
 PLG_VISUALIZATION_GOOGLEMAP_POLYLINE_ELEMENT_DESC="If an element is selected here then a line is drawn between each of the points on the map, ordered by this element"

diff --git a/plugins/fabrik_visualization/googlemap/models/googlemap.php b/plugins/fabrik_visualization/googlemap/models/googlemap.php
@@ -118,6 +118,8 @@ public function getJs()
 		$opts->polygonfillcolour = (array) $params->get('fb_gm_polygon_fillColor');
 		$opts->overlay_urls = (array) $params->get('fb_gm_overlay_urls');
 		$opts->overlay_labels = (array) $params->get('fb_gm_overlay_labels');
+		$opts->overlay_preserveviewports = (array) $params->get('fb_gm_overlay_preserveviewport');
+		$opts->overlay_suppressinfowindows = (array) $params->get('fb_gm_overlay_suppressinfowindows');
 		$opts->use_overlays = (int) $params->get('fb_gm_use_overlays', '0');
 		$opts->use_overlays_sidebar = $opts->use_overlays && (int) $params->get('fb_gm_use_overlays_sidebar', '0');
 		$opts->use_groups = (bool) $params->get('fb_gm_group_sidebar', 0);