Separate API controller for base locator module

client/src/js/actions/locationActions.js

@@ -6,8 +6,6 @@ import ActionType from 'actions/ActionTypes';
 
 // eslint-disable-next-line import/prefer-default-export
 export function fetchLocations(params) {
-  const loc = window.location;
-
   // removed unused query variables
   if (params.address === '') {
     delete params.address;
@@ -24,7 +22,7 @@ export function fetchLocations(params) {
   return {
     type: ActionType.FETCH_LOCATIONS,
     payload: axios.get(
-      `${loc.protocol}//${loc.host}${loc.pathname}/json`,
+      `${window.dynamic_locator.dataLocation}`,
       {
         // same as "params: params"
         params,

client/src/js/components/search/SearchBar.jsx

@@ -1,14 +1,14 @@
 /* global window, document */
-import React, { Component } from 'react';
+import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import FontAwesomeIcon from '@fortawesome/react-fontawesome';
-import { faSearch, faCheckCircle } from '@fortawesome/fontawesome-free-solid';
+import {faCheckCircle, faSearch} from '@fortawesome/fontawesome-free-solid';
 import PlacesAutocomplete from 'react-places-autocomplete';
 
-import { fetchLocations } from 'actions/locationActions';
-import { search } from 'actions/searchActions';
-import { changePage } from 'actions/listActions';
+import {fetchLocations} from 'actions/locationActions';
+import {search} from 'actions/searchActions';
+import {changePage} from 'actions/listActions';
 import RadiusDropDown from 'components/search/RadiusDropDown';
 import CategoryDropDown from 'components/search/CategoryDropDown';
 
@@ -57,6 +57,34 @@ export class SearchBar extends Component {
     this.handleAddressChange = this.handleAddressChange.bind(this);
   }
 
+  componentDidMount() {
+    if (!navigator.geolocation) {
+      return;
+    }
+
+    const success = position => {
+      const {latitude, longitude} = position.coords;
+      const geocoder = new google.maps.Geocoder;
+
+      geocoder.geocode({
+        location: {
+          lat: latitude,
+          lng: longitude,
+        }
+      }, (results, status) => {
+        if (status === 'OK') {
+          if (results[0]) {
+            this.handleSubmit(results[0].formatted_address);
+          }
+        }
+      });
+    };
+
+    const error = () => {
+    };
+
+    navigator.geolocation.getCurrentPosition(success, error);
+  }
 
   /**
    * 'Submits' form. Really just fires state change and changes the url.
@@ -82,7 +110,7 @@ export class SearchBar extends Component {
 
     // selects dispatch and unit from this.props.
     // const dispatch = this.props.dispatch; const unit = this.props.unit;
-    const { dispatch, unit } = this.props;
+    const {dispatch, unit} = this.props;
 
     // dispatches search (updates search values)
     dispatch(search({
@@ -157,7 +185,7 @@ export class SearchBar extends Component {
     const {
       address, category, radii, categories, unit, autocomplete
     } = this.props;
-    let { radius } = this.props;
+    let {radius} = this.props;
     if (typeof radius === 'string') {
       radius = Number(radius);
     }

src/Extensions/LocatorControllerExtension.php

@@ -2,7 +2,9 @@
 
 namespace Dynamic\Locator\React\Extensions;
 
+use Dynamic\Locator\Control\APIController;
 use Dynamic\SilverStripeGeocoder\GoogleGeocoder;
+use SilverStripe\Control\Controller;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Extension;
 use SilverStripe\Core\Manifest\ModuleResourceLoader;
@@ -43,6 +45,8 @@ public function onBeforeInit()
      */
     public function customScript()
     {
+        $path = Controller::join_links(APIController::create()->Link(), 'json');
+
         $radii = $this->owner->getShowRadius() ? $this->owner->getRadii() : [];
         $radiiString = json_encode($radii);
 
@@ -63,6 +67,7 @@ public function customScript()
 
         Requirements::customScript("
             window.dynamic_locator = {
+                'dataLocation': '{$path}',
                 'radii': {$radiiString},
                 'categories': {$categoriesString},
                 'unit': '{$unit}',

src/Extensions/LocatorExtension.php

@@ -15,21 +15,13 @@ class LocatorExtension extends DataExtension
 {
 
     private static $db = [
-        'DefaultLat' => 'Decimal(10,7)',
-        'DefaultLng' => 'Decimal(10,7)',
         'Clusters' => 'Boolean',
         'Autocomplete' => 'Boolean',
     ];
 
     public function updateCMSFields(FieldList $fields)
     {
         $fields->addFieldsToTab('Root.Settings', [
-            NumericField::create('DefaultLat')
-                ->setTitle('Default Latitude')
-                ->setScale(7),
-            NumericField::create('DefaultLng')
-                ->setTitle('Default Longitude')
-                ->setScale(7),
             CheckboxField::create('Clusters')
                 ->setRightTitle('Cluster the markers when zoomed out.'),
             CheckboxField::create('Autocomplete')