From 9e569bae17cf3c2114dc64f02fc6ee4c1f043ca1 Mon Sep 17 00:00:00 2001 From: Stephen Hess Date: Wed, 14 Dec 2016 14:57:09 -0500 Subject: [PATCH] renamed mt/st/ft sanitizer to something more generic --- ...aint_fort_standardizer.js => _city_name_standardizer.js} | 0 sanitizer/search.js | 2 +- sanitizer/structured_geocoding.js | 2 +- test/unit/run.js | 2 +- ...aint_fort_standardizer.js => _city_name_standardizer.js} | 4 ++-- test/unit/sanitizer/search.js | 6 +++--- test/unit/sanitizer/structured_geocoding.js | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) rename sanitizer/{_mount_saint_fort_standardizer.js => _city_name_standardizer.js} (100%) rename test/unit/sanitizer/{_mount_saint_fort_standardizer.js => _city_name_standardizer.js} (97%) diff --git a/sanitizer/_mount_saint_fort_standardizer.js b/sanitizer/_city_name_standardizer.js similarity index 100% rename from sanitizer/_mount_saint_fort_standardizer.js rename to sanitizer/_city_name_standardizer.js diff --git a/sanitizer/search.js b/sanitizer/search.js index 48418b7f..5694c9eb 100644 --- a/sanitizer/search.js +++ b/sanitizer/search.js @@ -6,7 +6,7 @@ var sanitizeAll = require('../sanitizer/sanitizeAll'), quattroshapes_deprecation: require('../sanitizer/_deprecate_quattroshapes'), text: require('../sanitizer/_text'), iso2_to_iso3: require('../sanitizer/_iso2_to_iso3'), - mount_saint_fort_standardizer: require('../sanitizer/_mount_saint_fort_standardizer'), + city_name_standardizer: require('../sanitizer/_city_name_standardizer'), size: require('../sanitizer/_size')(/* use defaults*/), layers: require('../sanitizer/_targets')('layers', type_mapping.layer_mapping), sources: require('../sanitizer/_targets')('sources', type_mapping.source_mapping), diff --git a/sanitizer/structured_geocoding.js b/sanitizer/structured_geocoding.js index 0edc6b11..29edce41 100644 --- a/sanitizer/structured_geocoding.js +++ b/sanitizer/structured_geocoding.js @@ -6,7 +6,7 @@ var sanitizeAll = require('../sanitizer/sanitizeAll'), quattroshapes_deprecation: require('../sanitizer/_deprecate_quattroshapes'), synthesize_analysis: require('../sanitizer/_synthesize_analysis'), iso2_to_iso3: require('../sanitizer/_iso2_to_iso3'), - mount_saint_fort_standardizer: require('../sanitizer/_mount_saint_fort_standardizer'), + city_name_standardizer: require('../sanitizer/_city_name_standardizer'), size: require('../sanitizer/_size')(/* use defaults*/), layers: require('../sanitizer/_targets')('layers', type_mapping.layer_mapping), sources: require('../sanitizer/_targets')('sources', type_mapping.source_mapping), diff --git a/test/unit/run.js b/test/unit/run.js index 5ca4c9c0..d21890e7 100644 --- a/test/unit/run.js +++ b/test/unit/run.js @@ -48,7 +48,7 @@ var tests = [ require('./sanitizer/_ids'), require('./sanitizer/_iso2_to_iso3'), require('./sanitizer/_layers'), - require('./sanitizer/_mount_saint_fort_standardizer'), + require('./sanitizer/_city_name_standardizer'), require('./sanitizer/_single_scalar_parameters'), require('./sanitizer/_size'), require('./sanitizer/_sources'), diff --git a/test/unit/sanitizer/_mount_saint_fort_standardizer.js b/test/unit/sanitizer/_city_name_standardizer.js similarity index 97% rename from test/unit/sanitizer/_mount_saint_fort_standardizer.js rename to test/unit/sanitizer/_city_name_standardizer.js index 54e68fea..da362868 100644 --- a/test/unit/sanitizer/_mount_saint_fort_standardizer.js +++ b/test/unit/sanitizer/_city_name_standardizer.js @@ -1,5 +1,5 @@ const _ = require('lodash'); -const sanitizer = require('../../../sanitizer/_mount_saint_fort_standardizer'); +const sanitizer = require('../../../sanitizer/_city_name_standardizer'); module.exports.tests = {}; @@ -276,7 +276,7 @@ module.exports.tests.text_parser = function(test, common) { module.exports.all = function (tape, common) { function test(name, testFunction) { - return tape('sanitizer _mount_saint_fort_standardizer: ' + name, testFunction); + return tape('sanitizer _city_name_standardizer: ' + name, testFunction); } for( const testCase in module.exports.tests ){ diff --git a/test/unit/sanitizer/search.js b/test/unit/sanitizer/search.js index 5844947f..0d44103d 100644 --- a/test/unit/sanitizer/search.js +++ b/test/unit/sanitizer/search.js @@ -25,8 +25,8 @@ module.exports.tests.sanitize = function(test, common) { called_sanitizers.push('_iso2_to_iso3'); return { errors: [], warnings: [] }; }, - '../sanitizer/_mount_saint_fort_standardizer': function() { - called_sanitizers.push('_mount_saint_fort_standardizer'); + '../sanitizer/_city_name_standardizer': function() { + called_sanitizers.push('_city_name_standardizer'); return { errors: [], warnings: [] }; }, '../sanitizer/_size': function() { @@ -90,7 +90,7 @@ module.exports.tests.sanitize = function(test, common) { '_deprecate_quattroshapes', '_text', '_iso2_to_iso3', - '_mount_saint_fort_standardizer', + '_city_name_standardizer', '_size', '_targets/layers', '_targets/sources', diff --git a/test/unit/sanitizer/structured_geocoding.js b/test/unit/sanitizer/structured_geocoding.js index 1a2295c0..133be462 100644 --- a/test/unit/sanitizer/structured_geocoding.js +++ b/test/unit/sanitizer/structured_geocoding.js @@ -25,8 +25,8 @@ module.exports.tests.sanitize = function(test, common) { called_sanitizers.push('_iso2_to_iso3'); return { errors: [], warnings: [] }; }, - '../sanitizer/_mount_saint_fort_standardizer': function() { - called_sanitizers.push('_mount_saint_fort_standardizer'); + '../sanitizer/_city_name_standardizer': function() { + called_sanitizers.push('_city_name_standardizer'); return { errors: [], warnings: [] }; }, '../sanitizer/_size': function() { @@ -90,7 +90,7 @@ module.exports.tests.sanitize = function(test, common) { '_deprecate_quattroshapes', '_synthesize_analysis', '_iso2_to_iso3', - '_mount_saint_fort_standardizer', + '_city_name_standardizer', '_size', '_targets/layers', '_targets/sources',