Browse Source

Rename isDiff* functions to be more intuitive

pull/666/head
Diana Shkolnikov 9 years ago committed by Stephen Hess
parent
commit
efa0818ade
  1. 16
      helper/diffPlaces.js

16
helper/diffPlaces.js

@ -11,7 +11,7 @@ var placeTypes = require('./placeTypes');
* @returns {boolean} * @returns {boolean}
* @throws {Error} * @throws {Error}
*/ */
function isDiffLayer(item1, item2) { function assertLayerMatch(item1, item2) {
if (item1.layer === item2.layer) { if (item1.layer === item2.layer) {
return false; return false;
} }
@ -29,7 +29,7 @@ function isDiffLayer(item1, item2) {
* @returns {boolean} * @returns {boolean}
* @throws {Error} * @throws {Error}
*/ */
function isDiffParentHierarchy(item1, item2) { function assertParentHierarchyMatch(item1, item2) {
// if neither object has parent, assume same // if neither object has parent, assume same
if (!item1.hasOwnProperty('parent') && !item2.hasOwnProperty('parent')) { if (!item1.hasOwnProperty('parent') && !item2.hasOwnProperty('parent')) {
return false; return false;
@ -61,7 +61,7 @@ function isDiffParentHierarchy(item1, item2) {
* @returns {boolean} * @returns {boolean}
* @throws {Error} * @throws {Error}
*/ */
function isDiffName(item1, item2) { function assertNameMatch(item1, item2) {
if (item1.hasOwnProperty('name') && item2.hasOwnProperty('name')) { if (item1.hasOwnProperty('name') && item2.hasOwnProperty('name')) {
for (var lang in item1.name) { for (var lang in item1.name) {
if(item2.name[lang] || lang === 'default') { if(item2.name[lang] || lang === 'default') {
@ -85,7 +85,7 @@ function isDiffName(item1, item2) {
* @returns {boolean} * @returns {boolean}
* @throws {Error} * @throws {Error}
*/ */
function isDiffAddress(item1, item2) { function assertAddressMatch(item1, item2) {
// if neither record has address, assume same // if neither record has address, assume same
if (!item1.hasOwnProperty('address_parts') && !item2.hasOwnProperty('address_parts')) { if (!item1.hasOwnProperty('address_parts') && !item2.hasOwnProperty('address_parts')) {
return false; return false;
@ -119,10 +119,10 @@ function isDiffAddress(item1, item2) {
*/ */
function isDifferent(item1, item2) { function isDifferent(item1, item2) {
try { try {
isDiffLayer(item1, item2); assertLayerMatch(item1, item2);
isDiffParentHierarchy(item1, item2); assertParentHierarchyMatch(item1, item2);
isDiffName(item1, item2); assertNameMatch(item1, item2);
isDiffAddress(item1, item2); assertAddressMatch(item1, item2);
} }
catch (err) { catch (err) {
if (err.message === 'different') { if (err.message === 'different') {

Loading…
Cancel
Save