From ebde7b5fef1fcd9f5e5652f2154be04df323fcb9 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 22 Oct 2017 15:39:08 +0000 Subject: [PATCH] Update expected results They are different than before because now we don't make any attempt to snap vertices to existing _segments_ (rather than vertices) of topology edges. There could be a way to fix this by first adding all endpoints and then performing the snap. git-svn-id: http://svn.osgeo.org/postgis/trunk@16036 b70326c6-7e19-0410-871a-916f4a2858ee --- .../regress/topogeo_addlinestring_expected | 178 +++++++++--------- 1 file changed, 91 insertions(+), 87 deletions(-) diff --git a/topology/test/regress/topogeo_addlinestring_expected b/topology/test/regress/topogeo_addlinestring_expected index c6582e37f..e1054af42 100644 --- a/topology/test/regress/topogeo_addlinestring_expected +++ b/topology/test/regress/topogeo_addlinestring_expected @@ -45,138 +45,142 @@ cross|E|34|sn31|en32 cross|E|35|sn32|en33 snap|7 snap|36 -snap|39 -snap|N|34||POINT(18 22) +snap|38 +snap|N|34||POINT(18 22.2) snap|N|35||POINT(22.4 22) -snap|N|36||POINT(21 20.4) -snap|E|6|sn16|en34 +snap|N|36||POINT(21.2 20.4) snap|E|7|sn17|en35 -snap|E|19|sn14|en36 snap|E|36|sn34|en17 snap|E|37|sn35|en18 -snap|E|38|sn36|en17 -snap|E|39|sn35|en36 +snap|E|38|sn35|en36 snap_again|7 snap_again|36 -snap_again|39 -crossover|42 +snap_again|38 +crossover|40 +crossover|41 crossover|44 crossover|45 -crossover|46 -crossover|N|37||POINT(9 20) -crossover|N|38||POINT(16.2 14) -crossover|N|39||POINT(21 10) -crossover|N|40||POINT(9 18) -crossover|N|41||POINT(21 7) -crossover|E|9|sn15|en38 -crossover|E|20|sn9|en41 -crossover|E|21|sn15|en40 -crossover|E|40|sn37|en16 -crossover|E|41|sn38|en14 -crossover|E|42|sn37|en38 -crossover|E|43|sn39|en14 -crossover|E|44|sn38|en39 -crossover|E|45|sn40|en37 -crossover|E|46|sn41|en39 -crossover_again|42 +crossover|N|37||POINT(21 10) +crossover|N|38||POINT(21 7) +crossover|N|39||POINT(9 18) +crossover|N|40||POINT(9 20) +crossover|N|41||POINT(16.2 14) +crossover|E|9|sn15|en41 +crossover|E|20|sn9|en38 +crossover|E|21|sn15|en39 +crossover|E|39|sn37|en14 +crossover|E|40|sn38|en37 +crossover|E|41|sn39|en40 +crossover|E|42|sn40|en16 +crossover|E|43|sn41|en14 +crossover|E|44|sn41|en37 +crossover|E|45|sn40|en41 +crossover_again|40 +crossover_again|41 crossover_again|44 crossover_again|45 -crossover_again|46 contains|25 +contains|46 contains|47 -contains|48 contains|N|42||POINT(7 36) contains|N|43||POINT(14 34) -contains|E|47|sn21|en42 -contains|E|48|sn43|en22 +contains|E|46|sn21|en42 +contains|E|47|sn43|en22 +nodecross|48 nodecross|49 -nodecross|50 nodecross|N|44||POINT(18 37) nodecross|N|45||POINT(22 37) -nodecross|E|49|sn44|en4 -nodecross|E|50|sn4|en45 +nodecross|E|48|sn44|en4 +nodecross|E|49|sn4|en45 iso_ex_2segs|28 -#1613.1|51 +#1613.1|50 #1613.1|N|46||POINT(556267.6 144887) #1613.1|N|47||POINT(556267 144887.4) -#1613.1|E|51|sn46|en47 +#1613.1|E|50|sn46|en47 +#1613.2|52 #1613.2|53 -#1613.2|54 -#1613.2|N|48||POINT(556250 144887) -#1613.2|N|49||POINT(556267.6 144887) -#1613.2|N|50||POINT(556310 144887) -#1613.2|E|51|sn46|en49 -#1613.2|E|52|sn49|en47 -#1613.2|E|53|sn48|en49 -#1613.2|E|54|sn49|en50 -#1631.1|55 +#1613.2|N|48||POINT(556267.6 144887) +#1613.2|N|49||POINT(556310 144887) +#1613.2|N|50||POINT(556250 144887) +#1613.2|E|50|sn46|en48 +#1613.2|E|51|sn48|en47 +#1613.2|E|52|sn48|en49 +#1613.2|E|53|sn50|en48 +#1631.1|54 #1631.1|N|51||POINT(556267.6 144887) #1631.1|N|52||POINT(556267.6 144888) -#1631.1|E|55|sn51|en52 +#1631.1|E|54|sn51|en52 +#1631.2|55 #1631.2|56 -#1631.2|57 #1631.2|N|53||POINT(556254.6 144886.6) #1631.2|N|54||POINT(556267.6 144887) -#1631.2|E|56|sn53|en51 -#1631.2|E|57|sn51|en54 -#1641.1|58 +#1631.2|E|55|sn53|en51 +#1631.2|E|56|sn51|en54 +#1641.1|57 #1641.1|N|55||POINT(-0.2 0.4) #1641.1|N|56||POINT(0.2 0.4) -#1641.1|E|58|sn55|en56 +#1641.1|E|57|sn55|en56 +#1641.2|59 #1641.2|60 -#1641.2|61 #1641.2|N|57||POINT(0 0.2) #1641.2|N|58||POINT(0 0.4) #1641.2|N|59||POINT(0 0.4) -#1641.2|E|58|sn55|en58 -#1641.2|E|59|sn58|en56 -#1641.2|E|60|sn57|en58 -#1641.2|E|61|sn58|en59 -#1641.3|62 +#1641.2|E|57|sn55|en58 +#1641.2|E|58|sn58|en56 +#1641.2|E|59|sn57|en58 +#1641.2|E|60|sn58|en59 +#1641.3|61 #1641.3|N|60||POINT(-0.2 0.4) #1641.3|N|61||POINT(0.2 0.4) -#1641.3|E|62|sn60|en61 +#1641.3|E|61|sn60|en61 +#1641.4|63 #1641.4|64 -#1641.4|65 #1641.4|N|62||POINT(0 0.2) #1641.4|N|63||POINT(0 0.4) #1641.4|N|64||POINT(0 0.4) -#1641.4|E|62|sn60|en63 -#1641.4|E|63|sn63|en61 -#1641.4|E|64|sn62|en63 -#1641.4|E|65|sn63|en64 +#1641.4|E|61|sn60|en63 +#1641.4|E|62|sn63|en61 +#1641.4|E|63|sn62|en63 +#1641.4|E|64|sn63|en64 #1650.1 -#1650.2|N|65|0|POINT(0 0) +#1650.265 +#1650.2|N|65||POINT(0 0) +#1650.2|N|66||POINT(0 1) +#1650.2|E|65|sn65|en66 +#1650.3|65 #1650.3|66 -#1650.3|N|66||POINT(10 0) -#1650.3|E|66|sn65|en66 -#1654.1|N|67 -#1654.1|N|67|0|POINT(0 0) +#1650.3|N|67||POINT(10 0) +#1650.3|E|66|sn65|en67 +#1654.1|N|68 +#1654.1|N|68|0|POINT(0 0) #1654.2|67 #1654.2|68 -#1654.2|N|68||POINT(-10 1) -#1654.2|N|69||POINT(10 1) -#1654.2|E|67|sn68|en67 -#1654.2|E|68|sn67|en69 +#1654.2|N|69||POINT(-10 1) +#1654.2|N|70||POINT(10 1) +#1654.2|E|67|sn69|en68 +#1654.2|E|68|sn68|en70 #1706.1|E|69 -#1706.1|N|70||POINT(20 10) -#1706.1|N|71||POINT(10 20) -#1706.1|E|69|sn70|en71 +#1706.1|N|71||POINT(20 10) +#1706.1|N|72||POINT(10 20) +#1706.1|E|69|sn71|en72 #1706.2|E*|69 +#1706.2|E*|70 #1706.2|E*|71 -#1706.2|E*|72 -#1706.2|N|72||POINT(10 0) -#1706.2|N|73||POINT(10 10) -#1706.2|N|74||POINT(15 10) -#1706.2|E|69|sn70|en74 -#1706.2|E|70|sn73|en71 -#1706.2|E|71|sn72|en73 -#1706.2|E|72|sn74|en73 -#1714.1|N|75 -#1714.1|N|75|0|POINT(10 0) -#1714.2|E*|73 -#1714.2|N|76||POINT(0 20) -#1714.2|E|73|sn75|en76 +#1706.2|E*|73 +#1706.2|N|73||POINT(10 0) +#1706.2|N|74||POINT(10 10) +#1706.2|N|75||POINT(9 12) +#1706.2|N|76||POINT(15 10) +#1706.2|E|69|sn71|en76 +#1706.2|E|70|sn74|en75 +#1706.2|E|71|sn73|en74 +#1706.2|E|72|sn75|en72 +#1706.2|E|73|sn76|en74 +#1714.1|N|77 +#1714.1|N|77|0|POINT(10 0) +#1714.2|E*|74 +#1714.2|N|78||POINT(0 20) +#1714.2|E|74|sn77|en78 Topology 'city_data' dropped t3280.start|t t3280|L11 -- 2.40.0