Merge branch 'master' into README-Draft

mediocre · Jul 8, 2019 · 561c0b1 · 561c0b1
2 parents 16d4011 + 57cc925
commit 561c0b1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/carriers/pitneyBowes.js b/carriers/pitneyBowes.js
@@ -2,6 +2,9 @@ const async = require('async');
 const moment = require('moment-timezone');
 const PitneyBowesClient = require('pitney-bowes');
 
+// Remove these words from cities to turn cities like `DISTRIBUTION CENTER INDIANAPOLIS` into `INDIANAPOLIS`
+const CITY_BLACKLIST = /DISTRIBUTION CENTER|INTERNATIONAL DISTRIBUTION CENTER|NETWORK DISTRIBUTION CENTER/ig;
+
 // These tracking status codes indicate the shipment was delivered
 const DELIVERED_TRACKING_STATUS_CODES = ['01'];
 
@@ -29,10 +32,19 @@ function PitneyBowes(options) {
                 return callback(null, results);
             }
 
+            data.scanDetailsList = data.scanDetailsList.filter(scanDetail => {
+                // Remove scan details without cities
+                if (!scanDetail.eventCity) {
+                    return false;
+                }
+
+                return true;
+            });
+
             // Set address and location of each scan detail
             data.scanDetailsList.forEach(scanDetail => {
                 scanDetail.address = {
-                    city: scanDetail.eventCity,
+                    city: scanDetail.eventCity.replace(CITY_BLACKLIST, '').trim(),
                     country: scanDetail.country,
                     state: scanDetail.eventStateOrProvince,
                     zip: scanDetail.postalCode

diff --git a/carriers/usps.js b/carriers/usps.js
@@ -6,7 +6,7 @@ const checkDigit = require('../util/checkDigit');
 const geography = require('../util/geography');
 
 // Remove these words from cities to turn cities like `DISTRIBUTION CENTER INDIANAPOLIS` into `INDIANAPOLIS`
-const CITY_BLACKLIST = /DISTRIBUTION CENTER|NETWORK DISTRIBUTION CENTER/ig;
+const CITY_BLACKLIST = /DISTRIBUTION CENTER|INTERNATIONAL DISTRIBUTION CENTER|NETWORK DISTRIBUTION CENTER/ig;
 
 // These tracking status codes indicate the shipment was delivered: https://about.usps.com/publications/pub97/pub97_appi.htm
 const DELIVERED_TRACKING_STATUS_CODES = ['01'];