Index: Main.cpp
==================================================================
--- Main.cpp
+++ Main.cpp
@@ -6880,34 +6880,10 @@
html +=
wxT
("NULL will be returned if any error is encountered (or when no item of required type is found)");
html +=
wxT
- ("| ST_Locate_Along_Measure( geom Geometry, m_value Double precision ) : Geometry | ");
- html +=
- wxT
- ("Return a derived geometry collection value with elements that match the specified measure.
");
- html +=
- wxT
- ("NULL will be returned if any error is encountered (or when no element corresponding to the given measure is found).
");
- html +=
- wxT
- ("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. |
");
- html +=
- wxT
- ("| ST_Locate_Between_Measures( geom Geometry, m_start Double precision , m_end Double precision) : Geometry | ");
- html +=
- wxT
- ("Return a derived geometry collection value with elements that match the specified range of measures.
");
- html +=
- wxT
- ("NULL will be returned if any error is encountered (or when no element corresponding to the given range if measures is found).
");
- html +=
- wxT
- ("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. |
");
- html +=
- wxT
("| BuildMbr( x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision, [ , SRID Integer] ) : Geometry | ");
html +=
wxT
("[x1 y1] and [x2 y2] are assumed to be Points identifying a line segment;");
html +=
@@ -6925,84 +6901,32 @@
wxT
(" | return a geometric object representing the bounding box that encloses a set of input values
");
html += wxT("aggregate function |
");
html +=
wxT
- ("MbrMinX( geom Geometry) : Double precision
");
- html += wxT("ST_MbrMinX( geom Geometry) : Double precision
");
- html += wxT("ST_MinX( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the x-coordinate for geom MBR's leftmost side as a double precision number.
");
- html +=
- wxT("NULL will be returned if geom isn't a valid Geometry. |
");
- html +=
- wxT
- ("MbrMinY( geom Geometry) : Double precision
");
- html += wxT("ST_MbrMinY( geom Geometry) : Double precision
");
- html += wxT("ST_MinY( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the y-coordinate for geom MBR's lowermost side as a double precision number.
");
- html +=
- wxT("NULL will be returned if geom isn't a valid Geometry. |
");
- html +=
- wxT
- ("MbrMaxX( geom Geometry) : Double precision
");
- html += wxT("ST_MbrMaxX( geom Geometry) : Double precision
");
- html += wxT("ST_MaxX( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the x-coordinate for geom MBR's rightmost side as a double precision number.
");
- html +=
- wxT("NULL will be returned if geom isn't a valid Geometry. |
");
- html +=
- wxT
- ("MbrMaxY( geom Geometry) : Double precision
");
- html += wxT("ST_MbrMaxY( geom Geometry) : Double precision
");
- html += wxT("ST_MaxY( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the y-coordinate for geom MBR's uppermost side as a double precision number.
");
- html +=
- wxT("NULL will be returned if geom isn't a valid Geometry. |
");
- html +=
- wxT
- ("| ST_MinZ( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the minimum Z-coordinate value for geom as a double precision number.
");
- html +=
- wxT
- ("NULL will be returned if geom isn't a valid Geometry or if geom has no Z dimension. |
");
- html +=
- wxT
- ("| ST_MaxZ( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the maximum Z-coordinate value for geom as a double precision number.
");
- html +=
- wxT
- ("NULL will be returned if geom isn't a valid Geometry or if geom has no Z dimension. |
");
- html +=
- wxT
- ("| ST_MinM( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the minimum M-coordinate value for geom as a double precision number.
");
- html +=
- wxT
- ("NULL will be returned if geom isn't a valid Geometry or if geom has no M dimension. |
");
- html +=
- wxT
- ("| ST_MaxM( geom Geometry) : Double precision | ");
- html +=
- wxT
- ("return the maximum M-coordinate value for geom as a double precision number.
");
- html +=
- wxT
- ("NULL will be returned if geom isn't a valid Geometry or if geom has no M dimension. |
");
+ ("| MbrMinX( geom Geometry) : Double precision | ");
+ html +=
+ wxT
+ ("return the x-coordinate for geom MBR's leftmost side as a double precision number |
");
+ html +=
+ wxT
+ ("| MbrMinY( geom Geometry) : Double precision | ");
+ html +=
+ wxT
+ ("return the y-coordinate for geom MBR's lowermost side as a double precision number |
");
+ html +=
+ wxT
+ ("| MbrMaxX( geom Geometry) : Double precision | ");
+ html +=
+ wxT
+ ("return the x-coordinate for geom MBR's rightmost side as a double precision number |
");
+ html +=
+ wxT
+ ("| MbrMaxY( geom Geometry) : Double precision | ");
+ html +=
+ wxT
+ ("return the y-coordinate for geom MBR's uppermost side as a double precision number |
");
html +=
wxT
("functions for constructing a geometric object given its Well-known Text Representation");
html += wxT("
back to index |
");
html +=
@@ -7011,11 +6935,11 @@
html +=
wxT("ST_GeomFromText( wkt String [ , SRID Integer] ) : Geometry");
html +=
wxT
("construct a geometric object given its Well-known text Representation | ");
- html +=
+html +=
wxT
("| ST_WKTToSQL( wkt String ) : Geometry | ");
html +=
wxT
("SQL/MM alias name for ST_GeomFromText: SRID=0 is assumed. |
");
@@ -7137,11 +7061,11 @@
wxT
("ST_GeomFromWKB( wkbGeometry Binary [ , SRID Integer] ) : Geometry");
html +=
wxT
("construct a geometric object given its Well-known binary Representation | ");
- html +=
+html +=
wxT
("| ST_WKBToSQL( wkbGeometry Binary ) : Geometry | ");
html +=
wxT
("SQL/MM alias name for ST_GeomFromWKB: SRID=0 is assumed. |
");
@@ -7348,32 +7272,15 @@
("| CoordDimension( geom Geometry ) : String | ");
html +=
wxT
("return the dimension model used by the geometric object as:
'XY', 'XYZ', 'XYM' or 'XYZM' |
");
html +=
- wxT("| ST_NDims( geom Geometry ) : Integer | ");
+ wxT("
| ST_NDims( geom Geometry ) : String | ");
html +=
wxT
("return the number of dimensions used by the geometric object as:
2, 3 or 4 |
");
html +=
- wxT("| ST_Is3D( geom Geometry ) : Integer | ");
- html +=
- wxT("Checks if geom has the Z dimension.
");
- html +=
- wxT
- ("The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a ");
- html += wxT("function invocation on invalid arguments. |
");
- html +=
- wxT
- ("| ST_IsMeasured( geom Geometry ) : Integer | ");
- html +=
- wxT("Checks if geom has the M dimension.
");
- html +=
- wxT
- ("The return type is Integer, with a return value of 1 for TRUE, 0 for FALSE, and -1 for UNKNOWN corresponding to a ");
- html += wxT("function invocation on invalid arguments. |
");
- html +=
wxT
("GeometryType( geom Geometry ) : String
");
html += wxT("ST_GeometryType( geom Geometry ) : String | ");
html +=
wxT
@@ -7799,31 +7706,10 @@
html +=
wxT
("convenience predicate: TRUE if the intersection of g1 and g2 MBRs is not empty
");
html +=
wxT
- ("ST_EnvIntersects( geom1 Geometry , geom2 Geometry ) : Integer
");
- html +=
- wxT
- ("ST_EnvelopesIntersects( geom1 Geometry , geom2 Geometry ) : Integer
");
- html +=
- wxT
- ("ST_EnvIntersects( geom1 Geometry , x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision ) : Integer
");
- html +=
- wxT
- ("ST_EnvelopesIntersects( geom1 Geometry , x1 Double precision , y1 Double precision , x2 Double precision , y2 Double precision ) : Integer | ");
- html +=
- wxT
- ("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].
");
- html +=
- wxT
- ("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
");
- html +=
- wxT
- ("convenience predicate: TRUE if the intersection of both MBRs is not empty |
");
- html +=
- wxT
("| MbrContains( geom1 Geometry , geom2 Geometry ) : Integer | ");
html +=
wxT
("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
");
html +=
Index: QueryView.cpp
==================================================================
--- QueryView.cpp
+++ QueryView.cpp
@@ -502,34 +502,10 @@
return true;
if (str.CmpNoCase(wxT("MbrMaxX")) == 0)
return true;
if (str.CmpNoCase(wxT("MbrMaxY")) == 0)
return true;
- if (str.CmpNoCase(wxT("ST_MbrMinX")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MbrMinY")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MbrMaxX")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MbrMaxY")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MinX")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MinY")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MaxX")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MaxY")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MinZ")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MinM")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MaxZ")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_MaxM")) == 0)
- return true;
if (str.CmpNoCase(wxT("GeomFromText")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_GeomFromText")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_WKTToSQL")) == 0)
@@ -744,14 +720,10 @@
return true;
if (str.CmpNoCase(wxT("CoordDimension")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_NDims")) == 0)
return true;
- if (str.CmpNoCase(wxT("ST_Is3D")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_IsMeasured")) == 0)
- return true;
if (str.CmpNoCase(wxT("GeometryType")) == 0)
return true;
if (str.CmpNoCase(wxT("GeometryAliasType")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_GeometryType")) == 0)
@@ -886,14 +858,10 @@
return true;
if (str.CmpNoCase(wxT("MbrOverlaps")) == 0)
return true;
if (str.CmpNoCase(wxT("MbrIntersects")) == 0)
return true;
- if (str.CmpNoCase(wxT("ST_EnvIntersects")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_EnvelopesIntersects")) == 0)
- return true;
if (str.CmpNoCase(wxT("MbrContains")) == 0)
return true;
if (str.CmpNoCase(wxT("Equals")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_Equals")) == 0)
@@ -1052,14 +1020,10 @@
return true;
if (str.CmpNoCase(wxT("CollectionExtract")) == 0)
return true;
if (str.CmpNoCase(wxT("ST_CollectionExtract")) == 0)
return true;
- if (str.CmpNoCase(wxT("ST_Locate_Along_Measure")) == 0)
- return true;
- if (str.CmpNoCase(wxT("ST_Locate_Between_Measures")) == 0)
- return true;
if (str.CmpNoCase(wxT("SridFromAuthCRS")) == 0)
return true;
if (str.CmpNoCase(wxT("ShiftCoords")) == 0)
return true;
if (str.CmpNoCase(wxT("ShiftCoordinates")) == 0)
|