gpaa-always-use-subpremise.js: Updated snippet to improve reliability with some addresses.

Author: claygriffiths

gp-address-autocomplete/gpaa-always-use-subpremise.js

@@ -28,9 +28,16 @@ window.gform.addFilter('gpaa_values', function(values, place, instance) {
         var subPremisePattern = RegExp('^(.*)' + component.long_name.split(' ', 1)[0]);
         var results = subPremisePattern.exec(instance.inputs.address1.value);
         var streetNumber = results[1].trim().split('/')[1];
-
+		
+		// Sometimes Rd/Road is inconsistent, let's use Road.
+		values.address1 = values.address1.replace('Rd', 'Road');
+		streetNumber = streetNumber.replace('Rd', 'Road');
+		
+		// Remove trailing comma from streetNumber
+		streetNumber = streetNumber.replace(/,$/, '');
+				
         if (results && values.address1.indexOf(results[1]) === -1) {
-            values.address1 = results[1].trim() + ' ' + values.address1.replace(streetNumber, '').trim();
+            values.address1 = (results[1].trim() + ' ' + values.address1.replace(streetNumber, '').trim()).trim().replace(/,$/, '');
         }
     }