Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From 92745c6f5ce19792 To a78bf380ac2c4763
|
2012-04-01
| ||
| 12:02 | updating the internal doc: ToGARS and GARSMbr check-in: d893af25ad user: sandro tags: trunk | |
|
2012-03-26
| ||
| 13:43 | updating the internal doc: ST_Locate_Along_Measure and ST_Locate_Between_Measures check-in: a78bf380ac user: sandro tags: trunk | |
|
2012-03-24
| ||
| 12:33 | updating the internal doc: ST_MinZ, ST_MinM, ST_Is3D, ST_IsMeasured, ST_EnvIntersects check-in: e720dd346b user: sandro tags: trunk | |
|
2012-03-22
| ||
| 14:34 | updating the internal doc: ST_WKTToSQL and ST_WKBToSQL check-in: 92745c6f5c user: sandro tags: trunk | |
|
2012-03-18
| ||
| 12:50 | supporting autoreconf check-in: 76abdb60d5 user: sandro tags: trunk | |
Changes to Main.cpp.
6877 6877 html += 6878 6878 wxT 6879 6879 ("Sub-geometries that are not the specified type are ignored.<br>(1=POINT-type, 2=LINESTRING-type, 3=POLYGON-type)<br>"); 6880 6880 html += 6881 6881 wxT 6882 6882 ("NULL will be returned if any error is encountered (or when no item of required type is found)</td></tr>"); 6883 6883 html += 6884 + wxT 6885 + ("<tr><td bgcolor=\"#fffff0\">ST_Locate_Along_Measure( geom Geometry, m_value Double precision ) : Geometry</td>"); 6886 + html += 6887 + wxT 6888 + ("<td bgcolor=\"#f0fff0\">Return a derived geometry collection value with elements that match the specified measure.<br>"); 6889 + html += 6890 + wxT 6891 + ("NULL will be returned if any error is encountered (or when no element corresponding to the given measure is found).<br>"); 6892 + html += 6893 + wxT 6894 + ("Please note: NULL will be returned anyway if Geometry doesn't support M-dimension, or if it contains any Polygon, or if it's of the GeometryCollection type.</td></tr>"); 6895 + html += 6896 + wxT 6897 + ("<tr><td bgcolor=\"#fffff0\">ST_Locate_Between_Measures( geom Geometry, m_start Double precision , m_end Double precision) : Geometry</td>"); 6898 + html += 6899 + wxT 6900 + ("<td bgcolor=\"#f0fff0\">Return a derived geometry collection value with elements that match the specified range of measures.<br>"); 6901 + html += 6902 + wxT 6903 + ("NULL will be returned if any error is encountered (or when no element corresponding to the given range if measures is found).<br>"); 6904 + html += 6905 + wxT 6906 + ("Please note: NULL will be returned anyway if Geometry doesn't support M-dimension, or if it contains any Polygon, or if it's of the GeometryCollection type.</td></tr>"); 6907 + html += 6884 6908 wxT 6885 6909 ("<tr><td bgcolor=\"#fffff0\">BuildMbr( x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision, [ , SRID Integer] ) : Geometry</td>"); 6886 6910 html += 6887 6911 wxT 6888 6912 ("<td bgcolor=\"#f0fff0\">[x1 y1] and [x2 y2] are assumed to be Points identifying a line segment;"); 6889 6913 html += 6890 6914 wxT ................................................................................ 6899 6923 wxT("<tr><td bgcolor=\"#fffff0\">Extent( geom Geometry ) : Geometry</td>"); 6900 6924 html += 6901 6925 wxT 6902 6926 ("<td bgcolor=\"#f0fff0\">return a geometric object representing the bounding box that encloses a set of input values<br>"); 6903 6927 html += wxT("<b><u>aggregate function</u></b></td></tr>"); 6904 6928 html += 6905 6929 wxT 6906 - ("<tr><td bgcolor=\"#fffff0\">MbrMinX( geom Geometry) : Double precision</td>"); 6907 - html += 6908 - wxT 6909 - ("<td bgcolor=\"#f0fff0\">return the x-coordinate for geom MBR's leftmost side as a double precision number</td></tr>"); 6910 - html += 6911 - wxT 6912 - ("<tr><td bgcolor=\"#fffff0\">MbrMinY( geom Geometry) : Double precision</td>"); 6913 - html += 6914 - wxT 6915 - ("<td bgcolor=\"#f0fff0\">return the y-coordinate for geom MBR's lowermost side as a double precision number</td></tr>"); 6916 - html += 6917 - wxT 6918 - ("<tr><td bgcolor=\"#fffff0\">MbrMaxX( geom Geometry) : Double precision</td>"); 6919 - html += 6920 - wxT 6921 - ("<td bgcolor=\"#f0fff0\">return the x-coordinate for geom MBR's rightmost side as a double precision number</td></tr>"); 6922 - html += 6923 - wxT 6924 - ("<tr><td bgcolor=\"#fffff0\">MbrMaxY( geom Geometry) : Double precision</td>"); 6925 - html += 6926 - wxT 6927 - ("<td bgcolor=\"#f0fff0\">return the y-coordinate for geom MBR's uppermost side as a double precision number</td></tr>"); 6930 + ("<tr><td bgcolor=\"#fffff0\">MbrMinX( geom Geometry) : Double precision<hr>"); 6931 + html += wxT("ST_MbrMinX( geom Geometry) : Double precision<hr>"); 6932 + html += wxT("ST_MinX( geom Geometry) : Double precision</td>"); 6933 + html += 6934 + wxT 6935 + ("<td bgcolor=\"#f0fff0\">return the x-coordinate for geom MBR's leftmost side as a double precision number.<br>"); 6936 + html += 6937 + wxT("NULL will be returned if geom isn't a valid Geometry.</td></tr>"); 6938 + html += 6939 + wxT 6940 + ("<tr><td bgcolor=\"#fffff0\">MbrMinY( geom Geometry) : Double precision<hr>"); 6941 + html += wxT("ST_MbrMinY( geom Geometry) : Double precision<hr>"); 6942 + html += wxT("ST_MinY( geom Geometry) : Double precision</td>"); 6943 + html += 6944 + wxT 6945 + ("<td bgcolor=\"#f0fff0\">return the y-coordinate for geom MBR's lowermost side as a double precision number.<br>"); 6946 + html += 6947 + wxT("NULL will be returned if geom isn't a valid Geometry.</td></tr>"); 6948 + html += 6949 + wxT 6950 + ("<tr><td bgcolor=\"#fffff0\">MbrMaxX( geom Geometry) : Double precision<hr>"); 6951 + html += wxT("ST_MbrMaxX( geom Geometry) : Double precision<hr>"); 6952 + html += wxT("ST_MaxX( geom Geometry) : Double precision</td>"); 6953 + html += 6954 + wxT 6955 + ("<td bgcolor=\"#f0fff0\">return the x-coordinate for geom MBR's rightmost side as a double precision number.<br>"); 6956 + html += 6957 + wxT("NULL will be returned if geom isn't a valid Geometry.</td></tr>"); 6958 + html += 6959 + wxT 6960 + ("<tr><td bgcolor=\"#fffff0\">MbrMaxY( geom Geometry) : Double precision<hr>"); 6961 + html += wxT("ST_MbrMaxY( geom Geometry) : Double precision<hr>"); 6962 + html += wxT("ST_MaxY( geom Geometry) : Double precision</td>"); 6963 + html += 6964 + wxT 6965 + ("<td bgcolor=\"#f0fff0\">return the y-coordinate for geom MBR's uppermost side as a double precision number.<br>"); 6966 + html += 6967 + wxT("NULL will be returned if geom isn't a valid Geometry.</td></tr>"); 6968 + html += 6969 + wxT 6970 + ("<tr><td bgcolor=\"#fffff0\">ST_MinZ( geom Geometry) : Double precision</td>"); 6971 + html += 6972 + wxT 6973 + ("<td bgcolor=\"#f0fff0\">return the minimum Z-coordinate value for geom as a double precision number.<br>"); 6974 + html += 6975 + wxT 6976 + ("NULL will be returned if geom isn't a valid Geometry or if geom has no Z dimension.</td></tr>"); 6977 + html += 6978 + wxT 6979 + ("<tr><td bgcolor=\"#fffff0\">ST_MaxZ( geom Geometry) : Double precision</td>"); 6980 + html += 6981 + wxT 6982 + ("<td bgcolor=\"#f0fff0\">return the maximum Z-coordinate value for geom as a double precision number.<br>"); 6983 + html += 6984 + wxT 6985 + ("NULL will be returned if geom isn't a valid Geometry or if geom has no Z dimension.</td></tr>"); 6986 + html += 6987 + wxT 6988 + ("<tr><td bgcolor=\"#fffff0\">ST_MinM( geom Geometry) : Double precision</td>"); 6989 + html += 6990 + wxT 6991 + ("<td bgcolor=\"#f0fff0\">return the minimum M-coordinate value for geom as a double precision number.<br>"); 6992 + html += 6993 + wxT 6994 + ("NULL will be returned if geom isn't a valid Geometry or if geom has no M dimension.</td></tr>"); 6995 + html += 6996 + wxT 6997 + ("<tr><td bgcolor=\"#fffff0\">ST_MaxM( geom Geometry) : Double precision</td>"); 6998 + html += 6999 + wxT 7000 + ("<td bgcolor=\"#f0fff0\">return the maximum M-coordinate value for geom as a double precision number.<br>"); 7001 + html += 7002 + wxT 7003 + ("NULL will be returned if geom isn't a valid Geometry or if geom has no M dimension.</td></tr>"); 6928 7004 html += 6929 7005 wxT 6930 7006 ("<tr><td align=\"center\" bgcolor=\"#e0ffe0\" colspan=\"2\"><a name=\"c31\">functions for constructing a geometric object given its Well-known Text Representation</a>"); 6931 7007 html += wxT("<br><a href=\"#index\">back to index</a></td></tr>"); 6932 7008 html += 6933 7009 wxT 6934 7010 ("<tr><td bgcolor=\"#fffff0\">GeomFromText( wkt String [ , SRID Integer] ) : Geometry<hr>"); 6935 7011 html += 6936 7012 wxT("ST_GeomFromText( wkt String [ , SRID Integer] ) : Geometry</td>"); 6937 7013 html += 6938 7014 wxT 6939 7015 ("<td bgcolor=\"#f0fff0\">construct a geometric object given its Well-known text Representation</td></tr>"); 6940 -html += 7016 + html += 6941 7017 wxT 6942 7018 ("<tr><td bgcolor=\"#fffff0\">ST_WKTToSQL( wkt String ) : Geometry</td>"); 6943 7019 html += 6944 7020 wxT 6945 7021 ("<td bgcolor=\"#f0fff0\">SQL/MM alias name for ST_GeomFromText: SRID=0 is assumed.</td></tr>"); 6946 7022 html += 6947 7023 wxT ................................................................................ 7059 7135 ("<tr><td bgcolor=\"#fffff0\">GeomFromWKB( wkbGeometry Binary [ , SRID Integer] ) : Geometry<hr>"); 7060 7136 html += 7061 7137 wxT 7062 7138 ("ST_GeomFromWKB( wkbGeometry Binary [ , SRID Integer] ) : Geometry</td>"); 7063 7139 html += 7064 7140 wxT 7065 7141 ("<td bgcolor=\"#f0fff0\">construct a geometric object given its Well-known binary Representation</td></tr>"); 7066 -html += 7142 + html += 7067 7143 wxT 7068 7144 ("<tr><td bgcolor=\"#fffff0\">ST_WKBToSQL( wkbGeometry Binary ) : Geometry</td>"); 7069 7145 html += 7070 7146 wxT 7071 7147 ("<td bgcolor=\"#f0fff0\">SQL/MM alias name for ST_GeomFromWKB: SRID=0 is assumed.</td></tr>"); 7072 7148 html += 7073 7149 wxT ................................................................................ 7270 7346 html += 7271 7347 wxT 7272 7348 ("<tr><td bgcolor=\"#fffff0\">CoordDimension( geom Geometry ) : String</td>"); 7273 7349 html += 7274 7350 wxT 7275 7351 ("<td bgcolor=\"#f0fff0\">return the dimension model used by the geometric object as:<br>'XY', 'XYZ', 'XYM' or 'XYZM'</td></tr>"); 7276 7352 html += 7277 - wxT("<tr><td bgcolor=\"#fffff0\">ST_NDims( geom Geometry ) : String</td>"); 7353 + wxT("<tr><td bgcolor=\"#fffff0\">ST_NDims( geom Geometry ) : Integer</td>"); 7278 7354 html += 7279 7355 wxT 7280 7356 ("<td bgcolor=\"#f0fff0\">return the number of dimensions used by the geometric object as:<br>2, 3 or 4</td></tr>"); 7357 + html += 7358 + wxT("<tr><td bgcolor=\"#fffff0\">ST_Is3D( geom Geometry ) : Integer</td>"); 7359 + html += 7360 + wxT("<td bgcolor=\"#f0fff0\">Checks if geom has the Z dimension.<br>"); 7361 + html += 7362 + wxT 7363 + ("The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a "); 7364 + html += wxT("function invocation on invalid arguments.</td></tr>"); 7365 + html += 7366 + wxT 7367 + ("<tr><td bgcolor=\"#fffff0\">ST_IsMeasured( geom Geometry ) : Integer</td>"); 7368 + html += 7369 + wxT("<td bgcolor=\"#f0fff0\">Checks if geom has the M dimension.<br>"); 7370 + html += 7371 + wxT 7372 + ("The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a "); 7373 + html += wxT("function invocation on invalid arguments.</td></tr>"); 7281 7374 html += 7282 7375 wxT 7283 7376 ("<tr><td bgcolor=\"#fffff0\">GeometryType( geom Geometry ) : String<hr>"); 7284 7377 html += wxT("ST_GeometryType( geom Geometry ) : String</td>"); 7285 7378 html += 7286 7379 wxT 7287 7380 ("<td bgcolor=\"#f0fff0\">return the name of the instantiable subtype of Geometry of which this geometric object is a member, as a string</td></tr>"); ................................................................................ 7703 7796 html += 7704 7797 wxT 7705 7798 ("<td bgcolor=\"#f0fff0\">The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a function invocation on NULL arguments<br>"); 7706 7799 html += 7707 7800 wxT 7708 7801 ("convenience predicate: TRUE if the intersection of g1 and g2 MBRs is not empty</td></tr>"); 7709 7802 html += 7803 + wxT 7804 + ("<tr><td bgcolor=\"#fffff0\">ST_EnvIntersects( geom1 Geometry , geom2 Geometry ) : Integer<hr>"); 7805 + html += 7806 + wxT 7807 + ("ST_EnvelopesIntersects( geom1 Geometry , geom2 Geometry ) : Integer<hr>"); 7808 + html += 7809 + wxT 7810 + ("ST_EnvIntersects( geom1 Geometry , x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision ) : Integer<hr>"); 7811 + html += 7812 + wxT 7813 + ("ST_EnvelopesIntersects( geom1 Geometry , x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision ) : Integer</td>"); 7814 + html += 7815 + wxT 7816 + ("<td bgcolor=\"#f0fff0\">The first form simply is an alias name for MbrIntersects; the other form allows to define the second MBR by two extreme points [x1, y1] and [x2, y2].<br>"); 7817 + html += 7818 + wxT 7819 + ("The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a function invocation on invalid arguments<br>"); 7820 + html += 7821 + wxT 7822 + ("convenience predicate: TRUE if the intersection of both MBRs is not empty</td></tr>"); 7823 + html += 7710 7824 wxT 7711 7825 ("<tr><td bgcolor=\"#fffff0\">MbrContains( geom1 Geometry , geom2 Geometry ) : Integer</td>"); 7712 7826 html += 7713 7827 wxT 7714 7828 ("<td bgcolor=\"#f0fff0\">The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a function invocation on NULL arguments<br>"); 7715 7829 html += 7716 7830 wxT
Changes to QueryView.cpp.
499 499 if (str.CmpNoCase(wxT("MbrMinX")) == 0) 500 500 return true; 501 501 if (str.CmpNoCase(wxT("MbrMinY")) == 0) 502 502 return true; 503 503 if (str.CmpNoCase(wxT("MbrMaxX")) == 0) 504 504 return true; 505 505 if (str.CmpNoCase(wxT("MbrMaxY")) == 0) 506 + return true; 507 + if (str.CmpNoCase(wxT("ST_MbrMinX")) == 0) 508 + return true; 509 + if (str.CmpNoCase(wxT("ST_MbrMinY")) == 0) 510 + return true; 511 + if (str.CmpNoCase(wxT("ST_MbrMaxX")) == 0) 512 + return true; 513 + if (str.CmpNoCase(wxT("ST_MbrMaxY")) == 0) 514 + return true; 515 + if (str.CmpNoCase(wxT("ST_MinX")) == 0) 516 + return true; 517 + if (str.CmpNoCase(wxT("ST_MinY")) == 0) 518 + return true; 519 + if (str.CmpNoCase(wxT("ST_MaxX")) == 0) 520 + return true; 521 + if (str.CmpNoCase(wxT("ST_MaxY")) == 0) 522 + return true; 523 + if (str.CmpNoCase(wxT("ST_MinZ")) == 0) 524 + return true; 525 + if (str.CmpNoCase(wxT("ST_MinM")) == 0) 526 + return true; 527 + if (str.CmpNoCase(wxT("ST_MaxZ")) == 0) 528 + return true; 529 + if (str.CmpNoCase(wxT("ST_MaxM")) == 0) 506 530 return true; 507 531 if (str.CmpNoCase(wxT("GeomFromText")) == 0) 508 532 return true; 509 533 if (str.CmpNoCase(wxT("ST_GeomFromText")) == 0) 510 534 return true; 511 535 if (str.CmpNoCase(wxT("ST_WKTToSQL")) == 0) 512 536 return true; ................................................................................ 718 742 return true; 719 743 if (str.CmpNoCase(wxT("ST_Dimension")) == 0) 720 744 return true; 721 745 if (str.CmpNoCase(wxT("CoordDimension")) == 0) 722 746 return true; 723 747 if (str.CmpNoCase(wxT("ST_NDims")) == 0) 724 748 return true; 749 + if (str.CmpNoCase(wxT("ST_Is3D")) == 0) 750 + return true; 751 + if (str.CmpNoCase(wxT("ST_IsMeasured")) == 0) 752 + return true; 725 753 if (str.CmpNoCase(wxT("GeometryType")) == 0) 726 754 return true; 727 755 if (str.CmpNoCase(wxT("GeometryAliasType")) == 0) 728 756 return true; 729 757 if (str.CmpNoCase(wxT("ST_GeometryType")) == 0) 730 758 return true; 731 759 if (str.CmpNoCase(wxT("SRID")) == 0) ................................................................................ 856 884 return true; 857 885 if (str.CmpNoCase(wxT("MbrWithin")) == 0) 858 886 return true; 859 887 if (str.CmpNoCase(wxT("MbrOverlaps")) == 0) 860 888 return true; 861 889 if (str.CmpNoCase(wxT("MbrIntersects")) == 0) 862 890 return true; 891 + if (str.CmpNoCase(wxT("ST_EnvIntersects")) == 0) 892 + return true; 893 + if (str.CmpNoCase(wxT("ST_EnvelopesIntersects")) == 0) 894 + return true; 863 895 if (str.CmpNoCase(wxT("MbrContains")) == 0) 864 896 return true; 865 897 if (str.CmpNoCase(wxT("Equals")) == 0) 866 898 return true; 867 899 if (str.CmpNoCase(wxT("ST_Equals")) == 0) 868 900 return true; 869 901 if (str.CmpNoCase(wxT("Disjoint")) == 0) ................................................................................ 1018 1050 return true; 1019 1051 if (str.CmpNoCase(wxT("ST_LinesCutAtNodes")) == 0) 1020 1052 return true; 1021 1053 if (str.CmpNoCase(wxT("CollectionExtract")) == 0) 1022 1054 return true; 1023 1055 if (str.CmpNoCase(wxT("ST_CollectionExtract")) == 0) 1024 1056 return true; 1057 + if (str.CmpNoCase(wxT("ST_Locate_Along_Measure")) == 0) 1058 + return true; 1059 + if (str.CmpNoCase(wxT("ST_Locate_Between_Measures")) == 0) 1060 + return true; 1025 1061 if (str.CmpNoCase(wxT("SridFromAuthCRS")) == 0) 1026 1062 return true; 1027 1063 if (str.CmpNoCase(wxT("ShiftCoords")) == 0) 1028 1064 return true; 1029 1065 if (str.CmpNoCase(wxT("ShiftCoordinates")) == 0) 1030 1066 return true; 1031 1067 if (str.CmpNoCase(wxT("ST_Translate")) == 0)