support for places such as "Air & Space Museum"

classifier/scheme/place.js

@@ -45,5 +45,24 @@ module.exports = [
         not: []
       }
     ]
+  },
+  {
+    // Air & Space Museum
+    confidence: 0.8,
+    Class: PlaceClassification,
+    scheme: [
+      {
+        is: ['AlphaClassification'],
+        not: ['StreetClassification', 'IntersectionClassification', 'StopWordClassification']
+      },
+      {
+        is: ['StopWordClassification'],
+        not: ['StreetClassification']
+      },
+      {
+        is: ['PlaceClassification'],
+        not: []
+      }
+    ]
   }
 ]

parser/AddressParser.js

@@ -64,8 +64,8 @@ class AddressParser extends Parser {
         new CompositeClassifier(require('../classifier/scheme/person')),
         new CompositeClassifier(require('../classifier/scheme/street_name')),
         new CompositeClassifier(require('../classifier/scheme/street')),
-        new CompositeClassifier(require('../classifier/scheme/intersection')),
-        new CompositeClassifier(require('../classifier/scheme/place'))
+        new CompositeClassifier(require('../classifier/scheme/place')),
+        new CompositeClassifier(require('../classifier/scheme/intersection'))
       ],
       // solvers
       [

test/venue.usa.test.js

@@ -0,0 +1,19 @@
+const AddressParser = require('../parser/AddressParser')
+
+const testcase = (test, common) => {
+  let parser = new AddressParser()
+  let assert = common.assert.bind(null, test, parser)
+
+  assert('Air & Space Museum Washington DC', [
+    { place: 'Air & Space Museum' },
+    { locality: 'Washington' }, { region: 'DC' }
+  ], true)
+}
+
+module.exports.all = (tape, common) => {
+  function test (name, testFunction) {
+    return tape(`USA: ${name}`, testFunction)
+  }
+
+  testcase(test, common)
+}