@@ -20,20 +20,20 @@ |
||
20 | 20 | */ |
21 | 21 | class Marker extends \WPLib_Item_Base { |
22 | 22 | |
23 | - /** |
|
24 | - * Marker_Model constructor. |
|
25 | - * |
|
26 | - * @param array $args |
|
27 | - */ |
|
28 | - function __construct( $args = array() ) { |
|
23 | + /** |
|
24 | + * Marker_Model constructor. |
|
25 | + * |
|
26 | + * @param array $args |
|
27 | + */ |
|
28 | + function __construct( $args = array() ) { |
|
29 | 29 | |
30 | - $args = wp_parse_args( $args, array( |
|
31 | - 'model' => new Marker_Model( array( 'marker' => new \Clubdeuce\WPGoogleMaps\Marker( $args ) ) ), |
|
32 | - ) ); |
|
30 | + $args = wp_parse_args( $args, array( |
|
31 | + 'model' => new Marker_Model( array( 'marker' => new \Clubdeuce\WPGoogleMaps\Marker( $args ) ) ), |
|
32 | + ) ); |
|
33 | 33 | |
34 | - parent::__construct( $args ); |
|
34 | + parent::__construct( $args ); |
|
35 | 35 | |
36 | - } |
|
36 | + } |
|
37 | 37 | |
38 | 38 | |
39 | 39 | } |
@@ -22,19 +22,19 @@ |
||
22 | 22 | */ |
23 | 23 | class Map extends \WPLib_Item_Base { |
24 | 24 | |
25 | - /** |
|
26 | - * Map_Model constructor. |
|
27 | - * |
|
28 | - * @param array $args |
|
29 | - */ |
|
30 | - function __construct( $args = array() ) { |
|
25 | + /** |
|
26 | + * Map_Model constructor. |
|
27 | + * |
|
28 | + * @param array $args |
|
29 | + */ |
|
30 | + function __construct( $args = array() ) { |
|
31 | 31 | |
32 | - $args = wp_parse_args( $args, array( |
|
33 | - 'model' => new Map_Model( array( 'map' => new \Clubdeuce\WPGoogleMaps\Map( $args ) ) ), |
|
34 | - ) ); |
|
32 | + $args = wp_parse_args( $args, array( |
|
33 | + 'model' => new Map_Model( array( 'map' => new \Clubdeuce\WPGoogleMaps\Map( $args ) ) ), |
|
34 | + ) ); |
|
35 | 35 | |
36 | - parent::__construct( $args ); |
|
36 | + parent::__construct( $args ); |
|
37 | 37 | |
38 | - } |
|
38 | + } |
|
39 | 39 | |
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -11,75 +11,75 @@ |
||
11 | 11 | */ |
12 | 12 | class Marker_Model extends Model_Base { |
13 | 13 | |
14 | - /** |
|
15 | - * @var \Clubdeuce\WPGoogleMaps\Marker |
|
16 | - */ |
|
14 | + /** |
|
15 | + * @var \Clubdeuce\WPGoogleMaps\Marker |
|
16 | + */ |
|
17 | 17 | protected $_marker; |
18 | 18 | |
19 | - /** |
|
20 | - * @return bool |
|
21 | - */ |
|
22 | - function has_marker() { |
|
19 | + /** |
|
20 | + * @return bool |
|
21 | + */ |
|
22 | + function has_marker() { |
|
23 | 23 | |
24 | - return $this->_has( '_marker' ); |
|
24 | + return $this->_has( '_marker' ); |
|
25 | 25 | |
26 | - } |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * @return Location |
|
30 | - */ |
|
31 | - function location() { |
|
28 | + /** |
|
29 | + * @return Location |
|
30 | + */ |
|
31 | + function location() { |
|
32 | 32 | |
33 | - return new Location( array( 'location' => $this->marker()->location() ) ); |
|
33 | + return new Location( array( 'location' => $this->marker()->location() ) ); |
|
34 | 34 | |
35 | - } |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * @return Marker_Label |
|
39 | - */ |
|
40 | - function label() { |
|
37 | + /** |
|
38 | + * @return Marker_Label |
|
39 | + */ |
|
40 | + function label() { |
|
41 | 41 | |
42 | - return new Marker_Label( array( 'label' => $this->marker()->label() ) ); |
|
42 | + return new Marker_Label( array( 'label' => $this->marker()->label() ) ); |
|
43 | 43 | |
44 | - } |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * @return Info_Window |
|
48 | - */ |
|
49 | - function info_window() { |
|
46 | + /** |
|
47 | + * @return Info_Window |
|
48 | + */ |
|
49 | + function info_window() { |
|
50 | 50 | |
51 | - $window = new Info_Window( array( 'info_window' => $this->marker()->info_window() ) ); |
|
52 | - $window->set_position( array( 'lat' => $this->marker()->latitude(), 'lng' => $this->marker()->longitude())); |
|
51 | + $window = new Info_Window( array( 'info_window' => $this->marker()->info_window() ) ); |
|
52 | + $window->set_position( array( 'lat' => $this->marker()->latitude(), 'lng' => $this->marker()->longitude())); |
|
53 | 53 | |
54 | - return $window; |
|
54 | + return $window; |
|
55 | 55 | |
56 | - } |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $method_name |
|
60 | - * @param array $args |
|
61 | - * |
|
62 | - * @return mixed|null |
|
63 | - */ |
|
64 | - function __call( $method_name, $args ) { |
|
58 | + /** |
|
59 | + * @param string $method_name |
|
60 | + * @param array $args |
|
61 | + * |
|
62 | + * @return mixed|null |
|
63 | + */ |
|
64 | + function __call( $method_name, $args ) { |
|
65 | 65 | |
66 | - $value = null; |
|
66 | + $value = null; |
|
67 | 67 | |
68 | - do { |
|
69 | - $value = parent::__call( $method_name, $args ); |
|
68 | + do { |
|
69 | + $value = parent::__call( $method_name, $args ); |
|
70 | 70 | |
71 | - if ( $value ) { |
|
72 | - break; |
|
73 | - } |
|
71 | + if ( $value ) { |
|
72 | + break; |
|
73 | + } |
|
74 | 74 | |
75 | - if ( $this->has_marker() ) { |
|
76 | - $value = call_user_func_array( array( $this->marker(), $method_name ), $args ); |
|
77 | - break; |
|
78 | - } |
|
79 | - } while ( false ); |
|
75 | + if ( $this->has_marker() ) { |
|
76 | + $value = call_user_func_array( array( $this->marker(), $method_name ), $args ); |
|
77 | + break; |
|
78 | + } |
|
79 | + } while ( false ); |
|
80 | 80 | |
81 | - return $value; |
|
81 | + return $value; |
|
82 | 82 | |
83 | - } |
|
83 | + } |
|
84 | 84 | |
85 | 85 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | function info_window() { |
50 | 50 | |
51 | 51 | $window = new Info_Window( array( 'info_window' => $this->marker()->info_window() ) ); |
52 | - $window->set_position( array( 'lat' => $this->marker()->latitude(), 'lng' => $this->marker()->longitude())); |
|
52 | + $window->set_position( array( 'lat' => $this->marker()->latitude(), 'lng' => $this->marker()->longitude() ) ); |
|
53 | 53 | |
54 | 54 | return $window; |
55 | 55 |