From 9ca41c041361426b78134931c1411b772e9a9a75 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 13 Oct 2001 17:41:11 +0000
Subject: [PATCH] Fixing closed-path intersection logic causes this test to
find more streets than it used to...
---
src/test/regress/expected/select_views.out | 57 +++++++++++++++++++++-
1 file changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/test/regress/expected/select_views.out b/src/test/regress/expected/select_views.out
index fcb5c76c0ee..7d81ce0b6d5 100644
--- a/src/test/regress/expected/select_views.out
+++ b/src/test/regress/expected/select_views.out
@@ -40,7 +40,9 @@ SELECT * FROM street;
Livermore Ave | [(-121.7687,37.448),(-121.769,37.375)] | Oakland
Livermore Ave | [(-121.772719,37.99085),(-121.7728,37.001)] | Oakland
Mission Blvd | [(-121.918886,37),(-121.9194,37.976),(-121.9198,37.975)] | Oakland
+ Mission Blvd | [(-122.0006,37.896),(-121.9989,37.88)] | Oakland
Navajo Ct | [(-121.8779,37.901),(-121.8783,37.9)] | Oakland
+ Paseo Padre Pkwy | [(-122.0021,37.639),(-121.996,37.628)] | Oakland
Pimlico Dr | [(-121.8616,37.998),(-121.8618,37.008)] | Oakland
Rosedale Ct | [(-121.9232,37.9),(-121.924,37.897)] | Oakland
Saginaw Ct | [(-121.8803,37.898),(-121.8806,37.901)] | Oakland
@@ -56,18 +58,35 @@ SELECT * FROM street;
Welch Creek Road | [(-121.7695,37.386),(-121.7737,37.413)] | Oakland
Whitlock Creek | [(-121.74683,37.91276),(-121.733107,37)] | Oakland
1st St | [(-121.75508,37.89294),(-121.753581,37.90031)] | Oakland
+ Apricot Lane | [(-121.9471,37.401),(-121.9456,37.392)] | Oakland
Arden Road | [(-122.0978,37.177),(-122.1,37.177)] | Oakland
+ Arlington Dr | [(-121.8802,37.408),(-121.8807,37.394)] | Oakland
+ Arroyo Las Positas | [(-121.7973,37.997),(-121.7957,37.005)] | Oakland
Ash St | [(-122.0408,37.31),(-122.04,37.292)] | Oakland
Bridgepointe Dr | [(-122.0514,37.305),(-122.0509,37.299)] | Oakland
Butterfield Dr | [(-122.0838,37.002),(-122.0834,37.987)] | Oakland
+ Calaveras Creek | [(-121.8203,37.035),(-121.8207,37.931)] | Oakland
Celia St | [(-122.0611,37.3),(-122.0616,37.299)] | Oakland
Claremont Pl | [(-122.0542,37.995),(-122.0542,37.008)] | Oakland
+ Corriea Way | [(-121.9501,37.402),(-121.9505,37.398)] | Oakland
Crystaline Dr | [(-121.925856,37),(-121.925869,37.00527)] | Oakland
Decoto Road | [(-122.0159,37.006),(-122.016,37.002),(-122.0164,37.993)] | Oakland
+ Driscoll Road | [(-121.9482,37.403),(-121.948451,37.39995)] | Oakland
Eden Creek | [(-122.022037,37.00675),(-122.0221,37.998)] | Oakland
+ Fairview Ave | [(-121.999,37.428),(-121.9863,37.351)] | Oakland
Hesperian Blvd | [(-122.097,37.333),(-122.0956,37.31),(-122.0946,37.293)] | Oakland
I- 580 | [(-121.727,37.074),(-121.7229,37.093),(-121.722301,37.09522),(-121.721001,37.10005),(-121.7194,37.106),(-121.7188,37.109),(-121.7168,37.12),(-121.7163,37.123),(-121.7145,37.127),(-121.7096,37.148),(-121.707731,37.1568),(-121.7058,37.166),(-121.7055,37.168),(-121.7044,37.174),(-121.7038,37.172),(-121.7037,37.172),(-121.7027,37.175),(-121.7001,37.181),(-121.6957,37.191),(-121.6948,37.192),(-121.6897,37.204),(-121.6697,37.185)] | Oakland
+ I- 580 | [(-121.9322,37.989),(-121.9243,37.006),(-121.9217,37.014)] | Oakland
+ I- 580 | [(-122.018,37.019),(-122.0009,37.032),(-121.9787,37.983),(-121.958,37.984),(-121.9571,37.986)] | Oakland
+ I- 580 Ramp | [(-121.8521,37.011),(-121.8479,37.999),(-121.8476,37.999),(-121.8456,37.01),(-121.8455,37.011)] | Oakland
+ I- 580 Ramp | [(-121.8743,37.014),(-121.8722,37.999),(-121.8714,37.999)] | Oakland
+ I- 580 Ramp | [(-121.9043,37.998),(-121.9036,37.013),(-121.902632,37.0174),(-121.9025,37.018)] | Oakland
+ I- 580 Ramp | [(-121.9368,37.986),(-121.936483,37.98832),(-121.9353,37.997),(-121.93504,37.00035),(-121.9346,37.006),(-121.933764,37.00031),(-121.9333,37.997),(-121.9322,37.989)] | Oakland
+ I- 580/I-680 Ramp | ((-121.9207,37.988),(-121.9192,37.016)) | Oakland
I- 680 | ((-121.939,37.15),(-121.9387,37.145),(-121.9373,37.125),(-121.934242,37.07643),(-121.933886,37.0709),(-121.9337,37.068),(-121.933122,37.06139),(-121.932736,37.05698),(-121.93222,37.05108),(-121.931844,37.04678),(-121.930113,37.027),(-121.926829,37),(-121.9265,37.998),(-121.9217,37.96),(-121.9203,37.949),(-121.9184,37.934)) | Oakland
+ I- 680 Ramp | [(-121.8833,37.376),(-121.8833,37.392),(-121.883,37.4),(-121.8835,37.402),(-121.8852,37.422)] | Oakland
+ I- 680 Ramp | [(-121.92,37.438),(-121.9218,37.424),(-121.9238,37.408),(-121.9252,37.392)] | Oakland
+ I- 680 Ramp | [(-121.9238,37.402),(-121.9234,37.395),(-121.923,37.399)] | Oakland
I- 880 | ((-121.9669,37.075),(-121.9663,37.071),(-121.9656,37.065),(-121.9618,37.037),(-121.95689,37),(-121.948,37.933)) | Oakland
I- 880 | [(-122.0612,37.003),(-122.0604,37.991),(-122.0596,37.982),(-122.0585,37.967),(-122.0583,37.961),(-122.0553,37.918),(-122.053635,37.89475),(-122.050759,37.8546),(-122.05,37.844),(-122.0485,37.817),(-122.0483,37.813),(-122.0482,37.811)] | Oakland
I- 880 | [(-122.0831,37.312),(-122.0819,37.296),(-122.081,37.285),(-122.0786,37.248),(-122.078,37.24),(-122.077642,37.23496),(-122.076983,37.22567),(-122.076599,37.22026),(-122.076229,37.21505),(-122.0758,37.209)] | Oakland
@@ -79,6 +98,9 @@ SELECT * FROM street;
I- 880 Ramp | [(-122.085,37.34),(-122.0801,37.316),(-122.081,37.285)] | Oakland
I- 880 Ramp | [(-122.085,37.34),(-122.0866,37.316),(-122.0819,37.296)] | Oakland
Kildare Road | [(-122.0968,37.016),(-122.0959,37)] | Oakland
+ Las Positas Road | [(-121.764488,37.99199),(-121.75569,37.02022)] | Oakland
+ Livermore Ave | [(-121.7687,37.448),(-121.769,37.375)] | Oakland
+ Livermore Ave | [(-121.772719,37.99085),(-121.7728,37.001)] | Oakland
Mildred Ct | [(-122.0002,37.388),(-121.9998,37.386)] | Oakland
Miramar Ave | [(-122.1009,37.025),(-122.099089,37.03209)] | Oakland
Mission Blvd | [(-121.918886,37),(-121.9194,37.976),(-121.9198,37.975)] | Oakland
@@ -86,14 +108,19 @@ SELECT * FROM street;
Oakridge Road | [(-121.8316,37.049),(-121.828382,37)] | Oakland
Paseo Padre Pkwy | [(-121.9143,37.005),(-121.913522,37)] | Oakland
Periwinkle Road | [(-122.0451,37.301),(-122.044758,37.29844)] | Oakland
+ Pimlico Dr | [(-121.8616,37.998),(-121.8618,37.008)] | Oakland
Railroad Ave | [(-122.0245,37.013),(-122.0234,37.003),(-122.0223,37.993)] | Oakland
Ranspot Dr | [(-122.0972,37.999),(-122.0959,37)] | Oakland
Santa Maria Ave | [(-122.0773,37),(-122.0773,37.98)] | Oakland
+ Sp Railroad | [(-121.893564,37.99009),(-121.897,37.016)] | Oakland
Sp Railroad | [(-122.0734,37.001),(-122.0734,37.997)] | Oakland
Stanton Ave | [(-122.100392,37.0697),(-122.099513,37.06052)] | Oakland
+ Sunol Ridge Trl | [(-121.9419,37.455),(-121.9345,37.38)] | Oakland
+ Tassajara Creek | [(-121.87866,37.98898),(-121.8782,37.015)] | Oakland
Thackeray Ave | [(-122.072,37.305),(-122.0715,37.298)] | Oakland
Tissiack Way | [(-121.920364,37),(-121.9208,37.995)] | Oakland
Warm Springs Blvd | [(-121.933956,37),(-121.9343,37.97)] | Oakland
+ Welch Creek Road | [(-121.7695,37.386),(-121.7737,37.413)] | Oakland
Western Pacific Railroad Spur | [(-122.0394,37.018),(-122.0394,37.961)] | Oakland
Whitlock Creek | [(-121.74683,37.91276),(-121.733107,37)] | Oakland
Avenue 134th | [(-122.1823,37.002),(-122.1851,37.992)] | Oakland
@@ -103,39 +130,55 @@ SELECT * FROM street;
Bancroft Ave | [(-122.1643,37.523),(-122.1631,37.508),(-122.1621,37.493)] | Oakland
Birch St | [(-122.1617,37.425),(-122.1614,37.417)] | Oakland
Birch St | [(-122.1673,37.509),(-122.1661,37.492)] | Oakland
+ Blacow Road | [(-122.0179,37.469),(-122.0167,37.465)] | Oakland
Broadmore Ave | [(-122.095,37.522),(-122.0936,37.497)] | Oakland
Butterfield Dr | [(-122.0838,37.002),(-122.0834,37.987)] | Oakland
C St | [(-122.1768,37.46),(-122.1749,37.435)] | Oakland
Cameron Ave | [(-122.1316,37.502),(-122.1327,37.481)] | Oakland
+ Cedar Blvd | [(-122.0282,37.446),(-122.0265,37.43)] | Oakland
Chapman Dr | [(-122.0421,37.504),(-122.0414,37.498)] | Oakland
Charles St | [(-122.0255,37.505),(-122.0252,37.499)] | Oakland
+ Cherry St | [(-122.0437,37.42),(-122.0434,37.413)] | Oakland
Claremont Pl | [(-122.0542,37.995),(-122.0542,37.008)] | Oakland
Coliseum Way | [(-122.2001,37.47),(-122.1978,37.516)] | Oakland
+ Cull Canyon Road | [(-122.0536,37.435),(-122.0499,37.315)] | Oakland
D St | [(-122.1811,37.505),(-122.1805,37.497)] | Oakland
Decoto Road | [(-122.0159,37.006),(-122.016,37.002),(-122.0164,37.993)] | Oakland
+ Driftwood Dr | [(-122.0109,37.482),(-122.0113,37.477)] | Oakland
E St | [(-122.1832,37.505),(-122.1826,37.498),(-122.182,37.49)] | Oakland
Eden Ave | [(-122.1143,37.505),(-122.1142,37.491)] | Oakland
Eden Creek | [(-122.022037,37.00675),(-122.0221,37.998)] | Oakland
+ Gading Road | [(-122.0801,37.343),(-122.08,37.336)] | Oakland
+ Harris Road | [(-122.0659,37.372),(-122.0675,37.363)] | Oakland
Hegenberger Exwy | [(-122.1946,37.52),(-122.1947,37.497)] | Oakland
Herrier St | [(-122.1943,37.006),(-122.1936,37.998)] | Oakland
+ Hesperian Blvd | [(-122.097,37.333),(-122.0956,37.31),(-122.0946,37.293)] | Oakland
I- 580 | [(-122.1108,37.023),(-122.1101,37.02),(-122.108103,37.00764),(-122.108,37.007),(-122.1069,37.998),(-122.1064,37.994),(-122.1053,37.982),(-122.1048,37.977),(-122.1032,37.958),(-122.1026,37.953),(-122.1013,37.938),(-122.0989,37.911),(-122.0984,37.91),(-122.098,37.908)] | Oakland
I- 580 | [(-122.1543,37.703),(-122.1535,37.694),(-122.1512,37.655),(-122.1475,37.603),(-122.1468,37.583),(-122.1472,37.569),(-122.149044,37.54874),(-122.1493,37.546),(-122.1501,37.532),(-122.1506,37.509),(-122.1495,37.482),(-122.1487,37.467),(-122.1477,37.447),(-122.1414,37.383),(-122.1404,37.376),(-122.1398,37.372),(-122.139,37.356),(-122.1388,37.353),(-122.1385,37.34),(-122.1382,37.33),(-122.1378,37.316)] | Oakland
I- 580 Ramp | [(-122.1086,37.003),(-122.1068,37.993),(-122.1066,37.992),(-122.1053,37.982)] | Oakland
I- 580 Ramp | [(-122.1414,37.383),(-122.1407,37.376),(-122.1403,37.372),(-122.139,37.356)] | Oakland
+ I- 880 | [(-122.0219,37.466),(-122.0205,37.447),(-122.020331,37.44447),(-122.020008,37.43962),(-122.0195,37.432),(-122.0193,37.429),(-122.0164,37.393),(-122.010219,37.34771),(-122.0041,37.313)] | Oakland
I- 880 | [(-122.0375,37.632),(-122.0359,37.619),(-122.0358,37.616),(-122.034514,37.60409),(-122.031876,37.57965),(-122.031193,37.57332),(-122.03016,37.56375),(-122.02943,37.55698),(-122.028689,37.54929),(-122.027833,37.53908),(-122.025979,37.51698),(-122.0238,37.491)] | Oakland
I- 880 | [(-122.0612,37.003),(-122.0604,37.991),(-122.0596,37.982),(-122.0585,37.967),(-122.0583,37.961),(-122.0553,37.918),(-122.053635,37.89475),(-122.050759,37.8546),(-122.05,37.844),(-122.0485,37.817),(-122.0483,37.813),(-122.0482,37.811)] | Oakland
I- 880 | [(-122.0978,37.528),(-122.096,37.496),(-122.0931,37.453),(-122.09277,37.4496),(-122.090189,37.41442),(-122.0896,37.405),(-122.085,37.34)] | Oakland
I- 880 | [(-122.1755,37.185),(-122.1747,37.178),(-122.1742,37.173),(-122.1692,37.126),(-122.167792,37.11594),(-122.16757,37.11435),(-122.1671,37.111),(-122.1655,37.1),(-122.165169,37.09811),(-122.1641,37.092),(-122.1596,37.061),(-122.158381,37.05275),(-122.155991,37.03657),(-122.1531,37.017),(-122.1478,37.98),(-122.1407,37.932),(-122.1394,37.924),(-122.1389,37.92),(-122.1376,37.91)] | Oakland
+ I- 880 Ramp | [(-122.0236,37.488),(-122.0231,37.458),(-122.0227,37.458),(-122.0223,37.452),(-122.0205,37.447)] | Oakland
+ I- 880 Ramp | [(-122.0238,37.491),(-122.0215,37.483),(-122.0211,37.477),(-122.0205,37.447)] | Oakland
I- 880 Ramp | [(-122.059,37.982),(-122.0577,37.984),(-122.0612,37.003)] | Oakland
I- 880 Ramp | [(-122.0618,37.011),(-122.0631,37.982),(-122.0585,37.967)] | Oakland
+ I- 880 Ramp | [(-122.085,37.34),(-122.0801,37.316),(-122.081,37.285)] | Oakland
+ I- 880 Ramp | [(-122.085,37.34),(-122.0866,37.316),(-122.0819,37.296)] | Oakland
Kaiser Dr | [(-122.067163,37.47821),(-122.060402,37.51961)] | Oakland
La Playa Dr | [(-122.1039,37.545),(-122.101,37.493)] | Oakland
Locust St | [(-122.1606,37.007),(-122.1593,37.987)] | Oakland
+ Logan Ct | [(-122.0053,37.492),(-122.0061,37.484)] | Oakland
Magnolia St | [(-122.0971,37.5),(-122.0962,37.484)] | Oakland
Mattos Dr | [(-122.0005,37.502),(-122.000898,37.49683)] | Oakland
Maubert Ave | [(-122.1114,37.009),(-122.1096,37.995)] | Oakland
McClure Ave | [(-122.1431,37.001),(-122.1436,37.998)] | Oakland
+ Medlar Dr | [(-122.0627,37.378),(-122.0625,37.375)] | Oakland
National Ave | [(-122.1192,37.5),(-122.1281,37.489)] | Oakland
+ Newark Blvd | [(-122.0352,37.438),(-122.0341,37.423)] | Oakland
Portsmouth Ave | [(-122.1064,37.315),(-122.1064,37.308)] | Oakland
Railroad Ave | [(-122.0245,37.013),(-122.0234,37.003),(-122.0223,37.993)] | Oakland
Ranspot Dr | [(-122.0972,37.999),(-122.0959,37)] | Oakland
@@ -146,8 +189,10 @@ SELECT * FROM street;
Sp Railroad | [(-122.0734,37.001),(-122.0734,37.997)] | Oakland
Sp Railroad | [(-122.137792,37.003),(-122.1365,37.992),(-122.131257,37.94612)] | Oakland
Sp Railroad | [(-122.1947,37.497),(-122.193328,37.4848)] | Oakland
+ State Hwy 84 | [(-122.0671,37.426),(-122.07,37.402),(-122.074,37.37),(-122.0773,37.338)] | Oakland
State Hwy 92 | [(-122.1085,37.326),(-122.1095,37.322),(-122.1111,37.316),(-122.1119,37.313),(-122.1125,37.311),(-122.1131,37.308),(-122.1167,37.292),(-122.1187,37.285),(-122.12,37.28)] | Oakland
State Hwy 92 Ramp | [(-122.1086,37.321),(-122.1089,37.315),(-122.1111,37.316)] | Oakland
+ Tennyson Road | [(-122.0891,37.317),(-122.0927,37.317)] | Oakland
Western Pacific Railroad Spur | [(-122.0394,37.018),(-122.0394,37.961)] | Oakland
Willimet Way | [(-122.0964,37.517),(-122.0949,37.493)] | Oakland
Wisconsin St | [(-122.1994,37.017),(-122.1975,37.998),(-122.1971,37.994)] | Oakland
@@ -162,12 +207,14 @@ SELECT * FROM street;
Arizona St | [(-122.0381,37.901),(-122.0367,37.898)] | Berkeley
Avenue 134th | [(-122.1823,37.002),(-122.1851,37.992)] | Berkeley
Avenue 140th | [(-122.1656,37.003),(-122.1691,37.988)] | Berkeley
+ Avenue D | [(-122.298,37.848),(-122.3024,37.849)] | Berkeley
Broadway | [(-122.2409,37.586),(-122.2395,37.601)] | Berkeley
Buckingham Blvd | [(-122.2231,37.59),(-122.2214,37.606)] | Berkeley
Butterfield Dr | [(-122.0838,37.002),(-122.0834,37.987)] | Berkeley
California St | [(-122.2032,37.005),(-122.2016,37.996)] | Berkeley
Campus Dr | [(-122.1704,37.905),(-122.1678,37.868),(-122.1671,37.865)] | Berkeley
Carson St | [(-122.1846,37.9),(-122.1843,37.901)] | Berkeley
+ Cedar St | [(-122.3011,37.737),(-122.2999,37.739)] | Berkeley
Central Ave | [(-122.2343,37.602),(-122.2331,37.595)] | Berkeley
Champion St | [(-122.214,37.991),(-122.2147,37.002)] | Berkeley
Claremont Pl | [(-122.0542,37.995),(-122.0542,37.008)] | Berkeley
@@ -242,6 +289,7 @@ SELECT * FROM street;
Shoreline Dr | [(-122.2657,37.603),(-122.2648,37.6)] | Berkeley
Skyline Blvd | [(-122.1738,37.01),(-122.1714,37.996)] | Berkeley
Skywest Dr | [(-122.1161,37.62),(-122.1123,37.586)] | Berkeley
+ Southern Pacific Railroad | [(-122.3002,37.674),(-122.2999,37.661)] | Berkeley
Sp Railroad | [(-122.0734,37.001),(-122.0734,37.997)] | Berkeley
Sp Railroad | [(-122.0914,37.601),(-122.087,37.56),(-122.086408,37.5551)] | Berkeley
Sp Railroad | [(-122.137792,37.003),(-122.1365,37.992),(-122.131257,37.94612)] | Berkeley
@@ -272,6 +320,8 @@ SELECT * FROM street;
Heartwood Dr | [(-122.2006,37.341),(-122.1992,37.338)] | Lafayette
Hollis St | [(-122.2885,37.397),(-122.289,37.414)] | Lafayette
I- 580 | [(-122.2197,37.99),(-122.22,37.99),(-122.222092,37.99523),(-122.2232,37.998),(-122.224146,37.99963),(-122.2261,37.003),(-122.2278,37.007),(-122.2302,37.026),(-122.2323,37.043),(-122.2344,37.059),(-122.235405,37.06427),(-122.2365,37.07)] | Lafayette
+ I- 80 | ((-122.2937,37.277),(-122.3016,37.262)) | Lafayette
+ I- 80 | ((-122.2962,37.273),(-122.3004,37.264)) | Lafayette
I- 80 Ramp | [(-122.2962,37.413),(-122.2959,37.382),(-122.2951,37.372)] | Lafayette
I- 880 Ramp | [(-122.2771,37.002),(-122.278,37)] | Lafayette
Indian Way | [(-122.2066,37.398),(-122.2045,37.411)] | Lafayette
@@ -285,9 +335,10 @@ SELECT * FROM street;
State Hwy 13 Ramp | [(-122.2244,37.427),(-122.223,37.414),(-122.2214,37.396),(-122.2213,37.388)] | Lafayette
State Hwy 24 | [(-122.2674,37.246),(-122.2673,37.248),(-122.267,37.261),(-122.2668,37.271),(-122.2663,37.298),(-122.2659,37.315),(-122.2655,37.336),(-122.265007,37.35882),(-122.264443,37.37286),(-122.2641,37.381),(-122.2638,37.388),(-122.2631,37.396),(-122.2617,37.405),(-122.2615,37.407),(-122.2605,37.412)] | Lafayette
Taurus Ave | [(-122.2159,37.416),(-122.2128,37.389)] | Lafayette
+ 14th St | [(-122.299,37.147),(-122.3,37.148)] | Lafayette
5th St | [(-122.278,37),(-122.2792,37.005),(-122.2803,37.009)] | Lafayette
98th Ave | [(-122.2001,37.258),(-122.1974,37.27)] | Lafayette
-(282 rows)
+(333 rows)
SELECT name, #thepath FROM iexit ORDER BY 1, 2;
name | ?column?
@@ -368,6 +419,7 @@ SELECT name, #thepath FROM iexit ORDER BY 1, 2;
I- 580 | 8
I- 580 | 8
I- 580 | 8
+ I- 580 | 8
I- 580 | 9
I- 580 | 9
I- 580 | 9
@@ -882,6 +934,7 @@ SELECT name, #thepath FROM iexit ORDER BY 1, 2;
I- 880 | 6
I- 880 | 6
I- 880 | 6
+ I- 880 | 6
I- 880 | 7
I- 880 | 7
I- 880 | 7
@@ -1186,7 +1239,7 @@ SELECT name, #thepath FROM iexit ORDER BY 1, 2;
I- 980 Ramp | 3
I- 980 Ramp | 3
I- 980 Ramp | 7
-(894 rows)
+(896 rows)
SELECT * FROM toyemp WHERE name = 'sharon';
name | age | location | annualsal
--
GitLab