Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Minor changes to the visual01.txt test script. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | rtree-geopoly |
Files: | files | file ages | folders |
SHA3-256: |
4bc28eed32154be0e62fe69acd30f828 |
User & Date: | drh 2018-08-27 17:05:59.920 |
Context
2018-08-27
| ||
17:13 | Add support for the Geopoly extension to the R-Tree extension. This also involves adding the SQLITE_INDEX_CONSTRAINT_FUNCTION capability to the xFindFunction method of the sqlite3_module object, and to the sqlite3_index_info.aConstraint.op field in the xBestIndex implementation of virtual tables. (check-in: 666133e32c user: drh tags: trunk) | |
17:05 | Minor changes to the visual01.txt test script. (Closed-Leaf check-in: 4bc28eed32 user: drh tags: rtree-geopoly) | |
15:55 | Split the three-argument version of geopoly_within() off into a separate function named geopoly_contains_point(). (check-in: 5a0e154103 user: drh tags: rtree-geopoly) | |
Changes
Changes to ext/rtree/visual01.txt.
︙ | ︙ | |||
373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 | printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Overlap Query</h1>' .print '<pre>' EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_overlap(_shape, poly); .print '</pre>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_overlap(_shape, poly); SELECT geopoly_svg(poly, printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Bounding-Box Overlap Query</h1>' | > > > > < < < < < < < < | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Overlap Query</h1>' .print '<pre>' .print 'SELECT *' .print ' FROM geo1, querypoly' .print ' WHERE geopoly_overlap(_shape, poly);' .print EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_overlap(_shape, poly); .print '</pre>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_overlap(_shape, poly); SELECT geopoly_svg(poly, printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Bounding-Box Overlap Query</h1>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ), geopoly_svg(geopoly_bbox(_shape), 'style="fill:none;stroke:black;stroke-width:1"' ) |
︙ | ︙ | |||
422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 | 'style="fill:none;stroke:black;stroke-width:3"' ) FROM querypoly; .print '</svg>' .print '<h1>Within Query</h1>' .print '<pre>' EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_within(_shape, poly); .print '</pre>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_within(_shape, poly); SELECT geopoly_svg(poly, printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Bounding-Box WITHIN Query</h1>' | > > > > < < < < < < < < | 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | 'style="fill:none;stroke:black;stroke-width:3"' ) FROM querypoly; .print '</svg>' .print '<h1>Within Query</h1>' .print '<pre>' .print 'SELECT *' .print ' FROM geo1, querypoly' .print ' WHERE geopoly_within(_shape, poly);' .print EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_within(_shape, poly); .print '</pre>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE geopoly_within(_shape, poly); SELECT geopoly_svg(poly, printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Bounding-Box WITHIN Query</h1>' .print '<svg width="1000" height="800" style="border:1px solid black">' SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ), geopoly_svg(geopoly_bbox(_shape), 'style="fill:none;stroke:black;stroke-width:1"' ) |
︙ | ︙ | |||
471 472 473 474 475 476 477 478 479 480 481 482 483 484 | 'style="fill:none;stroke:black;stroke-width:3"' ) FROM querypoly; .print '</svg>' .print '<h1>Not Overlap Query</h1>' .print '<pre>' EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE NOT geopoly_overlap(_shape, poly); .print '</pre>' | > > > > | 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 | 'style="fill:none;stroke:black;stroke-width:3"' ) FROM querypoly; .print '</svg>' .print '<h1>Not Overlap Query</h1>' .print '<pre>' .print 'SELECT *' .print ' FROM geo1, querypoly' .print ' WHERE NOT geopoly_overlap(_shape, poly);' .print EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE NOT geopoly_overlap(_shape, poly); .print '</pre>' |
︙ | ︙ | |||
492 493 494 495 496 497 498 499 500 501 502 503 504 505 | printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Not Within Query</h1>' .print '<pre>' EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE NOT geopoly_within(_shape, poly); .print '</pre>' | > > > > | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | printf('style="fill:%s;fill-opacity:0.5;"',clr) ) FROM querypoly; .print '</svg>' .print '<h1>Not Within Query</h1>' .print '<pre>' .print 'SELECT *' .print ' FROM geo1, querypoly' .print ' WHERE NOT geopoly_within(_shape, poly);' .print EXPLAIN QUERY PLAN SELECT geopoly_svg(_shape, printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr) ) FROM geo1, querypoly WHERE NOT geopoly_within(_shape, poly); .print '</pre>' |
︙ | ︙ |