Moved over ST_IsRing to new PostGIS reference.

Fixed link errors to ST_IsSimple.

git-svn-id: http://svn.osgeo.org/postgis/trunk@2962 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/reference.xml b/doc/reference.xml
index c9f45e688f9cc40844257366a6a4a85f63b6ccc0..b6593cac3ddbf30a11aabf81a217e4e811407582 100644 (file)
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -241,7 +241,7 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry id="IsSimple">
+        <varlistentry id="ST_IsSimple">
           <term>ST_IsSimple(geometry)</term>
 
           <listitem>
@@ -254,20 +254,6 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term>ST_IsRing(geometry)</term>
-
-          <listitem>
-            <para>Returns 1 (TRUE) if this Curve is closed (StartPoint ( ) =
-            EndPoint ( )) and this Curve is simple (does not pass through the
-            same point more than once).</para>
-
-            <para>performed by GEOS</para>
-
-            <para>OGC spec 2.1.5.1</para>
-          </listitem>
-        </varlistentry>
-
         <varlistentry>
           <term>ST_NumGeometries(geometry)</term>
 
@@ -1263,7 +1249,7 @@ z' = z </programlisting> This method is a subcase of the 3D method
             any kind of geometry. Since simplification occurs on a
             object-by-object basis you can also feed a GeometryCollection to
             this function. Note that returned geometry might loose its
-            simplicity (see <link linkend="IsSimple">IsSimple</link>)</para>
+            simplicity (see <xref linkend="ST_IsSimple" />)</para>
           </listitem>
         </varlistentry>
 
@@ -1293,7 +1279,7 @@ z' = z </programlisting> This method is a subcase of the 3D method
 
             <note>
               <para>The returned geometry might loose its simplicity (see
-              <link linkend="IsSimple">IsSimple</link>).</para>
+              <xref linkend="ST_IsSimple" />).</para>
             </note>
 
             <note>
@@ -1894,22 +1880,7 @@ WHERE n*100.00/length &lt; 1;
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ST_IsRing">
-        <term>ST_IsRing</term>
-
-        <listitem>
-          <para>Test if an ST_Curve value is a ring.</para>
-
-          <note>
-            <para>SQL-MM defines the result of ST_IsRing(NULL) to be 0, while
-            PostGIS returns NULL.</para>
-          </note>
-
-          <para>SQL-MM 3: 7.1.6</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry >
+      <varlistentry>
         <term>ST_IsSimple</term>
 
         <listitem>

diff --git a/doc/reference_new.xml b/doc/reference_new.xml
index d7495cd8c07368abb8e5b6fc2d41050475463234..7cf201b5dd8e82f9ac2e727d62872bd19a929001 100644 (file)
--- a/doc/reference_new.xml
+++ b/doc/reference_new.xml
@@ -2213,6 +2213,83 @@ NOTICE:  Self-intersection at or near point 0 0
          </refsection>
        </refentry>
        
+  <refentry id="ST_IsRing">
+    <refnamediv>
+      <refname>ST_IsRing</refname>
+  
+      <refpurpose>Returns <varname>TRUE</varname> if this
+      <varname>LINESTRING</varname> is both closed and simple.</refpurpose>
+    </refnamediv>
+  
+    <refsynopsisdiv>
+      <funcsynopsis>
+        <funcprototype>
+          <funcdef>boolean <function>ST_IsRing</function></funcdef>
+  
+          <paramdef><type>geometry </type> <parameter>g</parameter></paramdef>
+        </funcprototype>
+      </funcsynopsis>
+    </refsynopsisdiv>
+  
+    <refsection>
+      <title>Description</title>
+  
+      <para>Returns <varname>TRUE</varname> if this
+      <varname>LINESTRING</varname> is both <xref linkend="ST_IsClosed" />
+      (<function>ST_StartPoint(<parameter>g</parameter>)</function>
+      <function>~=</function>
+      <function>ST_Endpoint(<parameter>g</parameter>)</function>) and <xref
+      linkend="ST_IsSimple" /> (does not self intersect).</para>
+  
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/check.png" />
+          </imageobject>
+        </inlinemediaobject> This method implements the <ulink
+      url="http://www.opengeospatial.org/standards/sfs">OpenGIS Simple Features
+      Implementation Specification for SQL.</ulink> OGC SFSQL 1.1 -
+      2.1.5.1</para>
+  
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/check.png" />
+          </imageobject>
+        </inlinemediaobject> This method implements the SQL/MM specification:
+      SQL-MM 3: 7.1.6</para>
+  
+      <note>
+        <para>SQL-MM defines the result of
+        <function>ST_IsRing(<varname>NULL</varname>)</function> to be 0, while
+        PostGIS returns <varname>NULL</varname>.</para>
+      </note>
+    </refsection>
+  
+    <refsection>
+      <title>Examples</title>
+  
+      <programlisting>SELECT ST_IsRing(the_geom), ST_IsClosed(the_geom), ST_IsSimple(the_geom)
+FROM (SELECT 'LINESTRING(0 0, 0 1, 1 1, 1 0, 0 0)'::geometry AS the_geom) AS foo;
+ st_isring | st_isclosed | st_issimple
+-----------+-------------+-------------
+ t         | t           | t
+(1 row)
+
+SELECT ST_IsRing(the_geom), ST_IsClosed(the_geom), ST_IsSimple(the_geom)
+FROM (SELECT 'LINESTRING(0 0, 0 1, 1 0, 1 1, 0 0)'::geometry AS the_geom) AS foo;
+ st_isring | st_isclosed | st_issimple
+-----------+-------------+-------------
+ f         | t           | f
+(1 row)</programlisting>
+    </refsection>
+  
+    <refsection>
+      <title>See Also</title>
+  
+      <para><xref linkend="ST_IsClosed" />, <xref linkend="ST_IsSimple" />, <xref linkend="ST_StartPoint" />,
+      <xref linkend="ST_EndPoint" /></para>
+    </refsection>
+  </refentry>
+
        <refentry id="ST_SRID">
          <refnamediv>
                <refname>ST_SRID</refname>