dynamic / silverstripe-locator

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,
+	];
 }

tests/pages/LocatorControllerTest.php

Indentation +63 added lines, -63 removed lines

@@ -17,78 +17,78 @@
 class LocatorControllerTest extends FunctionalTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = '../fixtures.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = '../fixtures.yml';
 
-    /**
-     * @var bool
-     */
-    protected static $use_draft_site = true;
+	/**
+	 * @var bool
+	 */
+	protected static $use_draft_site = true;
 
-    /**
-     *
-     */
-    public function testIndex()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $controller = LocatorController::create($locator);
-        $this->assertInstanceOf(ViewableData::class, $controller->index($controller->getRequest()));
-    }
+	/**
+	 *
+	 */
+	public function testIndex()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$controller = LocatorController::create($locator);
+		$this->assertInstanceOf(ViewableData::class, $controller->index($controller->getRequest()));
+	}
 
-    /**
-     *
-     */
-    public function testXml()
-    {
-        /** @var Locator $locator */
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $page = $this->get($locator->Link('xml'));
+	/**
+	 *
+	 */
+	public function testXml()
+	{
+		/** @var Locator $locator */
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$page = $this->get($locator->Link('xml'));
 
-        $this->assertEquals(200, $page->getStatusCode());
-        $this->assertEquals('application/xml', $page->getHeader('content-type'));
+		$this->assertEquals(200, $page->getStatusCode());
+		$this->assertEquals('application/xml', $page->getHeader('content-type'));
 
-        $dom = new \DOMDocument();
-        // true if it loads, false if it doesn't
-        $valid = $dom->loadXML($page->getBody());
-        $this->assertTrue($valid);
-    }
+		$dom = new \DOMDocument();
+		// true if it loads, false if it doesn't
+		$valid = $dom->loadXML($page->getBody());
+		$this->assertTrue($valid);
+	}
 
-    /**
-     *
-     */
-    public function testJson()
-    {
-        /** @var Locator $locator */
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $page = $this->get($locator->Link('json'));
+	/**
+	 *
+	 */
+	public function testJson()
+	{
+		/** @var Locator $locator */
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$page = $this->get($locator->Link('json'));
 
-        $this->assertEquals(200, $page->getStatusCode());
-        $this->assertEquals('application/json', $page->getHeader('content-type'));
+		$this->assertEquals(200, $page->getStatusCode());
+		$this->assertEquals('application/json', $page->getHeader('content-type'));
 
-        $json = json_decode($page->getBody());
-        // if it is null its not valid
-        $this->assertNotNull($json);
-    }
+		$json = json_decode($page->getBody());
+		// if it is null its not valid
+		$this->assertNotNull($json);
+	}
 
-    /**
-     *
-     */
-    public function testLocationSearch()
-    {
-        $locator = $this->objFromFixture(Locator::class, 'locator1');
-        $object = LocatorController::create($locator);
-        $form = $object->LocationSearch();
-        $this->assertInstanceOf(Form::class, $form);
+	/**
+	 *
+	 */
+	public function testLocationSearch()
+	{
+		$locator = $this->objFromFixture(Locator::class, 'locator1');
+		$object = LocatorController::create($locator);
+		$form = $object->LocationSearch();
+		$this->assertInstanceOf(Form::class, $form);
 
-        $category = $this->objFromFixture(LocationCategory::class, 'service');
-        $category2 = $this->objFromFixture(LocationCategory::class, 'manufacturing');
-        $locator->Categories()->add($category);
-        $locator->Categories()->add($category2);
+		$category = $this->objFromFixture(LocationCategory::class, 'service');
+		$category2 = $this->objFromFixture(LocationCategory::class, 'manufacturing');
+		$locator->Categories()->add($category);
+		$locator->Categories()->add($category2);
 
-        $form = $object->LocationSearch();
-        $fields = $form->Fields();
-        $this->assertInstanceOf(FieldList::class, $fields);
-    }
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertInstanceOf(FieldList::class, $fields);
+	}
 }

src/pages/LocatorController.php

Indentation +339 added lines, -339 removed lines

@@ -20,347 +20,347 @@
  */
 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();
-
-        // prevent init of map if no query
-        $request = Controller::curr()->getRequest();
-        if (!$this->getTrigger($request)) {
-            return;
-        }
-
-        $locations = $this->getLocations();
-
-        // prevent init of map if there are no locations
-        if (!$locations) {
-            return;
-        }
-
-        // google maps api key
-        $key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
-        Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
-
-        $mapSettings = [
-            'fullMapStart' => true,
-            'maxDistance' => true,
-            'storeLimit' => -1,
-            'originMarker' => true,
-            'slideMap' => false,
-            'distanceAlert' => -1,
-            'featuredLocations' => false,
-            'defaultLat' => 0,
-            'defaultLng' => 0,
-            'mapSettings' => [
-                'zoom' => 12,
-                'mapTypeId' => 'google.maps.MapTypeId.ROADMAP',
-                'disableDoubleClickZoom' => true,
-                'scrollwheel' => false,
-                'navigationControl' => false,
-                'draggable' => false
-            ],
-        ];
-
-        $mapSettings['listTemplatePath'] = $this->getListTemplate();
-        $mapSettings['infowindowTemplatePath'] = $this->getInfoWindowTemplate();
-        $mapSettings['lengthUnit'] = $this->data()->Unit == 'km' ? 'km' : 'm';
-        $mapSettings['mapID'] = Config::inst()->get(LocatorController::class, 'map_container');
-        $mapSettings['locationList'] = Config::inst()->get(LocatorController::class, 'list_container');
-
-        if ($locations->filter('Featured', true)->count() > 0) {
-            $mapSettings['featuredLocations'] = true;
-        }
-
-        // map config based on user input in Settings tab
-        $limit = Config::inst()->get(LocatorController::class, 'limit');
-        if (0 < $limit) {
-            $mapSettings['storeLimit'] = $limit;
-        }
-
-        if ($coords = $this->getAddressSearchCoords()) {
-            $mapSettings['defaultLat'] = $coords->getField("Lat");
-            $mapSettings['defaultLat'] = $coords->getField("Lng");
-        }
-
-        // pass GET variables to xml action
-        $vars = $this->request->getVars();
-        unset($vars['url']);
-        $url = '';
-        if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
-        }
-        $mapSettings['dataLocation'] = Controller::join_links($this->Link(), 'xml.xml', $url);
-
-        if ($stylePath = $this->getMapStyleJSONPath()) {
-            if ($style = file_get_contents($stylePath)) {
-                $mapSettings['mapSettings']['styles'] = json_decode($style);
-            }
-        }
-
-        if ($imagePath = $this->getMarkerIcon()) {
-            $mapSettings['markerImg'] = $imagePath;
-        }
-
-        $this->extend('modifyMapSettings', $mapSettings);
-
-        $encoded = json_encode($mapSettings, JSON_UNESCAPED_SLASHES);
-        // mapTypeId is a javascript object
-        $encoded = preg_replace('/("mapTypeId"\s*:\s*)"(.+?)"/i', '$1$2', $encoded);
-
-        $this->extend('modifyMapSettingsEncoded', $encoded);
-        // 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();
+
+		// prevent init of map if no query
+		$request = Controller::curr()->getRequest();
+		if (!$this->getTrigger($request)) {
+			return;
+		}
+
+		$locations = $this->getLocations();
+
+		// prevent init of map if there are no locations
+		if (!$locations) {
+			return;
+		}
+
+		// google maps api key
+		$key = Config::inst()->get(GoogleGeocoder::class, 'map_api_key');
+		Requirements::javascript('https://maps.google.com/maps/api/js?key=' . $key);
+
+		$mapSettings = [
+			'fullMapStart' => true,
+			'maxDistance' => true,
+			'storeLimit' => -1,
+			'originMarker' => true,
+			'slideMap' => false,
+			'distanceAlert' => -1,
+			'featuredLocations' => false,
+			'defaultLat' => 0,
+			'defaultLng' => 0,
+			'mapSettings' => [
+				'zoom' => 12,
+				'mapTypeId' => 'google.maps.MapTypeId.ROADMAP',
+				'disableDoubleClickZoom' => true,
+				'scrollwheel' => false,
+				'navigationControl' => false,
+				'draggable' => false
+			],
+		];
+
+		$mapSettings['listTemplatePath'] = $this->getListTemplate();
+		$mapSettings['infowindowTemplatePath'] = $this->getInfoWindowTemplate();
+		$mapSettings['lengthUnit'] = $this->data()->Unit == 'km' ? 'km' : 'm';
+		$mapSettings['mapID'] = Config::inst()->get(LocatorController::class, 'map_container');
+		$mapSettings['locationList'] = Config::inst()->get(LocatorController::class, 'list_container');
+
+		if ($locations->filter('Featured', true)->count() > 0) {
+			$mapSettings['featuredLocations'] = true;
+		}
+
+		// map config based on user input in Settings tab
+		$limit = Config::inst()->get(LocatorController::class, 'limit');
+		if (0 < $limit) {
+			$mapSettings['storeLimit'] = $limit;
+		}
+
+		if ($coords = $this->getAddressSearchCoords()) {
+			$mapSettings['defaultLat'] = $coords->getField("Lat");
+			$mapSettings['defaultLat'] = $coords->getField("Lng");
+		}
+
+		// pass GET variables to xml action
+		$vars = $this->request->getVars();
+		unset($vars['url']);
+		$url = '';
+		if (count($vars)) {
+			$url .= '?' . http_build_query($vars);
+		}
+		$mapSettings['dataLocation'] = Controller::join_links($this->Link(), 'xml.xml', $url);
+
+		if ($stylePath = $this->getMapStyleJSONPath()) {
+			if ($style = file_get_contents($stylePath)) {
+				$mapSettings['mapSettings']['styles'] = json_decode($style);
+			}
+		}
+
+		if ($imagePath = $this->getMarkerIcon()) {
+			$mapSettings['markerImg'] = $imagePath;
+		}
+
+		$this->extend('modifyMapSettings', $mapSettings);
+
+		$encoded = json_encode($mapSettings, JSON_UNESCAPED_SLASHES);
+		// mapTypeId is a javascript object
+		$encoded = preg_replace('/("mapTypeId"\s*:\s*)"(.+?)"/i', '$1$2', $encoded);
+
+		$this->extend('modifyMapSettingsEncoded', $encoded);
+		// init map
+		Requirements::customScript("
                 $(function(){
                     $('#map-container').storeLocator({$encoded});
                 });
             ", '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 +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
 
         // 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);
 
         $mapSettings = [
             'fullMapStart' => true,
@@ -147,7 +147,7 @@ 
         unset($vars['url']);
         $url = '';
         if (count($vars)) {
-            $url .= '?' . http_build_query($vars);
+            $url .= '?'.http_build_query($vars);
         }
         $mapSettings['dataLocation'] = Controller::join_links($this->Link(), 'xml.xml', $url);
 
@@ -249,8 +249,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;
                 });
             }