dynamic / silverstripe-locator

src/objects/Location.php

Indentation +252 added lines, -252 removed lines

@@ -28,256 +28,256 @@
  */
 class Location extends DataObject implements PermissionProvider
 {
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
-
-    /**
-     * @var array
-     */
-    private static $db = [
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'Fax' => 'Varchar(45)',
-        'Import_ID' => 'Int',
-    ];
-
-    private static $many_many = [
-        'Categories' => LocationCategory::class,
-    ];
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'Location';
-
-    /**
-     * @var array
-     */
-    private static $casting = [
-        'distance' => 'Decimal(9,3)',
-    ];
-
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
-
-    /**
-     * api access via Restful Server module
-     *
-     * @var bool
-     */
-    private static $api_access = true;
-
-    /**
-     * search fields for Model Admin
-     *
-     * @var array
-     */
-    private static $searchable_fields = [
-        'Title',
-        'Address',
-        'City',
-        'State',
-        'PostalCode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Featured',
-    ];
-
-    /**
-     * columns for grid field
-     *
-     * @var array
-     */
-    private static $summary_fields = [
-        'Title',
-        'Address',
-        'Address2',
-        'City',
-        'State',
-        'PostalCode',
-        'CountryCode',
-        'Phone' => 'Phone',
-        'Fax' => 'Fax',
-        'Email' => 'Email',
-        'Website' => 'Website',
-        'Featured',
-        'CategoryList',
-        'Lat',
-        'Lng',
-        'Import_ID',
-    ];
-
-    /**
-     * Coords status for $summary_fields
-     *
-     * @return string
-     */
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
-
-    /**
-     * @return string
-     */
-    public function getCategoryList()
-    {
-        if ($this->Categories()->count()) {
-            return implode(', ', $this->Categories()->column('Name'));
-        }
-
-        return '';
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getCountryCode()
-    {
-        if ($this->Country) {
-            return strtoupper($this->Country);
-        }
-
-        return false;
-    }
-
-    /**
-     * custom labels for fields
-     *
-     * @param bool $includerelations
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
-        $labels['Title'] = 'Name';
-        $labels['Address2'] = 'Address 2';
-        $labels['PostalCode'] = 'Postal Code';
-        $labels['Categories.Name'] = 'Categories';
-        $labels['Featured.NiceAsBoolean'] = 'Featured';
-
-        return $labels;
-    }
-
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $this->beforeUpdateCMSFields(function ($fields) {
-            $fields->removeByName([
-                'Import_ID',
-                'LinkTracking',
-                'FileTracking',
-            ]);
-
-            $fields->dataFieldByName('Website')
-                ->setAttribute('placeholder', 'http://');
-
-            $fields->replaceField('Email', EmailField::create('Email'));
-
-            $featured = $fields->dataFieldByName('Featured')
-                ->setDescription('Location will display near the top of the results list');
-            $fields->insertAfter(
-                'Fax',
-                $featured
-            );
-
-            if ($this->ID) {
-                $categories = $fields->dataFieldByName('Categories');
-                $config = $categories->getConfig();
-                $config->removeComponentsByType([
-                    GridFieldAddExistingAutocompleter::class,
-                ])
-                    ->addComponents([
-                        new GridFieldAddExistingSearchButton(),
-                    ]);
-            }
-        });
-
-        $fields = parent::getCMSFields();
-
-        // allow to be extended via DataExtension
-        $this->extend('updateLocationFields', $fields);
-
-        return $fields;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool
-     */
-    public function canView($member = null, $context = [])
-    {
-        return true;
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canEdit($member = null, $context = [])
-    {
-        return Permission::check('Location_EDIT', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canDelete($member = null, $context = [])
-    {
-        return Permission::check('Location_DELETE', 'any', $member);
-    }
-
-    /**
-     * @param null $member
-     * @param array $context
-     * @return bool|int
-     */
-    public function canCreate($member = null, $context = [])
-    {
-        return Permission::check('Location_CREATE', 'any', $member);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return [
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function getWebsiteURL()
-    {
-        $url = $this->Website;
-
-        $this->extend('updateWebsiteURL', $url);
-
-        return $url;
-    }
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Location';
+
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locations';
+
+	/**
+	 * @var array
+	 */
+	private static $db = [
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'Fax' => 'Varchar(45)',
+		'Import_ID' => 'Int',
+	];
+
+	private static $many_many = [
+		'Categories' => LocationCategory::class,
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'Location';
+
+	/**
+	 * @var array
+	 */
+	private static $casting = [
+		'distance' => 'Decimal(9,3)',
+	];
+
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
+
+	/**
+	 * api access via Restful Server module
+	 *
+	 * @var bool
+	 */
+	private static $api_access = true;
+
+	/**
+	 * search fields for Model Admin
+	 *
+	 * @var array
+	 */
+	private static $searchable_fields = [
+		'Title',
+		'Address',
+		'City',
+		'State',
+		'PostalCode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Featured',
+	];
+
+	/**
+	 * columns for grid field
+	 *
+	 * @var array
+	 */
+	private static $summary_fields = [
+		'Title',
+		'Address',
+		'Address2',
+		'City',
+		'State',
+		'PostalCode',
+		'CountryCode',
+		'Phone' => 'Phone',
+		'Fax' => 'Fax',
+		'Email' => 'Email',
+		'Website' => 'Website',
+		'Featured',
+		'CategoryList',
+		'Lat',
+		'Lng',
+		'Import_ID',
+	];
+
+	/**
+	 * Coords status for $summary_fields
+	 *
+	 * @return string
+	 */
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCategoryList()
+	{
+		if ($this->Categories()->count()) {
+			return implode(', ', $this->Categories()->column('Name'));
+		}
+
+		return '';
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getCountryCode()
+	{
+		if ($this->Country) {
+			return strtoupper($this->Country);
+		}
+
+		return false;
+	}
+
+	/**
+	 * custom labels for fields
+	 *
+	 * @param bool $includerelations
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
+		$labels['Title'] = 'Name';
+		$labels['Address2'] = 'Address 2';
+		$labels['PostalCode'] = 'Postal Code';
+		$labels['Categories.Name'] = 'Categories';
+		$labels['Featured.NiceAsBoolean'] = 'Featured';
+
+		return $labels;
+	}
+
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$this->beforeUpdateCMSFields(function ($fields) {
+			$fields->removeByName([
+				'Import_ID',
+				'LinkTracking',
+				'FileTracking',
+			]);
+
+			$fields->dataFieldByName('Website')
+				->setAttribute('placeholder', 'http://');
+
+			$fields->replaceField('Email', EmailField::create('Email'));
+
+			$featured = $fields->dataFieldByName('Featured')
+				->setDescription('Location will display near the top of the results list');
+			$fields->insertAfter(
+				'Fax',
+				$featured
+			);
+
+			if ($this->ID) {
+				$categories = $fields->dataFieldByName('Categories');
+				$config = $categories->getConfig();
+				$config->removeComponentsByType([
+					GridFieldAddExistingAutocompleter::class,
+				])
+					->addComponents([
+						new GridFieldAddExistingSearchButton(),
+					]);
+			}
+		});
+
+		$fields = parent::getCMSFields();
+
+		// allow to be extended via DataExtension
+		$this->extend('updateLocationFields', $fields);
+
+		return $fields;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool
+	 */
+	public function canView($member = null, $context = [])
+	{
+		return true;
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canEdit($member = null, $context = [])
+	{
+		return Permission::check('Location_EDIT', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canDelete($member = null, $context = [])
+	{
+		return Permission::check('Location_DELETE', 'any', $member);
+	}
+
+	/**
+	 * @param null $member
+	 * @param array $context
+	 * @return bool|int
+	 */
+	public function canCreate($member = null, $context = [])
+	{
+		return Permission::check('Location_CREATE', 'any', $member);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return [
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getWebsiteURL()
+	{
+		$url = $this->Website;
+
+		$this->extend('updateWebsiteURL', $url);
+
+		return $url;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function($fields) {
             $fields->removeByName([
                 'Import_ID',
                 'LinkTracking',

tests/Extension/LocationExtension.php

Indentation +8 added lines, -8 removed lines

@@ -11,12 +11,12 @@
  */
 class LocationExtension extends DataExtension implements TestOnly
 {
-    /**
-     * @param $url
-     * @return string
-     */
-    public function updateWebsiteURL(&$url)
-    {
-        $url = 'foo';
-    }
+	/**
+	 * @param $url
+	 * @return string
+	 */
+	public function updateWebsiteURL(&$url)
+	{
+		$url = 'foo';
+	}
 }

tests/Model/ExtendedLocation.php

Indentation +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@
  */
 class ExtendedLocation extends Location implements TestOnly
 {
-    /**
-     * @var array
-     */
-    private static $extensions = [
-        LocationExtension::class,
-    ];
+	/**
+	 * @var array
+	 */
+	private static $extensions = [
+		LocationExtension::class,
+	];
 }

src/pages/LocatorController.php

Indentation +316 added lines, -316 removed lines

@@ -18,131 +18,131 @@ 
  */
 class LocatorController extends \PageController
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = [
-        'xml',
-        'json',
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter = [];
-
-    /**
-     * @var array
-     */
-    private static $base_exclude = [
-        'Lat' => 0,
-        'Lng' => 0,
-    ];
-
-    /**
-     * @var array
-     */
-    private static $base_filter_any = [];
-
-    /**
-     * @var bool
-     */
-    private static $bootstrapify = true;
-
-    /**
-     * ID of map container
-     *
-     * @var string
-     */
-    private static $map_container = 'map';
-
-    /**
-     * class of location list container
-     *
-     * @var string
-     */
-    private static $list_container = 'loc-list';
-
-    /**
-     * GET variable which, if isset, will trigger storeLocator init and return XML
-     *
-     * @var string
-     */
-    private static $query_trigger = 'action_doFilterLocations';
-
-    /**
-     * @var DataList|ArrayList
-     */
-    protected $locations;
-
-    /**
-     * Set Requirements based on input from CMS
-     */
-    public function init()
-    {
-        parent::init();
-        // google maps api key
-        $key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
-        Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
-
-        // prevent init of map if no query
-        $request = Controller::curr()->getRequest();
-
-        if ($this->getTrigger($request)) {
-            $locations = $this->getLocations();
-
-            if ($locations) {
-                $featuredInList = ($locations->filter('Featured', true)->count() > 0);
-                $defaultCoords = $this->getAddressSearchCoords() ?
-                    $this->getAddressSearchCoords() :
-                    new ArrayData([
-                        "Lat" => 0,
-                        "Lng" => 0,
-                    ]);
-
-                $featured = $featuredInList
-                    ? 'featuredLocations: true'
-                    : 'featuredLocations: false';
-
-                // map config based on user input in Settings tab
-                $limit = Config::inst()->get(LocatorController::class, 'limit');
-                if ($limit < 1) {
-                    $limit = -1;
-                }
-                $load = 'fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,';
-
-                $listTemplatePath = $this->getListTemplate();
-                $infowindowTemplatePath = $this->getInfoWindowTemplate();
-
-                $kilometer = ($this->data()->Unit == 'km') ? "lengthUnit: 'km'" : "lengthUnit: 'm'";
-
-                // pass GET variables to xml action
-                $vars = $this->request->getVars();
-                unset($vars['url']);
-                $url = '';
-                if (count($vars)) {
-                    $url .= '?' . http_build_query($vars);
-                }
-                $link = Controller::join_links($this->Link(), 'xml.xml', $url);
-
-                // containers
-                $map_id = Config::inst()->get(LocatorController::class, 'map_container');
-                $list_class = Config::inst()->get(LocatorController::class, 'list_container');
-
-                $mapStyle = '';
-                if ($stylePath = $this->getMapStyleJSONPath()) {
-                    if ($style = file_get_contents($stylePath)) {
-                        $mapStyle = "styles: {$style},";
-                    }
-                };
-
-                $markerImage = '';
-                if ($imagePath = $this->getMarkerIcon()) {
-                    $markerImage = "markerImg: '{$imagePath}',";
-                }
-
-                // init map
-                Requirements::customScript("
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = [
+		'xml',
+		'json',
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter = [];
+
+	/**
+	 * @var array
+	 */
+	private static $base_exclude = [
+		'Lat' => 0,
+		'Lng' => 0,
+	];
+
+	/**
+	 * @var array
+	 */
+	private static $base_filter_any = [];
+
+	/**
+	 * @var bool
+	 */
+	private static $bootstrapify = true;
+
+	/**
+	 * ID of map container
+	 *
+	 * @var string
+	 */
+	private static $map_container = 'map';
+
+	/**
+	 * class of location list container
+	 *
+	 * @var string
+	 */
+	private static $list_container = 'loc-list';
+
+	/**
+	 * GET variable which, if isset, will trigger storeLocator init and return XML
+	 *
+	 * @var string
+	 */
+	private static $query_trigger = 'action_doFilterLocations';
+
+	/**
+	 * @var DataList|ArrayList
+	 */
+	protected $locations;
+
+	/**
+	 * Set Requirements based on input from CMS
+	 */
+	public function init()
+	{
+		parent::init();
+		// google maps api key
+		$key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
+		Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+
+		// prevent init of map if no query
+		$request = Controller::curr()->getRequest();
+
+		if ($this->getTrigger($request)) {
+			$locations = $this->getLocations();
+
+			if ($locations) {
+				$featuredInList = ($locations->filter('Featured', true)->count() > 0);
+				$defaultCoords = $this->getAddressSearchCoords() ?
+					$this->getAddressSearchCoords() :
+					new ArrayData([
+						"Lat" => 0,
+						"Lng" => 0,
+					]);
+
+				$featured = $featuredInList
+					? 'featuredLocations: true'
+					: 'featuredLocations: false';
+
+				// map config based on user input in Settings tab
+				$limit = Config::inst()->get(LocatorController::class, 'limit');
+				if ($limit < 1) {
+					$limit = -1;
+				}
+				$load = 'fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,';
+
+				$listTemplatePath = $this->getListTemplate();
+				$infowindowTemplatePath = $this->getInfoWindowTemplate();
+
+				$kilometer = ($this->data()->Unit == 'km') ? "lengthUnit: 'km'" : "lengthUnit: 'm'";
+
+				// pass GET variables to xml action
+				$vars = $this->request->getVars();
+				unset($vars['url']);
+				$url = '';
+				if (count($vars)) {
+					$url .= '?' . http_build_query($vars);
+				}
+				$link = Controller::join_links($this->Link(), 'xml.xml', $url);
+
+				// containers
+				$map_id = Config::inst()->get(LocatorController::class, 'map_container');
+				$list_class = Config::inst()->get(LocatorController::class, 'list_container');
+
+				$mapStyle = '';
+				if ($stylePath = $this->getMapStyleJSONPath()) {
+					if ($style = file_get_contents($stylePath)) {
+						$mapStyle = "styles: {$style},";
+					}
+				};
+
+				$markerImage = '';
+				if ($imagePath = $this->getMarkerIcon()) {
+					$markerImage = "markerImg: '{$imagePath}',";
+				}
+
+				// init map
+				Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({
                         {$load}
@@ -171,195 +171,195 @@ 
                     });
                 });
             ", 'jquery-locator');
-            }
-        }
-    }
-
-    /**
-     * @param HTTPRequest $request
-     *
-     * @return bool
-     */
-    public function getTrigger(HTTPRequest $request = null)
-    {
-        if ($request === null) {
-            $request = $this->getRequest();
-        }
-        $trigger = $request->getVar(Config::inst()->get(LocatorController::class, 'query_trigger'));
-
-        return isset($trigger);
-    }
-
-    /**
-     * @return ArrayList|DataList
-     */
-    public function getLocations()
-    {
-        if (!$this->locations) {
-            $this->setLocations($this->request);
-        }
-
-        return $this->locations;
-    }
-
-    /**
-     * @param HTTPRequest|null $request
-     *
-     * @return $this
-     */
-    public function setLocations(HTTPRequest $request = null)
-    {
-
-        if ($request === null) {
-            $request = $this->request;
-        }
-        $filter = $this->config()->get('base_filter');
-
-        $categoryVar = $this->data()->config()->get('category_var');
-        if ($request->getVar($categoryVar)) {
-            $filter['Categories.ID'] = $request->getVar($categoryVar);
-        } else {
-            if ($this->getPageCategories()->exists()) {
-                foreach ($this->getPageCategories() as $category) {
-                    $filter['Categories.ID'][] = $category->ID;
-                }
-            }
-        }
-
-        $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);
-
-        $class = $this->data()->ClassName;
-        $locations = $class::get_locations($filter, $filterAny, $exclude);
-        $locations = DataToArrayListHelper::to_array_list($locations);
-
-        //allow for adjusting list post possible distance calculation
-        $this->extend('updateLocationList', $locations);
-
-        if ($locations->canSortBy('Distance')) {
-            $locations = $locations->sort('Distance');
-        }
-
-        if ($this->getShowRadius()) {
-            $radiusVar = $this->data()->config()->get('radius_var');
-
-            if ($radius = (int)$request->getVar($radiusVar)) {
-                $locations = $locations->filterByCallback(function ($location) use (&$radius) {
-                    return $location->Distance <= $radius;
-                });
-            }
-        }
-
-        //allow for returning list to be set as
-        $this->extend('updateListType', $locations);
-
-        $limit = $this->getLimit();
-        if ($limit > 0) {
-            $locations = $locations->limit($limit);
-        }
-
-        $this->locations = $locations;
-
-        return $this;
-    }
-
-    /**
-     * @return ArrayData|boolean
-     */
-    public function getAddressSearchCoords()
-    {
-        $addressVar = Config::inst()->get(DistanceDataExtension::class, 'address_var');
-        if (!$this->request->getVar($addressVar)) {
-            return false;
-        }
-        if (class_exists(GoogleGeocoder::class)) {
-            $geocoder = new GoogleGeocoder($this->request->getVar($addressVar));
-            $response = $geocoder->getResult();
-            $lat = $response->getLatitude();
-            $lng = $response->getLongitude();
-
-            return new ArrayData([
-                "Lat" => $lat,
-                "Lng" => $lng,
-            ]);
-        }
-    }
-
-    /**
-     * @param HTTPRequest $request
-     *
-     * @return \SilverStripe\View\ViewableData_Customised
-     */
-    public function index(HTTPRequest $request)
-    {
-        if ($this->getTrigger($request)) {
-            $locations = $this->getLocations();
-        } else {
-            $locations = ArrayList::create();
-        }
-
-        return $this->customise(array(
-            'Locations' => $locations,
-        ));
-    }
-
-    /**
-     * Renders locations in xml format
-     *
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function xml()
-    {
-        $this->getResponse()->addHeader("Content-Type", "application/xml");
-        $data = new ArrayData(array(
-            "Locations" => $this->getLocations(),
-            "AddressCoords" => $this->getAddressSearchCoords(),
-        ));
-
-        return $data->renderWith('Dynamic/Locator/Data/XML');
-    }
-
-    /**
-     * Renders locations in json format
-     *
-     * @return \SilverStripe\ORM\FieldType\DBHTMLText
-     */
-    public function json()
-    {
-        $this->getResponse()->addHeader("Content-Type", "application/json");
-        $data = new ArrayData(array(
-            "Locations" => $this->getLocations(),
-            "AddressCoords" => $this->getAddressSearchCoords(),
-        ));
-
-        return $data->renderWith('Dynamic/Locator/Data/JSON');
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return \SilverStripe\Forms\Form
-     */
-    public function LocationSearch()
-    {
-
-        $form = LocatorForm::create($this, 'LocationSearch');
-        if (class_exists(BootstrapForm::class) && $this->config()->get('bootstrapify')) {
-            $form->Fields()->bootstrapify();
-            $form->Actions()->bootstrapify();
-        }
-
-        return $form
-            ->setFormMethod('GET')
-            ->setFormAction($this->Link())
-            ->disableSecurityToken()
-            ->loadDataFrom($this->request->getVars());
-    }
+			}
+		}
+	}
+
+	/**
+	 * @param HTTPRequest $request
+	 *
+	 * @return bool
+	 */
+	public function getTrigger(HTTPRequest $request = null)
+	{
+		if ($request === null) {
+			$request = $this->getRequest();
+		}
+		$trigger = $request->getVar(Config::inst()->get(LocatorController::class, 'query_trigger'));
+
+		return isset($trigger);
+	}
+
+	/**
+	 * @return ArrayList|DataList
+	 */
+	public function getLocations()
+	{
+		if (!$this->locations) {
+			$this->setLocations($this->request);
+		}
+
+		return $this->locations;
+	}
+
+	/**
+	 * @param HTTPRequest|null $request
+	 *
+	 * @return $this
+	 */
+	public function setLocations(HTTPRequest $request = null)
+	{
+
+		if ($request === null) {
+			$request = $this->request;
+		}
+		$filter = $this->config()->get('base_filter');
+
+		$categoryVar = $this->data()->config()->get('category_var');
+		if ($request->getVar($categoryVar)) {
+			$filter['Categories.ID'] = $request->getVar($categoryVar);
+		} else {
+			if ($this->getPageCategories()->exists()) {
+				foreach ($this->getPageCategories() as $category) {
+					$filter['Categories.ID'][] = $category->ID;
+				}
+			}
+		}
+
+		$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);
+
+		$class = $this->data()->ClassName;
+		$locations = $class::get_locations($filter, $filterAny, $exclude);
+		$locations = DataToArrayListHelper::to_array_list($locations);
+
+		//allow for adjusting list post possible distance calculation
+		$this->extend('updateLocationList', $locations);
+
+		if ($locations->canSortBy('Distance')) {
+			$locations = $locations->sort('Distance');
+		}
+
+		if ($this->getShowRadius()) {
+			$radiusVar = $this->data()->config()->get('radius_var');
+
+			if ($radius = (int)$request->getVar($radiusVar)) {
+				$locations = $locations->filterByCallback(function ($location) use (&$radius) {
+					return $location->Distance <= $radius;
+				});
+			}
+		}
+
+		//allow for returning list to be set as
+		$this->extend('updateListType', $locations);
+
+		$limit = $this->getLimit();
+		if ($limit > 0) {
+			$locations = $locations->limit($limit);
+		}
+
+		$this->locations = $locations;
+
+		return $this;
+	}
+
+	/**
+	 * @return ArrayData|boolean
+	 */
+	public function getAddressSearchCoords()
+	{
+		$addressVar = Config::inst()->get(DistanceDataExtension::class, 'address_var');
+		if (!$this->request->getVar($addressVar)) {
+			return false;
+		}
+		if (class_exists(GoogleGeocoder::class)) {
+			$geocoder = new GoogleGeocoder($this->request->getVar($addressVar));
+			$response = $geocoder->getResult();
+			$lat = $response->getLatitude();
+			$lng = $response->getLongitude();
+
+			return new ArrayData([
+				"Lat" => $lat,
+				"Lng" => $lng,
+			]);
+		}
+	}
+
+	/**
+	 * @param HTTPRequest $request
+	 *
+	 * @return \SilverStripe\View\ViewableData_Customised
+	 */
+	public function index(HTTPRequest $request)
+	{
+		if ($this->getTrigger($request)) {
+			$locations = $this->getLocations();
+		} else {
+			$locations = ArrayList::create();
+		}
+
+		return $this->customise(array(
+			'Locations' => $locations,
+		));
+	}
+
+	/**
+	 * Renders locations in xml format
+	 *
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function xml()
+	{
+		$this->getResponse()->addHeader("Content-Type", "application/xml");
+		$data = new ArrayData(array(
+			"Locations" => $this->getLocations(),
+			"AddressCoords" => $this->getAddressSearchCoords(),
+		));
+
+		return $data->renderWith('Dynamic/Locator/Data/XML');
+	}
+
+	/**
+	 * Renders locations in json format
+	 *
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
+	 */
+	public function json()
+	{
+		$this->getResponse()->addHeader("Content-Type", "application/json");
+		$data = new ArrayData(array(
+			"Locations" => $this->getLocations(),
+			"AddressCoords" => $this->getAddressSearchCoords(),
+		));
+
+		return $data->renderWith('Dynamic/Locator/Data/JSON');
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return \SilverStripe\Forms\Form
+	 */
+	public function LocationSearch()
+	{
+
+		$form = LocatorForm::create($this, 'LocationSearch');
+		if (class_exists(BootstrapForm::class) && $this->config()->get('bootstrapify')) {
+			$form->Fields()->bootstrapify();
+			$form->Actions()->bootstrapify();
+		}
+
+		return $form
+			->setFormMethod('GET')
+			->setFormAction($this->Link())
+			->disableSecurityToken()
+			->loadDataFrom($this->request->getVars());
+	}
 }

Spacing +6 added lines, -7 removed lines

@@ -83,7 +83,7 @@ 
         parent::init();
         // google maps api key
         $key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
-        Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+        Requirements::javascript('https://maps.google.com/maps/api/js?key='.$key);
 
         // prevent init of map if no query
         $request = Controller::curr()->getRequest();
@@ -94,8 +94,7 @@ 
             if ($locations) {
                 $featuredInList = ($locations->filter('Featured', true)->count() > 0);
                 $defaultCoords = $this->getAddressSearchCoords() ?
-                    $this->getAddressSearchCoords() :
-                    new ArrayData([
+                    $this->getAddressSearchCoords() : new ArrayData([
                         "Lat" => 0,
                         "Lng" => 0,
                     ]);
@@ -109,7 +108,7 @@ 
                 if ($limit < 1) {
                     $limit = -1;
                 }
-                $load = 'fullMapStart: true, storeLimit: ' . $limit . ', maxDistance: true,';
+                $load = 'fullMapStart: true, storeLimit: '.$limit.', maxDistance: true,';
 
                 $listTemplatePath = $this->getListTemplate();
                 $infowindowTemplatePath = $this->getInfoWindowTemplate();
@@ -121,7 +120,7 @@ 
                 unset($vars['url']);
                 $url = '';
                 if (count($vars)) {
-                    $url .= '?' . http_build_query($vars);
+                    $url .= '?'.http_build_query($vars);
                 }
                 $link = Controller::join_links($this->Link(), 'xml.xml', $url);
 
@@ -248,8 +247,8 @@ 
         if ($this->getShowRadius()) {
             $radiusVar = $this->data()->config()->get('radius_var');
 
-            if ($radius = (int)$request->getVar($radiusVar)) {
-                $locations = $locations->filterByCallback(function ($location) use (&$radius) {
+            if ($radius = (int) $request->getVar($radiusVar)) {
+                $locations = $locations->filterByCallback(function($location) use (&$radius) {
                     return $location->Distance <= $radius;
                 });
             }