Add tests and fix for filter bug

- Adds a test to prove specify that property filtering should refine a type filter rather than only allow 1 type of filtering or the other.
- Implement fix

ie. before fix the following was the situation:
```js
//correctly filtered geometry types
{
  filter: {
    geometry: ["Point"]
  }
}

//correctly filtered by property
{
  filter: {
    properties: {
      "highway": ["trunk", "motorway", "traffic_signals", "crossing"]
    }
  }
}

//always only filtered geometry
filter: {
    geometry: ["Point"],
    properties: {
        highway: ["trunk", "motorway", "traffic_signals", "crossing"]
    }
}
```