dynamic / silverstripe-locator

code/extensions/DistanceDataExtension.php

Indentation +15 added lines, -15 removed lines

@@ -2,21 +2,21 @@
 
 class DistanceDataExtension extends DataExtension
 {
-    /**
-     * @param SQLQuery $query
-     */
-    public function augmentSQL(SQLQuery &$query)
-    {
-        if (Controller::curr()->getRequest()->getVar('Address')) { // on frontend
-            $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
+	/**
+	 * @param SQLQuery $query
+	 */
+	public function augmentSQL(SQLQuery &$query)
+	{
+		if (Controller::curr()->getRequest()->getVar('Address')) { // on frontend
+			$coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
 
-            $Lat = $coords['lat'];
-            $Lng = $coords['lng'];
+			$Lat = $coords['lat'];
+			$Lng = $coords['lng'];
 
-            $query
-                ->addSelect(array(
-                    '( 3959 * acos( cos( radians('.$Lat.') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians('.$Lng.') ) + sin( radians('.$Lat.') ) * sin( radians( `Lat` ) ) ) ) AS distance',
-                ));
-        }
-    }
+			$query
+				->addSelect(array(
+					'( 3959 * acos( cos( radians('.$Lat.') ) * cos( radians( `Lat` ) ) * cos( radians( `Lng` ) - radians('.$Lng.') ) + sin( radians('.$Lat.') ) * sin( radians( `Lat` ) ) ) ) AS distance',
+				));
+		}
+	}
 }

code/form/LocatorForm.php

Indentation +30 added lines, -30 removed lines

@@ -6,45 +6,45 @@
 class LocatorForm extends Form
 {
 
-    /**
-     * LocatorForm constructor.
-     * @param Controller $controller
-     * @param string $name
-     */
-    public function __construct(Controller $controller, $name)
-    {
+	/**
+	 * LocatorForm constructor.
+	 * @param Controller $controller
+	 * @param string $name
+	 */
+	public function __construct(Controller $controller, $name)
+	{
 
-        $fields = FieldList::create(
-            TextField::create('Address')
-                ->setTitle('')
-                ->setAttribute('placeholder', 'address or zip code')
-        );
+		$fields = FieldList::create(
+			TextField::create('Address')
+				->setTitle('')
+				->setAttribute('placeholder', 'address or zip code')
+		);
 
-        $categories = (Locator::locator_categories_by_locator($controller->data()->ID)->count() > 0)
-            ? Locator::locator_categories_by_locator($controller->data()->ID)
-            : Locator::get_all_categories();
+		$categories = (Locator::locator_categories_by_locator($controller->data()->ID)->count() > 0)
+			? Locator::locator_categories_by_locator($controller->data()->ID)
+			: Locator::get_all_categories();
 
-        $categoriesField = DropdownField::create('CategoryID')
-            ->setTitle('')
-            ->setEmptyString('All Categories')
-            ->setSource($categories->map());
+		$categoriesField = DropdownField::create('CategoryID')
+			->setTitle('')
+			->setEmptyString('All Categories')
+			->setSource($categories->map());
 
-        $fields->push($categoriesField);
+		$fields->push($categoriesField);
 
-        $this->extend('updateLocatorFormFields', $fields);
+		$this->extend('updateLocatorFormFields', $fields);
 
-        $actions = FieldList::create(
-            FormAction::create('doFilterLocations')
-                ->setTitle('Search')
-        );
+		$actions = FieldList::create(
+			FormAction::create('doFilterLocations')
+				->setTitle('Search')
+		);
 
-        $this->extend('updateLocatorFormActions', $actions);
+		$this->extend('updateLocatorFormActions', $actions);
 
-        $validator = RequiredFields::create();
+		$validator = RequiredFields::create();
 
-        $this->extend('updateLocatorFormRequiredFields', $validator);
+		$this->extend('updateLocatorFormRequiredFields', $validator);
 
-        parent::__construct($controller, $name, $fields, $actions, $validator);
-    }
+		parent::__construct($controller, $name, $fields, $actions, $validator);
+	}
 
 }
\ No newline at end of file

code/form/LocatorBootstrapForm.php

Indentation +36 added lines, -36 removed lines

@@ -2,53 +2,53 @@
 
 if (class_exists('BootstrapForm')) {
 
-    /**
-     * Class LocatorForm
-     */
-    class LocatorBootstrapForm extends BootstrapForm
-    {
+	/**
+	 * Class LocatorForm
+	 */
+	class LocatorBootstrapForm extends BootstrapForm
+	{
 
-        /**
-         * LocatorForm constructor.
-         * @param Controller $controller
-         * @param string $name
-         */
-        public function __construct(Controller $controller, $name)
-        {
+		/**
+		 * LocatorForm constructor.
+		 * @param Controller $controller
+		 * @param string $name
+		 */
+		public function __construct(Controller $controller, $name)
+		{
 
-            $fields = FieldList::create(
-                TextField::create('Address')
-                    ->setTitle('')
-                    ->setAttribute('placeholder', 'address or zip code')
-            );
+			$fields = FieldList::create(
+				TextField::create('Address')
+					->setTitle('')
+					->setAttribute('placeholder', 'address or zip code')
+			);
 
-            $categories = (Locator::locator_categories_by_locator($controller->data()->ID)->count() > 0)
-                ? Locator::locator_categories_by_locator($controller->data()->ID)
-                : Locator::get_all_categories();
+			$categories = (Locator::locator_categories_by_locator($controller->data()->ID)->count() > 0)
+				? Locator::locator_categories_by_locator($controller->data()->ID)
+				: Locator::get_all_categories();
 
-            $categoriesField = DropdownField::create('CategoryID')
-                ->setTitle('')
-                ->setEmptyString('All Categories')
-                ->setSource($categories->map());
+			$categoriesField = DropdownField::create('CategoryID')
+				->setTitle('')
+				->setEmptyString('All Categories')
+				->setSource($categories->map());
 
-            $fields->push($categoriesField);
+			$fields->push($categoriesField);
 
-            $this->extend('updateLocatorFormFields', $fields);
+			$this->extend('updateLocatorFormFields', $fields);
 
-            $actions = FieldList::create(
-                FormAction::create('doFilterLocations')
-                    ->setTitle('Search')
-            );
+			$actions = FieldList::create(
+				FormAction::create('doFilterLocations')
+					->setTitle('Search')
+			);
 
-            $this->extend('updateLocatorFormActions', $actions);
+			$this->extend('updateLocatorFormActions', $actions);
 
-            $validator = RequiredFields::create();
+			$validator = RequiredFields::create();
 
-            $this->extend('updateLocatorFormRequiredFields', $validator);
+			$this->extend('updateLocatorFormRequiredFields', $validator);
 
-            parent::__construct($controller, $name, $fields, $actions, $validator);
-        }
+			parent::__construct($controller, $name, $fields, $actions, $validator);
+		}
 
-    }
+	}
 
 }
\ No newline at end of file

code/pages/Locator.php

Indentation +354 added lines, -354 removed lines

@@ -11,137 +11,137 @@ 
 class Locator extends Page
 {
 
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'AutoGeocode' => 'Boolean',
-        'ModalWindow' => 'Boolean',
-        'Unit' => 'Enum("m,km","m")',
-    );
-
-    /**
-     * @var array
-     */
-    private static $many_many = array(
-        'Categories' => 'LocationCategory',
-    );
-
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'AutoGeocode' => true,
-    );
-
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Locator';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locators';
-    /**
-     * @var string
-     */
-    private static $description = 'Find locations on a map';
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        // Settings
-        $fields->addFieldsToTab('Root.Settings', array(
-            HeaderField::create('DisplayOptions', 'Display Options', 3),
-            OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
-            CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
-                ->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'),
-            CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'),
-        ));
-
-        // Filter categories
-        $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldAddExistingSearchButton')) {
-            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-            $config->addComponent(new GridFieldAddExistingSearchButton());
-        }
-        $categories = $this->Categories();
-        $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
-            ->setDescription('only show locations from the selected category');
-
-        // Filter
-        $fields->addFieldsToTab('Root.Filter', array(
-            HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
-            $categoriesField,
-        ));
-
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @param array $filter
-     * @param array $filterAny
-     * @param array $exclude
-     * @param null|callable $callback
-     * @return DataList|ArrayList
-     */
-    public static function get_locations(
-        $filter = [],
-        $filterAny = [],
-        $exclude = [],
-        $callback = null
-    )
-    {
-        $locations = Location::get()->filter($filter)->exclude($exclude);
-
-        if (!empty($filterAny)) {
-            $locations = $locations->filterAny($filterAny);
-        }
-        if (!empty($exclude)) {
-            $locations = $locations->exclude($exclude);
-        }
-
-        if ($callback !== null && is_callable($callback)) {
-            $locations->filterByCallback($callback);
-        }
-
-        return $locations;
-    }
-
-    /**
-     * @return DataList
-     */
-    public static function get_all_categories()
-    {
-        return LocationCategory::get();
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPageCategories()
-    {
-        return self::locator_categories_by_locator($this->ID);
-    }
-
-    /**
-     * @param int $id
-     * @return bool|
-     */
-    public static function locator_categories_by_locator($id = 0)
-    {
-        if ($id == 0) {
-            return false;
-        }
-
-        return Locator::get()->byID($id)->Categories();
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'AutoGeocode' => 'Boolean',
+		'ModalWindow' => 'Boolean',
+		'Unit' => 'Enum("m,km","m")',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $many_many = array(
+		'Categories' => 'LocationCategory',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'AutoGeocode' => true,
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Locator';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locators';
+	/**
+	 * @var string
+	 */
+	private static $description = 'Find locations on a map';
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		// Settings
+		$fields->addFieldsToTab('Root.Settings', array(
+			HeaderField::create('DisplayOptions', 'Display Options', 3),
+			OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
+			CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
+				->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'),
+			CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'),
+		));
+
+		// Filter categories
+		$config = GridFieldConfig_RelationEditor::create();
+		if (class_exists('GridFieldAddExistingSearchButton')) {
+			$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+			$config->addComponent(new GridFieldAddExistingSearchButton());
+		}
+		$categories = $this->Categories();
+		$categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
+			->setDescription('only show locations from the selected category');
+
+		// Filter
+		$fields->addFieldsToTab('Root.Filter', array(
+			HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
+			$categoriesField,
+		));
+
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @param array $filter
+	 * @param array $filterAny
+	 * @param array $exclude
+	 * @param null|callable $callback
+	 * @return DataList|ArrayList
+	 */
+	public static function get_locations(
+		$filter = [],
+		$filterAny = [],
+		$exclude = [],
+		$callback = null
+	)
+	{
+		$locations = Location::get()->filter($filter)->exclude($exclude);
+
+		if (!empty($filterAny)) {
+			$locations = $locations->filterAny($filterAny);
+		}
+		if (!empty($exclude)) {
+			$locations = $locations->exclude($exclude);
+		}
+
+		if ($callback !== null && is_callable($callback)) {
+			$locations->filterByCallback($callback);
+		}
+
+		return $locations;
+	}
+
+	/**
+	 * @return DataList
+	 */
+	public static function get_all_categories()
+	{
+		return LocationCategory::get();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getPageCategories()
+	{
+		return self::locator_categories_by_locator($this->ID);
+	}
+
+	/**
+	 * @param int $id
+	 * @return bool|
+	 */
+	public static function locator_categories_by_locator($id = 0)
+	{
+		if ($id == 0) {
+			return false;
+		}
+
+		return Locator::get()->byID($id)->Categories();
+	}
 
 
 }
@@ -151,106 +151,106 @@ 
  */
 class Locator_Controller extends Page_Controller
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'xml',
-    );
-
-    /**
-     * @var array
-     */
-    private static $base_filter = [
-        'ShowInLocator' => true,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_exclude = [
-        'Lat' => 0,
-        'Lng' => 0,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter_any = [];
-
-    /**
-     * @var string
-     */
-    private static $list_template_path = 'locator/templates/location-list-description.html';
-
-    /**
-     * @var string
-     */
-    private static $info_window_template_path = 'locator/templates/infowindow-description.html';
-
-    /**
-     * @var DataList|ArrayList
-     */
-    private $locations;
-
-    /**
-     * Set Requirements based on input from CMS
-     */
-    public function init()
-    {
-        parent::init();
-
-        // google maps api key
-        $key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
-
-        $locations = $this->getLocations();
-
-        if ($locations) {
-
-            Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-            Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
-            Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
-            Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
-            Requirements::css('locator/css/map.css');
-
-            $featuredInList = ($locations->filter('Featured', true)->count() > 0);
-            $defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : '';
-            $isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE);
-
-            $featured = $featuredInList
-                ? 'featuredLocations: true'
-                : 'featuredLocations: false';
-
-            // map config based on user input in Settings tab
-            // AutoGeocode or Full Map
-            if ($this->data()->AutoGeocode) {
-                $load = $featuredInList || $defaultCoords || $isChrome != ''
-                    ? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
-                    : 'autoGeocode: true, fullMapStart: false,';
-            } else {
-                $load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
-            }
-
-            $listTemplatePath = $this->config()->get('list_template_path');
-            $infowindowTemplatePath = $this->config()->get('info_window_template_path');
-
-            // in page or modal
-            $modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
-
-            $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
-
-            // pass GET variables to xml action
-            $vars = $this->request->getVars();
-            unset($vars['url']);
-            unset($vars['action_doFilterLocations']);
-            $url = '';
-            if (count($vars)) {
-                $url .= '?' . http_build_query($vars);
-            }
-            $link = $this->Link() . 'xml.xml' . $url;
-
-            // init map
-            Requirements::customScript("
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'xml',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter = [
+		'ShowInLocator' => true,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_exclude = [
+		'Lat' => 0,
+		'Lng' => 0,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter_any = [];
+
+	/**
+	 * @var string
+	 */
+	private static $list_template_path = 'locator/templates/location-list-description.html';
+
+	/**
+	 * @var string
+	 */
+	private static $info_window_template_path = 'locator/templates/infowindow-description.html';
+
+	/**
+	 * @var DataList|ArrayList
+	 */
+	private $locations;
+
+	/**
+	 * Set Requirements based on input from CMS
+	 */
+	public function init()
+	{
+		parent::init();
+
+		// google maps api key
+		$key = Config::inst()->get('GoogleGeocoding', 'google_api_key');
+
+		$locations = $this->getLocations();
+
+		if ($locations) {
+
+			Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+			Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+			Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
+			Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
+			Requirements::css('locator/css/map.css');
+
+			$featuredInList = ($locations->filter('Featured', true)->count() > 0);
+			$defaultCoords = $this->getAddressSearchCoords() ? $this->getAddressSearchCoords() : '';
+			$isChrome = (strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome') !== FALSE);
+
+			$featured = $featuredInList
+				? 'featuredLocations: true'
+				: 'featuredLocations: false';
+
+			// map config based on user input in Settings tab
+			// AutoGeocode or Full Map
+			if ($this->data()->AutoGeocode) {
+				$load = $featuredInList || $defaultCoords || $isChrome != ''
+					? 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,'
+					: 'autoGeocode: true, fullMapStart: false,';
+			} else {
+				$load = 'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
+			}
+
+			$listTemplatePath = $this->config()->get('list_template_path');
+			$infowindowTemplatePath = $this->config()->get('info_window_template_path');
+
+			// in page or modal
+			$modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
+
+			$kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
+
+			// pass GET variables to xml action
+			$vars = $this->request->getVars();
+			unset($vars['url']);
+			unset($vars['action_doFilterLocations']);
+			$url = '';
+			if (count($vars)) {
+				$url .= '?' . http_build_query($vars);
+			}
+			$link = $this->Link() . 'xml.xml' . $url;
+
+			// init map
+			Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({
                         " . $load . "
@@ -269,128 +269,128 @@ 
                     });
                 });
             ');
-        }
-    }
-
-    /**
-     * @param SS_HTTPRequest $request
-     *
-     * @return ViewableData_Customised
-     */
-    public function index(SS_HTTPRequest $request)
-    {
-        $locations = $this->getLocations();
-
-        if ($locations->canSortBy('distance')) {
-            $locations = $locations->sort('distance');
-        }
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ));
-    }
-
-    /**
-     * Return a XML feed of all locations marked "show in locator"
-     *
-     * @param SS_HTTPRequest $request
-     * @return HTMLText
-     */
-    public function xml(SS_HTTPRequest $request)
-    {
-        $locations = $this->getLocations();
-
-        if ($locations->canSortBy('distance')) {
-            $locations = $locations->sort('distance');
-        }
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ))->renderWith('LocationXML');
-    }
-
-    /**
-     * @return ArrayList|DataList
-     */
-    public function getLocations()
-    {
-        if (!$this->locations) {
-            $this->setLocations($this->request);
-        }
-        return $this->locations;
-    }
-
-    /**
-     * @param SS_HTTPRequest|null $request
-     * @return $this
-     */
-    public function setLocations(SS_HTTPRequest $request = null)
-    {
-
-        if ($request === null) {
-            $request = $this->request;
-        }
-        $filter = $this->config()->get('base_filter');
-
-        if ($request->getVar('CategoryID')) {
-            $filter['CategoryID'] = $request->getVar('CategoryID');
-        }
-
-        $this->extend('updateLocatorFilter', $filter, $request);
-
-        $filterAny = $this->config()->get('base_filter_any');
-        $this->extend('updateLocatorFilterAny', $filterAny, $request);
-
-        $exclude = $this->config()->get('base_exclude');
-        $this->extend('updateLocatorExclude', $exclude, $request);
-
-        $callback = null;
-        $this->extend('updateLocatorCallback', $callback, $request);
-
-        $locations = Locator::get_locations($filter, $filterAny, $exclude, $callback);
-        $locations = DataToArrayListHelper::to_array_list($locations);
-
-        $this->locations = $locations;
-        return $this;
-
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getAddressSearchCoords()
-    {
-        if (!$this->request->getVar('Address')) {
-            return false;
-        }
-        $coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
-
-        $lat = $coords['lat'];
-        $lng = $coords['lng'];
-
-        return "defaultLat: {$lat}, defaultLng: {$lng},";
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return Form
-     */
-    public function LocationSearch()
-    {
-        if (class_exists('BootstrapForm')) {
-            $form = LocatorBootstrapForm::create($this, 'LocationSearch');
-        } else {
-            $form = LocatorForm::create($this, 'LocationSearch');
-        }
-
-        return $form
-            ->setFormMethod('GET')
-            ->setFormAction($this->Link())
-            ->disableSecurityToken()
-            ->loadDataFrom($this->request->getVars());
-    }
+		}
+	}
+
+	/**
+	 * @param SS_HTTPRequest $request
+	 *
+	 * @return ViewableData_Customised
+	 */
+	public function index(SS_HTTPRequest $request)
+	{
+		$locations = $this->getLocations();
+
+		if ($locations->canSortBy('distance')) {
+			$locations = $locations->sort('distance');
+		}
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		));
+	}
+
+	/**
+	 * Return a XML feed of all locations marked "show in locator"
+	 *
+	 * @param SS_HTTPRequest $request
+	 * @return HTMLText
+	 */
+	public function xml(SS_HTTPRequest $request)
+	{
+		$locations = $this->getLocations();
+
+		if ($locations->canSortBy('distance')) {
+			$locations = $locations->sort('distance');
+		}
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		))->renderWith('LocationXML');
+	}
+
+	/**
+	 * @return ArrayList|DataList
+	 */
+	public function getLocations()
+	{
+		if (!$this->locations) {
+			$this->setLocations($this->request);
+		}
+		return $this->locations;
+	}
+
+	/**
+	 * @param SS_HTTPRequest|null $request
+	 * @return $this
+	 */
+	public function setLocations(SS_HTTPRequest $request = null)
+	{
+
+		if ($request === null) {
+			$request = $this->request;
+		}
+		$filter = $this->config()->get('base_filter');
+
+		if ($request->getVar('CategoryID')) {
+			$filter['CategoryID'] = $request->getVar('CategoryID');
+		}
+
+		$this->extend('updateLocatorFilter', $filter, $request);
+
+		$filterAny = $this->config()->get('base_filter_any');
+		$this->extend('updateLocatorFilterAny', $filterAny, $request);
+
+		$exclude = $this->config()->get('base_exclude');
+		$this->extend('updateLocatorExclude', $exclude, $request);
+
+		$callback = null;
+		$this->extend('updateLocatorCallback', $callback, $request);
+
+		$locations = Locator::get_locations($filter, $filterAny, $exclude, $callback);
+		$locations = DataToArrayListHelper::to_array_list($locations);
+
+		$this->locations = $locations;
+		return $this;
+
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getAddressSearchCoords()
+	{
+		if (!$this->request->getVar('Address')) {
+			return false;
+		}
+		$coords = GoogleGeocoding::address_to_point(Controller::curr()->getRequest()->getVar('Address'));
+
+		$lat = $coords['lat'];
+		$lng = $coords['lng'];
+
+		return "defaultLat: {$lat}, defaultLng: {$lng},";
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return Form
+	 */
+	public function LocationSearch()
+	{
+		if (class_exists('BootstrapForm')) {
+			$form = LocatorBootstrapForm::create($this, 'LocationSearch');
+		} else {
+			$form = LocatorForm::create($this, 'LocationSearch');
+		}
+
+		return $form
+			->setFormMethod('GET')
+			->setFormAction($this->Link())
+			->disableSecurityToken()
+			->loadDataFrom($this->request->getVars());
+	}
 
 }

tests/LocatorTest.php

Indentation +103 added lines, -103 removed lines

@@ -6,108 +6,108 @@
 class LocatorTest extends Locator_Test
 {
 
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $locator = singleton('Locator');
-        $this->assertInstanceOf('FieldList', $locator->getCMSFields());
-    }
-
-    /**
-     *
-     */
-    public function testLocations()
-    {
-        $filter = Config::inst()->get('Locator_Controller', 'base_filter');
-        $filterAny = Config::inst()->get('Locator_Controller', 'base_filter_any');
-        $exclude = Config::inst()->get('Locator_Controller', 'base_exclude');
-        $locations = Locator::get_locations($filter, $filterAny, $exclude);
-        $locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
-        $this->assertEquals($locations->count(), $locations2->count());
-    }
-
-    /**
-     *
-     */
-    public function testGetAllCategories()
-    {
-
-        $this->assertEquals(Locator::get_all_categories()->count(), 4);
-    }
-
-    /**
-     *
-     */
-    public function testGetPageCategories()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $this->assertEquals($locator->getPageCategories()->count(), 2);
-    }
-
-    /**
-     *
-     */
-    public function testLocatorCategoriesByLocator()
-    {
-
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 2);
-
-        $newLocator = Locator::create();
-        $newLocator->Title = 'Locator 2';
-        $newLocator->write();
-
-        $this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0);
-
-    }
-
-    /**
-     *
-     */
-    public function testInit()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testIndex()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $controller = Locator_Controller::create($locator);
-        $this->assertInstanceOf('ViewableData', $controller->index($controller->request));
-    }
-
-    /**
-     *
-     */
-    public function testXml()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $controller = Locator_Controller::create($locator);
-        $this->assertInstanceOf('HTMLText', $controller->xml($controller->request));
-    }
-
-    /**
-     *
-     */
-    public function testLocationSearch()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $object = Locator_Controller::create($locator);
-        $form = $object->LocationSearch();
-        $this->assertTrue(is_a($form, 'Form'));
-
-        $category = $this->objFromFixture('LocationCategory', 'service');
-        $category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
-        $locator->Categories()->add($category);
-        $locator->Categories()->add($category2);
-
-        $form = $object->LocationSearch();
-        $fields = $form->Fields();
-        $this->assertNotNull($fields->fieldByName('CategoryID'));
-    }
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$locator = singleton('Locator');
+		$this->assertInstanceOf('FieldList', $locator->getCMSFields());
+	}
+
+	/**
+	 *
+	 */
+	public function testLocations()
+	{
+		$filter = Config::inst()->get('Locator_Controller', 'base_filter');
+		$filterAny = Config::inst()->get('Locator_Controller', 'base_filter_any');
+		$exclude = Config::inst()->get('Locator_Controller', 'base_exclude');
+		$locations = Locator::get_locations($filter, $filterAny, $exclude);
+		$locations2 = Location::get()->filter($filter)->filterAny($filterAny)->exclude($exclude);
+		$this->assertEquals($locations->count(), $locations2->count());
+	}
+
+	/**
+	 *
+	 */
+	public function testGetAllCategories()
+	{
+
+		$this->assertEquals(Locator::get_all_categories()->count(), 4);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetPageCategories()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$this->assertEquals($locator->getPageCategories()->count(), 2);
+	}
+
+	/**
+	 *
+	 */
+	public function testLocatorCategoriesByLocator()
+	{
+
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$this->assertEquals(Locator::locator_categories_by_locator($locator->ID)->count(), 2);
+
+		$newLocator = Locator::create();
+		$newLocator->Title = 'Locator 2';
+		$newLocator->write();
+
+		$this->assertEquals(Locator::locator_categories_by_locator($newLocator->ID)->count(), 0);
+
+	}
+
+	/**
+	 *
+	 */
+	public function testInit()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testIndex()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$controller = Locator_Controller::create($locator);
+		$this->assertInstanceOf('ViewableData', $controller->index($controller->request));
+	}
+
+	/**
+	 *
+	 */
+	public function testXml()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$controller = Locator_Controller::create($locator);
+		$this->assertInstanceOf('HTMLText', $controller->xml($controller->request));
+	}
+
+	/**
+	 *
+	 */
+	public function testLocationSearch()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$object = Locator_Controller::create($locator);
+		$form = $object->LocationSearch();
+		$this->assertTrue(is_a($form, 'Form'));
+
+		$category = $this->objFromFixture('LocationCategory', 'service');
+		$category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
+		$locator->Categories()->add($category);
+		$locator->Categories()->add($category2);
+
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertNotNull($fields->fieldByName('CategoryID'));
+	}
 
 }