Filter by Latitude and Longitude (Part 2)

Me again,

Following on from https://forum.grabaperch.com/forum/10-01-2015-filter-by-latitude-and-longitude

After getting this to the client and having them add a nice amount of data, I've run in to some odd behaviour when filtering by map_lat and map_lng. For some reason I am getting an or match rather than and no matter what I do. I'm not sure if this is related to collections or the map field type.

I've also just noticed that items that DO match both latitude and longitude, don't actually get pulled through to the results.

if ($_SERVER['REQUEST_METHOD'] == 'POST' && !empty($_POST)) {

    $usr_input = isset($_POST['loc']) && !empty($_POST['loc']) ? htmlspecialchars($_POST['loc']) : '';
    $usr_dist = (isset($_POST['dist']) && is_numeric($_POST['dist'])) ? (int) $_POST['dist'] : 10;
    perch_layout('locations_form',[
        'page' => PerchSystem::get_page(),
        'input' => $usr_input,
        'distance' => $usr_dist
    ]);

    //stuff like getDistance, getDueCoords and lookup all in here.
    perch_layout('locations_functions');

    $usr_loc = lookup($usr_input);
    if (isset($usr_loc['error'])) {

        // TODO: switch case for error messages.
        echo "Error";

    } else {

        $north = getDueCoords($usr_loc['latitude'], $usr_loc['longitude'], 0, $usr_dist);
        $south = getDueCoords($usr_loc['latitude'], $usr_loc['longitude'], 180, $usr_dist);
        $east = getDueCoords($usr_loc['latitude'], $usr_loc['longitude'], 90, $usr_dist);
        $west = getDueCoords($usr_loc['latitude'], $usr_loc['longitude'], 270, $usr_dist);
        echo "<!-- Lat:".$north['lat'].' to '.$south['lat']." Lng:".$west['lng'].' to '.$east['lng']." Input: ".$usr_loc['country']." -->";

        PerchSystem::set_vars([
            'usr_loc' => $usr_input,
            'usr_dist' => $usr_dist.' miles'
        ]);
        $stuff = perch_collection('Locations', [
            'filter' => [
                [
                    'filter' => 'country',
                    'match' => 'contains',
                    'value' => $usr_loc['country'],
                ],[
                    'filter' => 'map_lat',
                    'match' => 'between',
                    'value' => $south['lat'].','.$north['lat'],
                ],[
                    'filter' => 'map_lng',
                    'match' => 'between',
                    'value' => $west['lng'].','.$east['lng'],
                ]
            ],
            'each' => function($item) {
                $the_loc = $GLOBALS['usr_loc'];
                $lat_min = $GLOBALS['south']['lat'];
                $lat_max = $GLOBALS['north']['lat'];
                $lng_min = $GLOBALS['west']['lng'];
                $lng_max = $GLOBALS['east']['lng'];
                $item_lat = $item['map']['lat'];
                $item_lng = $item['map']['lng'];
                if (!($item_lng > $lng_min && $item_lng < $lng_max)) {
                    $item['longitude'] = "Out of range";
                }
                if (!($item_lat > $lat_min && $item_lat < $lat_max)) {
                    $item['latitude'] = "Out of range";
                }
                $item['distance'] = getDistance($the_loc['latitude'], $the_loc['longitude'], $item['map']['lat'], $item['map']['lng']).' miles';
                $item['start'] = $the_loc['latitude'].','.$the_loc['longitude'];
                $item['destination'] = $item['map']['lat'].','.$item['map']['lng'];
                return $item;
            },
            'skip-template' => true,
            'raw' => true
        ],true);

        var_dump($stuff);
    }

}