Changeset 4750
- Timestamp:
- 11/05/09 11:04:45 (2 years ago)
- Location:
- trunk
- Files:
-
- 7 modified
-
postgis/lwgeom_functions_basic.c (modified) (2 diffs)
-
postgis/postgis.sql.in.c (modified) (97 diffs)
-
postgis/sqlmm.sql.in.c (modified) (1 diff)
-
regress/regress_expected (modified) (1 diff)
-
regress/regress_ogc_expected (modified) (2 diffs)
-
regress/regress_ogc.sql (modified) (2 diffs)
-
regress/regress.sql (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/postgis/lwgeom_functions_basic.c
r4635 r4750 59 59 Datum LWGEOM_noop(PG_FUNCTION_ARGS); 60 60 Datum LWGEOM_zmflag(PG_FUNCTION_ARGS); 61 Datum LWGEOM_hasz(PG_FUNCTION_ARGS); 62 Datum LWGEOM_hasm(PG_FUNCTION_ARGS); 61 63 Datum LWGEOM_ndims(PG_FUNCTION_ARGS); 62 64 Datum LWGEOM_makepoint(PG_FUNCTION_ARGS); … … 2687 2689 } 2688 2690 2691 PG_FUNCTION_INFO_V1(LWGEOM_hasz); 2692 Datum LWGEOM_hasz(PG_FUNCTION_ARGS) 2693 { 2694 PG_LWGEOM *in = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); 2695 PG_RETURN_BOOL(TYPE_HASZ(in->type)); 2696 } 2697 2698 PG_FUNCTION_INFO_V1(LWGEOM_hasm); 2699 Datum LWGEOM_hasm(PG_FUNCTION_ARGS) 2700 { 2701 PG_LWGEOM *in = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0)); 2702 PG_RETURN_BOOL(TYPE_HASM(in->type)); 2703 } 2704 2705 2689 2706 PG_FUNCTION_INFO_V1(LWGEOM_hasBBOX); 2690 2707 Datum LWGEOM_hasBBOX(PG_FUNCTION_ARGS) -
trunk/postgis/postgis.sql.in.c
r4712 r4750 28 28 ------------------------------------------------------------------- 29 29 30 -- Deprecation in 1.2.331 30 CREATE OR REPLACE FUNCTION spheroid_in(cstring) 32 31 RETURNS spheroid … … 34 33 LANGUAGE 'C' IMMUTABLE STRICT; 35 34 36 -- Availability: 1.2.237 CREATE OR REPLACE FUNCTION ST_spheroid_in(cstring)38 RETURNS spheroid39 AS 'MODULE_PATHNAME','ellipsoid_in'40 LANGUAGE 'C' IMMUTABLE STRICT;41 42 -- Deprecation in 1.2.343 35 CREATE OR REPLACE FUNCTION spheroid_out(spheroid) 44 36 RETURNS cstring … … 46 38 LANGUAGE 'C' IMMUTABLE STRICT; 47 39 48 -- Availability: 1.2.249 CREATE OR REPLACE FUNCTION ST_spheroid_out(spheroid)50 RETURNS cstring51 AS 'MODULE_PATHNAME','ellipsoid_out'52 LANGUAGE 'C' IMMUTABLE STRICT;53 54 40 CREATE TYPE spheroid ( 55 41 alignment = double, 56 42 internallength = 65, 57 input = ST_spheroid_in,58 output = ST_spheroid_out43 input = spheroid_in, 44 output = spheroid_out 59 45 ); 60 46 … … 63 49 ------------------------------------------------------------------- 64 50 65 -- Deprecation in 1.2.366 51 CREATE OR REPLACE FUNCTION geometry_in(cstring) 67 52 RETURNS geometry … … 69 54 LANGUAGE 'C' IMMUTABLE STRICT; 70 55 71 -- Availability: 1.2.272 CREATE OR REPLACE FUNCTION ST_geometry_in(cstring)73 RETURNS geometry74 AS 'MODULE_PATHNAME','LWGEOM_in'75 LANGUAGE 'C' IMMUTABLE STRICT;76 77 -- Deprecation in 1.2.378 56 CREATE OR REPLACE FUNCTION geometry_out(geometry) 79 57 RETURNS cstring … … 81 59 LANGUAGE 'C' IMMUTABLE STRICT; 82 60 83 -- Availability: 1.2.284 CREATE OR REPLACE FUNCTION ST_geometry_out(geometry)85 RETURNS cstring86 AS 'MODULE_PATHNAME','LWGEOM_out'87 LANGUAGE 'C' IMMUTABLE STRICT;88 89 -- Deprecation in 1.2.390 61 CREATE OR REPLACE FUNCTION geometry_analyze(internal) 91 62 RETURNS bool … … 93 64 LANGUAGE 'C' VOLATILE STRICT; 94 65 95 -- Availability: 1.2.296 CREATE OR REPLACE FUNCTION ST_geometry_analyze(internal)97 RETURNS bool98 AS 'MODULE_PATHNAME', 'LWGEOM_analyze'99 LANGUAGE 'C' VOLATILE STRICT;100 101 -- Deprecation in 1.2.3102 66 CREATE OR REPLACE FUNCTION geometry_recv(internal) 103 67 RETURNS geometry … … 105 69 LANGUAGE 'C' IMMUTABLE STRICT; 106 70 107 -- Availability: 1.2.2108 CREATE OR REPLACE FUNCTION ST_geometry_recv(internal)109 RETURNS geometry110 AS 'MODULE_PATHNAME','LWGEOM_recv'111 LANGUAGE 'C' IMMUTABLE STRICT;112 113 -- Deprecation in 1.2.3114 71 CREATE OR REPLACE FUNCTION geometry_send(geometry) 115 72 RETURNS bytea … … 117 74 LANGUAGE 'C' IMMUTABLE STRICT; 118 75 119 -- Availability: 1.2.2120 CREATE OR REPLACE FUNCTION ST_geometry_send(geometry)121 RETURNS bytea122 AS 'MODULE_PATHNAME','LWGEOM_send'123 LANGUAGE 'C' IMMUTABLE STRICT;124 125 76 CREATE TYPE geometry ( 126 77 internallength = variable, 127 input = ST_geometry_in,128 output = ST_geometry_out,129 send = ST_geometry_send,130 receive = ST_geometry_recv,78 input = geometry_in, 79 output = geometry_out, 80 send = geometry_send, 81 receive = geometry_recv, 131 82 delimiter = ':', 132 analyze = ST_geometry_analyze,83 analyze = geometry_analyze, 133 84 storage = main 134 85 ); … … 310 261 LANGUAGE 'C' IMMUTABLE STRICT; 311 262 312 -- Availability: 1.2.2313 CREATE OR REPLACE FUNCTION ST_box3d_in(cstring)314 RETURNS box3d315 AS 'MODULE_PATHNAME', 'BOX3D_in'316 LANGUAGE 'C' IMMUTABLE STRICT;317 318 -- Availability: 1.2.2319 CREATE OR REPLACE FUNCTION ST_box3d_out(box3d)320 RETURNS cstring321 AS 'MODULE_PATHNAME', 'BOX3D_out'322 LANGUAGE 'C' IMMUTABLE STRICT;323 324 263 CREATE TYPE box3d ( 325 264 alignment = double, 326 265 internallength = 48, 327 input = ST_box3d_in,328 output = ST_box3d_out266 input = box3d_in, 267 output = box3d_out 329 268 ); 330 269 … … 350 289 351 290 -- Availability: 1.4.0 352 CREATE OR REPLACE FUNCTION ST_box3d_extent(box3d_extent)291 CREATE OR REPLACE FUNCTION box3d_extent(box3d_extent) 353 292 RETURNS box3d 354 293 AS 'MODULE_PATHNAME', 'BOX3D_extent_to_BOX3D' 355 294 LANGUAGE 'C' IMMUTABLE STRICT; 356 295 357 CREATE OR REPLACE FUNCTION ST_box2d(box3d_extent)296 CREATE OR REPLACE FUNCTION box2d(box3d_extent) 358 297 RETURNS box2d 359 298 AS 'MODULE_PATHNAME', 'BOX3D_to_BOX2DFLOAT4' 360 299 LANGUAGE 'C' IMMUTABLE STRICT; 361 300 362 CREATE OR REPLACE FUNCTION ST_geometry(box3d_extent)301 CREATE OR REPLACE FUNCTION geometry(box3d_extent) 363 302 RETURNS geometry 364 303 AS 'MODULE_PATHNAME','BOX3D_to_LWGEOM' … … 484 423 LANGUAGE 'C' IMMUTABLE STRICT; 485 424 486 -- Availability: 1.2.2487 CREATE OR REPLACE FUNCTION ST_box2d_in(cstring)488 RETURNS box2d489 AS 'MODULE_PATHNAME','BOX2DFLOAT4_in'490 LANGUAGE 'C' IMMUTABLE STRICT;491 492 425 -- Deprecation in 1.2.3 493 426 CREATE OR REPLACE FUNCTION box2d_out(box2d) … … 496 429 LANGUAGE 'C' IMMUTABLE STRICT; 497 430 498 -- Availability: 1.2.2499 CREATE OR REPLACE FUNCTION ST_box2d_out(box2d)500 RETURNS cstring501 AS 'MODULE_PATHNAME','BOX2DFLOAT4_out'502 LANGUAGE 'C' IMMUTABLE STRICT;503 504 431 CREATE TYPE box2d ( 505 432 internallength = 16, 506 input = ST_box2d_in,507 output = ST_box2d_out,433 input = box2d_in, 434 output = box2d_out, 508 435 storage = plain 509 436 ); … … 517 444 LANGUAGE 'C' IMMUTABLE STRICT; 518 445 519 -- Availability: 1.2.2520 CREATE OR REPLACE FUNCTION ST_box2d_overleft(box2d, box2d)521 RETURNS bool522 AS 'MODULE_PATHNAME', 'BOX2D_overleft'523 LANGUAGE 'C' IMMUTABLE STRICT;524 525 446 -- Deprecation in 1.2.3 526 447 CREATE OR REPLACE FUNCTION box2d_overright(box2d, box2d) … … 529 450 LANGUAGE 'C' IMMUTABLE STRICT; 530 451 531 -- Availability: 1.2.2532 CREATE OR REPLACE FUNCTION ST_box2d_overright(box2d, box2d)533 RETURNS bool534 AS 'MODULE_PATHNAME', 'BOX2D_overright'535 LANGUAGE 'C' IMMUTABLE STRICT;536 537 452 -- Deprecation in 1.2.3 538 453 CREATE OR REPLACE FUNCTION box2d_left(box2d, box2d) … … 541 456 LANGUAGE 'C' IMMUTABLE STRICT; 542 457 543 -- Availability: 1.2.2544 CREATE OR REPLACE FUNCTION ST_box2d_left(box2d, box2d)545 RETURNS bool546 AS 'MODULE_PATHNAME', 'BOX2D_left'547 LANGUAGE 'C' IMMUTABLE STRICT;548 549 458 -- Deprecation in 1.2.3 550 459 CREATE OR REPLACE FUNCTION box2d_right(box2d, box2d) … … 553 462 LANGUAGE 'C' IMMUTABLE STRICT; 554 463 555 -- Availability: 1.2.2556 CREATE OR REPLACE FUNCTION ST_box2d_right(box2d, box2d)557 RETURNS bool558 AS 'MODULE_PATHNAME', 'BOX2D_right'559 LANGUAGE 'C' IMMUTABLE STRICT;560 561 464 -- Deprecation in 1.2.3 562 465 CREATE OR REPLACE FUNCTION box2d_contain(box2d, box2d) … … 565 468 LANGUAGE 'C' IMMUTABLE STRICT; 566 469 567 -- Availability: 1.2.2568 CREATE OR REPLACE FUNCTION ST_box2d_contain(box2d, box2d)569 RETURNS bool570 AS 'MODULE_PATHNAME', 'BOX2D_contain'571 LANGUAGE 'C' IMMUTABLE STRICT;572 573 470 -- Deprecation in 1.2.3 574 471 CREATE OR REPLACE FUNCTION box2d_contained(box2d, box2d) … … 577 474 LANGUAGE 'C' IMMUTABLE STRICT; 578 475 579 -- Availability: 1.2.2580 CREATE OR REPLACE FUNCTION ST_box2d_contained(box2d, box2d)581 RETURNS bool582 AS 'MODULE_PATHNAME', 'BOX2D_contained'583 LANGUAGE 'C' IMMUTABLE STRICT;584 585 476 -- Deprecation in 1.2.3 586 477 CREATE OR REPLACE FUNCTION box2d_overlap(box2d, box2d) … … 589 480 LANGUAGE 'C' IMMUTABLE STRICT; 590 481 591 -- Availability: 1.2.2592 CREATE OR REPLACE FUNCTION ST_box2d_overlap(box2d, box2d)593 RETURNS bool594 AS 'MODULE_PATHNAME', 'BOX2D_overlap'595 LANGUAGE 'C' IMMUTABLE STRICT;596 597 482 -- Deprecation in 1.2.3 598 483 CREATE OR REPLACE FUNCTION box2d_same(box2d, box2d) … … 601 486 LANGUAGE 'C' IMMUTABLE STRICT; 602 487 603 -- Availability: 1.2.2604 CREATE OR REPLACE FUNCTION ST_box2d_same(box2d, box2d)605 RETURNS bool606 AS 'MODULE_PATHNAME', 'BOX2D_same'607 LANGUAGE 'C' IMMUTABLE STRICT;608 609 488 -- Deprecation in 1.2.3 610 489 CREATE OR REPLACE FUNCTION box2d_intersects(box2d, box2d) … … 613 492 LANGUAGE 'C' IMMUTABLE STRICT; 614 493 615 -- Availability: 1.2.2616 CREATE OR REPLACE FUNCTION ST_box2d_intersects(box2d, box2d)617 RETURNS bool618 AS 'MODULE_PATHNAME', 'BOX2D_intersects'619 LANGUAGE 'C' IMMUTABLE STRICT;620 621 494 622 495 -- lwgeom operator support functions … … 626 499 ------------------------------------------------------------------- 627 500 628 -- Deprecation in 1.2.3629 501 CREATE OR REPLACE FUNCTION geometry_lt(geometry, geometry) 630 502 RETURNS bool … … 632 504 LANGUAGE 'C' IMMUTABLE STRICT; 633 505 634 -- Availability: 1.2.2635 CREATE OR REPLACE FUNCTION ST_geometry_lt(geometry, geometry)636 RETURNS bool637 AS 'MODULE_PATHNAME', 'lwgeom_lt'638 LANGUAGE 'C' IMMUTABLE STRICT;639 640 -- Deprecation in 1.2.3641 506 CREATE OR REPLACE FUNCTION geometry_le(geometry, geometry) 642 507 RETURNS bool … … 644 509 LANGUAGE 'C' IMMUTABLE STRICT; 645 510 646 -- Availability: 1.2.2647 CREATE OR REPLACE FUNCTION ST_geometry_le(geometry, geometry)648 RETURNS bool649 AS 'MODULE_PATHNAME', 'lwgeom_le'650 LANGUAGE 'C' IMMUTABLE STRICT;651 652 -- Deprecation in 1.2.3653 511 CREATE OR REPLACE FUNCTION geometry_gt(geometry, geometry) 654 512 RETURNS bool … … 656 514 LANGUAGE 'C' IMMUTABLE STRICT; 657 515 658 -- Availability: 1.2.2659 CREATE OR REPLACE FUNCTION ST_geometry_gt(geometry, geometry)660 RETURNS bool661 AS 'MODULE_PATHNAME', 'lwgeom_gt'662 LANGUAGE 'C' IMMUTABLE STRICT;663 664 -- Deprecation in 1.2.3665 516 CREATE OR REPLACE FUNCTION geometry_ge(geometry, geometry) 666 517 RETURNS bool … … 668 519 LANGUAGE 'C' IMMUTABLE STRICT; 669 520 670 -- Availability: 1.2.2671 CREATE OR REPLACE FUNCTION ST_geometry_ge(geometry, geometry)672 RETURNS bool673 AS 'MODULE_PATHNAME', 'lwgeom_ge'674 LANGUAGE 'C' IMMUTABLE STRICT;675 676 -- Deprecation in 1.2.3677 521 CREATE OR REPLACE FUNCTION geometry_eq(geometry, geometry) 678 522 RETURNS bool … … 680 524 LANGUAGE 'C' IMMUTABLE STRICT; 681 525 682 -- Availability: 1.2.2683 CREATE OR REPLACE FUNCTION ST_geometry_eq(geometry, geometry)684 RETURNS bool685 AS 'MODULE_PATHNAME', 'lwgeom_eq'686 LANGUAGE 'C' IMMUTABLE STRICT;687 688 -- Deprecation in 1.2.3689 526 CREATE OR REPLACE FUNCTION geometry_cmp(geometry, geometry) 690 527 RETURNS integer … … 692 529 LANGUAGE 'C' IMMUTABLE STRICT; 693 530 694 -- Availability: 1.2.2695 CREATE OR REPLACE FUNCTION ST_geometry_cmp(geometry, geometry)696 RETURNS integer697 AS 'MODULE_PATHNAME', 'lwgeom_cmp'698 LANGUAGE 'C' IMMUTABLE STRICT;699 700 531 -- 701 532 -- Sorting operators for Btree … … 703 534 704 535 CREATE OPERATOR < ( 705 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_lt,536 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_lt, 706 537 COMMUTATOR = '>', NEGATOR = '>=', 707 538 RESTRICT = contsel, JOIN = contjoinsel … … 709 540 710 541 CREATE OPERATOR <= ( 711 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_le,542 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_le, 712 543 COMMUTATOR = '>=', NEGATOR = '>', 713 544 RESTRICT = contsel, JOIN = contjoinsel … … 715 546 716 547 CREATE OPERATOR = ( 717 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_eq,548 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_eq, 718 549 COMMUTATOR = '=', -- we might implement a faster negator here 719 550 RESTRICT = contsel, JOIN = contjoinsel … … 721 552 722 553 CREATE OPERATOR >= ( 723 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_ge,554 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_ge, 724 555 COMMUTATOR = '<=', NEGATOR = '<', 725 556 RESTRICT = contsel, JOIN = contjoinsel 726 557 ); 727 558 CREATE OPERATOR > ( 728 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_gt,559 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_gt, 729 560 COMMUTATOR = '<', NEGATOR = '<=', 730 561 RESTRICT = contsel, JOIN = contjoinsel … … 746 577 -- GiST indexes 747 578 ------------------------------------------------------------------- 748 -- Deprecation in 1.2.3 749 CREATE OR REPLACE FUNCTION postgis_gist_sel (internal, oid, internal, int4)579 580 CREATE OR REPLACE FUNCTION geometry_gist_sel (internal, oid, internal, int4) 750 581 RETURNS float8 751 582 AS 'MODULE_PATHNAME', 'LWGEOM_gist_sel' 752 583 LANGUAGE 'C'; 753 584 754 -- Availability: 1.2.2 755 CREATE OR REPLACE FUNCTION ST_postgis_gist_sel (internal, oid, internal, int4) 756 RETURNS float8 757 AS 'MODULE_PATHNAME', 'LWGEOM_gist_sel' 758 LANGUAGE 'C'; 759 760 -- Deprecation in 1.2.3 761 CREATE OR REPLACE FUNCTION postgis_gist_joinsel(internal, oid, internal, smallint) 585 586 CREATE OR REPLACE FUNCTION geometry_gist_joinsel(internal, oid, internal, smallint) 762 587 RETURNS float8 763 588 AS 'MODULE_PATHNAME', 'LWGEOM_gist_joinsel' 764 589 LANGUAGE 'C'; 765 590 766 -- Availability: 1.2.2 767 CREATE OR REPLACE FUNCTION ST_postgis_gist_joinsel(internal, oid, internal, smallint) 768 RETURNS float8 769 AS 'MODULE_PATHNAME', 'LWGEOM_gist_joinsel' 770 LANGUAGE 'C'; 771 772 -- Deprecation in 1.2.3 591 773 592 CREATE OR REPLACE FUNCTION geometry_overleft(geometry, geometry) 774 593 RETURNS bool … … 776 595 LANGUAGE 'C' IMMUTABLE STRICT; 777 596 778 -- Availability: 1.2.2779 CREATE OR REPLACE FUNCTION ST_geometry_overleft(geometry, geometry)780 RETURNS bool781 AS 'MODULE_PATHNAME', 'LWGEOM_overleft'782 LANGUAGE 'C' IMMUTABLE STRICT;783 784 -- Deprecation in 1.2.3785 597 CREATE OR REPLACE FUNCTION geometry_overright(geometry, geometry) 786 598 RETURNS bool … … 788 600 LANGUAGE 'C' IMMUTABLE STRICT; 789 601 790 -- Availability: 1.2.2791 CREATE OR REPLACE FUNCTION ST_geometry_overright(geometry, geometry)792 RETURNS bool793 AS 'MODULE_PATHNAME', 'LWGEOM_overright'794 LANGUAGE 'C' IMMUTABLE STRICT;795 796 -- Deprecation in 1.2.3797 602 CREATE OR REPLACE FUNCTION geometry_overabove(geometry, geometry) 798 603 RETURNS bool … … 800 605 LANGUAGE 'C' IMMUTABLE STRICT; 801 606 802 -- Availability: 1.2.2803 CREATE OR REPLACE FUNCTION ST_geometry_overabove(geometry, geometry)804 RETURNS bool805 AS 'MODULE_PATHNAME', 'LWGEOM_overabove'806 LANGUAGE 'C' IMMUTABLE STRICT;807 808 -- Deprecation in 1.2.3809 607 CREATE OR REPLACE FUNCTION geometry_overbelow(geometry, geometry) 810 608 RETURNS bool … … 812 610 LANGUAGE 'C' IMMUTABLE STRICT; 813 611 814 -- Availability: 1.2.2815 CREATE OR REPLACE FUNCTION ST_geometry_overbelow(geometry, geometry)816 RETURNS bool817 AS 'MODULE_PATHNAME', 'LWGEOM_overbelow'818 LANGUAGE 'C' IMMUTABLE STRICT;819 820 -- Deprecation in 1.2.3821 612 CREATE OR REPLACE FUNCTION geometry_left(geometry, geometry) 822 613 RETURNS bool … … 824 615 LANGUAGE 'C' IMMUTABLE STRICT; 825 616 826 -- Availability: 1.2.2827 CREATE OR REPLACE FUNCTION ST_geometry_left(geometry, geometry)828 RETURNS bool829 AS 'MODULE_PATHNAME', 'LWGEOM_left'830 LANGUAGE 'C' IMMUTABLE STRICT;831 832 -- Deprecation in 1.2.3833 617 CREATE OR REPLACE FUNCTION geometry_right(geometry, geometry) 834 618 RETURNS bool … … 836 620 LANGUAGE 'C' IMMUTABLE STRICT; 837 621 838 -- Availability: 1.2.2839 CREATE OR REPLACE FUNCTION ST_geometry_right(geometry, geometry)840 RETURNS bool841 AS 'MODULE_PATHNAME', 'LWGEOM_right'842 LANGUAGE 'C' IMMUTABLE STRICT;843 844 -- Deprecation in 1.2.3845 622 CREATE OR REPLACE FUNCTION geometry_above(geometry, geometry) 846 623 RETURNS bool … … 848 625 LANGUAGE 'C' IMMUTABLE STRICT; 849 626 850 -- Availability: 1.2.2851 CREATE OR REPLACE FUNCTION ST_geometry_above(geometry, geometry)852 RETURNS bool853 AS 'MODULE_PATHNAME', 'LWGEOM_above'854 LANGUAGE 'C' IMMUTABLE STRICT;855 856 -- Deprecation in 1.2.3857 627 CREATE OR REPLACE FUNCTION geometry_below(geometry, geometry) 858 628 RETURNS bool … … 860 630 LANGUAGE 'C' IMMUTABLE STRICT; 861 631 862 -- Availability: 1.2.2863 CREATE OR REPLACE FUNCTION ST_geometry_below(geometry, geometry)864 RETURNS bool865 AS 'MODULE_PATHNAME', 'LWGEOM_below'866 LANGUAGE 'C' IMMUTABLE STRICT;867 868 -- Deprecation in 1.2.3869 632 CREATE OR REPLACE FUNCTION geometry_contain(geometry, geometry) 870 633 RETURNS bool … … 872 635 LANGUAGE 'C' IMMUTABLE STRICT; 873 636 874 -- Availability: 1.2.2875 CREATE OR REPLACE FUNCTION ST_geometry_contain(geometry, geometry)876 RETURNS bool877 AS 'MODULE_PATHNAME', 'LWGEOM_contain'878 LANGUAGE 'C' IMMUTABLE STRICT;879 880 -- Deprecation in 1.2.3881 637 CREATE OR REPLACE FUNCTION geometry_contained(geometry, geometry) 882 638 RETURNS bool … … 884 640 LANGUAGE 'C' IMMUTABLE STRICT; 885 641 886 -- Availability: 1.2.2887 CREATE OR REPLACE FUNCTION ST_geometry_contained(geometry, geometry)888 RETURNS bool889 AS 'MODULE_PATHNAME', 'LWGEOM_contained'890 LANGUAGE 'C' IMMUTABLE STRICT;891 892 -- Deprecation in 1.2.3893 642 CREATE OR REPLACE FUNCTION geometry_overlap(geometry, geometry) 894 643 RETURNS bool … … 896 645 LANGUAGE 'C' IMMUTABLE STRICT; 897 646 898 -- Availability: 1.2.2899 CREATE OR REPLACE FUNCTION ST_geometry_overlap(geometry, geometry)900 RETURNS bool901 AS 'MODULE_PATHNAME', 'LWGEOM_overlap'902 LANGUAGE 'C' IMMUTABLE STRICT;903 904 -- Deprecation in 1.2.3905 647 CREATE OR REPLACE FUNCTION geometry_same(geometry, geometry) 906 648 RETURNS bool … … 908 650 LANGUAGE 'C' IMMUTABLE STRICT; 909 651 910 --Availability: 1.2.2911 CREATE OR REPLACE FUNCTION ST_geometry_same(geometry, geometry)912 RETURNS bool913 AS 'MODULE_PATHNAME', 'LWGEOM_same'914 LANGUAGE 'C' IMMUTABLE STRICT;915 916 -- GEOMETRY operators917 652 918 653 CREATE OPERATOR << ( 919 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_left,654 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_left, 920 655 COMMUTATOR = '>>', 921 656 RESTRICT = positionsel, JOIN = positionjoinsel … … 923 658 924 659 CREATE OPERATOR &< ( 925 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overleft,660 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overleft, 926 661 COMMUTATOR = '&>', 927 662 RESTRICT = positionsel, JOIN = positionjoinsel … … 929 664 930 665 CREATE OPERATOR <<| ( 931 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_below,666 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_below, 932 667 COMMUTATOR = '|>>', 933 668 RESTRICT = positionsel, JOIN = positionjoinsel … … 935 670 936 671 CREATE OPERATOR &<| ( 937 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overbelow,672 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overbelow, 938 673 COMMUTATOR = '|&>', 939 674 RESTRICT = positionsel, JOIN = positionjoinsel … … 941 676 942 677 CREATE OPERATOR && ( 943 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overlap,678 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overlap, 944 679 COMMUTATOR = '&&', 945 RESTRICT = ST_postgis_gist_sel, JOIN = ST_postgis_gist_joinsel680 RESTRICT = geometry_gist_sel, JOIN = geometry_gist_joinsel 946 681 ); 947 682 948 683 CREATE OPERATOR &> ( 949 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overright,684 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overright, 950 685 COMMUTATOR = '&<', 951 686 RESTRICT = positionsel, JOIN = positionjoinsel … … 953 688 954 689 CREATE OPERATOR >> ( 955 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_right,690 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_right, 956 691 COMMUTATOR = '<<', 957 692 RESTRICT = positionsel, JOIN = positionjoinsel … … 959 694 960 695 CREATE OPERATOR |&> ( 961 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_overabove,696 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_overabove, 962 697 COMMUTATOR = '&<|', 963 698 RESTRICT = positionsel, JOIN = positionjoinsel … … 965 700 966 701 CREATE OPERATOR |>> ( 967 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_above,702 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_above, 968 703 COMMUTATOR = '<<|', 969 704 RESTRICT = positionsel, JOIN = positionjoinsel … … 971 706 972 707 CREATE OPERATOR ~= ( 973 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_same,708 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_same, 974 709 COMMUTATOR = '~=', 975 710 RESTRICT = eqsel, JOIN = eqjoinsel … … 977 712 978 713 CREATE OPERATOR @ ( 979 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_contained,714 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contained, 980 715 COMMUTATOR = '~', 981 716 RESTRICT = contsel, JOIN = contjoinsel … … 983 718 984 719 CREATE OPERATOR ~ ( 985 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = ST_geometry_contain,720 LEFTARG = geometry, RIGHTARG = geometry, PROCEDURE = geometry_contain, 986 721 COMMUTATOR = '@', 987 722 RESTRICT = contsel, JOIN = contjoinsel … … 990 725 -- gist support functions 991 726 992 CREATE OR REPLACE FUNCTION LWGEOM_gist_consistent(internal,geometry,int4)727 CREATE OR REPLACE FUNCTION postgis_gist_consistent(internal,geometry,int4) 993 728 RETURNS bool 994 729 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_consistent' 995 730 LANGUAGE 'C'; 996 731 997 CREATE OR REPLACE FUNCTION LWGEOM_gist_compress(internal)732 CREATE OR REPLACE FUNCTION postgis_gist_compress(internal) 998 733 RETURNS internal 999 734 AS 'MODULE_PATHNAME','LWGEOM_gist_compress' 1000 735 LANGUAGE 'C'; 1001 736 1002 CREATE OR REPLACE FUNCTION LWGEOM_gist_penalty(internal,internal,internal)737 CREATE OR REPLACE FUNCTION postgis_gist_penalty(internal,internal,internal) 1003 738 RETURNS internal 1004 739 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_penalty' 1005 740 LANGUAGE 'C'; 1006 741 1007 CREATE OR REPLACE FUNCTION LWGEOM_gist_picksplit(internal, internal)742 CREATE OR REPLACE FUNCTION postgis_gist_picksplit(internal, internal) 1008 743 RETURNS internal 1009 744 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_picksplit' 1010 745 LANGUAGE 'C'; 1011 746 1012 CREATE OR REPLACE FUNCTION LWGEOM_gist_union(bytea, internal)747 CREATE OR REPLACE FUNCTION postgis_gist_union(bytea, internal) 1013 748 RETURNS internal 1014 749 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_union' 1015 750 LANGUAGE 'C'; 1016 751 1017 CREATE OR REPLACE FUNCTION LWGEOM_gist_same(box2d, box2d, internal)752 CREATE OR REPLACE FUNCTION postgis_gist_same(box2d, box2d, internal) 1018 753 RETURNS internal 1019 754 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_same' 1020 755 LANGUAGE 'C'; 1021 756 1022 CREATE OR REPLACE FUNCTION LWGEOM_gist_decompress(internal)757 CREATE OR REPLACE FUNCTION postgis_gist_decompress(internal) 1023 758 RETURNS internal 1024 759 AS 'MODULE_PATHNAME' ,'LWGEOM_gist_decompress' … … 1047 782 OPERATOR 11 |>> , 1048 783 OPERATOR 12 |&> , 1049 FUNCTION 1 LWGEOM_gist_consistent (internal, geometry, int4),1050 FUNCTION 2 LWGEOM_gist_union (bytea, internal),1051 FUNCTION 3 LWGEOM_gist_compress (internal),1052 FUNCTION 4 LWGEOM_gist_decompress (internal),1053 FUNCTION 5 LWGEOM_gist_penalty (internal, internal, internal),1054 FUNCTION 6 LWGEOM_gist_picksplit (internal, internal),1055 FUNCTION 7 LWGEOM_gist_same (box2d, box2d, internal);784 FUNCTION 1 postgis_gist_consistent (internal, geometry, int4), 785 FUNCTION 2 postgis_gist_union (bytea, internal), 786 FUNCTION 3 postgis_gist_compress (internal), 787 FUNCTION 4 postgis_gist_decompress (internal), 788 FUNCTION 5 postgis_gist_penalty (internal, internal, internal), 789 FUNCTION 6 postgis_gist_picksplit (internal, internal), 790 FUNCTION 7 postgis_gist_same (box2d, box2d, internal); 1056 791 1057 792 ------------------------------------------- … … 1059 794 ------------------------------------------- 1060 795 1061 -- Deprecation in 1.2.3 1062 CREATE OR REPLACE FUNCTION addBBOX(geometry) 796 CREATE OR REPLACE FUNCTION addbbox(geometry) 1063 797 RETURNS geometry 1064 798 AS 'MODULE_PATHNAME','LWGEOM_addBBOX' 1065 799 LANGUAGE 'C' IMMUTABLE STRICT; 1066 800 1067 -- Availability: 1. 2.21068 CREATE OR REPLACE FUNCTION ST_addBBOX(geometry)801 -- Availability: 1.5.0 802 CREATE OR REPLACE FUNCTION postgis_addbbox(geometry) 1069 803 RETURNS geometry 1070 804 AS 'MODULE_PATHNAME','LWGEOM_addBBOX' 1071 805 LANGUAGE 'C' IMMUTABLE STRICT; 1072 806 1073 -- Deprecation in 1.2.3 1074 CREATE OR REPLACE FUNCTION dropBBOX(geometry) 807 CREATE OR REPLACE FUNCTION dropbbox(geometry) 1075 808 RETURNS geometry 1076 809 AS 'MODULE_PATHNAME','LWGEOM_dropBBOX' 1077 810 LANGUAGE 'C' IMMUTABLE STRICT; 1078 811 1079 -- Availability: 1. 2.21080 CREATE OR REPLACE FUNCTION ST_dropBBOX(geometry)812 -- Availability: 1.5.0 813 CREATE OR REPLACE FUNCTION postgis_dropbbox(geometry) 1081 814 RETURNS geometry 1082 815 AS 'MODULE_PATHNAME','LWGEOM_dropBBOX' 1083 816 LANGUAGE 'C' IMMUTABLE STRICT; 1084 817 1085 -- Deprecation in 1.2.31086 CREATE OR REPLACE FUNCTION get SRID(geometry)818 -- Availability: 1.2.2 819 CREATE OR REPLACE FUNCTION getsrid(geometry) 1087 820 RETURNS int4 1088 821 AS 'MODULE_PATHNAME','LWGEOM_getSRID' 1089 822 LANGUAGE 'C' IMMUTABLE STRICT; 1090 823 1091 -- Availability: 1.2.2 1092 CREATE OR REPLACE FUNCTION getSRID(geometry) 1093 RETURNS int4 1094 AS 'MODULE_PATHNAME','LWGEOM_getSRID' 1095 LANGUAGE 'C' IMMUTABLE STRICT; 1096 1097 -- Deprecation in 1.2.3 1098 CREATE OR REPLACE FUNCTION getBBOX(geometry) 824 -- Availability: 1.5.0 825 CREATE OR REPLACE FUNCTION getbbox(geometry) 1099 826 RETURNS box2d 1100 827 AS 'MODULE_PATHNAME','LWGEOM_to_BOX2DFLOAT4' 1101 828 LANGUAGE 'C' IMMUTABLE STRICT; 1102 829 1103 -- Availability: 1. 2.21104 CREATE OR REPLACE FUNCTION getBBOX(geometry)830 -- Availability: 1.5.0 831 CREATE OR REPLACE FUNCTION postgis_getbbox(geometry) 1105 832 RETURNS box2d 1106 833 AS 'MODULE_PATHNAME','LWGEOM_to_BOX2DFLOAT4' 834 LANGUAGE 'C' IMMUTABLE STRICT; 835 836 -- Deprecation in 1.2.3 837 CREATE OR REPLACE FUNCTION hasbbox(geometry) 838 RETURNS bool 839 AS 'MODULE_PATHNAME', 'LWGEOM_hasBBOX' 840 LANGUAGE 'C' IMMUTABLE STRICT; 841 842 -- Availability: 1.5.0 843 CREATE OR REPLACE FUNCTION postgis_hasbbox(geometry) 844 RETURNS bool 845 AS 'MODULE_PATHNAME', 'LWGEOM_hasBBOX' 1107 846 LANGUAGE 'C' IMMUTABLE STRICT; 1108 847 … … 1639 1378 LANGUAGE 'C' VOLATILE STRICT; 1640 1379 1641 -- Availability: 1. 2.21642 CREATE OR REPLACE FUNCTION ST_noop(geometry)1380 -- Availability: 1.5.0 1381 CREATE OR REPLACE FUNCTION postgis_noop(geometry) 1643 1382 RETURNS geometry 1644 1383 AS 'MODULE_PATHNAME', 'LWGEOM_noop' … … 1651 1390 LANGUAGE 'C' IMMUTABLE STRICT; 1652 1391 1653 -- Availability: 1.2.21392 -- Deprecation in 1.5.0 1654 1393 CREATE OR REPLACE FUNCTION ST_zmflag(geometry) 1655 1394 RETURNS smallint … … 1658 1397 1659 1398 -- Deprecation in 1.2.3 1660 CREATE OR REPLACE FUNCTION hasBBOX(geometry)1661 RETURNS bool1662 AS 'MODULE_PATHNAME', 'LWGEOM_hasBBOX'1663 LANGUAGE 'C' IMMUTABLE STRICT;1664 1665 -- Availabitily: 1.2.21666 CREATE OR REPLACE FUNCTION ST_HasBBOX(geometry)1667 RETURNS bool1668 AS 'MODULE_PATHNAME', 'LWGEOM_hasBBOX'1669 LANGUAGE 'C' IMMUTABLE STRICT;1670 1671 -- Deprecation in 1.2.31672 1399 CREATE OR REPLACE FUNCTION ndims(geometry) 1673 1400 RETURNS smallint … … 1765 1492 LANGUAGE 'C' IMMUTABLE STRICT; 1766 1493 1767 -- Deprecation in 1.2.31768 CREATE OR REPLACE FUNCTION cache_bbox()1494 -- Availability: 1.5.0 1495 CREATE OR REPLACE FUNCTION postgis_cache_bbox() 1769 1496 RETURNS trigger 1770 AS 'MODULE_PATHNAME' 1771 LANGUAGE 'C'; 1772 1773 -- Availability: 1.2.2 1774 CREATE OR REPLACE FUNCTION ST_Cache_BBox() 1775 RETURNS trigger 1776 AS 'MODULE_PATHNAME','cache_bbox' 1497 AS 'MODULE_PATHNAME', 'cache_bbox' 1777 1498 LANGUAGE 'C'; 1778 1499 … … 3367 3088 LANGUAGE 'plpgsql' IMMUTABLE STRICT; 3368 3089 3369 3370 3371 CREATE OR REPLACE FUNCTION transform_geometry(geometry,text,text,int) 3090 CREATE OR REPLACE FUNCTION postgis_transform_geometry(geometry,text,text,int) 3372 3091 RETURNS geometry 3373 3092 AS 'MODULE_PATHNAME','transform_geom' … … 3483 3202 --------------------------------------------------------------- 3484 3203 3485 -- Deprecation in 1.2.33486 3204 CREATE OR REPLACE FUNCTION box2d(geometry) 3487 3205 RETURNS box2d … … 3489 3207 LANGUAGE 'C' IMMUTABLE STRICT; 3490 3208 3491 -- Availability: 1.2.23209 -- Deprecation in 1.5.0 3492 3210 CREATE OR REPLACE FUNCTION ST_box2d(geometry) 3493 3211 RETURNS box2d … … 3495 3213 LANGUAGE 'C' IMMUTABLE STRICT; 3496 3214 3497 -- Deprecation in 1.2.33498 3215 CREATE OR REPLACE FUNCTION box3d(geometry) 3499 3216 RETURNS box3d … … 3501 3218 LANGUAGE 'C' IMMUTABLE STRICT; 3502 3219 3503 -- Availability: 1.2.23220 -- Deprecation in 1.5.0 3504 3221 CREATE OR REPLACE FUNCTION ST_box3d(geometry) 3505 3222 RETURNS box3d … … 3507 3224 LANGUAGE 'C' IMMUTABLE STRICT; 3508 3225 3509 -- Deprecation in 1.2.33510 3226 CREATE OR REPLACE FUNCTION box(geometry) 3511 3227 RETURNS box … … 3513 3229 LANGUAGE 'C' IMMUTABLE STRICT; 3514 3230 3515 -- Availability: 1.2.23231 -- Deprecation in 1.5.0 3516 3232 CREATE OR REPLACE FUNCTION ST_box(geometry) 3517 3233 RETURNS box … … 3519 3235 LANGUAGE 'C' IMMUTABLE STRICT; 3520 3236 3521 -- Deprecation in 1.2.33522 3237 CREATE OR REPLACE FUNCTION box2d(box3d) 3523 3238 RETURNS box2d … … 3525 3240 LANGUAGE 'C' IMMUTABLE STRICT; 3526 3241 3527 -- Availability: 1.2.23242 -- Deprecation in 1.5.0 3528 3243 CREATE OR REPLACE FUNCTION ST_box2d(box3d) 3529 3244 RETURNS box2d … … 3531 3246 LANGUAGE 'C' IMMUTABLE STRICT; 3532 3247 3533 -- Deprecation in 1.2.33534 3248 CREATE OR REPLACE FUNCTION box3d(box2d) 3535 3249 RETURNS box3d … … 3537 3251 LANGUAGE 'C' IMMUTABLE STRICT; 3538 3252 3539 -- Availability: 1.2.23253 -- Deprecation in 1.5.0 3540 3254 CREATE OR REPLACE FUNCTION ST_box3d(box2d) 3541 3255 RETURNS box3d … … 3543 3257 LANGUAGE 'C' IMMUTABLE STRICT; 3544 3258 3545 -- Deprecation in 1.2.33546 3259 CREATE OR REPLACE FUNCTION box(box3d) 3547 3260 RETURNS box … … 3549 3262 LANGUAGE 'C' IMMUTABLE STRICT; 3550 3263 3551 -- Availability: 1.2.23264 -- Deprecation in 1.5.0 3552 3265 CREATE OR REPLACE FUNCTION ST_box(box3d) 3553 3266 RETURNS box … … 3555 3268 LANGUAGE 'C' IMMUTABLE STRICT; 3556 3269 3557 -- Deprecation in 1.2.33558 3270 CREATE OR REPLACE FUNCTION text(geometry) 3559 3271 RETURNS text … … 3561 3273 LANGUAGE 'C' IMMUTABLE STRICT; 3562 3274 3563 -- Availability: 1.2.23275 -- Deprecation in 1.5.0 3564 3276 CREATE OR REPLACE FUNCTION ST_text(geometry) 3565 3277 RETURNS text … … 3574 3286 LANGUAGE 'SQL' IMMUTABLE STRICT; 3575 3287 3576 -- Deprecation in 1.2.33577 3288 CREATE OR REPLACE FUNCTION geometry(box2d) 3578 3289 RETURNS geometry … … 3580 3291 LANGUAGE 'C' IMMUTABLE STRICT; 3581 3292 3582 -- Availability: 1.2.23293 -- Deprecation in 1.5.0 3583 3294 CREATE OR REPLACE FUNCTION ST_geometry(box2d) 3584 3295 RETURNS geometry … … 3586 3297 LANGUAGE 'C' IMMUTABLE STRICT; 3587 3298 3588 -- Deprecation in 1.2.33589 3299 CREATE OR REPLACE FUNCTION geometry(box3d) 3590 3300 RETURNS geometry … … 3592 3302 LANGUAGE 'C' IMMUTABLE STRICT; 3593 3303 3594 -- Availability: 1.2.23304 -- Deprecation in 1.5.0 3595 3305 CREATE OR REPLACE FUNCTION ST_geometry(box3d) 3596 3306 RETURNS geometry … … 3598 3308 LANGUAGE 'C' IMMUTABLE STRICT; 3599 3309 3600 -- Deprecation in 1.2.33601 3310 CREATE OR REPLACE FUNCTION geometry(text) 3602 3311 RETURNS geometry … … 3604 3313 LANGUAGE 'C' IMMUTABLE STRICT; 3605 3314 3606 -- Availability: 1.2.23315 -- Deprecation in 1.5.0 3607 3316 CREATE OR REPLACE FUNCTION ST_geometry(text) 3608 3317 RETURNS geometry … … 3610 3319 LANGUAGE 'C' IMMUTABLE STRICT; 3611 3320 3612 -- Deprecation in 1.2.33613 3321 CREATE OR REPLACE FUNCTION geometry(chip) 3614 3322 RETURNS geometry … … 3616 3324 LANGUAGE 'C' IMMUTABLE STRICT; 3617 3325 3618 -- Availability: 1.2.23326 -- Deprecation in 1.5.0 3619 3327 CREATE OR REPLACE FUNCTION ST_geometry(chip) 3620 3328 RETURNS geometry … … 3622 3330 LANGUAGE 'C' IMMUTABLE STRICT; 3623 3331 3624 -- Deprecation in 1.2.33625 3332 CREATE OR REPLACE FUNCTION geometry(bytea) 3626 3333 RETURNS geometry … … 3628 3335 LANGUAGE 'C' IMMUTABLE STRICT; 3629 3336 3630 -- Availability: 1.2.23337 -- Deprecation in 1.5.0 3631 3338 CREATE OR REPLACE FUNCTION ST_geometry(bytea) 3632 3339 RETURNS geometry … … 3634 3341 LANGUAGE 'C' IMMUTABLE STRICT; 3635 3342 3636 -- Deprecation in 1.2.33637 3343 CREATE OR REPLACE FUNCTION bytea(geometry) 3638 3344 RETURNS bytea … … 3640 3346 LANGUAGE 'C' IMMUTABLE STRICT; 3641 3347 3642 -- Availability: 1.2.23348 -- Deprecation in 1.5.0 3643 3349 CREATE OR REPLACE FUNCTION ST_bytea(geometry) 3644 3350 RETURNS bytea … … 3647 3353 3648 3354 -- 7.3+ explicit casting definitions 3649 CREATE CAST (geometry AS box2d) WITH FUNCTION ST_box2d(geometry) AS IMPLICIT;3650 CREATE CAST (geometry AS box3d) WITH FUNCTION ST_box3d(geometry) AS IMPLICIT;3651 CREATE CAST (geometry AS box) WITH FUNCTION ST_box(geometry) AS IMPLICIT;3652 CREATE CAST (box3d AS box2d) WITH FUNCTION ST_box2d(box3d) AS IMPLICIT;3653 CREATE CAST (box2d AS box3d) WITH FUNCTION ST_box3d(box2d) AS IMPLICIT;3654 CREATE CAST (box2d AS geometry) WITH FUNCTION ST_geometry(box2d) AS IMPLICIT;3655 CREATE CAST (box3d AS box) WITH FUNCTION ST_box(box3d) AS IMPLICIT;3656 CREATE CAST (box3d AS geometry) WITH FUNCTION ST_geometry(box3d) AS IMPLICIT;3657 CREATE CAST (text AS geometry) WITH FUNCTION ST_geometry(text) AS IMPLICIT;3658 CREATE CAST (geometry AS text) WITH FUNCTION ST_text(geometry) AS IMPLICIT;3659 CREATE CAST (chip AS geometry) WITH FUNCTION ST_geometry(chip) AS IMPLICIT;3660 CREATE CAST (bytea AS geometry) WITH FUNCTION ST_geometry(bytea) AS IMPLICIT;3661 CREATE CAST (geometry AS bytea) WITH FUNCTION ST_bytea(geometry) AS IMPLICIT;3355 CREATE CAST (geometry AS box2d) WITH FUNCTION box2d(geometry) AS IMPLICIT; 3356 CREATE CAST (geometry AS box3d) WITH FUNCTION box3d(geometry) AS IMPLICIT; 3357 CREATE CAST (geometry AS box) WITH FUNCTION box(geometry) AS IMPLICIT; 3358 CREATE CAST (box3d AS box2d) WITH FUNCTION box2d(box3d) AS IMPLICIT; 3359 CREATE CAST (box2d AS box3d) WITH FUNCTION box3d(box2d) AS IMPLICIT; 3360 CREATE CAST (box2d AS geometry) WITH FUNCTION geometry(box2d) AS IMPLICIT; 3361 CREATE CAST (box3d AS box) WITH FUNCTION box(box3d) AS IMPLICIT; 3362 CREATE CAST (box3d AS geometry) WITH FUNCTION geometry(box3d) AS IMPLICIT; 3363 CREATE CAST (text AS geometry) WITH FUNCTION geometry(text) AS IMPLICIT; 3364 CREATE CAST (geometry AS text) WITH FUNCTION text(geometry) AS IMPLICIT; 3365 CREATE CAST (chip AS geometry) WITH FUNCTION geometry(chip) AS IMPLICIT; 3366 CREATE CAST (bytea AS geometry) WITH FUNCTION geometry(bytea) AS IMPLICIT; 3367 CREATE CAST (geometry AS bytea) WITH FUNCTION bytea(geometry) AS IMPLICIT; 3662 3368 3663 3369 -- Casts to allow the box3d_extent type to automatically cast to box3d/box2d in queries 3664 CREATE CAST (box3d_extent AS box3d) WITH FUNCTION ST_box3d_extent(box3d_extent) AS IMPLICIT;3665 CREATE CAST (box3d_extent AS box2d) WITH FUNCTION ST_box2d(box3d_extent) AS IMPLICIT;3666 CREATE CAST (box3d_extent AS geometry) WITH FUNCTION ST_geometry(box3d_extent) AS IMPLICIT;3370 CREATE CAST (box3d_extent AS box3d) WITH FUNCTION box3d_extent(box3d_extent) AS IMPLICIT; 3371 CREATE CAST (box3d_extent AS box2d) WITH FUNCTION box2d(box3d_extent) AS IMPLICIT; 3372 CREATE CAST (box3d_extent AS geometry) WITH FUNCTION geometry(box3d_extent) AS IMPLICIT; 3667 3373 3668 3374 --------------------------------------------------------------- … … 4002 3708 4003 3709 -- Deprecation in 1.2.3 4004 CREATE OR REPLACE FUNCTION collector(geometry, geometry)4005 RETURNS geometry4006 AS 'MODULE_PATHNAME', 'LWGEOM_collect'4007 LANGUAGE 'C' IMMUTABLE;4008 4009 -- Availability: 1.2.24010 CREATE OR REPLACE FUNCTION ST_collector(geometry, geometry)4011 RETURNS geometry4012 AS 'MODULE_PATHNAME', 'LWGEOM_collect'4013 LANGUAGE 'C' IMMUTABLE;4014 4015 -- Deprecation in 1.2.34016 3710 CREATE OR REPLACE FUNCTION collect(geometry, geometry) 4017 3711 RETURNS geometry … … 4039 3733 ); 4040 3734 4041 -- Deprecation in 1.2.34042 CREATE OR REPLACE FUNCTION geom_accum (geometry[],geometry)4043 RETURNS geometry[]4044 AS 'MODULE_PATHNAME', 'LWGEOM_accum'4045 LANGUAGE 'C' IMMUTABLE;4046 4047 -- Availability: 1.2.24048 CREATE OR REPLACE FUNCTION ST_geom_accum (geometry[],geometry)4049 RETURNS geometry[]4050 AS 'MODULE_PATHNAME', 'LWGEOM_accum'4051 LANGUAGE 'C' IMMUTABLE;4052 4053 4054 4055 -- Deprecation in 1.2.34056 CREATE OR REPLACE FUNCTION collect_garray (geometry[])4057 RETURNS geometry4058 AS 'MODULE_PATHNAME', 'LWGEOM_collect_garray'4059 LANGUAGE 'C' IMMUTABLE STRICT;4060 4061 -- Availability: 1.2.24062 CREATE OR REPLACE FUNCTION ST_collect_garray (geometry[])4063 RETURNS geometry4064 AS 'MODULE_PATHNAME', 'LWGEOM_collect_garray'4065 LANGUAGE 'C' IMMUTABLE STRICT;4066 4067 3735 -- Availability: 1.2.2 4068 3736 CREATE OR REPLACE FUNCTION ST_collect (geometry[]) … … 4081 3749 CREATE AGGREGATE ST_MemUnion ( 4082 3750 basetype = geometry, 4083 sfunc = ST_ union,3751 sfunc = ST_Union, 4084 3752 stype = geometry 4085 3753 ); … … 4159 3827 ); 4160 3828 4161 -- TO BE REMOVED BEFORE RELEASE4162 CREATE AGGREGATE accum_old (4163 sfunc = ST_geom_accum,4164 basetype = geometry,4165 stype = geometry[]4166 );4167 4168 -- TO BE REMOVED BEFORE RELEASE4169 CREATE AGGREGATE ST_accum_old (4170 sfunc = ST_geom_accum,4171 basetype = geometry,4172 stype = geometry[]4173 );4174 4175 3829 -- Deprecation in 1.2.3 4176 3830 CREATE OR REPLACE FUNCTION unite_garray (geometry[]) … … 4336 3990 AS 'SELECT $1 && $2 AND _ST_Intersects($1,$2)' 4337 3991 LANGUAGE 'SQL' IMMUTABLE; 3992 4338 3993 -- Deprecation in 1.2.3 4339 3994 CREATE OR REPLACE FUNCTION crosses(geometry,geometry) … … 4466 4121 AS 'MODULE_PATHNAME', 'isvalid' 4467 4122 LANGUAGE 'C' IMMUTABLE STRICT; 4468 4469 -- Deprecation in 1.2.34470 CREATE OR REPLACE FUNCTION GEOSnoop(geometry)4471 RETURNS geometry4472 AS 'MODULE_PATHNAME', 'GEOSnoop'4473 LANGUAGE 'C' VOLATILE STRICT;4474 4123 4475 4124 -- This is also available w/out GEOS -
trunk/postgis/sqlmm.sql.in.c
r4494 r4750 157 157 LANGUAGE 'SQL' IMMUTABLE STRICT; 158 158 159 -- PostGIS equivalent function: zmflag(geometry)159 -- Availability: 1.5.0 160 160 CREATE OR REPLACE FUNCTION SE_Is3D(geometry) 161 RETURNS boolean 162 AS $$ 163 SELECT CASE ST_zmflag($1) 164 WHEN 0 THEN false 165 WHEN 1 THEN false 166 WHEN 2 THEN true 167 WHEN 3 THEN true 168 ELSE false 169 END 170 $$ 171 LANGUAGE 'SQL' IMMUTABLE STRICT; 172 173 -- PostGIS equivalent function: zmflag(geometry) 161 RETURNS bool 162 AS 'MODULE_PATHNAME', 'LWGEOM_hasz' 163 LANGUAGE 'C' IMMUTABLE STRICT; 164 165 -- Availability: 1.5.0 174 166 CREATE OR REPLACE FUNCTION SE_IsMeasured(geometry) 175 RETURNS boolean 176 AS $$ 177 SELECT CASE ST_zmflag($1) 178 WHEN 0 THEN false 179 WHEN 1 THEN true 180 WHEN 2 THEN false 181 WHEN 3 THEN true 182 ELSE false 183 END 184 $$ 185 LANGUAGE 'SQL' IMMUTABLE STRICT; 186 187 188 189 167 RETURNS bool 168 AS 'MODULE_PATHNAME', 'LWGEOM_hasm' 169 LANGUAGE 'C' IMMUTABLE STRICT; 190 170 191 171 ------------------------------------------------------------------------------- -
trunk/regress/regress_expected
r4542 r4750 184 184 150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0))) 185 185 150_|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0))) 186 151|187 151_| -
trunk/regress/regress_ogc_expected
r4192 r4750 3 3 buffer|POLYGON((1 0,0.866025 -0.5,0.5 -0.866025,0 -1,-0.5 -0.866025,-0.866025 -0.5,-1 0,-0.866025 0.5,-0.5 0.866025,0 1,0.5 0.866025,0.866025 0.5,1 0)) 4 4 geomunion|MULTIPOINT(0 0,1 1) 5 unite_garray|t6 5 convexhull|POLYGON((0 0,0 10,10 10,10 0,0 0)) 7 6 relate|F0FFFF102 … … 75 74 linemerge149|LINESTRING(-5 -5,0 0,1 1,4 4) 76 75 intersects|f 77 ERROR: geometry requires more points78 HINT: "POLYGON((0 0, 1 1, 0 0)" <-- parse error at position 23 within geometry79 76 buffer|POLYGON((1 0,0.707107 -0.707107,0 -1,-0.707107 -0.707107,-1 0,-0.707107 0.707107,0 1,0.707107 0.707107,1 0)) 80 77 geomunion|MULTIPOINT(0 0,1 1) 81 unite_garray|t82 78 convexhull|POLYGON((0 0,0 10,10 10,10 0,0 0)) 83 79 relate|F0FFFF102 -
trunk/regress/regress_ogc.sql
r4192 r4750 11 11 12 12 SELECT 'geomunion', astext(geomunion('POINT(0 0)', 'POINT(1 1)')); 13 SELECT 'unite_garray', equals(unite_garray(geom_accum('{POINT(0 0)}', 'POINT(2 3)')), 'MULTIPOINT(2 3,0 0)');14 13 SELECT 'convexhull', asewkt(convexhull('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))')); 15 14 SELECT 'relate', relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)'); … … 133 132 ); 134 133 135 select '130', geosnoop('POLYGON((0 0, 1 1, 0 0))');136 137 134 -- Repeat all tests with new function names. 138 135 SELECT 'buffer', ST_astext(ST_SnapToGrid(ST_buffer('POINT(0 0)', 1, 2), 1.0e-6)); 139 136 140 137 SELECT 'geomunion', ST_astext(ST_union('POINT(0 0)', 'POINT(1 1)')); 141 SELECT 'unite_garray', ST_equals(ST_unite_garray(ST_geom_accum('{POINT(0 0)}', 'POINT(2 3)')), 'MULTIPOINT(2 3,0 0)');142 138 SELECT 'convexhull', ST_asewkt(ST_convexhull('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))')); 143 139 SELECT 'relate', ST_relate('POINT(0 0)', 'LINESTRING(0 0, 1 1)'); -
trunk/regress/regress.sql
r4542 r4750 263 263 select '150_', asewkt(force_collection(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6))); 264 264 265 select '151', ST_geom_accum(NULL, NULL);266 select '151_', geom_accum(NULL, NULL);267 268 265 -- Drop test table 269 266 DROP table test;
