Kouhei Sutou
null+****@clear*****
Tue Dec 10 23:12:17 JST 2013
Kouhei Sutou 2013-12-10 23:12:17 +0900 (Tue, 10 Dec 2013) New Revision: 298a6dda5b023b7e5d66543ed7f80d9102bbb01b https://github.com/groonga/groonga/commit/298a6dda5b023b7e5d66543ed7f80d9102bbb01b Message: test geo_in_rectangle: add tests for all areas around 0 point with index use Added files: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.test test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.expected test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.test Modified files: lib/geo.c Modified: lib/geo.c (+14 -4) =================================================================== --- lib/geo.c 2013-12-10 23:02:59 +0900 (ea75ffe) +++ lib/geo.c 2013-12-10 23:12:17 +0900 (a2b38b2) @@ -1307,10 +1307,17 @@ extract_rectangle_in_area(grn_ctx *ctx, grn_geo_point *area_bottom_right) { grn_bool out_of_area = GRN_FALSE; + grn_bool cover_all_areas = GRN_FALSE; + + if (GRN_GEO_POINT_IN_NORTH_WEST(top_left) && + GRN_GEO_POINT_IN_SOUTH_EAST(bottom_right)) { + cover_all_areas = GRN_TRUE; + } switch (area_type) { case GRN_GEO_AREA_NORTH_EAST : - if (GRN_GEO_POINT_IN_NORTH_EAST(top_left) || + if (cover_all_areas || + GRN_GEO_POINT_IN_NORTH_EAST(top_left) || GRN_GEO_POINT_IN_NORTH_EAST(bottom_right)) { area_top_left->latitude = MAX(top_left->latitude, 0); area_bottom_right->latitude = MAX(bottom_right->latitude, 0); @@ -1326,7 +1333,8 @@ extract_rectangle_in_area(grn_ctx *ctx, } break; case GRN_GEO_AREA_NORTH_WEST : - if (GRN_GEO_POINT_IN_NORTH_WEST(top_left) || + if (cover_all_areas || + GRN_GEO_POINT_IN_NORTH_WEST(top_left) || GRN_GEO_POINT_IN_NORTH_WEST(bottom_right)) { area_top_left->latitude = MAX(top_left->latitude, 0); area_bottom_right->latitude = MAX(bottom_right->latitude, 0); @@ -1342,7 +1350,8 @@ extract_rectangle_in_area(grn_ctx *ctx, } break; case GRN_GEO_AREA_SOUTH_WEST : - if (GRN_GEO_POINT_IN_SOUTH_WEST(top_left) || + if (cover_all_areas || + GRN_GEO_POINT_IN_SOUTH_WEST(top_left) || GRN_GEO_POINT_IN_SOUTH_WEST(bottom_right)) { area_top_left->latitude = MIN(top_left->latitude, -1); area_bottom_right->latitude = MIN(bottom_right->latitude, -1); @@ -1358,7 +1367,8 @@ extract_rectangle_in_area(grn_ctx *ctx, } break; case GRN_GEO_AREA_SOUTH_EAST : - if (GRN_GEO_POINT_IN_SOUTH_EAST(top_left) || + if (cover_all_areas || + GRN_GEO_POINT_IN_SOUTH_EAST(top_left) || GRN_GEO_POINT_IN_SOUTH_EAST(bottom_right)) { area_top_left->latitude = MIN(top_left->latitude, -1); area_bottom_right->latitude = MIN(bottom_right->latitude, -1); Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.expected (+129 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.expected 2013-12-10 23:12:17 +0900 (e858664) @@ -0,0 +1,129 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "2x-3", "-3x2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 36 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-2" + ], + [ + "-3x-1" + ], + [ + "-3x0" + ], + [ + "-3x1" + ], + [ + "-3x2" + ], + [ + "-2x-3" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-2x2" + ], + [ + "-1x-3" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "-1x2" + ], + [ + "0x-3" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "0x2" + ], + [ + "1x-3" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "1x2" + ], + [ + "2x-3" + ], + [ + "2x-2" + ], + [ + "2x-1" + ], + [ + "2x0" + ], + [ + "2x1" + ], + [ + "2x2" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/all_out.test 2013-12-10 23:12:17 +0900 (57eea56) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "2x-3", "-3x2")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.expected (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.expected 2013-12-10 23:12:17 +0900 (4d84494) @@ -0,0 +1,81 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-2", "-2x2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 20 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-2x2" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "-1x2" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "0x2" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "1x2" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_out.test 2013-12-10 23:12:17 +0900 (af6bdda) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-2", "-2x2")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.expected (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.expected 2013-12-10 23:12:17 +0900 (f62bc58) @@ -0,0 +1,93 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-3", "-2x2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 24 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-2x2" + ], + [ + "-1x-3" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "-1x2" + ], + [ + "0x-3" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "0x2" + ], + [ + "1x-3" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "1x2" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/east_west_out.test 2013-12-10 23:12:17 +0900 (8b67dd7) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-3", "-2x2")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.expected (+96 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.expected 2013-12-10 23:12:17 +0900 (6f7d536) @@ -0,0 +1,96 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "2x-2", "-2x2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 25 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-2x2" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "-1x2" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "0x2" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "1x2" + ], + [ + "2x-2" + ], + [ + "2x-1" + ], + [ + "2x0" + ], + [ + "2x1" + ], + [ + "2x2" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_east_out.test 2013-12-10 23:12:17 +0900 (0bbb032) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "2x-2", "-2x2")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.expected (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.expected 2013-12-10 23:12:17 +0900 (3f1ebd8) @@ -0,0 +1,81 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "2x-2", "-2x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 20 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "2x-2" + ], + [ + "2x-1" + ], + [ + "2x0" + ], + [ + "2x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_out.test 2013-12-10 23:12:17 +0900 (c7b9619) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "2x-2", "-2x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.expected (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.expected 2013-12-10 23:12:17 +0900 (80d93e2) @@ -0,0 +1,93 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "2x-2", "-3x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 24 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-1" + ], + [ + "-3x0" + ], + [ + "-3x1" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "2x-2" + ], + [ + "2x-1" + ], + [ + "2x0" + ], + [ + "2x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_south_out.test 2013-12-10 23:12:17 +0900 (c0ff38b) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "2x-2", "-3x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.expected (+96 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.expected 2013-12-10 23:12:17 +0900 (355d825) @@ -0,0 +1,96 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "2x-3", "-2x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 25 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-3" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-3" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-3" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "2x-3" + ], + [ + "2x-2" + ], + [ + "2x-1" + ], + [ + "2x0" + ], + [ + "2x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/north_west_out.test 2013-12-10 23:12:17 +0900 (748c447) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "2x-3", "-2x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.expected (+69 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.expected 2013-12-10 23:12:17 +0900 (e20710f) @@ -0,0 +1,69 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-2", "-2x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 16 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/same_as_mesh.test 2013-12-10 23:12:17 +0900 (3e206a2) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-2", "-2x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.expected (+96 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.expected 2013-12-10 23:12:17 +0900 (f39e29f) @@ -0,0 +1,96 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-2", "-3x2")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 25 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-1" + ], + [ + "-3x0" + ], + [ + "-3x1" + ], + [ + "-3x2" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-2x2" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "-1x2" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "0x2" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ], + [ + "1x2" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_east_out.test 2013-12-10 23:12:17 +0900 (a32a040) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-2", "-3x2")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.expected (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.expected 2013-12-10 23:12:17 +0900 (623749d) @@ -0,0 +1,81 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-2", "-3x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 20 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-2" + ], + [ + "-3x-1" + ], + [ + "-3x0" + ], + [ + "-3x1" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_out.test 2013-12-10 23:12:17 +0900 (2bc8fe0) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-2", "-3x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.expected (+96 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.expected 2013-12-10 23:12:17 +0900 (e35d11b) @@ -0,0 +1,96 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-3", "-3x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 25 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-3x-3" + ], + [ + "-3x-2" + ], + [ + "-3x-1" + ], + [ + "-3x0" + ], + [ + "-3x1" + ], + [ + "-2x-3" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-3" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-3" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-3" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/south_west_out.test 2013-12-10 23:12:17 +0900 (cd38120) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-3", "-3x1")' Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.expected (+81 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.expected 2013-12-10 23:12:17 +0900 (8c96517) @@ -0,0 +1,81 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "1x-3", "-2x1")' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 20 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "-2x-3" + ], + [ + "-2x-2" + ], + [ + "-2x-1" + ], + [ + "-2x0" + ], + [ + "-2x1" + ], + [ + "-1x-3" + ], + [ + "-1x-2" + ], + [ + "-1x-1" + ], + [ + "-1x0" + ], + [ + "-1x1" + ], + [ + "0x-3" + ], + [ + "0x-2" + ], + [ + "0x-1" + ], + [ + "0x0" + ], + [ + "0x1" + ], + [ + "1x-3" + ], + [ + "1x-2" + ], + [ + "1x-1" + ], + [ + "1x0" + ], + [ + "1x1" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/all/around_0/use_index/west_out.test 2013-12-10 23:12:17 +0900 (a8d492a) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/all/around_0.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "1x-3", "-2x1")' -------------- next part -------------- HTML����������������������������...ダウンロード
