Rb192

classes/class-eventorganiser-shortcodes.php

@@ -152,22 +152,19 @@ static function handle_venuemap_shortcode($atts) {
 
 		$venue_slugs = explode(',',$atts['venue']);
 
-		$args = shortcode_atts( array(
-			'zoom' => 15, 'scrollwheel'=>'true','zoomcontrol'=>'true',
-			'rotatecontrol'=>'true','pancontrol'=>'true','overviewmapcontrol'=>'true',
-			'streetviewcontrol'=>'true','maptypecontrol'=>'true','draggable'=>'true',
-			'maptypeid' => 'ROADMAP',
-			'width' => '100%','height' => '200px','class' => '',
-			'tooltip'=>'false'
-			), $atts );
-
-		//Cast options as boolean:
-		$bool_options = array('tooltip','scrollwheel','zoomcontrol','rotatecontrol','pancontrol','overviewmapcontrol','streetviewcontrol','draggable','maptypecontrol');
-		foreach( $bool_options as $option  ){
-			$args[$option] = ( $args[$option] == 'false' ? false : true );
+		// Cast options as boolean:
+		$boolean_keys = array_filter(eo_venue_map_defaults(), "is_bool");
+		if (!function_exists("cast_to_boolean_if_possible")) {
+			function cast_to_boolean_if_possible($attribute) {
+				return ("false" === $attribute ? false : true);
+			}
 		}
+		$booleans = array_intersect_key($atts, $boolean_keys);
+		$booleans_cast = array_map("cast_to_boolean_if_possible", $booleans);
+		$non_booleans = array_diff_key($atts, $boolean_keys);
+		$all_atts = array_merge($booleans_cast, $non_booleans);
 
-		return eo_get_venue_map($venue_slugs, $args);
+		return eo_get_venue_map($venue_slugs, $all_atts);
 	}
 
 
@@ -421,7 +418,6 @@ static function print_script() {
 		));	
 
 		if( !empty(self::$calendars) || !empty(self::$map) || !empty(self::$widget_calendars) ):				
-			wp_enqueue_script( 'eo_qtip2');		
 			wp_enqueue_script( 'eo_front');
 
 			if( !eventorganiser_get_option( 'disable_css' ) ){
@@ -430,8 +426,11 @@ static function print_script() {
 			}
 		endif;
 
-		if( !empty( self::$map ) )
+		if( !empty( self::$map ) ) {
 			wp_enqueue_script( 'eo_GoogleMap' );
+		} else {
+			wp_enqueue_script( 'eo_qtip2');		
+		}
 	}
 }
 

event-organiser.php

@@ -229,4 +229,4 @@ function eventorganiser_get_option( $option = false, $default = false ){
 require_once(EVENT_ORGANISER_DIR.'classes/class-eo-calendar-widget.php');
 require_once(EVENT_ORGANISER_DIR.'classes/class-eo-widget-categories.php');
 require_once(EVENT_ORGANISER_DIR.'classes/class-eo-widget-venues.php');
-require_once(EVENT_ORGANISER_DIR.'classes/class-eventorganiser-shortcodes.php');
+require_once(EVENT_ORGANISER_DIR.'classes/class-eventorganiser-shortcodes.php');

includes/event-organiser-venue-functions.php

@@ -664,6 +664,19 @@ function eo_delete_venue($venue_id){
 		return true;
 	}
 
+/**
+ * Defaults for the venue map
+ */
+function eo_venue_map_defaults() {
+	return array(
+		'zoom' => 15, 'scrollwheel' => true, 'zoomcontrol' => true, 'rotatecontrol' => true,
+		'pancontrol' => true, 'overviewmapcontrol' => true, 'streetviewcontrol' => true,
+		'maptypecontrol' => true, 'draggable' => true, 'maptypeid' => 'ROADMAP',
+		'width' => '100%', 'height' => '200px', 'class' => '',
+		'tooltip' => true, 'centerlat' => "", 'centerlng' => "", "disableautopan" => false
+	);
+}
+
 /**
  * Returns the mark-up for a Google map of the venue (and enqueues scripts).
  * Accepts an arguments array corresponding to the attributes supported by the shortcode.
@@ -694,16 +707,19 @@ function eo_get_venue_map($venue_slug_or_id='', $args=array()){
 		$venue_ids = array_map('eo_get_venue_id_by_slugorid',$venue_slug_or_id);
 
 		//Map properties
-		$args = shortcode_atts( array(
-			'zoom' => 15, 'scrollwheel'=>true, 'zoomcontrol'=>true, 'rotatecontrol'=>true,
-			'pancontrol'=>true, 'overviewmapcontrol'=>true, 'streetviewcontrol'=>true,
-			'maptypecontrol'=>true, 'draggable'=>true,'maptypeid' => 'ROADMAP',
-			'width' => '100%','height' => '200px','class' => '',
-			'tooltip' => true
-			), $args );
+		$args = shortcode_atts(eo_venue_map_defaults(), $args);
 
 		//Cast zoom as integer
 		$args['zoom'] = (int) $args['zoom']; 
+
+		// remove center lat and lng if they are not filled both
+		if(is_numeric($args['centerlat']) && is_numeric($args['centerlng'])) {
+			$args['centerlat'] = (double) $args['centerlat'];
+			$args['centerlng'] = (double) $args['centerlng'];
+		} else {
+			unset($args['centerlng']);
+			unset($args['centerlat']);
+		}
 
 		//Escape attributes
 		$width = esc_attr($args['width']);