Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From a78bf380ac2c4763 To 92745c6f5ce19792
|
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.
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 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 += 6908 - wxT 6909 6885 ("<tr><td bgcolor=\"#fffff0\">BuildMbr( x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision, [ , SRID Integer] ) : Geometry</td>"); 6910 6886 html += 6911 6887 wxT 6912 6888 ("<td bgcolor=\"#f0fff0\">[x1 y1] and [x2 y2] are assumed to be Points identifying a line segment;"); 6913 6889 html += 6914 6890 wxT 6915 6891 ("then a Geometry will be returned representing the MBR for this line segment</td></tr>"); ................................................................................ 6923 6899 wxT("<tr><td bgcolor=\"#fffff0\">Extent( geom Geometry ) : Geometry</td>"); 6924 6900 html += 6925 6901 wxT 6926 6902 ("<td bgcolor=\"#f0fff0\">return a geometric object representing the bounding box that encloses a set of input values<br>"); 6927 6903 html += wxT("<b><u>aggregate function</u></b></td></tr>"); 6928 6904 html += 6929 6905 wxT 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>"); 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>"); 7004 6928 html += 7005 6929 wxT 7006 6930 ("<tr><td align=\"center\" bgcolor=\"#e0ffe0\" colspan=\"2\"><a name=\"c31\">functions for constructing a geometric object given its Well-known Text Representation</a>"); 7007 6931 html += wxT("<br><a href=\"#index\">back to index</a></td></tr>"); 7008 6932 html += 7009 6933 wxT 7010 6934 ("<tr><td bgcolor=\"#fffff0\">GeomFromText( wkt String [ , SRID Integer] ) : Geometry<hr>"); 7011 6935 html += 7012 6936 wxT("ST_GeomFromText( wkt String [ , SRID Integer] ) : Geometry</td>"); 7013 6937 html += 7014 6938 wxT 7015 6939 ("<td bgcolor=\"#f0fff0\">construct a geometric object given its Well-known text Representation</td></tr>"); 7016 - html += 6940 +html += 7017 6941 wxT 7018 6942 ("<tr><td bgcolor=\"#fffff0\">ST_WKTToSQL( wkt String ) : Geometry</td>"); 7019 6943 html += 7020 6944 wxT 7021 6945 ("<td bgcolor=\"#f0fff0\">SQL/MM alias name for ST_GeomFromText: SRID=0 is assumed.</td></tr>"); 7022 6946 html += 7023 6947 wxT ................................................................................ 7135 7059 ("<tr><td bgcolor=\"#fffff0\">GeomFromWKB( wkbGeometry Binary [ , SRID Integer] ) : Geometry<hr>"); 7136 7060 html += 7137 7061 wxT 7138 7062 ("ST_GeomFromWKB( wkbGeometry Binary [ , SRID Integer] ) : Geometry</td>"); 7139 7063 html += 7140 7064 wxT 7141 7065 ("<td bgcolor=\"#f0fff0\">construct a geometric object given its Well-known binary Representation</td></tr>"); 7142 - html += 7066 +html += 7143 7067 wxT 7144 7068 ("<tr><td bgcolor=\"#fffff0\">ST_WKBToSQL( wkbGeometry Binary ) : Geometry</td>"); 7145 7069 html += 7146 7070 wxT 7147 7071 ("<td bgcolor=\"#f0fff0\">SQL/MM alias name for ST_GeomFromWKB: SRID=0 is assumed.</td></tr>"); 7148 7072 html += 7149 7073 wxT ................................................................................ 7346 7270 html += 7347 7271 wxT 7348 7272 ("<tr><td bgcolor=\"#fffff0\">CoordDimension( geom Geometry ) : String</td>"); 7349 7273 html += 7350 7274 wxT 7351 7275 ("<td bgcolor=\"#f0fff0\">return the dimension model used by the geometric object as:<br>'XY', 'XYZ', 'XYM' or 'XYZM'</td></tr>"); 7352 7276 html += 7353 - wxT("<tr><td bgcolor=\"#fffff0\">ST_NDims( geom Geometry ) : Integer</td>"); 7277 + wxT("<tr><td bgcolor=\"#fffff0\">ST_NDims( geom Geometry ) : String</td>"); 7354 7278 html += 7355 7279 wxT 7356 7280 ("<td bgcolor=\"#f0fff0\">return the number of dimensions used by the geometric object as:<br>2, 3 or 4</td></tr>"); 7357 7281 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>"); 7374 - html += 7375 7282 wxT 7376 7283 ("<tr><td bgcolor=\"#fffff0\">GeometryType( geom Geometry ) : String<hr>"); 7377 7284 html += wxT("ST_GeometryType( geom Geometry ) : String</td>"); 7378 7285 html += 7379 7286 wxT 7380 7287 ("<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>"); 7381 7288 html += ................................................................................ 7797 7704 wxT 7798 7705 ("<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>"); 7799 7706 html += 7800 7707 wxT 7801 7708 ("convenience predicate: TRUE if the intersection of g1 and g2 MBRs is not empty</td></tr>"); 7802 7709 html += 7803 7710 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 += 7824 - wxT 7825 7711 ("<tr><td bgcolor=\"#fffff0\">MbrContains( geom1 Geometry , geom2 Geometry ) : Integer</td>"); 7826 7712 html += 7827 7713 wxT 7828 7714 ("<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>"); 7829 7715 html += 7830 7716 wxT 7831 7717 ("convenience predicate: TRUE if g2 MBR is completely contained in g1 MBR</td></tr>");
Changes to QueryView.cpp.
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 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) 530 - return true; 531 507 if (str.CmpNoCase(wxT("GeomFromText")) == 0) 532 508 return true; 533 509 if (str.CmpNoCase(wxT("ST_GeomFromText")) == 0) 534 510 return true; 535 511 if (str.CmpNoCase(wxT("ST_WKTToSQL")) == 0) 536 512 return true; 537 513 if (str.CmpNoCase(wxT("GeometryFromText")) == 0) ................................................................................ 742 718 return true; 743 719 if (str.CmpNoCase(wxT("ST_Dimension")) == 0) 744 720 return true; 745 721 if (str.CmpNoCase(wxT("CoordDimension")) == 0) 746 722 return true; 747 723 if (str.CmpNoCase(wxT("ST_NDims")) == 0) 748 724 return true; 749 - if (str.CmpNoCase(wxT("ST_Is3D")) == 0) 750 - return true; 751 - if (str.CmpNoCase(wxT("ST_IsMeasured")) == 0) 752 - return true; 753 725 if (str.CmpNoCase(wxT("GeometryType")) == 0) 754 726 return true; 755 727 if (str.CmpNoCase(wxT("GeometryAliasType")) == 0) 756 728 return true; 757 729 if (str.CmpNoCase(wxT("ST_GeometryType")) == 0) 758 730 return true; 759 731 if (str.CmpNoCase(wxT("SRID")) == 0) ................................................................................ 884 856 return true; 885 857 if (str.CmpNoCase(wxT("MbrWithin")) == 0) 886 858 return true; 887 859 if (str.CmpNoCase(wxT("MbrOverlaps")) == 0) 888 860 return true; 889 861 if (str.CmpNoCase(wxT("MbrIntersects")) == 0) 890 862 return true; 891 - if (str.CmpNoCase(wxT("ST_EnvIntersects")) == 0) 892 - return true; 893 - if (str.CmpNoCase(wxT("ST_EnvelopesIntersects")) == 0) 894 - return true; 895 863 if (str.CmpNoCase(wxT("MbrContains")) == 0) 896 864 return true; 897 865 if (str.CmpNoCase(wxT("Equals")) == 0) 898 866 return true; 899 867 if (str.CmpNoCase(wxT("ST_Equals")) == 0) 900 868 return true; 901 869 if (str.CmpNoCase(wxT("Disjoint")) == 0) ................................................................................ 1050 1018 return true; 1051 1019 if (str.CmpNoCase(wxT("ST_LinesCutAtNodes")) == 0) 1052 1020 return true; 1053 1021 if (str.CmpNoCase(wxT("CollectionExtract")) == 0) 1054 1022 return true; 1055 1023 if (str.CmpNoCase(wxT("ST_CollectionExtract")) == 0) 1056 1024 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; 1061 1025 if (str.CmpNoCase(wxT("SridFromAuthCRS")) == 0) 1062 1026 return true; 1063 1027 if (str.CmpNoCase(wxT("ShiftCoords")) == 0) 1064 1028 return true; 1065 1029 if (str.CmpNoCase(wxT("ShiftCoordinates")) == 0) 1066 1030 return true; 1067 1031 if (str.CmpNoCase(wxT("ST_Translate")) == 0)