Kouhei Sutou
null+****@clear*****
Sun Dec 8 21:12:14 JST 2013
Kouhei Sutou 2013-12-08 21:12:14 +0900 (Sun, 08 Dec 2013) New Revision: 99cfc6eb6de1264fc35c5efd9dc982d4dad3946c https://github.com/groonga/groonga/commit/99cfc6eb6de1264fc35c5efd9dc982d4dad3946c Message: geo_in_rectangle: support east longitude to west longitude without index TODO: Document it. geo_in_rectangle(column, "200x-100", "100x100") means | +---200---+ | | | +---100---+ | ---+----+----+--- -100 | 100 geo_in_rectangle(column, "200x100", "100x-100") means | ---+ 200 +--- | | | ---+ 100 +--- | ---+----+----+--- -100 | 100 Added files: test/command/fixture/geo/in_rectangle/north/around_180.grn test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.reject test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.test test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.expected test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.test Modified files: lib/geo.c Modified: lib/geo.c (+24 -4) =================================================================== --- lib/geo.c 2013-12-08 19:31:01 +0900 (11ce32c) +++ lib/geo.c 2013-12-08 21:12:14 +0900 (02c12d6) @@ -2079,10 +2079,30 @@ grn_bool grn_geo_in_rectangle_raw(grn_ctx *ctx, grn_geo_point *point, grn_geo_point *top_left, grn_geo_point *bottom_right) { - return ((top_left->longitude <= point->longitude) && - (point->longitude <= bottom_right->longitude) && - (bottom_right->latitude <= point->latitude) && - (point->latitude <= top_left->latitude)); + if (point->latitude > top_left->latitude) { + return GRN_FALSE; + } + if (point->latitude < bottom_right->latitude) { + return GRN_FALSE; + } + + if (top_left->longitude > 0 && bottom_right->longitude < 0) { + if (point->longitude >= top_left->longitude) { + return GRN_TRUE; + } + if (point->longitude <= bottom_right->longitude) { + return GRN_TRUE; + } + return GRN_FALSE; + } else { + if (point->longitude < top_left->longitude) { + return GRN_FALSE; + } + if (point->longitude > bottom_right->longitude) { + return GRN_FALSE; + } + return GRN_TRUE; + } } grn_bool Added: test/command/fixture/geo/in_rectangle/north/around_180.grn (+264 -0) 100644 =================================================================== --- /dev/null +++ test/command/fixture/geo/in_rectangle/north/around_180.grn 2013-12-08 21:12:14 +0900 (3fef67d) @@ -0,0 +1,264 @@ +#@include fixture/geo/in_rectangle/ddl.grn + +#@disable-logging +load --table LandMarks +[ +["point"], +["0x-647999999"], +["0x-647999998"], +["0x-647999997"], +["0x-647999996"], +["0x-647999995"], +["0x-647999994"], +["0x-647999993"], +["0x-647999992"], +["0x647999992"], +["0x647999993"], +["0x647999994"], +["0x647999995"], +["0x647999996"], +["0x647999997"], +["0x647999998"], +["0x647999999"], +["1x-647999999"], +["1x-647999998"], +["1x-647999997"], +["1x-647999996"], +["1x-647999995"], +["1x-647999994"], +["1x-647999993"], +["1x-647999992"], +["1x647999992"], +["1x647999993"], +["1x647999994"], +["1x647999995"], +["1x647999996"], +["1x647999997"], +["1x647999998"], +["1x647999999"], +["2x-647999999"], +["2x-647999998"], +["2x-647999997"], +["2x-647999996"], +["2x-647999995"], +["2x-647999994"], +["2x-647999993"], +["2x-647999992"], +["2x647999992"], +["2x647999993"], +["2x647999994"], +["2x647999995"], +["2x647999996"], +["2x647999997"], +["2x647999998"], +["2x647999999"], +["3x-647999999"], +["3x-647999998"], +["3x-647999997"], +["3x-647999996"], +["3x-647999995"], +["3x-647999994"], +["3x-647999993"], +["3x-647999992"], +["3x647999992"], +["3x647999993"], +["3x647999994"], +["3x647999995"], +["3x647999996"], +["3x647999997"], +["3x647999998"], +["3x647999999"], +["4x-647999999"], +["4x-647999998"], +["4x-647999997"], +["4x-647999996"], +["4x-647999995"], +["4x-647999994"], +["4x-647999993"], +["4x-647999992"], +["4x647999992"], +["4x647999993"], +["4x647999994"], +["4x647999995"], +["4x647999996"], +["4x647999997"], +["4x647999998"], +["4x647999999"], +["5x-647999999"], +["5x-647999998"], +["5x-647999997"], +["5x-647999996"], +["5x-647999995"], +["5x-647999994"], +["5x-647999993"], +["5x-647999992"], +["5x647999992"], +["5x647999993"], +["5x647999994"], +["5x647999995"], +["5x647999996"], +["5x647999997"], +["5x647999998"], +["5x647999999"], +["6x-647999999"], +["6x-647999998"], +["6x-647999997"], +["6x-647999996"], +["6x-647999995"], +["6x-647999994"], +["6x-647999993"], +["6x-647999992"], +["6x647999992"], +["6x647999993"], +["6x647999994"], +["6x647999995"], +["6x647999996"], +["6x647999997"], +["6x647999998"], +["6x647999999"], +["7x-647999999"], +["7x-647999998"], +["7x-647999997"], +["7x-647999996"], +["7x-647999995"], +["7x-647999994"], +["7x-647999993"], +["7x-647999992"], +["7x647999992"], +["7x647999993"], +["7x647999994"], +["7x647999995"], +["7x647999996"], +["7x647999997"], +["7x647999998"], +["7x647999999"], +["8x-647999999"], +["8x-647999998"], +["8x-647999997"], +["8x-647999996"], +["8x-647999995"], +["8x-647999994"], +["8x-647999993"], +["8x-647999992"], +["8x647999992"], +["8x647999993"], +["8x647999994"], +["8x647999995"], +["8x647999996"], +["8x647999997"], +["8x647999998"], +["8x647999999"], +["9x-647999999"], +["9x-647999998"], +["9x-647999997"], +["9x-647999996"], +["9x-647999995"], +["9x-647999994"], +["9x-647999993"], +["9x-647999992"], +["9x647999992"], +["9x647999993"], +["9x647999994"], +["9x647999995"], +["9x647999996"], +["9x647999997"], +["9x647999998"], +["9x647999999"], +["10x-647999999"], +["10x-647999998"], +["10x-647999997"], +["10x-647999996"], +["10x-647999995"], +["10x-647999994"], +["10x-647999993"], +["10x-647999992"], +["10x647999992"], +["10x647999993"], +["10x647999994"], +["10x647999995"], +["10x647999996"], +["10x647999997"], +["10x647999998"], +["10x647999999"], +["11x-647999999"], +["11x-647999998"], +["11x-647999997"], +["11x-647999996"], +["11x-647999995"], +["11x-647999994"], +["11x-647999993"], +["11x-647999992"], +["11x647999992"], +["11x647999993"], +["11x647999994"], +["11x647999995"], +["11x647999996"], +["11x647999997"], +["11x647999998"], +["11x647999999"], +["12x-647999999"], +["12x-647999998"], +["12x-647999997"], +["12x-647999996"], +["12x-647999995"], +["12x-647999994"], +["12x-647999993"], +["12x-647999992"], +["12x647999992"], +["12x647999993"], +["12x647999994"], +["12x647999995"], +["12x647999996"], +["12x647999997"], +["12x647999998"], +["12x647999999"], +["13x-647999999"], +["13x-647999998"], +["13x-647999997"], +["13x-647999996"], +["13x-647999995"], +["13x-647999994"], +["13x-647999993"], +["13x-647999992"], +["13x647999992"], +["13x647999993"], +["13x647999994"], +["13x647999995"], +["13x647999996"], +["13x647999997"], +["13x647999998"], +["13x647999999"], +["14x-647999999"], +["14x-647999998"], +["14x-647999997"], +["14x-647999996"], +["14x-647999995"], +["14x-647999994"], +["14x-647999993"], +["14x-647999992"], +["14x647999992"], +["14x647999993"], +["14x647999994"], +["14x647999995"], +["14x647999996"], +["14x647999997"], +["14x647999998"], +["14x647999999"], +["15x-647999999"], +["15x-647999998"], +["15x-647999997"], +["15x-647999996"], +["15x-647999995"], +["15x-647999994"], +["15x-647999993"], +["15x-647999992"], +["15x647999992"], +["15x647999993"], +["15x647999994"], +["15x647999995"], +["15x647999996"], +["15x647999997"], +["15x647999998"], +["15x647999999"] +] +#@enable-logging Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.expected (+93 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.expected 2013-12-08 21:12:14 +0900 (e926160) @@ -0,0 +1,93 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "4x647999997", "1x-647999997") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 24 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "1x-647999999" + ], + [ + "1x-647999998" + ], + [ + "1x-647999997" + ], + [ + "1x647999997" + ], + [ + "1x647999998" + ], + [ + "1x647999999" + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x-647999997" + ], + [ + "2x647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x-647999997" + ], + [ + "3x647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ], + [ + "4x-647999999" + ], + [ + "4x-647999998" + ], + [ + "4x-647999997" + ], + [ + "4x647999997" + ], + [ + "4x647999998" + ], + [ + "4x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/all_out.test 2013-12-08 21:12:14 +0900 (7509fa5) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "4x647999997", "1x-647999997") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.expected (+51 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.expected 2013-12-08 21:12:14 +0900 (db2ede6) @@ -0,0 +1,51 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999997", "2x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 10 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_out.test 2013-12-08 21:12:14 +0900 (29a1177) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999997", "2x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.expected (+57 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.expected 2013-12-08 21:12:14 +0900 (06e1978) @@ -0,0 +1,57 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999997", "2x-647999997") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 12 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x-647999997" + ], + [ + "2x647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x-647999997" + ], + [ + "3x647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/east_west_out.test 2013-12-08 21:12:14 +0900 (cb4710d) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999997", "2x-647999997") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.expected (+66 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.expected 2013-12-08 21:12:14 +0900 (257502b) @@ -0,0 +1,66 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "4x647999997", "2x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 15 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ], + [ + "4x-647999999" + ], + [ + "4x-647999998" + ], + [ + "4x647999997" + ], + [ + "4x647999998" + ], + [ + "4x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_east_out.test 2013-12-08 21:12:14 +0900 (ffe12d8) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "4x647999997", "2x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.expected (+57 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.expected 2013-12-08 21:12:14 +0900 (5287e9a) @@ -0,0 +1,57 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "4x647999998", "2x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 12 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ], + [ + "4x-647999999" + ], + [ + "4x-647999998" + ], + [ + "4x647999998" + ], + [ + "4x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_out.test 2013-12-08 21:12:14 +0900 (474b795) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "4x647999998", "2x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.expected (+69 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.expected 2013-12-08 21:12:14 +0900 (64ecf0f) @@ -0,0 +1,69 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "4x647999998", "1x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 16 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "1x-647999999" + ], + [ + "1x-647999998" + ], + [ + "1x647999998" + ], + [ + "1x647999999" + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ], + [ + "4x-647999999" + ], + [ + "4x-647999998" + ], + [ + "4x647999998" + ], + [ + "4x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_south_out.test 2013-12-08 21:12:14 +0900 (21059f2) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "4x647999998", "1x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.expected (+66 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.expected 2013-12-08 21:12:14 +0900 (979ed9a) @@ -0,0 +1,66 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "4x647999998", "2x-647999997") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 15 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x-647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x-647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ], + [ + "4x-647999999" + ], + [ + "4x-647999998" + ], + [ + "4x-647999997" + ], + [ + "4x647999998" + ], + [ + "4x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/north_west_out.test 2013-12-08 21:12:14 +0900 (2124d41) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "4x647999998", "2x-647999997") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.expected (+45 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.expected 2013-12-08 21:12:14 +0900 (fcabb8f) @@ -0,0 +1,45 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999998", "2x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 8 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.reject (+45 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.reject 2013-12-08 21:12:14 +0900 (fcabb8f) @@ -0,0 +1,45 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999998", "2x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 8 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/same_as_mesh.test 2013-12-08 21:12:14 +0900 (ebf2ee9) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999998", "2x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.expected (+66 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.expected 2013-12-08 21:12:14 +0900 (74d37c0) @@ -0,0 +1,66 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999997", "1x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 15 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "1x-647999999" + ], + [ + "1x-647999998" + ], + [ + "1x647999997" + ], + [ + "1x647999998" + ], + [ + "1x647999999" + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_east_out.test 2013-12-08 21:12:14 +0900 (1da6903) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999997", "1x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.expected (+57 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.expected 2013-12-08 21:12:14 +0900 (b29257c) @@ -0,0 +1,57 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999998", "1x-647999998") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 12 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "1x-647999999" + ], + [ + "1x-647999998" + ], + [ + "1x647999998" + ], + [ + "1x647999999" + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_out.test 2013-12-08 21:12:14 +0900 (05cae5d) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999998", "1x-647999998") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.expected (+66 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.expected 2013-12-08 21:12:14 +0900 (f50c1b3) @@ -0,0 +1,66 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999998", "1x-647999997") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 15 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "1x-647999999" + ], + [ + "1x-647999998" + ], + [ + "1x-647999997" + ], + [ + "1x647999998" + ], + [ + "1x647999999" + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x-647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x-647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/south_west_out.test 2013-12-08 21:12:14 +0900 (b2980fb) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999998", "1x-647999997") > 0' Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.expected (+51 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.expected 2013-12-08 21:12:14 +0900 (cde0048) @@ -0,0 +1,51 @@ +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 --filter 'geo_in_rectangle(point, "3x647999998", "2x-647999997") > 0' +[ + [ + 0, + 0.0, + 0.0 + ], + [ + [ + [ + 10 + ], + [ + [ + "point", + "WGS84GeoPoint" + ] + ], + [ + "2x-647999999" + ], + [ + "2x-647999998" + ], + [ + "2x-647999997" + ], + [ + "2x647999998" + ], + [ + "2x647999999" + ], + [ + "3x-647999999" + ], + [ + "3x-647999998" + ], + [ + "3x-647999997" + ], + [ + "3x647999998" + ], + [ + "3x647999999" + ] + ] + ] +] Added: test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.test (+4 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/select/filter/geo_in_rectangle/north/around_180/no_index/west_out.test 2013-12-08 21:12:14 +0900 (7b677d2) @@ -0,0 +1,4 @@ +#@include fixture/geo/in_rectangle/north/around_180.grn + +select LandMarks --sortby '_id' --output_columns 'point' --limit -1 \ + --filter 'geo_in_rectangle(point, "3x647999998", "2x-647999997") > 0' -------------- next part -------------- HTML����������������������������...Download