From f4a5dd812b43d9ba3097ffd851c692f471c344e1 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 9 Feb 2016 11:31:29 -0500
Subject: [PATCH] Replace depricated Lodash function contains with includes

See https://github.com/lodash/lodash/wiki/Changelog#jan-12-2016--diff--docs
---
 helper/adminFields.js    |  2 +-
 helper/geojsonify.js     | 10 +++++-----
 helper/labelGenerator.js |  2 +-
 sanitiser/_details.js    |  2 +-
 sanitiser/_flag_bool.js  |  2 +-
 sanitiser/_groups.js     |  4 ++--
 sanitiser/_ids.js        |  6 +++---
 sanitiser/_source.js     |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/helper/adminFields.js b/helper/adminFields.js
index af6ac432..31648bc4 100644
--- a/helper/adminFields.js
+++ b/helper/adminFields.js
@@ -32,7 +32,7 @@ function getAvailableAdminFields(schema, expectedFields, logger) {
 
   // check if expected fields are actually in current schema
   var available = expectedFields.filter(function (field) {
-    return _.contains( actualFields, field );
+    return _.includes( actualFields, field );
   });
 
   if (available.length === 0) {
diff --git a/helper/geojsonify.js b/helper/geojsonify.js
index d01b6f36..d77792ee 100644
--- a/helper/geojsonify.js
+++ b/helper/geojsonify.js
@@ -35,10 +35,10 @@ function lookupSource(src) {
  */
 function lookupLayer(src) {
   if (src._type === 'geoname') {
-    if (_.contains(src.category, 'admin')) {
-      if (_.contains(src.category, 'admin:city')) { return 'locality'; }
-      if (_.contains(src.category, 'admin:admin1')) { return 'region'; }
-      if (_.contains(src.category, 'admin:admin2')) { return 'county'; }
+    if (_.includes(src.category, 'admin')) {
+      if (_.includes(src.category, 'admin:city')) { return 'locality'; }
+      if (_.includes(src.category, 'admin:admin1')) { return 'region'; }
+      if (_.includes(src.category, 'admin:admin2')) { return 'county'; }
       return 'neighbourhood'; // this could also be 'local_admin'
     }
 
@@ -46,7 +46,7 @@ function lookupLayer(src) {
     if (src.address) { return 'address'; }
   }
 
-  if (_.contains(type_mapping.types, src._type)) {
+  if (_.includes(type_mapping.types, src._type)) {
     return type_mapping.type_to_layer[src._type];
   }
 
diff --git a/helper/labelGenerator.js b/helper/labelGenerator.js
index 1938232d..422c3409 100644
--- a/helper/labelGenerator.js
+++ b/helper/labelGenerator.js
@@ -16,7 +16,7 @@ module.exports = function( record ){
   var buildOutput = function(parts, schemaArr, record) {
     for (var i=0; i<schemaArr.length; i++) {
       var fieldValue = record[schemaArr[i]];
-      if (check.unemptyString(fieldValue) && !_.contains(parts, fieldValue)) {
+      if (check.unemptyString(fieldValue) && !_.includes(parts, fieldValue)) {
         parts.push( fieldValue );
         return parts;
       }
diff --git a/sanitiser/_details.js b/sanitiser/_details.js
index f0e2bade..c67f7c47 100644
--- a/sanitiser/_details.js
+++ b/sanitiser/_details.js
@@ -22,7 +22,7 @@ function sanitize( raw, clean ){
 // be lenient with 'truthy' values
 function isTruthy(val) {
   if( check.string( val ) ){
-    return _.contains( ['true', '1'], val );
+    return _.includes( ['true', '1'], val );
   }
 
   return val === 1 || val === true;
diff --git a/sanitiser/_flag_bool.js b/sanitiser/_flag_bool.js
index 68e9ce1c..4ed5c339 100644
--- a/sanitiser/_flag_bool.js
+++ b/sanitiser/_flag_bool.js
@@ -44,7 +44,7 @@ function sanitize( raw, clean, opts ){
  * @returns {boolean}
  */
 function isTruthy(val) {
-  return _.contains( ['true', '1', 1, true], val );
+  return _.includes( ['true', '1', 1, true], val );
 }
 
 module.exports = setup;
diff --git a/sanitiser/_groups.js b/sanitiser/_groups.js
index a06b839c..fc1d3f30 100644
--- a/sanitiser/_groups.js
+++ b/sanitiser/_groups.js
@@ -10,7 +10,7 @@ var _ = require('lodash');
  * returns true if all are present, false if none are present, throws an exception otherwise
  */
 function optional_group(object, keys) {
-  var contained_in_object = _.contains.bind(null, Object.keys(object));
+  var contained_in_object = _.includes.bind(null, Object.keys(object));
 
   if (keys.every(contained_in_object)) {
     return true;
@@ -26,7 +26,7 @@ function optional_group(object, keys) {
  * An error will be thrown if any of the keys are missing from the object
  */
 function required_group(object, keys) {
-  var contained_in_object = _.contains.bind(null, Object.keys(object));
+  var contained_in_object = _.includes.bind(null, Object.keys(object));
 
   if (keys.every(contained_in_object)) {
     return true;
diff --git a/sanitiser/_ids.js b/sanitiser/_ids.js
index 47c95ad6..12f83972 100644
--- a/sanitiser/_ids.js
+++ b/sanitiser/_ids.js
@@ -30,17 +30,17 @@ function sanitizeId(rawId, messages) {
   var id = parts.slice(2).join(ID_DELIM);
 
   // check if any parts of the gid are empty
-  if (_.contains([source, layer, id], '')) {
+  if (_.includes([source, layer, id], '')) {
     messages.errors.push( formatError(rawId) );
     return;
   }
 
-  if (!_.contains(type_mapping.sources, source)) {
+  if (!_.includes(type_mapping.sources, source)) {
     messages.errors.push( targetError(source, type_mapping.sources) );
     return;
   }
 
-  if (!_.contains(type_mapping.layers, layer)) {
+  if (!_.includes(type_mapping.layers, layer)) {
     messages.errors.push( targetError(layer, type_mapping.layers) );
     return;
   }
diff --git a/sanitiser/_source.js b/sanitiser/_source.js
index fae33d1d..c1f98bcc 100644
--- a/sanitiser/_source.js
+++ b/sanitiser/_source.js
@@ -21,7 +21,7 @@ function sanitize( raw, clean ) {
     var sources = raw.source.split(',');
 
     var invalid_sources = sources.filter(function(source) {
-      return !_.contains( ALL_SOURCES, source );
+      return !_.includes( ALL_SOURCES, source );
     });
 
     if( invalid_sources.length > 0 ){