diff --git a/jstests/geo_fiddly_box.js b/jstests/geo_fiddly_box.js index fbab2bf489cbb..2a9cf4978f424 100644 --- a/jstests/geo_fiddly_box.js +++ b/jstests/geo_fiddly_box.js @@ -4,20 +4,20 @@ // "expand" portion of the geo-lookup expands the 2d range in only one // direction (so points are required on either side of the expanding range) -db.users.drop(); -db.users.ensureIndex({ loc : "2d" }) +db.geo_fiddly_box.drop(); +db.geo_fiddly_box.ensureIndex({ loc : "2d" }) -db.users.insert({ "loc" : [3, 1] }) -db.users.insert({ "loc" : [3, 0.5] }) -db.users.insert({ "loc" : [3, 0.25] }) -db.users.insert({ "loc" : [3, -0.01] }) -db.users.insert({ "loc" : [3, -0.25] }) -db.users.insert({ "loc" : [3, -0.5] }) -db.users.insert({ "loc" : [3, -1] }) +db.geo_fiddly_box.insert({ "loc" : [3, 1] }) +db.geo_fiddly_box.insert({ "loc" : [3, 0.5] }) +db.geo_fiddly_box.insert({ "loc" : [3, 0.25] }) +db.geo_fiddly_box.insert({ "loc" : [3, -0.01] }) +db.geo_fiddly_box.insert({ "loc" : [3, -0.25] }) +db.geo_fiddly_box.insert({ "loc" : [3, -0.5] }) +db.geo_fiddly_box.insert({ "loc" : [3, -1] }) // OK! -print( db.users.count() ) -assert.eq( 7, db.users.count({ "loc" : { "$within" : { "$box" : [ [2, -2], [46, 2] ] } } }), "Not all locations found!" ); +print( db.geo_fiddly_box.count() ) +assert.eq( 7, db.geo_fiddly_box.count({ "loc" : { "$within" : { "$box" : [ [2, -2], [46, 2] ] } } }), "Not all locations found!" ); // Test normal lookup of a small square of points as a sanity check. @@ -28,17 +28,17 @@ max = 1 step = 1 numItems = 0; -db.users2.drop() -db.users2.ensureIndex({ loc : "2d" }, { max : max + epsilon / 2, min : min - epsilon / 2 }) +db.geo_fiddly_box2.drop() +db.geo_fiddly_box2.ensureIndex({ loc : "2d" }, { max : max + epsilon / 2, min : min - epsilon / 2 }) for(var x = min; x <= max; x += step){ for(var y = min; y <= max; y += step){ - db.users2.insert({ "loc" : { x : x, y : y } }) + db.geo_fiddly_box2.insert({ "loc" : { x : x, y : y } }) numItems++; } } -assert.eq( numItems, db.users2.count({ loc : { $within : { $box : [[min - epsilon / 3, +assert.eq( numItems, db.geo_fiddly_box2.count({ loc : { $within : { $box : [[min - epsilon / 3, min - epsilon / 3], [max + epsilon / 3, - max + epsilon / 3]] } } }), "Not all locations found!"); \ No newline at end of file + max + epsilon / 3]] } } }), "Not all locations found!"); diff --git a/jstests/geo_fiddly_box2.js b/jstests/geo_fiddly_box2.js index fd4cd31228b6c..0588abfa1dedd 100644 --- a/jstests/geo_fiddly_box2.js +++ b/jstests/geo_fiddly_box2.js @@ -3,7 +3,7 @@ // The setup to reproduce is to create a set of points and a really big bounds so that we are required to do // exact lookups on the points to get correct results. -t = db.tiles +t = db.geo_fiddly_box2 t.drop() t.insert( { "letter" : "S", "position" : [ -3, 0 ] } )