[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-562-gab04f0267
git at osgeo.org
git at osgeo.org
Thu Feb 17 16:05:15 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 ab04f0267b100e10866f770f1dba8f3d5672a33b (commit)
from 8aa5e5062c6c650962bd25106a82544417b32d59 (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 ab04f0267b100e10866f770f1dba8f3d5672a33b
Author: Martin Davis <mtnclimb at gmail.com>
Date: Thu Feb 17 16:05:11 2022 -0800
Add doc LRS reference examples
diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 0ac0a1359..8d0fe9dc3 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -99,6 +99,7 @@ IMAGES= \
../images/st_line_interpolate_point01.png \
../images/st_line_interpolate_points01.png \
../images/st_line_substring01.png \
+ ../images/st_locatebetween01.png \
../images/st_longestline01.png \
../images/st_longestline02.png \
../images/st_longestline03.png \
diff --git a/doc/html/image_src/st_line_substring01.wkt b/doc/html/image_src/st_line_substring01.wkt
index d56db779b..229001278 100644
--- a/doc/html/image_src/st_line_substring01.wkt
+++ b/doc/html/image_src/st_line_substring01.wkt
@@ -1,2 +1,2 @@
-ArgA;LINESTRING(25 50, 100 125, 150 190)
-Result-thick;LINESTRING(69.2846934853974 94.2846934853974,100 125,111.700356260683 140.210463138888)
+ArgA;LINESTRING (20 180, 50 20, 90 80, 120 40, 180 150)
+Result-endpoints;LINESTRING (45.17311810399485 45.74337011202746, 50 20, 90 80, 112.97593050157862 49.36542599789519)
diff --git a/doc/html/image_src/st_locatebetween01.wkt b/doc/html/image_src/st_locatebetween01.wkt
new file mode 100644
index 000000000..41eaa8813
--- /dev/null
+++ b/doc/html/image_src/st_locatebetween01.wkt
@@ -0,0 +1,2 @@
+ArgA-arrow;LINESTRING (20 180, 50 20, 100 120, 180 20)
+Result-endpoints;MULTILINESTRING((54.49835019899045 104.53426957938231,58.70056060327303 82.12248075654186,69.16695286779743 103.05526528559065,82.11145618000168 128.94427190999915,84.24893681714357 132.32493442618113,87.01636951231555 135.21267035596549,90.30307285299679 137.49198684843182,93.97759758337769 139.07172433557758,97.89298381958797 139.8887023914453,101.89263860095893 139.9102465862721,105.81659870902816 139.13549527600819,109.50792827749828 137.5954340631298,112.81899532549731 135.351656550512,115.6173761888606 132.49390095108848,145.31017306064817 95.37790486135405))
diff --git a/doc/html/image_src/styles.conf b/doc/html/image_src/styles.conf
index 20df8d2e8..ac85f1ad7 100644
--- a/doc/html/image_src/styles.conf
+++ b/doc/html/image_src/styles.conf
@@ -156,6 +156,18 @@ polygonFillColor = "#e5ccffff"
polygonStrokeColor = "#770000"
polygonStrokeWidth = 2
+# Result with line endpoints
+styleName = Result-endpoints
+pointSize = 4
+pointColor = "#770000"
+lineWidth = 4
+lineColor = "#770000"
+lineStartSize = 5
+lineEndSize = 5
+polygonFillColor = "#ff000020"
+polygonStrokeColor = "#770000"
+polygonStrokeWidth = 2
+
[Style]
# Result style for overlapping results
styleName = Result-light
diff --git a/doc/reference_lrs.xml b/doc/reference_lrs.xml
index 77eb43213..eb54356e3 100644
--- a/doc/reference_lrs.xml
+++ b/doc/reference_lrs.xml
@@ -63,36 +63,27 @@
</informalfigure>
<programlisting>-- The point 20% along a line
-SELECT ST_AsEWKT(
- ST_LineInterpolatePoint(
+SELECT ST_AsEWKT( ST_LineInterpolatePoint(
'LINESTRING(25 50, 100 125, 150 190)',
0.2 ));
-
- st_asewkt
----------------
POINT(51.5974135047432 76.5974135047432)
</programlisting>
<para>The mid-point of a 3D line:</para>
<programlisting>
-SELECT ST_AsEWKT(
- ST_LineInterpolatePoint('
+SELECT ST_AsEWKT( ST_LineInterpolatePoint('
LINESTRING(1 2 3, 4 5 6, 6 7 8)',
0.5 ));
-
- st_asewkt
--------------------
POINT(3.5 4.5 5.5)
</programlisting>
<para>The closest point on a line to a point:</para>
<programlisting>
-SELECT ST_AsText(
- ST_LineInterpolatePoint( line.geom,
- ST_LineLocatePoint( line.geom, 'POINT(4 3)')))
+SELECT ST_AsText( ST_LineInterpolatePoint( line.geom,
+ ST_LineLocatePoint( line.geom, 'POINT(4 3)')))
FROM (SELECT ST_GeomFromText('LINESTRING(1 2, 4 5, 6 7)') As geom) AS line;
-
- st_astext
------------
POINT(3 4)
</programlisting>
@@ -202,12 +193,12 @@ SELECT ST_AsText(
must be a LINESTRING. The second argument is a float8 between 0 and 1
representing the spacing between the points as a fraction of
line length. If the third argument is false, at most one point
- will be constructed (the function will be equivalent to <xref linkend="ST_LineInterpolatePoint" />.)
+ will be constructed (which is equivalent to <xref linkend="ST_LineInterpolatePoint" />.)
</para>
<para>
- If the result has zero or one points, it will be returned as a POINT.
- If it has two or more points, it will be returned as a MULTIPOINT.
+ If the result has zero or one points, it is returned as a POINT.
+ If it has two or more points, it is returned as a MULTIPOINT.
</para>
@@ -223,12 +214,11 @@ SELECT ST_AsText(
<imageobject>
<imagedata fileref="images/st_line_interpolate_points01.png" />
</imageobject>
- <caption><para>A LineString with the interpolated points every 20% </para></caption>
+ <caption><para>A LineString with points interpolated every 20% </para></caption>
</mediaobject>
</informalfigure>
<programlisting>--Return points each 20% along a 2D line
SELECT ST_AsText(ST_LineInterpolatePoints('LINESTRING(25 50, 100 125, 150 190)', 0.20))
- st_astext
----------------
MULTIPOINT(51.5974135047432 76.5974135047432,78.1948270094864 103.194827009486,104.132163186446 130.37181214238,127.066081593223 160.18590607119,150 190)
</programlisting>
@@ -238,7 +228,7 @@ SELECT ST_AsText(ST_LineInterpolatePoints('LINESTRING(25 50, 100 125, 150 190)',
<title>See Also</title>
<para>
- <xref linkend="ST_LineInterpolatePoint" />
+ <xref linkend="ST_LineInterpolatePoint" />,
<xref linkend="ST_LineLocatePoint" />
</para>
</refsection>
@@ -386,11 +376,9 @@ FROM (SELECT ST_GeomFromText('LINESTRING(1 2, 4 5, 6 7)') As the_line) As foo;
</mediaobject>
</informalfigure>
<programlisting>
-SELECT ST_AsText(ST_LineSubstring( 'LINESTRING(25 50, 100 125, 150 190)', 0.333, 0.666));
-
- st_astext
+SELECT ST_AsText(ST_LineSubstring( 'LINESTRING (20 180, 50 20, 90 80, 120 40, 180 150)', 0.333, 0.666));
------------------------------------------------------------------------------------------------
-LINESTRING(69.2846934853974 94.2846934853974,100 125,111.700356260683 140.210463138888)
+LINESTRING (45.17311810399485 45.74337011202746, 50 20, 90 80, 112.97593050157862 49.36542599789519)
</programlisting>
<para>
@@ -398,8 +386,6 @@ If start and end locations are the same, the result is a POINT.
</para>
<programlisting>
SELECT ST_AsText(ST_LineSubstring( 'LINESTRING(25 50, 100 125, 150 190)', 0.333, 0.333));
-
- st_astext
------------------------------------------
POINT(69.2846934853974 94.2846934853974)
</programlisting>
@@ -559,13 +545,30 @@ SELECT ST_AsText(
SELECT ST_AsText(
ST_LocateBetween(
'MULTILINESTRING M ((1 2 3, 3 4 2, 9 4 3),(1 2 3, 5 4 5))':: geometry,
- 1.5,
- 3 ));
-
- st_asewkt
+ 1.5, 3 ));
------------------------------------------------------------------------
GEOMETRYCOLLECTION M (LINESTRING M (1 2 3,3 4 2,9 4 3),POINT M (1 2 3))
</programlisting>
+
+ <informalfigure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/st_locatebetween01.png" />
+ </imageobject>
+ <caption><para>A LineString with the section between measures 2 and 8, offset to the left </para></caption>
+ </mediaobject>
+ </informalfigure>
+
+<programlisting>
+SELECT ST_AsText( ST_LocateBetween(
+ ST_AddMeasure('LINESTRING (20 180, 50 20, 100 120, 180 20)', 0, 10),
+ 2, 8,
+ 20
+));
+------------------------------------------------------------------------
+MULTILINESTRING((54.49835019899045 104.53426957938231,58.70056060327303 82.12248075654186,69.16695286779743 103.05526528559065,82.11145618000168 128.94427190999915,84.24893681714357 132.32493442618113,87.01636951231555 135.21267035596549,90.30307285299679 137.49198684843182,93.97759758337769 139.07172433557758,97.89298381958797 139.8887023914453,101.89263860095893 139.9102465862721,105.81659870902816 139.13549527600819,109.50792827749828 137.5954340631298,112.81899532549731 135.351656550512,115.6173761888606 132.49390095108848,145.31017306064817 95.37790486135405))
+</programlisting>
+
</refsection>
<!-- Optionally add a "See Also" section -->
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/Makefile.in | 1 +
doc/html/image_src/st_line_substring01.wkt | 4 +-
doc/html/image_src/st_locatebetween01.wkt | 2 +
doc/html/image_src/styles.conf | 12 ++++++
doc/reference_lrs.xml | 61 ++++++++++++++++--------------
5 files changed, 49 insertions(+), 31 deletions(-)
create mode 100644 doc/html/image_src/st_locatebetween01.wkt
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list