pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Geo SON tweaks

Browse Source
This commit is contained in:
Ross Lawley
2014-06-27 11:27:10 +01:00
parent de9ba12779
commit 89b9b60e0c
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mongoengine/queryset/transform.py
View File

@@ -117,19 +117,24 @@ def query(_doc_cls=None, _field_operation=False, **query):
mongo_query[key].update(value) mongo_query[key].update(value)
# $maxDistance needs to come last - convert to SON # $maxDistance needs to come last - convert to SON
value_dict = mongo_query[key] value_dict = mongo_query[key]
if ('$maxDistance' in value_dict and '$near' in value_dict and if ('$maxDistance' in value_dict and '$near' in value_dict):
isinstance(value_dict['$near'], dict)):
value_son = SON() value_son = SON()
for k, v in value_dict.iteritems(): if isinstance(value_dict['$near'], dict):
if k == '$maxDistance': for k, v in value_dict.iteritems():
continue if k == '$maxDistance':
value_son[k] = v continue
if (get_connection().max_wire_version <= 1): value_son[k] = v
value_son['$maxDistance'] = value_dict['$maxDistance'] if (get_connection().max_wire_version <= 1):
value_son['$maxDistance'] = value_dict['$maxDistance']
else:
value_son['$near'] = SON(value_son['$near'])
value_son['$near']['$maxDistance'] = value_dict['$maxDistance']
else: else:
value_son['$near'] = SON(value_son['$near']) for k, v in value_dict.iteritems():
value_son['$near']['$maxDistance'] = value_dict['$maxDistance'] if k == '$maxDistance':
continue
value_son[k] = v
value_son['$maxDistance'] = value_dict['$maxDistance']
mongo_query[key] = value_son mongo_query[key] = value_son
else: else: