fix(administrative): the administrative can be undefined (#99)

Also, do not use the `administrative` if it has the same value than `name`.
algolia · Apr 11, 2016 · ace575d · ace575d
1 parent d9d47e5
commit ace575d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/createHitFormatter.js b/src/createHitFormatter.js
@@ -3,8 +3,10 @@ import findCountryCode from './findCountryCode.js';
 export default function createHitFormatter({formatAutocompleteSuggestion, formatInputValue}) {
  return hit => {
  try {
+ const administrative = hit.administrative && hit.administrative[0] !== hit.locale_names[0] ?
+ hit.administrative[0] : undefined;
  let suggestion = {
- administrative: hit.administrative && hit.administrative[0],
+ administrative,
  city: hit.city && hit.city[0],
  country: hit.country,
  countryCode: findCountryCode(hit._tags),

diff --git a/src/formatAutocompleteSuggestion.js b/src/formatAutocompleteSuggestion.js
@@ -10,8 +10,8 @@ export default function formatAutocompleteSuggestion({
 }) {
  const out = `<span class="ap-suggestion-icon">${isCity === true ? cityIcon : addressIcon}</span>
 <span class="ap-name">${name}</span> <span class="ap-address">
-${isCity === false ? `${city},` : ``}
- ${administrative},
+${isCity === false ? `${city},` : ''}
+ ${administrative ? `${administrative},` : ''}
  ${country}</span>`
  .replace(/\n/g, '');
 

diff --git a/src/formatInputValue.js b/src/formatInputValue.js
@@ -7,7 +7,7 @@ export default function formatInputValue({
 }) {
  const out = `${name}
 ${isCity === false ? ` ${city},` : ''}
- ${administrative},
+ ${administrative ? `${administrative},` : ''}
  ${country}`
  .replace(/\n/g, '');