@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | if ($locations) { |
209 | 209 | |
210 | 210 | Requirements::javascript('framework/thirdparty/jquery/jquery.js'); |
211 | - Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key); |
|
211 | + Requirements::javascript('https://maps.google.com/maps/api/js?key='.$key); |
|
212 | 212 | Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js'); |
213 | 213 | Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js'); |
214 | 214 | Requirements::css('locator/css/map.css'); |
@@ -245,27 +245,27 @@ discard block |
||
245 | 245 | unset($vars['action_doFilterLocations']); |
246 | 246 | $url = ''; |
247 | 247 | if (count($vars)) { |
248 | - $url .= '?' . http_build_query($vars); |
|
248 | + $url .= '?'.http_build_query($vars); |
|
249 | 249 | } |
250 | - $link = $this->Link() . 'xml.xml' . $url; |
|
250 | + $link = $this->Link().'xml.xml'.$url; |
|
251 | 251 | |
252 | 252 | // init map |
253 | 253 | Requirements::customScript(" |
254 | 254 | $(function(){ |
255 | 255 | $('#map-container').storeLocator({ |
256 | - " . $load . " |
|
257 | - dataLocation: '" . $link . "', |
|
258 | - listTemplatePath: '" . $listTemplatePath . "', |
|
259 | - infowindowTemplatePath: '" . $infowindowTemplatePath . "', |
|
256 | + " . $load." |
|
257 | + dataLocation: '" . $link."', |
|
258 | + listTemplatePath: '" . $listTemplatePath."', |
|
259 | + infowindowTemplatePath: '" . $infowindowTemplatePath."', |
|
260 | 260 | originMarker: true, |
261 | - " . $modal . ', |
|
262 | - ' . $featured . ", |
|
261 | + " . $modal.', |
|
262 | + ' . $featured.", |
|
263 | 263 | slideMap: false, |
264 | 264 | zoomLevel: 0, |
265 | 265 | noForm: true, |
266 | 266 | distanceAlert: -1, |
267 | - " . $kilometer . ', |
|
268 | - ' . $defaultCoords . ' |
|
267 | + " . $kilometer.', |
|
268 | + ' . $defaultCoords.' |
|
269 | 269 | }); |
270 | 270 | }); |
271 | 271 | '); |
@@ -11,137 +11,137 @@ discard block |
||
11 | 11 | class Locator extends Page |
12 | 12 | { |
13 | 13 | |
14 | - /** |
|
15 | - * @var array |
|
16 | - */ |
|
17 | - private static $db = array( |
|
18 | - 'AutoGeocode' => 'Boolean', |
|
19 | - 'ModalWindow' => 'Boolean', |
|
20 | - 'Unit' => 'Enum("m,km","m")', |
|
21 | - ); |
|
22 | - |
|
23 | - /** |
|
24 | - * @var array |
|
25 | - */ |
|
26 | - private static $many_many = array( |
|
27 | - 'Categories' => 'LocationCategory', |
|
28 | - ); |
|
29 | - |
|
30 | - /** |
|
31 | - * @var array |
|
32 | - */ |
|
33 | - private static $defaults = array( |
|
34 | - 'AutoGeocode' => true, |
|
35 | - ); |
|
36 | - |
|
37 | - /** |
|
38 | - * @var string |
|
39 | - */ |
|
40 | - private static $singular_name = 'Locator'; |
|
41 | - /** |
|
42 | - * @var string |
|
43 | - */ |
|
44 | - private static $plural_name = 'Locators'; |
|
45 | - /** |
|
46 | - * @var string |
|
47 | - */ |
|
48 | - private static $description = 'Find locations on a map'; |
|
49 | - |
|
50 | - /** |
|
51 | - * @return FieldList |
|
52 | - */ |
|
53 | - public function getCMSFields() |
|
54 | - { |
|
55 | - $fields = parent::getCMSFields(); |
|
56 | - |
|
57 | - // Settings |
|
58 | - $fields->addFieldsToTab('Root.Settings', array( |
|
59 | - HeaderField::create('DisplayOptions', 'Display Options', 3), |
|
60 | - OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')), |
|
61 | - CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location') |
|
62 | - ->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'), |
|
63 | - CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'), |
|
64 | - )); |
|
65 | - |
|
66 | - // Filter categories |
|
67 | - $config = GridFieldConfig_RelationEditor::create(); |
|
68 | - if (class_exists('GridFieldAddExistingSearchButton')) { |
|
69 | - $config->removeComponentsByType('GridFieldAddExistingAutocompleter'); |
|
70 | - $config->addComponent(new GridFieldAddExistingSearchButton()); |
|
71 | - } |
|
72 | - $categories = $this->Categories(); |
|
73 | - $categoriesField = GridField::create('Categories', 'Categories', $categories, $config) |
|
74 | - ->setDescription('only show locations from the selected category'); |
|
75 | - |
|
76 | - // Filter |
|
77 | - $fields->addFieldsToTab('Root.Filter', array( |
|
78 | - HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3), |
|
79 | - $categoriesField, |
|
80 | - )); |
|
81 | - |
|
82 | - $this->extend('updateCMSFields', $fields); |
|
83 | - |
|
84 | - return $fields; |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * @param array $filter |
|
89 | - * @param array $filterAny |
|
90 | - * @param array $exclude |
|
91 | - * @param null|callable $callback |
|
92 | - * @return DataList|ArrayList |
|
93 | - */ |
|
94 | - public static function get_locations( |
|
95 | - $filter = [], |
|
96 | - $filterAny = [], |
|
97 | - $exclude = [], |
|
98 | - $callback = null |
|
99 | - ) |
|
100 | - { |
|
101 | - $locations = Location::get()->filter($filter)->exclude($exclude); |
|
102 | - |
|
103 | - if (!empty($filterAny)) { |
|
104 | - $locations = $locations->filterAny($filterAny); |
|
105 | - } |
|
106 | - if (!empty($exclude)) { |
|
107 | - $locations = $locations->exclude($exclude); |
|
108 | - } |
|
109 | - |
|
110 | - if ($callback !== null && is_callable($callback)) { |
|
111 | - $locations->filterByCallback($callback); |
|
112 | - } |
|
113 | - |
|
114 | - return $locations; |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * @return DataList |
|
119 | - */ |
|
120 | - public static function get_all_categories() |
|
121 | - { |
|
122 | - return LocationCategory::get(); |
|
123 | - } |
|
124 | - |
|
125 | - /** |
|
126 | - * @return bool |
|
127 | - */ |
|
128 | - public function getPageCategories() |
|
129 | - { |
|
130 | - return self::locator_categories_by_locator($this->ID); |
|
131 | - } |
|
132 | - |
|
133 | - /** |
|
134 | - * @param int $id |
|
135 | - * @return bool| |
|
136 | - */ |
|
137 | - public static function locator_categories_by_locator($id = 0) |
|
138 | - { |
|
139 | - if ($id == 0) { |
|
140 | - return false; |
|
141 | - } |
|
142 | - |
|
143 | - return Locator::get()->byID($id)->Categories(); |
|
144 | - } |
|
14 | + /** |
|
15 | + * @var array |
|
16 | + */ |
|
17 | + private static $db = array( |
|
18 | + 'AutoGeocode' => 'Boolean', |
|
19 | + 'ModalWindow' => 'Boolean', |
|
20 | + 'Unit' => 'Enum("m,km","m")', |
|
21 | + ); |
|
22 | + |
|
23 | + /** |
|
24 | + * @var array |
|
25 | + */ |
|
26 | + private static $many_many = array( |
|
27 | + 'Categories' => 'LocationCategory', |
|
28 | + ); |
|
29 | + |
|
30 | + /** |
|
31 | + * @var array |
|
32 | + */ |
|
33 | + private static $defaults = array( |
|
34 | + 'AutoGeocode' => true, |
|
35 | + ); |
|
36 | + |
|
37 | + /** |
|
38 | + * @var string |
|
39 | + */ |
|
40 | + private static $singular_name = 'Locator'; |
|
41 | + /** |
|
42 | + * @var string |
|
43 | + */ |
|
44 | + private static $plural_name = 'Locators'; |
|
45 | + /** |
|
46 | + * @var string |
|
47 | + */ |
|
48 | + private static $description = 'Find locations on a map'; |
|
49 | + |
|
50 | + /** |
|
51 | + * @return FieldList |
|
52 | + */ |
|
53 | + public function getCMSFields() |
|
54 | + { |
|
55 | + $fields = parent::getCMSFields(); |
|
56 | + |
|
57 | + // Settings |
|
58 | + $fields->addFieldsToTab('Root.Settings', array( |
|
59 | + HeaderField::create('DisplayOptions', 'Display Options', 3), |
|
60 | + OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')), |
|
61 | + CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location') |
|
62 | + ->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'), |
|
63 | + CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'), |
|
64 | + )); |
|
65 | + |
|
66 | + // Filter categories |
|
67 | + $config = GridFieldConfig_RelationEditor::create(); |
|
68 | + if (class_exists('GridFieldAddExistingSearchButton')) { |
|
69 | + $config->removeComponentsByType('GridFieldAddExistingAutocompleter'); |
|
70 | + $config->addComponent(new GridFieldAddExistingSearchButton()); |
|
71 | + } |
|
72 | + $categories = $this->Categories(); |
|
73 | + $categoriesField = GridField::create('Categories', 'Categories', $categories, $config) |
|
74 | + ->setDescription('only show locations from the selected category'); |
|
75 | + |
|
76 | + // Filter |
|
77 | + $fields->addFieldsToTab('Root.Filter', array( |
|
78 | + HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3), |
|
79 | + $categoriesField, |
|
80 | + )); |
|
81 | + |
|
82 | + $this->extend('updateCMSFields', $fields); |
|
83 | + |
|
84 | + return $fields; |
|
85 | + } |
|
86 | + |
|
87 | + /** |
|
88 | + * @param array $filter |
|
89 | + * @param array $filterAny |
|
90 | + * @param array $exclude |
|
91 | + * @param null|callable $callback |
|
92 | + * @return DataList|ArrayList |
|
93 | + */ |
|
94 | + public static function get_locations( |
|
95 | + $filter = [], |
|
96 | + $filterAny = [], |
|
97 | + $exclude = [], |
|
98 | + $callback = null |
|
99 | + ) |
|
100 | + { |
|
101 | + $locations = Location::get()->filter($filter)->exclude($exclude); |
|
102 | + |
|
103 | + if (!empty($filterAny)) { |
|
104 | + $locations = $locations->filterAny($filterAny); |
|
105 | + } |
|
106 | + if (!empty($exclude)) { |
|
107 | + $locations = $locations->exclude($exclude); |
|
108 | + } |
|
109 | + |
|
110 | + if ($callback !== null && is_callable($callback)) { |
|
111 | + $locations->filterByCallback($callback); |
|
112 | + } |
|
113 | + |
|
114 | + return $locations; |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * @return DataList |
|
119 | + */ |
|
120 | + public static function get_all_categories() |
|
121 | + { |
|
122 | + return LocationCategory::get(); |
|
123 | + } |
|
124 | + |
|
125 | + /** |
|
126 | + * @return bool |
|
127 | + */ |
|
128 | + public function getPageCategories() |
|
129 | + { |
|
130 | + return self::locator_categories_by_locator($this->ID); |
|
131 | + } |
|
132 | + |
|
133 | + /** |
|
134 | + * @param int $id |
|
135 | + * @return bool| |
|
136 | + */ |
|
137 | + public static function locator_categories_by_locator($id = 0) |
|
138 | + { |
|
139 | + if ($id == 0) { |
|
140 | + return false; |
|
141 | + } |
|
142 | + |
|
143 | + return Locator::get()->byID($id)->Categories(); |
|
144 | + } |
|
145 | 145 | |
146 | 146 | |
147 | 147 | } |
@@ -151,111 +151,111 @@ discard block |
||
151 | 151 | */ |
152 | 152 | class Locator_Controller extends Page_Controller |
153 | 153 | { |
154 | - /** |
|
155 | - * @var array |
|
156 | - */ |
|
157 | - private static $allowed_actions = array( |
|
158 | - 'xml', |
|
159 | - ); |
|
160 | - |
|
161 | - /** |
|
162 | - * @var array |
|
163 | - */ |
|
164 | - private static $base_filter = [ |
|
165 | - 'ShowInLocator' => true, |
|
166 | - ]; |
|
167 | - |
|
168 | - /** |
|
169 | - * @var array |
|
170 | - */ |
|
171 | - private static $base_exclude = [ |
|
172 | - 'Lat' => 0, |
|
173 | - 'Lng' => 0, |
|
174 | - ]; |
|
175 | - |
|
176 | - /** |
|
177 | - * @var array |
|
178 | - */ |
|
179 | - private static $base_filter_any = []; |
|
180 | - |
|
181 | - /** |
|
182 | - * @var string |
|
183 | - */ |
|
184 | - private static $list_template_path = 'locator/templates/location-list-description.html'; |
|
185 | - |
|
186 | - /** |
|
187 | - * @var string |
|
188 | - */ |
|
189 | - private static $info_window_template_path = 'locator/templates/infowindow-description.html'; |
|
190 | - |
|
191 | - /** |
|
192 | - * @var bool |
|
193 | - */ |
|
194 | - private static $bootstrapify = true; |
|
195 | - |
|
196 | - /** |
|
197 | - * @var DataList|ArrayList |
|
198 | - */ |
|
199 | - private $locations; |
|
200 | - |
|
201 | - /** |
|
202 | - * Set Requirements based on input from CMS |
|
203 | - */ |
|
204 | - public function init() |
|
205 | - { |
|
206 | - parent::init(); |
|
207 | - |
|
208 | - // google maps api key |
|
209 | - $key = Config::inst()->get('GoogleGeocoding', 'google_api_key'); |
|
210 | - |
|
211 | - $locations = $this->getLocations(); |
|
212 | - |
|
213 | - if ($locations) { |
|
214 | - |
|
215 | - Requirements::css('locator/css/map.css'); |
|
216 | - Requirements::javascript('framework/thirdparty/jquery/jquery.js'); |
|
217 | - Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key); |
|
218 | - Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js'); |
|
219 | - Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js'); |
|
220 | - |
|
221 | - $featuredInList = ($locations->filter('Featured', true)->count() > 0); |
|
222 | - $defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : ''; |
|
223 | - $isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE); |
|
224 | - |
|
225 | - $featured = $featuredInList |
|
226 | - ? 'featuredLocations: true' |
|
227 | - : 'featuredLocations: false'; |
|
228 | - |
|
229 | - // map config based on user input in Settings tab |
|
230 | - // AutoGeocode or Full Map |
|
231 | - if ($this->data()->AutoGeocode) { |
|
232 | - $load = $featuredInList || $defaultCoords != '' || $isChrome |
|
233 | - ? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,' |
|
234 | - : 'autoGeocode: true, fullMapStart: false,'; |
|
235 | - } else { |
|
236 | - $load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'; |
|
237 | - } |
|
238 | - |
|
239 | - $listTemplatePath = $this->config()->get('list_template_path'); |
|
240 | - $infowindowTemplatePath = $this->config()->get('info_window_template_path'); |
|
241 | - |
|
242 | - // in page or modal |
|
243 | - $modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false'; |
|
244 | - |
|
245 | - $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"'; |
|
246 | - |
|
247 | - // pass GET variables to xml action |
|
248 | - $vars = $this->request->getVars(); |
|
249 | - unset($vars['url']); |
|
250 | - unset($vars['action_doFilterLocations']); |
|
251 | - $url = ''; |
|
252 | - if (count($vars)) { |
|
253 | - $url .= '?' . http_build_query($vars); |
|
254 | - } |
|
255 | - $link = $this->Link() . 'xml.xml' . $url; |
|
256 | - |
|
257 | - // init map |
|
258 | - Requirements::customScript(" |
|
154 | + /** |
|
155 | + * @var array |
|
156 | + */ |
|
157 | + private static $allowed_actions = array( |
|
158 | + 'xml', |
|
159 | + ); |
|
160 | + |
|
161 | + /** |
|
162 | + * @var array |
|
163 | + */ |
|
164 | + private static $base_filter = [ |
|
165 | + 'ShowInLocator' => true, |
|
166 | + ]; |
|
167 | + |
|
168 | + /** |
|
169 | + * @var array |
|
170 | + */ |
|
171 | + private static $base_exclude = [ |
|
172 | + 'Lat' => 0, |
|
173 | + 'Lng' => 0, |
|
174 | + ]; |
|
175 | + |
|
176 | + /** |
|
177 | + * @var array |
|
178 | + */ |
|
179 | + private static $base_filter_any = []; |
|
180 | + |
|
181 | + /** |
|
182 | + * @var string |
|
183 | + */ |
|
184 | + private static $list_template_path = 'locator/templates/location-list-description.html'; |
|
185 | + |
|
186 | + /** |
|
187 | + * @var string |
|
188 | + */ |
|
189 | + private static $info_window_template_path = 'locator/templates/infowindow-description.html'; |
|
190 | + |
|
191 | + /** |
|
192 | + * @var bool |
|
193 | + */ |
|
194 | + private static $bootstrapify = true; |
|
195 | + |
|
196 | + /** |
|
197 | + * @var DataList|ArrayList |
|
198 | + */ |
|
199 | + private $locations; |
|
200 | + |
|
201 | + /** |
|
202 | + * Set Requirements based on input from CMS |
|
203 | + */ |
|
204 | + public function init() |
|
205 | + { |
|
206 | + parent::init(); |
|
207 | + |
|
208 | + // google maps api key |
|
209 | + $key = Config::inst()->get('GoogleGeocoding', 'google_api_key'); |
|
210 | + |
|
211 | + $locations = $this->getLocations(); |
|
212 | + |
|
213 | + if ($locations) { |
|
214 | + |
|
215 | + Requirements::css('locator/css/map.css'); |
|
216 | + Requirements::javascript('framework/thirdparty/jquery/jquery.js'); |
|
217 | + Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key); |
|
218 | + Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js'); |
|
219 | + Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js'); |
|
220 | + |
|
221 | + $featuredInList = ($locations->filter('Featured', true)->count() > 0); |
|
222 | + $defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : ''; |
|
223 | + $isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE); |
|
224 | + |
|
225 | + $featured = $featuredInList |
|
226 | + ? 'featuredLocations: true' |
|
227 | + : 'featuredLocations: false'; |
|
228 | + |
|
229 | + // map config based on user input in Settings tab |
|
230 | + // AutoGeocode or Full Map |
|
231 | + if ($this->data()->AutoGeocode) { |
|
232 | + $load = $featuredInList || $defaultCoords != '' || $isChrome |
|
233 | + ? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,' |
|
234 | + : 'autoGeocode: true, fullMapStart: false,'; |
|
235 | + } else { |
|
236 | + $load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'; |
|
237 | + } |
|
238 | + |
|
239 | + $listTemplatePath = $this->config()->get('list_template_path'); |
|
240 | + $infowindowTemplatePath = $this->config()->get('info_window_template_path'); |
|
241 | + |
|
242 | + // in page or modal |
|
243 | + $modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false'; |
|
244 | + |
|
245 | + $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"'; |
|
246 | + |
|
247 | + // pass GET variables to xml action |
|
248 | + $vars = $this->request->getVars(); |
|
249 | + unset($vars['url']); |
|
250 | + unset($vars['action_doFilterLocations']); |
|
251 | + $url = ''; |
|
252 | + if (count($vars)) { |
|
253 | + $url .= '?' . http_build_query($vars); |
|
254 | + } |
|
255 | + $link = $this->Link() . 'xml.xml' . $url; |
|
256 | + |
|
257 | + // init map |
|
258 | + Requirements::customScript(" |
|
259 | 259 | $(function(){ |
260 | 260 | $('#map-container').storeLocator({ |
261 | 261 | " . $load . " |
@@ -274,128 +274,128 @@ discard block |
||
274 | 274 | }); |
275 | 275 | }); |
276 | 276 | '); |
277 | - } |
|
278 | - } |
|
279 | - |
|
280 | - /** |
|
281 | - * @param SS_HTTPRequest $request |
|
282 | - * |
|
283 | - * @return ViewableData_Customised |
|
284 | - */ |
|
285 | - public function index(SS_HTTPRequest $request) |
|
286 | - { |
|
287 | - $locations = $this->getLocations(); |
|
288 | - |
|
289 | - return $this->customise(array( |
|
290 | - 'Locations' => $locations, |
|
291 | - )); |
|
292 | - } |
|
293 | - |
|
294 | - /** |
|
295 | - * Return a XML feed of all locations marked "show in locator" |
|
296 | - * |
|
297 | - * @param SS_HTTPRequest $request |
|
298 | - * @return HTMLText |
|
299 | - */ |
|
300 | - public function xml(SS_HTTPRequest $request) |
|
301 | - { |
|
302 | - $locations = $this->getLocations(); |
|
303 | - |
|
304 | - return $this->customise(array( |
|
305 | - 'Locations' => $locations, |
|
306 | - ))->renderWith('LocationXML'); |
|
307 | - } |
|
308 | - |
|
309 | - /** |
|
310 | - * @return ArrayList|DataList |
|
311 | - */ |
|
312 | - public function getLocations() |
|
313 | - { |
|
314 | - if (!$this->locations) { |
|
315 | - $this->setLocations($this->request); |
|
316 | - } |
|
317 | - return $this->locations; |
|
318 | - } |
|
319 | - |
|
320 | - /** |
|
321 | - * @param SS_HTTPRequest|null $request |
|
322 | - * @return $this |
|
323 | - */ |
|
324 | - public function setLocations(SS_HTTPRequest $request = null) |
|
325 | - { |
|
326 | - |
|
327 | - if ($request === null) { |
|
328 | - $request = $this->request; |
|
329 | - } |
|
330 | - $filter = $this->config()->get('base_filter'); |
|
331 | - |
|
332 | - if ($request->getVar('CategoryID')) { |
|
333 | - $filter['CategoryID'] = $request->getVar('CategoryID'); |
|
334 | - } |
|
335 | - |
|
336 | - $this->extend('updateLocatorFilter', $filter, $request); |
|
337 | - |
|
338 | - $filterAny = $this->config()->get('base_filter_any'); |
|
339 | - $this->extend('updateLocatorFilterAny', $filterAny, $request); |
|
340 | - |
|
341 | - $exclude = $this->config()->get('base_exclude'); |
|
342 | - $this->extend('updateLocatorExclude', $exclude, $request); |
|
343 | - |
|
344 | - $locations = Locator::get_locations($filter, $filterAny, $exclude); |
|
345 | - $locations = DataToArrayListHelper::to_array_list($locations); |
|
346 | - |
|
347 | - //allow for adjusting list post possible distance calculation |
|
348 | - $this->extend('updateLocationList', $locations); |
|
349 | - |
|
350 | - if ($locations->canSortBy('distance')) { |
|
351 | - $locations = $locations->sort('distance'); |
|
352 | - } |
|
353 | - |
|
354 | - //allow for returning list to be set as |
|
355 | - $this->extend('updateListType', $locations); |
|
356 | - |
|
357 | - $this->locations = $locations; |
|
358 | - return $this; |
|
359 | - |
|
360 | - } |
|
361 | - |
|
362 | - /** |
|
363 | - * @return bool|string |
|
364 | - */ |
|
365 | - public function getAddressSearchCoords() |
|
366 | - { |
|
367 | - if (!$this->request->getVar('Address')) { |
|
368 | - return false; |
|
369 | - } |
|
370 | - $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address')); |
|
371 | - |
|
372 | - $lat = $coords['lat']; |
|
373 | - $lng = $coords['lng']; |
|
374 | - |
|
375 | - return "defaultLat: {$lat}, defaultLng: {$lng},"; |
|
376 | - } |
|
377 | - |
|
378 | - /** |
|
379 | - * LocationSearch form. |
|
380 | - * |
|
381 | - * Search form for locations, updates map and results list via AJAX |
|
382 | - * |
|
383 | - * @return Form |
|
384 | - */ |
|
385 | - public function LocationSearch() |
|
386 | - { |
|
387 | - |
|
388 | - $form = LocatorForm::create($this, 'LocationSearch'); |
|
389 | - if (class_exists('BootstrapForm') && $this->config()->get('bootstrapify')) { |
|
390 | - $form->Fields()->bootstrapify(); |
|
391 | - $form->Actions()->bootstrapify(); |
|
392 | - } |
|
393 | - |
|
394 | - return $form |
|
395 | - ->setFormMethod('GET') |
|
396 | - ->setFormAction($this->Link()) |
|
397 | - ->disableSecurityToken() |
|
398 | - ->loadDataFrom($this->request->getVars()); |
|
399 | - } |
|
277 | + } |
|
278 | + } |
|
279 | + |
|
280 | + /** |
|
281 | + * @param SS_HTTPRequest $request |
|
282 | + * |
|
283 | + * @return ViewableData_Customised |
|
284 | + */ |
|
285 | + public function index(SS_HTTPRequest $request) |
|
286 | + { |
|
287 | + $locations = $this->getLocations(); |
|
288 | + |
|
289 | + return $this->customise(array( |
|
290 | + 'Locations' => $locations, |
|
291 | + )); |
|
292 | + } |
|
293 | + |
|
294 | + /** |
|
295 | + * Return a XML feed of all locations marked "show in locator" |
|
296 | + * |
|
297 | + * @param SS_HTTPRequest $request |
|
298 | + * @return HTMLText |
|
299 | + */ |
|
300 | + public function xml(SS_HTTPRequest $request) |
|
301 | + { |
|
302 | + $locations = $this->getLocations(); |
|
303 | + |
|
304 | + return $this->customise(array( |
|
305 | + 'Locations' => $locations, |
|
306 | + ))->renderWith('LocationXML'); |
|
307 | + } |
|
308 | + |
|
309 | + /** |
|
310 | + * @return ArrayList|DataList |
|
311 | + */ |
|
312 | + public function getLocations() |
|
313 | + { |
|
314 | + if (!$this->locations) { |
|
315 | + $this->setLocations($this->request); |
|
316 | + } |
|
317 | + return $this->locations; |
|
318 | + } |
|
319 | + |
|
320 | + /** |
|
321 | + * @param SS_HTTPRequest|null $request |
|
322 | + * @return $this |
|
323 | + */ |
|
324 | + public function setLocations(SS_HTTPRequest $request = null) |
|
325 | + { |
|
326 | + |
|
327 | + if ($request === null) { |
|
328 | + $request = $this->request; |
|
329 | + } |
|
330 | + $filter = $this->config()->get('base_filter'); |
|
331 | + |
|
332 | + if ($request->getVar('CategoryID')) { |
|
333 | + $filter['CategoryID'] = $request->getVar('CategoryID'); |
|
334 | + } |
|
335 | + |
|
336 | + $this->extend('updateLocatorFilter', $filter, $request); |
|
337 | + |
|
338 | + $filterAny = $this->config()->get('base_filter_any'); |
|
339 | + $this->extend('updateLocatorFilterAny', $filterAny, $request); |
|
340 | + |
|
341 | + $exclude = $this->config()->get('base_exclude'); |
|
342 | + $this->extend('updateLocatorExclude', $exclude, $request); |
|
343 | + |
|
344 | + $locations = Locator::get_locations($filter, $filterAny, $exclude); |
|
345 | + $locations = DataToArrayListHelper::to_array_list($locations); |
|
346 | + |
|
347 | + //allow for adjusting list post possible distance calculation |
|
348 | + $this->extend('updateLocationList', $locations); |
|
349 | + |
|
350 | + if ($locations->canSortBy('distance')) { |
|
351 | + $locations = $locations->sort('distance'); |
|
352 | + } |
|
353 | + |
|
354 | + //allow for returning list to be set as |
|
355 | + $this->extend('updateListType', $locations); |
|
356 | + |
|
357 | + $this->locations = $locations; |
|
358 | + return $this; |
|
359 | + |
|
360 | + } |
|
361 | + |
|
362 | + /** |
|
363 | + * @return bool|string |
|
364 | + */ |
|
365 | + public function getAddressSearchCoords() |
|
366 | + { |
|
367 | + if (!$this->request->getVar('Address')) { |
|
368 | + return false; |
|
369 | + } |
|
370 | + $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address')); |
|
371 | + |
|
372 | + $lat = $coords['lat']; |
|
373 | + $lng = $coords['lng']; |
|
374 | + |
|
375 | + return "defaultLat: {$lat}, defaultLng: {$lng},"; |
|
376 | + } |
|
377 | + |
|
378 | + /** |
|
379 | + * LocationSearch form. |
|
380 | + * |
|
381 | + * Search form for locations, updates map and results list via AJAX |
|
382 | + * |
|
383 | + * @return Form |
|
384 | + */ |
|
385 | + public function LocationSearch() |
|
386 | + { |
|
387 | + |
|
388 | + $form = LocatorForm::create($this, 'LocationSearch'); |
|
389 | + if (class_exists('BootstrapForm') && $this->config()->get('bootstrapify')) { |
|
390 | + $form->Fields()->bootstrapify(); |
|
391 | + $form->Actions()->bootstrapify(); |
|
392 | + } |
|
393 | + |
|
394 | + return $form |
|
395 | + ->setFormMethod('GET') |
|
396 | + ->setFormAction($this->Link()) |
|
397 | + ->disableSecurityToken() |
|
398 | + ->loadDataFrom($this->request->getVars()); |
|
399 | + } |
|
400 | 400 | |
401 | 401 | } |
@@ -2,25 +2,25 @@ |
||
2 | 2 | |
3 | 3 | class DistanceDataExtension extends DataExtension |
4 | 4 | { |
5 | - /** |
|
6 | - * @param SQLQuery $query |
|
7 | - */ |
|
8 | - public function augmentSQL(SQLQuery &$query) |
|
9 | - { |
|
10 | - $address = Controller::curr()->getRequest()->getVar('Address'); |
|
11 | - if ($this->owner->hasMethod('updateAddressValue')) { |
|
12 | - $address = $this->owner->updateAddressValue($address); |
|
13 | - } |
|
14 | - if ($address) { // on frontend |
|
15 | - $coords = GoogleGeocoding::address_to_point($address); |
|
5 | + /** |
|
6 | + * @param SQLQuery $query |
|
7 | + */ |
|
8 | + public function augmentSQL(SQLQuery &$query) |
|
9 | + { |
|
10 | + $address = Controller::curr()->getRequest()->getVar('Address'); |
|
11 | + if ($this->owner->hasMethod('updateAddressValue')) { |
|
12 | + $address = $this->owner->updateAddressValue($address); |
|
13 | + } |
|
14 | + if ($address) { // on frontend |
|
15 | + $coords = GoogleGeocoding::address_to_point($address); |
|
16 | 16 | |
17 | - $Lat = $coords['lat']; |
|
18 | - $Lng = $coords['lng']; |
|
17 | + $Lat = $coords['lat']; |
|
18 | + $Lng = $coords['lng']; |
|
19 | 19 | |
20 | - $query |
|
21 | - ->addSelect(array( |
|
22 | - '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance', |
|
23 | - )); |
|
24 | - } |
|
25 | - } |
|
20 | + $query |
|
21 | + ->addSelect(array( |
|
22 | + '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance', |
|
23 | + )); |
|
24 | + } |
|
25 | + } |
|
26 | 26 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | /** |
6 | 6 | * @param SQLQuery $query |
7 | 7 | */ |
8 | - public function augmentSQL(SQLQuery &$query) |
|
8 | + public function augmentSQL(SQLQuery & $query) |
|
9 | 9 | { |
10 | 10 | $address = Controller::curr()->getRequest()->getVar('Address'); |
11 | 11 | if ($this->owner->hasMethod('updateAddressValue')) { |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | $query |
21 | 21 | ->addSelect(array( |
22 | - '( 3959 * acos( cos( radians(' . $Lat . ') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians(' . $Lng . ') ) + sin( radians(' . $Lat . ') ) * sin( radians( `Lat` ) ) ) ) AS distance', |
|
22 | + '( 3959 * acos( cos( radians('.$Lat.') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians('.$Lng.') ) + sin( radians('.$Lat.') ) * sin( radians( `Lat` ) ) ) ) AS distance', |
|
23 | 23 | )); |
24 | 24 | } |
25 | 25 | } |