[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-476-g4d970198b
git at osgeo.org
git at osgeo.org
Thu Feb 3 14:00:16 PST 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 4d970198baef0c027843dc6be9e3e85e0c8e4367 (commit)
from 289bc3830c2af633f92ea86c3d3c65f969379083 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4d970198baef0c027843dc6be9e3e85e0c8e4367
Author: Martin Davis <mtnclimb at gmail.com>
Date: Thu Feb 3 14:00:12 2022 -0800
Improve doc for ST_LineCrossingDirection
diff --git a/doc/html/image_src/st_linecrossingdirection01.wkt b/doc/html/image_src/st_linecrossingdirection01.wkt
index d4963c680..64b080b24 100644
--- a/doc/html/image_src/st_linecrossingdirection01.wkt
+++ b/doc/html/image_src/st_linecrossingdirection01.wkt
@@ -1,2 +1,2 @@
-ArgB;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169),POLYGON((78.26 40.98,83.98 50.74,86 43,78.26 40.98)) )
-ArgA;GEOMETRYCOLLECTION(LINESTRING(171 154,20 140,71 74,161 53),POINT(171 154),POLYGON((153.15 48.12,156.12 60.85,161 53,153.15 48.12)) )
+ArgA;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169),POLYGON((78.26 40.98,83.98 50.74,86 43,78.26 40.98)) )
+ArgB;GEOMETRYCOLLECTION(LINESTRING(171 154,20 140,71 74,161 53),POINT(171 154),POLYGON((153.15 48.12,156.12 60.85,161 53,153.15 48.12)) )
diff --git a/doc/html/image_src/st_linecrossingdirection02.wkt b/doc/html/image_src/st_linecrossingdirection02.wkt
index 28dcd17e3..f26dcf2f5 100644
--- a/doc/html/image_src/st_linecrossingdirection02.wkt
+++ b/doc/html/image_src/st_linecrossingdirection02.wkt
@@ -1,2 +1,2 @@
-ArgB;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
-ArgA;GEOMETRYCOLLECTION(LINESTRING(171 154, 20 140, 71 74, 2.99 90.16),POINT(171 154),POLYGON((6.66 84.21,2.99 90.16,8.94 93.83,6.66 84.21)) )
+ArgA;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
+ArgB;GEOMETRYCOLLECTION(LINESTRING(171 154, 20 140, 71 74, 2.99 90.16),POINT(171 154),POLYGON((6.66 84.21,2.99 90.16,8.94 93.83,6.66 84.21)) )
diff --git a/doc/html/image_src/st_linecrossingdirection03.wkt b/doc/html/image_src/st_linecrossingdirection03.wkt
index 2d84451bd..072ce4dc3 100644
--- a/doc/html/image_src/st_linecrossingdirection03.wkt
+++ b/doc/html/image_src/st_linecrossingdirection03.wkt
@@ -1,2 +1,2 @@
-ArgB;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169),POLYGON((78.26 40.98,83.98 50.74,86 43,78.26 40.98)) )
-ArgA;GEOMETRYCOLLECTION(LINESTRING (20 140, 71 74, 161 53), POLYGON ((153.15 48.12, 156.12 60.85, 161 53, 153.15 48.12)))
+ArgA;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((78.26 40.98,83.98 50.74,86 43,78.26 40.98)) )
+ArgB;GEOMETRYCOLLECTION(LINESTRING (20 140, 71 74, 161 53), POINT(20 140), POLYGON ((153.15 48.12, 156.12 60.85, 161 53, 153.15 48.12)))
diff --git a/doc/html/image_src/st_linecrossingdirection04.wkt b/doc/html/image_src/st_linecrossingdirection04.wkt
index df543396f..b46305346 100644
--- a/doc/html/image_src/st_linecrossingdirection04.wkt
+++ b/doc/html/image_src/st_linecrossingdirection04.wkt
@@ -1,2 +1,2 @@
-ArgB;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
-ArgA;GEOMETRYCOLLECTION(LINESTRING(2.99 90.16,71 74,20 140,171 154),POINT(2.99 90.16),POLYGON((159.33 163.69,171 154,161.31 142.33,159.33 163.69)) )
+ArgA;GEOMETRYCOLLECTION(LINESTRING(25 169,89 114,40 70,86 43), POINT(25 169), POLYGON((80.84 41.66,84.66 48.16,86 43,80.84 41.66)) )
+ArgB;GEOMETRYCOLLECTION(LINESTRING(5 90,71 74,20 140,171 154),POINT(5 90),POLYGON((159.33 163.69,171 154,161.31 142.33,159.33 163.69)) )
diff --git a/doc/reference_relationship.xml b/doc/reference_relationship.xml
index 85c55041b..8bc310f08 100644
--- a/doc/reference_relationship.xml
+++ b/doc/reference_relationship.xml
@@ -709,191 +709,6 @@ WHERE ST_Crosses(roads.geom, highways.geom);</programlisting>
</refsection>
</refentry>
- <refentry id="ST_LineCrossingDirection">
- <refnamediv>
- <refname>ST_LineCrossingDirection</refname>
-
- <refpurpose>Returns a number indicating the crossing behavior of two LineStrings.</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <funcsynopsis>
- <funcprototype>
- <funcdef>integer <function>ST_LineCrossingDirection</function></funcdef>
- <paramdef><type>geometry </type> <parameter>linestringA</parameter></paramdef>
- <paramdef><type>geometry </type> <parameter>linestringB</parameter></paramdef>
- </funcprototype>
- </funcsynopsis>
- </refsynopsisdiv>
-
- <refsection>
- <title>Description</title>
-
- <para>Given 2 linestrings, returns an integer between -3 and 3
- indicating what kind of crossing behavior exists between them.
- 0 indicates no crossing.
- This is only supported for <varname>LINESTRING</varname>s.
- </para>
- <para>The crossing number has the following meaning:
- <itemizedlist>
- <listitem>
- <para> 0: LINE NO CROSS</para>
- </listitem>
- <listitem>
- <para>-1: LINE CROSS LEFT</para>
- </listitem>
- <listitem>
- <para> 1: LINE CROSS RIGHT</para>
- </listitem>
- <listitem>
- <para>-2: LINE MULTICROSS END LEFT</para>
- </listitem>
- <listitem>
- <para> 2: LINE MULTICROSS END RIGHT</para>
- </listitem>
- <listitem>
- <para>-3: LINE MULTICROSS END SAME FIRST LEFT</para>
- </listitem>
- <listitem>
- <para> 3: LINE MULTICROSS END SAME FIRST RIGHT</para>
- </listitem>
- </itemizedlist>
- </para>
- <para>Availability: 1.4</para>
- <!-- optionally mention that this function uses indexes if appropriate -->
-
- </refsection>
-
-
- <refsection>
- <title>Examples</title>
- <!-- TODO: We really badly need diagrams here and more examples -->
- <informaltable>
- <tgroup cols="2">
- <tbody>
- <row>
- <entry><para><informalfigure>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/st_linecrossingdirection01.png" />
- </imageobject>
- <caption><para>Line 1 (green), Line 2 ball is start point,
- triangle are end points. Query below. </para></caption>
- </mediaobject>
- </informalfigure>
- <programlisting>
-SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
- ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (
-SELECT
- ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
- ST_GeomFromText('LINESTRING(171 154,20 140,71 74,161 53)') As line2
- ) As foo;
-
- l1_cross_l2 | l2_cross_l1
--------------+-------------
- 3 | -3
- </programlisting>
- </para>
- </entry>
-
- <entry>
- <para><informalfigure>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/st_linecrossingdirection02.png" />
- </imageobject>
- <caption><para>Line 1 (green), Line 2 (blue) ball is start point,
- triangle are end points. Query below.</para></caption>
- </mediaobject>
- </informalfigure>
- <programlisting>
-SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
- ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (
- SELECT
- ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
- ST_GeomFromText('LINESTRING (171 154, 20 140, 71 74, 2.99 90.16)') As line2
-) As foo;
-
- l1_cross_l2 | l2_cross_l1
--------------+-------------
- 2 | -2
- </programlisting>
- </para>
- </entry>
- </row>
- <row>
- <entry><para><informalfigure>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/st_linecrossingdirection03.png" />
- </imageobject>
- <caption><para>Line 1 (green), Line 2 (blue) ball is start point,
- triangle are end points. Query below. </para></caption>
- </mediaobject>
- </informalfigure>
- <programlisting>
-SELECT
- ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
- ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (
- SELECT
- ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
- ST_GeomFromText('LINESTRING (20 140, 71 74, 161 53)') As line2
- ) As foo;
-
- l1_cross_l2 | l2_cross_l1
--------------+-------------
- -1 | 1
- </programlisting>
- </para>
- </entry>
-
- <entry>
- <para><informalfigure>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/st_linecrossingdirection04.png" />
- </imageobject>
- <caption><para>Line 1 (green), Line 2 (blue) ball is start point,
- triangle are end points. Query below.</para></caption>
- </mediaobject>
- </informalfigure>
- <programlisting>
-SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2 ,
- ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
-FROM (SELECT
- ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
- ST_GeomFromText('LINESTRING(2.99 90.16,71 74,20 140,171 154)') As line2
- ) As foo;
-
- l1_cross_l2 | l2_cross_l1
--------------+-------------
- -2 | 2
- </programlisting>
- </para>
- </entry>
- </row>
- </tbody>
- </tgroup>
-</informaltable>
-
-<programlisting>
-SELECT s1.gid, s2.gid, ST_LineCrossingDirection(s1.geom, s2.geom)
- FROM streets s1 CROSS JOIN streets s2 ON (s1.gid != s2.gid AND s1.geom && s2.geom )
-WHERE ST_CrossingDirection(s1.geom, s2.geom) > 0;
-</programlisting>
- </refsection>
-
- <!-- Optionally add a "See Also" section -->
- <refsection>
- <title>See Also</title>
-
- <para><xref linkend="ST_Crosses" /></para>
- </refsection>
- </refentry>
-
<refentry id="ST_Disjoint">
<refnamediv>
<refname>ST_Disjoint</refname>
@@ -1132,6 +947,175 @@ t
</refsection>
</refentry>
+ <refentry id="ST_LineCrossingDirection">
+ <refnamediv>
+ <refname>ST_LineCrossingDirection</refname>
+
+ <refpurpose>Returns a number indicating the crossing behavior of two LineStrings.</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <funcsynopsis>
+ <funcprototype>
+ <funcdef>integer <function>ST_LineCrossingDirection</function></funcdef>
+ <paramdef><type>geometry </type> <parameter>linestringA</parameter></paramdef>
+ <paramdef><type>geometry </type> <parameter>linestringB</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis>
+ </refsynopsisdiv>
+
+ <refsection>
+ <title>Description</title>
+
+ <para>Given 2 linestrings, returns an integer between -3 and 3
+ indicating what kind of crossing behavior exists between them.
+ 0 indicates no crossing.
+ This is only supported for <varname>LINESTRING</varname>s.
+ </para>
+ <para>The crossing number has the following meaning:
+ <itemizedlist>
+ <listitem>
+ <para> 0: LINE NO CROSS</para>
+ </listitem>
+ <listitem>
+ <para>-1: LINE CROSS LEFT</para>
+ </listitem>
+ <listitem>
+ <para> 1: LINE CROSS RIGHT</para>
+ </listitem>
+ <listitem>
+ <para>-2: LINE MULTICROSS END LEFT</para>
+ </listitem>
+ <listitem>
+ <para> 2: LINE MULTICROSS END RIGHT</para>
+ </listitem>
+ <listitem>
+ <para>-3: LINE MULTICROSS END SAME FIRST LEFT</para>
+ </listitem>
+ <listitem>
+ <para> 3: LINE MULTICROSS END SAME FIRST RIGHT</para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ <para>Availability: 1.4</para>
+ <!-- optionally mention that this function uses indexes if appropriate -->
+
+ </refsection>
+
+
+ <refsection>
+ <title>Examples</title>
+
+ <para><emphasis role="bold">Example:</emphasis>
+ LINE CROSS LEFT and LINE CROSS RIGHT
+ </para>
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_linecrossingdirection03.png" />
+ </imageobject>
+ <caption><para>Blue: Line 1; Green: Line 2</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2,
+ ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
+FROM (SELECT
+ ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
+ ST_GeomFromText('LINESTRING (20 140, 71 74, 161 53)') As line2
+ ) As foo;
+
+ l1_cross_l2 | l2_cross_l1
+-------------+-------------
+ -1 | 1
+</programlisting>
+
+ <para><emphasis role="bold">Example:</emphasis>
+ LINE MULTICROSS END SAME FIRST LEFT and LINE MULTICROSS END SAME FIRST RIGHT
+ </para>
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_linecrossingdirection01.png" />
+ </imageobject>
+ <caption><para>Blue: Line 1; Green: Line 2</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2,
+ ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
+FROM (SELECT
+ ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
+ ST_GeomFromText('LINESTRING(171 154,20 140,71 74,161 53)') As line2
+ ) As foo;
+
+ l1_cross_l2 | l2_cross_l1
+-------------+-------------
+ 3 | -3
+</programlisting>
+
+ <para><emphasis role="bold">Example:</emphasis>
+ LINE MULTICROSS END LEFT and LINE MULTICROSS END RIGHT
+ </para>
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_linecrossingdirection04.png" />
+ </imageobject>
+ <caption><para>Blue: Line 1; Green: Line 2</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2,
+ ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
+FROM (SELECT
+ ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
+ ST_GeomFromText('LINESTRING(5 90, 71 74, 20 140, 171 154)') As line2
+ ) As foo;
+
+ l1_cross_l2 | l2_cross_l1
+-------------+-------------
+ -2 | 2
+</programlisting>
+
+ <para><emphasis role="bold">Example:</emphasis>
+ LINE MULTICROSS END LEFT and LINE MULTICROSS END RIGHT
+ </para>
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_linecrossingdirection02.png" />
+ </imageobject>
+ <caption><para>Blue: Line 1; Green: Line 2</para></caption>
+ </mediaobject>
+ </informalfigure>
+ <programlisting>
+SELECT ST_LineCrossingDirection(foo.line1, foo.line2) As l1_cross_l2,
+ ST_LineCrossingDirection(foo.line2, foo.line1) As l2_cross_l1
+FROM (SELECT
+ ST_GeomFromText('LINESTRING(25 169,89 114,40 70,86 43)') As line1,
+ ST_GeomFromText('LINESTRING (171 154, 20 140, 71 74, 2.99 90.16)') As line2
+) As foo;
+
+ l1_cross_l2 | l2_cross_l1
+-------------+-------------
+ 2 | -2
+</programlisting>
+
+<programlisting>
+SELECT s1.gid, s2.gid, ST_LineCrossingDirection(s1.geom, s2.geom)
+ FROM streets s1 CROSS JOIN streets s2
+ ON (s1.gid != s2.gid AND s1.geom && s2.geom )
+WHERE ST_LineCrossingDirection(s1.geom, s2.geom) > 0;
+</programlisting>
+ </refsection>
+
+ <refsection>
+ <title>See Also</title>
+ <para><xref linkend="ST_Crosses" /></para>
+ </refsection>
+ </refentry>
+
<refentry id="ST_OrderingEquals">
<refnamediv>
<refname>ST_OrderingEquals</refname>
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/st_linecrossingdirection01.wkt | 4 +-
doc/html/image_src/st_linecrossingdirection02.wkt | 4 +-
doc/html/image_src/st_linecrossingdirection03.wkt | 4 +-
doc/html/image_src/st_linecrossingdirection04.wkt | 4 +-
doc/reference_relationship.xml | 354 +++++++++++-----------
5 files changed, 177 insertions(+), 193 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list