[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-435-g71bf4e8dd
git at osgeo.org
git at osgeo.org
Mon Jan 31 14:18: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 71bf4e8dd34e90ad1a40b8ccb36e3003ac9ee96e (commit)
from c26e3bd66ab2ec2fd5ba8d205311967268639ba8 (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 71bf4e8dd34e90ad1a40b8ccb36e3003ac9ee96e
Author: Martin Davis <mtnclimb at gmail.com>
Date: Mon Jan 31 14:18:11 2022 -0800
Finish doc image styling upgrade
diff --git a/doc/html/image_src/de9im01.wkt b/doc/html/image_src/de9im01.wkt
index 656636a56..2a4aded39 100644
--- a/doc/html/image_src/de9im01.wkt
+++ b/doc/html/image_src/de9im01.wkt
@@ -1,2 +1,2 @@
-Style1;LINESTRING ( 10 10, 40 90, 70 110, 140 110, 170 130, 190 190 )
-Style2;LINESTRING ( 10 190, 50 130, 90 110, 130 110, 160 70, 180 10 )
+ArgA;LINESTRING ( 10 10, 40 90, 70 110, 140 110, 170 130, 190 190 )
+ArgB;LINESTRING ( 10 190, 50 130, 90 110, 130 110, 160 70, 180 10 )
diff --git a/doc/html/image_src/de9im02.wkt b/doc/html/image_src/de9im02.wkt
index 53a3c2fcd..47814acb6 100644
--- a/doc/html/image_src/de9im02.wkt
+++ b/doc/html/image_src/de9im02.wkt
@@ -1,2 +1,2 @@
-Style1;POLYGON (( -20 10, 30 30, 80 70, 110 80, 145 85, 190 110, 300 220, 230 220, -20 220, -20 10 ))
-Style2;MULTILINESTRING(( 120 180, 145 85 ),( 10 130, 30 70 ),( 90 140, 110 80, 94.81118881118876 75.83496503496498 ),( 150 160, 180 80 ))
+ArgA;POLYGON (( -20 10, 30 30, 80 70, 110 80, 145 85, 190 110, 300 220, 230 220, -20 220, -20 10 ))
+ArgB;MULTILINESTRING(( 120 180, 145 85 ),( 10 130, 30 70 ),( 90 140, 110 80, 94.81118881118876 75.83496503496498 ),( 150 160, 180 80 ))
diff --git a/doc/html/image_src/de9im03.wkt b/doc/html/image_src/de9im03.wkt
index 4fad41627..792455b11 100644
--- a/doc/html/image_src/de9im03.wkt
+++ b/doc/html/image_src/de9im03.wkt
@@ -1 +1 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
diff --git a/doc/html/image_src/de9im04.wkt b/doc/html/image_src/de9im04.wkt
index e65a34912..81c0cc3d5 100644
--- a/doc/html/image_src/de9im04.wkt
+++ b/doc/html/image_src/de9im04.wkt
@@ -1 +1 @@
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
diff --git a/doc/html/image_src/de9im05.wkt b/doc/html/image_src/de9im05.wkt
index 4feba343d..505f10842 100644
--- a/doc/html/image_src/de9im05.wkt
+++ b/doc/html/image_src/de9im05.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 79 50, 75 63, 75 76, 73 86, 72 94, 75 104, 79 110, 86 116, 92 126, 92 142, 96 152, 112 165, 124 158, 133 148, 140 140 ))
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 79 50, 75 63, 75 76, 73 86, 72 94, 75 104, 79 110, 86 116, 92 126, 92 142, 96 152, 112 165, 124 158, 133 148, 140 140 ))
diff --git a/doc/html/image_src/de9im06.wkt b/doc/html/image_src/de9im06.wkt
index cad875599..31faa4d56 100644
--- a/doc/html/image_src/de9im06.wkt
+++ b/doc/html/image_src/de9im06.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;LINESTRING ( 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63, 79 50, 87 38 )
\ No newline at end of file
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;LINESTRING ( 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63, 79 50, 87 38 )
diff --git a/doc/html/image_src/de9im07.wkt b/doc/html/image_src/de9im07.wkt
index 4b5b4b2a2..248c2b9e2 100644
--- a/doc/html/image_src/de9im07.wkt
+++ b/doc/html/image_src/de9im07.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;POLYGON (( 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63, 79 50, 87 38 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
\ No newline at end of file
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;POLYGON (( 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63, 79 50, 87 38 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
diff --git a/doc/html/image_src/de9im08.wkt b/doc/html/image_src/de9im08.wkt
index 2816a6927..63ae57df6 100644
--- a/doc/html/image_src/de9im08.wkt
+++ b/doc/html/image_src/de9im08.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;LINESTRING ( 112 165, 124 158, 133 148, 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38 )
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;LINESTRING ( 112 165, 124 158, 133 148, 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38 )
diff --git a/doc/html/image_src/de9im09.wkt b/doc/html/image_src/de9im09.wkt
index e739085a7..05b5c14ec 100644
--- a/doc/html/image_src/de9im09.wkt
+++ b/doc/html/image_src/de9im09.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;MULTIPOINT ( 87 38, 112 165 )
\ No newline at end of file
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;MULTIPOINT ( 87 38, 112 165 )
diff --git a/doc/html/image_src/de9im10.wkt b/doc/html/image_src/de9im10.wkt
index 76852dc00..60fb48164 100644
--- a/doc/html/image_src/de9im10.wkt
+++ b/doc/html/image_src/de9im10.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;MULTILINESTRING (( 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;MULTILINESTRING (( 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
diff --git a/doc/html/image_src/de9im11.wkt b/doc/html/image_src/de9im11.wkt
index 5f433e837..e5e7b9ee4 100644
--- a/doc/html/image_src/de9im11.wkt
+++ b/doc/html/image_src/de9im11.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;POLYGON (( 112 165, 124 171, 139 172, 154 171, 166 163, 178 154, 185 139, 190 121, 193 104, 190 82, 190 58, 188 35, 184 21, 176 10, 166 6, 154 11, 140 18, 124 22, 108 25, 95 31, 87 38, 98 49, 102 59, 97 73, 100 86, 110 94, 118 99, 126 100, 135 105, 140 122, 140 140, 133 148, 124 158, 112 165 ))
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;POLYGON (( 112 165, 124 171, 139 172, 154 171, 166 163, 178 154, 185 139, 190 121, 193 104, 190 82, 190 58, 188 35, 184 21, 176 10, 166 6, 154 11, 140 18, 124 22, 108 25, 95 31, 87 38, 98 49, 102 59, 97 73, 100 86, 110 94, 118 99, 126 100, 135 105, 140 122, 140 140, 133 148, 124 158, 112 165 ))
diff --git a/doc/html/image_src/de9im12.wkt b/doc/html/image_src/de9im12.wkt
index 094d1a33f..6c06a82aa 100644
--- a/doc/html/image_src/de9im12.wkt
+++ b/doc/html/image_src/de9im12.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;LINESTRING ( 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165 )
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;LINESTRING ( 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165 )
diff --git a/doc/html/image_src/de9im13.wkt b/doc/html/image_src/de9im13.wkt
index 8bf30140d..fb3850126 100644
--- a/doc/html/image_src/de9im13.wkt
+++ b/doc/html/image_src/de9im13.wkt
@@ -1,3 +1,3 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-Style6;MULTIPOLYGON ((( 0 0, 0 200, 200 200, 200 0, 0 0 ), ( 112 165, 86 179, 67 186, 55 189, 40 190, 28 195, 18 191, 10 180, 6 166, 4 143, 4 119, 6 100, 10 84, 14 66, 20 50, 28 38, 40 30, 55 29, 70 30, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165 )), (( 48 177, 51 174, 53 169, 52 162, 45 157, 40 154, 30 153, 25 155, 22 159, 24 166, 30 174, 40 177, 48 177 )))
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
+Highlight-red;MULTIPOLYGON ((( 0 0, 0 200, 200 200, 200 0, 0 0 ), ( 112 165, 86 179, 67 186, 55 189, 40 190, 28 195, 18 191, 10 180, 6 166, 4 143, 4 119, 6 100, 10 84, 14 66, 20 50, 28 38, 40 30, 55 29, 70 30, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165 )), (( 48 177, 51 174, 53 169, 52 162, 45 157, 40 154, 30 153, 25 155, 22 159, 24 166, 30 174, 40 177, 48 177 )))
diff --git a/doc/html/image_src/st_overlaps01.wkt b/doc/html/image_src/st_overlaps01.wkt
index a6bcca466..15a72af24 100644
--- a/doc/html/image_src/st_overlaps01.wkt
+++ b/doc/html/image_src/st_overlaps01.wkt
@@ -1,2 +1,2 @@
-Style1-alpha;MULTIPOINT ( (20 20), (40 90), (80 130), (140 100), (110 40), (120 170), (150 70) )
-Style2-alpha;MULTIPOINT ( (180 10), (40 90), (80 130), (160 150), (110 40), (50 50), (50 160) )
+ArgA-thick;MULTIPOINT ( (20 20), (40 90), (80 130), (140 100), (110 40), (120 170), (150 70) )
+ArgB;MULTIPOINT ( (180 10), (40 90), (80 130), (160 150), (110 40), (50 50), (50 160) )
diff --git a/doc/html/image_src/st_overlaps02.wkt b/doc/html/image_src/st_overlaps02.wkt
index e126eb455..41080fa7b 100644
--- a/doc/html/image_src/st_overlaps02.wkt
+++ b/doc/html/image_src/st_overlaps02.wkt
@@ -1,2 +1,2 @@
-Style1-alpha;LINESTRING ( 10 10, 40 90, 70 110, 140 110, 170 130, 190 190 )
-Style2-alpha;LINESTRING ( 10 190, 50 130, 90 110, 130 110, 160 70, 180 10 )
+ArgA-thick;LINESTRING ( 10 10, 40 90, 70 110, 140 110, 170 130, 190 190 )
+ArgB;LINESTRING ( 10 190, 50 130, 90 110, 130 110, 160 70, 180 10 )
diff --git a/doc/html/image_src/st_overlaps03.wkt b/doc/html/image_src/st_overlaps03.wkt
index 6121b59ee..99a3b8a45 100644
--- a/doc/html/image_src/st_overlaps03.wkt
+++ b/doc/html/image_src/st_overlaps03.wkt
@@ -1,3 +1,2 @@
-Style1-alpha;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
-Style2-alpha;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
-
+ArgA;POLYGON (( 140 140, 140 122, 135 105, 126 100, 118 99, 110 94, 100 86, 97 73, 102 59, 98 49, 87 38, 70 30, 55 29, 40 30, 28 38, 20 50, 14 66, 10 84, 6 100, 4 119, 4 143, 6 166, 10 180, 18 191, 28 195, 40 190, 55 189, 67 186, 86 179, 112 165, 124 158, 133 148, 140 140 ), ( 48 177, 40 177, 30 174, 24 166, 22 159, 25 155, 30 153, 40 154, 45 157, 52 162, 53 169, 51 174, 48 177 ))
+ArgB;POLYGON (( 75 63, 79 50, 87 38, 95 31, 108 25, 124 22, 140 18, 154 11, 166 6, 176 10, 184 21, 188 35, 190 58, 190 82, 193 104, 190 121, 185 139, 178 154, 166 163, 154 171, 139 172, 124 171, 112 165, 96 152, 92 142, 92 126, 86 116, 79 110, 75 104, 72 94, 73 86, 75 76, 75 63 ))
diff --git a/doc/html/image_src/styles.conf b/doc/html/image_src/styles.conf
index 72b5dc58f..e536e8966 100644
--- a/doc/html/image_src/styles.conf
+++ b/doc/html/image_src/styles.conf
@@ -40,6 +40,17 @@ polygonFillColor = "#C0D0F080"
polygonStrokeColor = "#6495ED"
polygonStrokeWidth = 1
+[Style]
+# Argument A with thick points and lines
+styleName = ArgA-thick
+pointSize = 8
+pointColor = "#6495ED"
+lineWidth = 6
+lineColor = "#6495ED"
+polygonFillColor = "#C0D0F080"
+polygonStrokeColor = "#6495ED"
+polygonStrokeWidth = 2
+
[Style]
# Argument B
styleName = ArgB
@@ -127,59 +138,3 @@ lineColor = red
polygonFillColor = red
polygonStrokeColor = red
polygonStrokeWidth = 0
-
-#-------------------------------------------
-[Style]
-# The bottom layer in the rendered WKT image
-styleName = Style1
-pointSize = 6
-pointColor = "#00bfff"
-lineWidth = 7
-lineColor = "#00bfff"
-polygonFillColor = "#00bfff"
-polygonStrokeColor = "#00bfff"
-polygonStrokeWidth = 0
-
-[Style]
-# The bottom layer in the rendered WKT image
-styleName = Style1-alpha
-pointSize = 6
-pointColor = "#0000ff80"
-lineWidth = 7
-lineColor = "#0000ff80"
-polygonFillColor = "#0000ff80"
-polygonStrokeColor = "#0000ff80"
-polygonStrokeWidth = 0
-
-[Style]
-# The second layer in the rendered WKT image
-styleName = Style2
-pointSize = 6
-pointColor = DarkSeaGreen4
-lineWidth = 7
-lineColor = DarkSeaGreen4
-polygonFillColor = DarkSeaGreen4
-polygonStrokeColor = DarkGreen
-polygonStrokeWidth = 0
-
-[Style]
-# The second layer in the rendered WKT image
-styleName = Style2-alpha
-pointSize = 6
-pointColor = "#00ff0080"
-lineWidth = 7
-lineColor = "#00ff0080"
-polygonFillColor = "#00ff0080"
-polygonStrokeColor = "#00ff0080"
-polygonStrokeWidth = 0
-
-[Style]
-# The fifth layer in the rendered WKT image
-styleName = Style6
-pointSize = 6
-pointColor = red
-lineWidth = 5
-lineColor = red
-polygonFillColor = red
-polygonStrokeColor = red
-polygonStrokeWidth = 0
-----------------------------------------------------------------------
Summary of changes:
doc/html/image_src/de9im01.wkt | 4 +--
doc/html/image_src/de9im02.wkt | 4 +--
doc/html/image_src/de9im03.wkt | 2 +-
doc/html/image_src/de9im04.wkt | 2 +-
doc/html/image_src/de9im05.wkt | 6 ++--
doc/html/image_src/de9im06.wkt | 6 ++--
doc/html/image_src/de9im07.wkt | 6 ++--
doc/html/image_src/de9im08.wkt | 6 ++--
doc/html/image_src/de9im09.wkt | 6 ++--
doc/html/image_src/de9im10.wkt | 6 ++--
doc/html/image_src/de9im11.wkt | 6 ++--
doc/html/image_src/de9im12.wkt | 6 ++--
doc/html/image_src/de9im13.wkt | 6 ++--
doc/html/image_src/st_overlaps01.wkt | 4 +--
doc/html/image_src/st_overlaps02.wkt | 4 +--
doc/html/image_src/st_overlaps03.wkt | 5 ++-
doc/html/image_src/styles.conf | 67 ++++++------------------------------
17 files changed, 50 insertions(+), 96 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list