[SDESK-1925] Split location field into location name and address

test case fix

Address schema fix in events

client/actions/locations.js

@@ -3,16 +3,15 @@ import { get } from 'lodash'
 
 export function saveNominatim(nominatim) {
     return (dispatch, getState, { api }) => {
-        const { shortName, address } = formatAddress(nominatim)
+        const { address } = formatAddress(nominatim)
         return api('locations').save({}, {
             unique_name: nominatim.display_name,
-            name: shortName,
+            name: nominatim.namedetails.name,
             address: address,
             position: {
                 latitude: nominatim.lat,
                 longitude: nominatim.lon,
             },
-            type: nominatim.type,
         })
     }
 }
@@ -50,7 +49,6 @@ export function saveLocation(newLocation) {
         .then(data => {
             const eventData = {
                 name: data.name,
-                type: data.type,
                 qcode: data.guid,
             }
 
@@ -61,6 +59,10 @@ export function saveLocation(newLocation) {
                 }
             }
 
+            if (get(data, 'address.external.nominatim.address')) {
+                eventData.address = data.address.external.nominatim.address
+            }
+
             return eventData
         })
     }

client/components/AddGeoLookupInput/AddGeoLookupResultsPopUp.jsx

@@ -32,8 +32,7 @@ export class AddGeoLookupResultsPopUp extends React.Component {
                     const shortName = formatAddress(suggest.raw).shortName
                     return (<li key={index} className='addgeolookup__item'
                                 onClick={this.props.onChange.bind(null, suggest)}>
-                            <span><span className='label addgeolookup__suggestItemLabel'>{suggest.raw.type.replace('_', ' ')}</span>
-                            &nbsp;&nbsp;{shortName}</span>
+                            <span>&nbsp;&nbsp;{shortName}</span>
                     </li>)
                 })}
             </ul>

client/components/AddGeoLookupInput/index.jsx

@@ -61,14 +61,42 @@ class GeoLookupInput extends React.Component {
             { disabledInput: this.props.readOnly }
         )
 
+
+        let locationName = locationName = get(this.props.initialValue, 'name')
+        let formattedAddress = ''
+        let displayText = locationName
+
+        if (get(this.props.initialValue, 'address')) {
+            // Location from local locations collection in database
+            formattedAddress = formatAddress(this.props.initialValue).formattedAddress
+            displayText = displayText + '\n' + formattedAddress
+        } else if (get(this.props.initialValue, 'nominatim.address')) {
+            // Location select from lookup suggests
+            locationName = get(this.props.initialValue.nominatim, 'namedetails.name')
+            formattedAddress = formatAddress(this.props.initialValue.nominatim).formattedAddress
+            displayText = locationName + '\n' + formattedAddress
+        }
+
         return (
             <div className='addgeolookup sd-line-input__input'>
-                <span className='addgeolookup__input-wrapper'><TextareaAutosize
+                {this.props.readOnly &&
+                    <span className='addgeolookup__input-wrapper'>
+                        {locationName}
+                        <span style={{
+                            'font-style': 'italic',
+                            'font-size': 'small',
+                        }}>
+                            <br />
+                            {formattedAddress}
+                        </span>
+                    </span>
+                }
+                {!this.props.readOnly && <span className='addgeolookup__input-wrapper'><TextareaAutosize
                     className={textAreaClassNames}
                     disabled={this.props.readOnly ? 'disabled' : ''}
-                    value={get(this.props.initialValue, 'name')}
+                    value={displayText}
                     onChange={this.handleInputChange.bind(this)} />
-                </span>
+                </span>}
                 {!this.props.readOnly &&
                     <span><button type='button' className='btn' disabled={this.state.searching}
                         onClick={this.handleSearchClick.bind(this)} >

client/components/fields/GeoLookupInput.jsx

@@ -1,7 +1,6 @@
 import { AddGeoLookupInput } from '../index'
 import classNames from 'classnames'
 import React from 'react'
-import { get } from 'lodash'
 
 export const GeoLookupInput = ({ input, label, readOnly, meta: { touched, error, warning } }) => {
 
@@ -12,11 +11,9 @@ export const GeoLookupInput = ({ input, label, readOnly, meta: { touched, error,
         { 'sd-line-input--no-margin': !showMessage }
     )
 
-    const type = input.value && (input.value.type || get(input.value.nominatim, 'type') || null)
     return (<div className={divClass}>
         {label && <label className="sd-line-input__label">{label}</label>}
 
-        {type && <span className='label addgeolookup__suggestItemLabel'>{type.replace('_', ' ')}</span>}
         <AddGeoLookupInput
             onChange={input.onChange}
             initialValue={input.value || {}}

client/components/tests/AddGeoLookupInput_test.jsx

@@ -21,12 +21,13 @@ const nominatimLocation = {
             postcode: 'postcode',
             country: 'country',
         },
+        namedetails: { name: 'Location' },
     },
 }
 
 const formattedLocation = {
     unique_name: 'display location',
-    name: '123 road, town, state, postcode, country',
+    name: 'Location',
     address: {
         line: ['123 road'],
         locality: 'state',
@@ -76,7 +77,6 @@ describe('<AddGeoLookupInput />', () => {
             expect(savedLocation).toEqual({
                 qcode: 'location-guid',
                 name: '123 road, town, state, postcode, country',
-                type: 'residential',
             })
         })
     })
@@ -105,6 +105,7 @@ describe('<AddGeoLookupInput />', () => {
                 country: 'France',
                 country_code: 'fr',
             },
+            namedetails: { name: 'Paris, France' },
         })
         action(dispatch, getState, { api })
     })

client/utils/index.js

@@ -499,17 +499,21 @@ export const formatAddress = (nominatim) => {
         postal_code: nominatim.address.postcode,
         external: { nominatim },
     }
-    const shortName = [
-        get(address, 'title'),
+
+    const formattedAddress = [
         get(address, 'line[0]'),
         get(address, 'area'),
         get(address, 'locality'),
         get(address, 'postal_code'),
         get(address, 'country'),
     ].filter(d => d).join(', ')
 
+    const shortName = get(address, 'title') ? get(address, 'title') + ', ' + formattedAddress :
+        formattedAddress
+
     return {
         address,
+        formattedAddress,
         shortName,
     }
 }

server/planning/events.py

@@ -696,8 +696,8 @@ def _is_only_time_updated(self, original_dates, updated_dates):
             'properties': {
                 'qcode': {'type': 'string'},
                 'name': {'type': 'string'},
+                'address': {'type': 'object'},
                 'geo': {'type': 'string'},
-                'type': {'type': 'string'},
                 'location': {'type': 'geo_point'},
             }
         }

server/planning/locations.py

@@ -90,8 +90,7 @@ def on_create(self, docs):
     # the field where we store the formatted address, which can have variations (street number vs number street)
     # for the same address
     'name': {
-        'type': 'string',
-        'unique': True,
+        'type': 'string'
     },
     'type': {
         'type': 'string',