Additional test cases for geopoly.

FossilOrigin-Name: 19b5eb45e090c4b7169a52d881495ee2eafc59f80e3db2288fc1814ba76134ac

diff --git a/ext/rtree/visual01.txt b/ext/rtree/visual01.txt
index b1c808c6652b6df056847e453c83113ec24ec015..90ae92403dca2c553b4a0170983eccf96f164821 100644 (file)
--- a/ext/rtree/visual01.txt
+++ b/ext/rtree/visual01.txt
@@ -558,7 +558,7 @@ BEGIN;
 UPDATE geo1
    SET clr=CASE WHEN rowid IN (SELECT geo1.rowid FROM geo1, querypoly
                                 WHERE geopoly_overlap(_shape,poly))
-           THEN 'red' ELSE 'blue' END;
+           THEN 'red' ELSE '#76ccff' END;
 UPDATE geo1
    SET _shape=geopoly_xform(_shape,1,0,0,1,300,0)
  WHERE geopoly_overlap(_shape,(SELECT poly FROM querypoly));
@@ -569,6 +569,20 @@ SELECT geopoly_svg(_shape,
   FROM geo1;
 SELECT geopoly_svg(poly,'style="fill:none;stroke:black;stroke-width:2"')
   FROM querypoly;
+--ROLLBACK;
+.print '</svg>'
+
+
+.print '<h1>Overlap With Translated Query Polygon</h1>'
+UPDATE querypoly SET poly=geopoly_xform(poly,1,0,0,1,300,0);
+.print '<svg width="1000" height="800" style="border:1px solid black">'
+SELECT geopoly_svg(_shape,
+         printf('style="fill:none;stroke:%s;stroke-width:1"',geo1.clr)
+       )
+  FROM geo1
+ WHERE geopoly_overlap(_shape,(SELECT poly FROM querypoly));
+SELECT geopoly_svg(poly,'style="fill:none;stroke:black;stroke-width:2"')
+  FROM querypoly;
 ROLLBACK;
 .print '</svg>'
 

diff --git a/manifest b/manifest
index c9093d9428154c5f41a69603485908c67968e8f5..19aea93dfd8588f1cef75c33e27d577069185fa2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sthe\sUPDATE\slogic\sin\sGeopoly.
-D 2018-08-29T20:52:40.880
+C Additional\stest\scases\sfor\sgeopoly.
+D 2018-08-29T21:01:22.572
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d06f463c5b623a61ac27f5cb8214fca9e53a6704d34d6b8f2124e2b1b293c88f
@@ -386,7 +386,7 @@ F ext/rtree/rtreeconnect.test 225ad3fcb483d36cbee423a25052a6bbae762c9576ae926833
 F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F ext/rtree/visual01.txt e47922ab37af9589cd03aca33876fcc8eefef7c9a624e1960d14bdd2572e8d9e
+F ext/rtree/visual01.txt 17c3afefc208c375607aa82242e97fa79c316e539bcd0b7b3e59344c69445d05
 F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a
 F ext/session/session1.test 4532116484f525110eb4cfff7030c59354c0cde9def4d109466b0df2b35ad5cc
 F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0
@@ -1758,7 +1758,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f48e9feb3fca514e4e586932e6d19a5e34a384204effeba553006dcddf5f13d2
-R c11872ace9ae24cb28c40999f97e723f
+P 7c3cee0a2a5ccacff27400c38bd708f7b9b968eb013a8fa685d876dfe85e12a6
+R 771e2fad0c71e34b021e9df816201c53
 U drh
-Z 581e01d30ec7f16b604718e3d6a88b37
+Z fceaa831790380442f9478793a598598

diff --git a/manifest.uuid b/manifest.uuid
index b6bf5f9d2238a933e0b3ad7429318a47e96442e4..e33dd2740f78b37b8aca9779d041eaba317b64c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c3cee0a2a5ccacff27400c38bd708f7b9b968eb013a8fa685d876dfe85e12a6
\ No newline at end of file
+19b5eb45e090c4b7169a52d881495ee2eafc59f80e3db2288fc1814ba76134ac
\ No newline at end of file