diff --git a/autotest/ogr/ogr_dxf.py b/autotest/ogr/ogr_dxf.py index 2f96653d95ed..1cd665593482 100644 --- a/autotest/ogr/ogr_dxf.py +++ b/autotest/ogr/ogr_dxf.py @@ -1109,7 +1109,7 @@ def test_ogr_dxf_20(): ogrtest.check_feature_geometry( feat, - "LINESTRING (10.75 62.75,20.637752769146068 63.434832501489716,29.283239084385464 63.396838394381845,36.766943814562865 62.711565975596599,43.169351828522906 61.454563542054103,48.570947995110252 59.70137939067456,53.05221718316956 57.527561818378146,56.693644261545501 55.008659122085049,59.575714099082703 52.220219598715438,61.778911564625851 49.237791545189509,63.383721527019588 46.136923258427423,64.470628855108572 42.993163035349369,65.120118417737459 39.882059172875508,65.412419131869868 36.878358785215056,65.417809785093752 34.025663008687722,65.193643595004147 31.327113252708507,64.796409941597645 28.783146935042897,64.282598204870823 26.394201473456341,63.708697764820236 24.16071428571431,63.131198001442392 22.083122789582241,62.606588294733939 20.161864402825621,62.191358024691354 18.397376543209894,61.941996571311265 16.790096628500525,61.914993314590184 15.340462076462975,62.166837634524704 14.0489103048627,62.754018911111373 12.915878731465167,63.723652286703427 11.940700981548817,65.053571428571416 11.114552964042769,66.690557841792398 10.424954275262921,68.581246558980226 9.859407264767562,70.672272612748785 9.405414282114966,72.910271035711943 9.050477676863418,75.241876860483572 8.782099798571203,77.613725119677511 8.587782996796603,79.97245084590763 8.4550296210979,82.264689071787842 8.371342021033378,84.437074829931987 8.324222546161321,86.436243152953921 8.301173546040012,88.208926721776336 8.289771106365336,89.722559658784164 8.293223374005688,90.990763736417563 8.349615688917151,92.033410218878885 8.501752503862612,92.870370370370395 8.792438271604945,93.521515455094473 9.264477444907039,94.006716737253413 9.960674476531764,94.345845481049565 10.923833819242011,94.558772950685281 12.196759925800654,94.665370410362868 13.82225724897058,94.685509124284636 15.843130241514663,94.639060356652948 18.302183356195791,94.545895371670113 21.242221045776841,94.421471763308503 24.702030018356666,94.215205541358216 28.660279617432039,93.825673773330607 33.049360720184715,93.15014577259474 37.800473760933045,92.085890852519697 42.844819173995376,90.530178326474584 48.113597393690064,88.380277507828495 53.538008854335445,85.533457709950525 59.049253990249873,81.886988246209697 64.578533235751706,77.338138429975174 70.057047025159264,71.784177574615995 75.415995792790937,65.122374993501282 80.586579972965055,57.25 85.5)", + "LINESTRING Z (10.75 62.75 0,20.6377527691461 63.4348325014897 0,29.2832390843855 63.3968383943819 0,36.7669438145629 62.7115659755966 0,43.1693518285229 61.4545635420541 0,48.5709479951103 59.7013793906746 0,53.0522171831696 57.5275618183782 0,56.6936442615455 55.0086591220851 0,59.5757140990827 52.2202195987154 0,61.7789115646259 49.2377915451895 0,63.3837215270196 46.1369232584274 0,64.4706288551086 42.9931630353494 0,65.1201184177375 39.8820591728755 0,65.4124191318699 36.8783587852151 0,65.4178097850938 34.0256630086877 0,65.1936435950041 31.3271132527085 0,64.7964099415976 28.7831469350429 0,64.2825982048708 26.3942014734563 0,63.7086977648202 24.1607142857143 0,63.1311980014424 22.0831227895822 0,62.6065882947339 20.1618644028256 0,62.1913580246914 18.3973765432099 0,61.9419965713113 16.7900966285005 0,61.9149933145902 15.340462076463 0,62.1668376345247 14.0489103048627 0,62.7540189111114 12.9158787314652 0,63.7236522867034 11.9407009815488 0,65.0535714285714 11.1145529640428 0,66.6905578417924 10.4249542752629 0,68.5812465589803 9.85940726476756 0,70.6722726127488 9.40541428211496 0,72.9102710357119 9.05047767686342 0,75.2418768604836 8.7820997985712 0,77.6137251196775 8.5877829967966 0,79.9724508459076 8.4550296210979 0,82.2646890717878 8.37134202103338 0,84.4370748299319 8.32422254616132 0,86.4362431529539 8.30117354604001 0,88.2089267217763 8.28977110636533 0,89.7225596587841 8.29322337400568 0,90.9907637364175 8.34961568891715 0,92.0334102188788 8.5017525038626 0,92.8703703703704 8.79243827160492 0,93.5215154550944 9.264477444907 0,94.0067167372534 9.9606744765317 0,94.3458454810496 10.9238338192419 0,94.5587729506853 12.1967599258005 0,94.6653704103629 13.8222572489704 0,94.6855091242846 15.8431302415145 0,94.6390603566529 18.3021833561955 0,94.5458953716701 21.2422210457765 0,94.4214717633085 24.7020300183563 0,94.2152055413583 28.6602796174316 0,93.8256737733306 33.0493607201842 0,93.1501457725948 37.8004737609325 0,92.0858908525198 42.8448191739948 0,90.5301783264748 48.1135973936895 0,88.3802775078288 53.5380088543349 0,85.5334577099508 59.0492539902493 0,81.8869882462101 64.5785332357511 0,77.3381384299757 70.0570470251587 0,71.7841775746166 75.4159957927904 0,65.122374993502 80.5865799729645 0,57.25 85.5 0)", ) ds = None @@ -1350,21 +1350,21 @@ def test_ogr_dxf_29(): feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 2, 2.10256409645081 2.15371131896973, 2.20512819290161 2.3066132068634, 2.307692527771 2.4578971862793, 2.41025638580322 2.6067533493042, 2.51282024383545 2.75237274169922, 2.61538457870483 2.89394640922546, 2.71794891357422 3.03066444396973, 2.82051301002502 3.16171884536743, 2.92307710647583 3.28629970550537, 3.02564096450806 3.40359783172607, 3.12820529937744 3.51280379295349, 3.23076939582825 3.61310863494873, 3.33333325386047 3.70370388031006, 3.43589782714844 3.78377938270569, 3.53846144676208 3.85252642631531, 3.64102602005005 3.90913581848145, 3.74358987808228 3.95279765129089, 3.84615445137024 3.98270392417908, 3.94871830940247 3.99804472923279, 4.05128240585327 3.99804425239563, 4.15384674072266 3.9827036857605, 4.25641107559204 3.95279765129089, 4.35897541046143 3.90913534164429, 4.46153926849365 3.85252571105957, 4.56410360336304 3.78377866744995, 4.66666793823242 3.70370292663574, 4.76923179626465 3.61310815811157, 4.87179613113403 3.51280236244202, 4.97436046600342 3.40359592437744, 5.07692432403564 3.2862982749939, 5.17948865890503 3.16171741485596, 5.28205299377441 3.03066277503967, 5.38461685180664 2.89394426345825, 5.48718070983887 2.75237035751343, 5.58974552154541 2.60675096511841, 5.69230937957764 2.45789456367493, 5.79487323760986 2.30661058425903, 5.89743757247925 2.15370845794678, 6 2)", + "LINESTRING Z (2 2 0,2.1025641025641 2.15371128980596 0,2.2051282051282 2.30661339537079 0,2.30769230769231 2.45789713245335 0,2.41025641025641 2.60675331681249 0,2.51282051282051 2.75237276420708 0,2.61538461538461 2.89394629039599 0,2.71794871794872 3.03066471113808 0,2.82051282051282 3.16171884219221 0,2.92307692307692 3.28629949931725 0,3.02564102564102 3.40359749827205 0,3.12820512820513 3.51280365481549 0,3.23076923076923 3.61310878470642 0,3.33333333333333 3.7037037037037 0,3.43589743589744 3.78377922756621 0,3.53846153846154 3.8525261720528 0,3.64102564102564 3.90913535292233 0,3.74358974358974 3.95279758593368 0,3.84615384615384 3.9827036868457 0,3.94871794871795 3.99804447141725 0,4.05128205128205 3.99804447141725 0,4.15384615384615 3.9827036868457 0,4.25641025641026 3.95279758593368 0,4.35897435897436 3.90913535292233 0,4.46153846153846 3.8525261720528 0,4.56410256410256 3.78377922756621 0,4.66666666666667 3.7037037037037 0,4.76923076923077 3.61310878470642 0,4.87179487179487 3.51280365481549 0,4.97435897435897 3.40359749827205 0,5.07692307692308 3.28629949931725 0,5.17948717948718 3.16171884219221 0,5.28205128205128 3.03066471113808 0,5.38461538461539 2.89394629039599 0,5.48717948717949 2.75237276420708 0,5.58974358974359 2.60675331681249 0,5.69230769230769 2.45789713245334 0,5.7948717948718 2.30661339537079 0,5.8974358974359 2.15371128980596 0,6 2 0)", ) # spline 261, weight(3) = 2.0 feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 2, 2.10976576805115 2.16451454162598, 2.23113083839417 2.34563326835632, 2.35994720458984 2.53639197349548, 2.49239826202393 2.73041176795959, 2.62522411346436 2.92225241661072, 2.75582838058472 3.10756635665894, 2.88229131698608 3.2831084728241, 3.00331926345825 3.44663000106812, 3.11815142631531 3.59672045707703, 3.2264621257782 3.73262500762939, 3.32825922966003 3.85407567024231, 3.42379808425903 3.96113181114197, 3.51351404190063 4.05405473709106, 3.59796214103699 4.13319540023804, 3.67778849601746 4.19891929626465, 3.75369834899902 4.25152969360352, 3.82645153999329 4.29121112823486, 3.89685702323914 4.31797361373901, 3.96579027175903 4.33159732818604, 4.03421020507812 4.33159732818604, 4.1031436920166 4.31797361373901, 4.17354917526245 4.29121017456055, 4.24630165100098 4.2515287399292, 4.32221221923828 4.19891929626465, 4.40203857421875 4.13319492340088, 4.48648738861084 4.05405378341675, 4.57620286941528 3.96113133430481, 4.67174291610718 3.85407471656799, 4.77353954315186 3.73262333869934, 4.88184928894043 3.59671831130981, 4.99668216705322 3.44662809371948, 5.11771011352539 3.28310608863831, 5.24417400360107 3.10756373405457, 5.37477827072144 2.92224931716919, 5.50760412216187 2.73040890693665, 5.64005517959595 2.5363883972168, 5.76887130737305 2.34562969207764, 5.89023685455322 2.16451120376587, 6 2)", + "LINESTRING Z (2 2 0,2.10976572340247 2.16451423293308 0,2.23113089996843 2.34563306806665 0,2.35994706660785 2.5363917071019 0,2.4923982030663 2.7304119838212 0,2.62522401782792 2.92225217784288 0,2.7558282208589 3.10756646216769 0,2.88229155950089 3.2831087138637 0,3.00331913560022 3.44663029387883 0,3.11815132314573 3.5967200894521 0,3.22646181024907 3.73262490129686 0,3.32825875170488 3.85407546924726 0,3.42379815888169 3.96113194681214 0,3.51351351351351 4.05405405405405 0,3.59796229770158 4.13319556415278 0,3.67778836987607 4.19891960597394 0,3.75369845584408 4.25152969753051 0,3.82645109024315 4.29121073470179 0,3.89685688129387 4.31797375648459 0,3.96578985841365 4.33159771032714 0,4.03421014158635 4.33159771032714 0,4.10314311870613 4.31797375648459 0,4.17354890975685 4.29121073470179 0,4.24630154415592 4.25152969753051 0,4.32221163012393 4.19891960597394 0,4.40203770229842 4.13319556415278 0,4.48648648648649 4.05405405405405 0,4.57620184111831 3.96113194681214 0,4.67174124829512 3.85407546924726 0,4.77353818975093 3.73262490129686 0,4.88184867685427 3.59672008945211 0,4.99668086439978 3.44663029387883 0,5.11770844049911 3.2831087138637 0,5.24417177914111 3.10756646216769 0,5.37477598217208 2.92225217784288 0,5.5076017969337 2.7304119838212 0,5.64005293339215 2.53639170710189 0,5.76886910003157 2.34563306806665 0,5.89023427659753 2.16451423293307 0,6 2 0)", ) # spline 262, weight(3) = 0.5 feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 2, 2.09894275665283 2.14827871322632, 2.19183802604675 2.28667020797729, 2.28029608726501 2.41674375534058, 2.36573505401611 2.53972935676575, 2.4494321346283 2.65657186508179, 2.53256177902222 2.76796913146973, 2.61621570587158 2.87439489364624, 2.70142364501953 2.97611308097839, 2.78915071487427 3.07318329811096, 2.88029623031616 3.16546249389648, 2.97567653656006 3.25260472297668, 3.07599782943726 3.33406257629395, 3.18181824684143 3.40909075737, 3.29349946975708 3.4767644405365, 3.4111499786377 3.53600478172302, 3.53456783294678 3.58562660217285, 3.66318273544312 3.62440752983093, 3.79601716995239 3.6511766910553, 3.93166828155518 3.66492199897766, 4.06833267211914 3.66492199897766, 4.20398426055908 3.65117692947388, 4.33681774139404 3.62440729141235, 4.4654335975647 3.58562660217285, 4.58885097503662 3.53600406646729, 4.70650196075439 3.47676372528076, 4.81818294525146 3.40909028053284, 4.92400360107422 3.33406162261963, 5.02432489395142 3.25260376930237, 5.11970520019531 3.16546106338501, 5.21085071563721 3.07318210601807, 5.29857730865479 2.9761118888855, 5.38378524780273 2.87439346313477, 5.46744012832642 2.76796770095825, 5.55056858062744 2.65656995773315, 5.63426637649536 2.53972721099854, 5.71970558166504 2.41674160957336, 5.8081636428833 2.2866678237915, 5.9010591506958 2.14827609062195, 6 2)", + "LINESTRING Z (2 2 0,2.09894267472891 2.14827889065297 0,2.1918380517297 2.28667017645161 0,2.28029602220166 2.41674375578168 0,2.36573488380154 2.53972930350242 0,2.44943227756881 2.65657187049601 0,2.53256150506512 2.76796912686927 0,2.6162160195058 2.87439499253976 0,2.70142356019971 2.9761131424117 0,2.78915046059365 3.07318321392016 0,2.88029601503322 3.1654623297623 0,2.97567642514756 3.25260468248623 0,3.07599781301257 3.33406232914161 0,3.18181818181818 3.40909090909091 0,3.29349914490214 3.47676456305555 0,3.41114982578397 3.53600464576074 0,3.53456755043606 3.5856265436821 0,3.66318260330395 3.62440763541344 0,3.79601689800845 3.65117682558841 0,3.93166808931219 3.66492205400063 0,4.06833191068781 3.66492205400063 0,4.20398310199155 3.65117682558841 0,4.33681739669604 3.62440763541344 0,4.46543244956394 3.58562654368211 0,4.58885017421603 3.53600464576074 0,4.70650085509786 3.47676456305555 0,4.81818181818182 3.40909090909091 0,4.92400218698742 3.33406232914161 0,5.02432357485243 3.25260468248623 0,5.11970398496678 3.1654623297623 0,5.21084953940635 3.07318321392016 0,5.29857643980029 2.9761131424117 0,5.3837839804942 2.87439499253976 0,5.46743849493488 2.76796912686927 0,5.55056772243119 2.65657187049601 0,5.63426511619847 2.53972930350242 0,5.71970397779834 2.41674375578168 0,5.8081619482703 2.2866701764516 0,5.90105732527109 2.14827889065297 0,6 2 0)", ) ds = None @@ -1383,14 +1383,14 @@ def test_ogr_dxf_30(): feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (14 2, 13.9043273925781 2.11115527153015, 13.82310962677 2.23728489875793, 13.7564849853516 2.3759388923645, 13.7045974731445 2.52466750144958, 13.6675891876221 2.68102264404297, 13.6455984115601 2.84255337715149, 13.6387672424316 3.00681042671204, 13.6472396850586 3.17134499549866, 13.6711559295654 3.33370733261108, 13.7106552124023 3.49144792556763, 13.7658815383911 3.64211750030518, 13.8369770050049 3.78326630592346, 13.9240808486938 3.9124448299408, 14.0273275375366 4.0272102355957, 14.1460762023926 4.125901222229, 14.2781581878662 4.20836925506592, 14.4212408065796 4.27464532852173, 14.5729866027832 4.32475566864014, 14.7310619354248 4.35873079299927, 14.8931264877319 4.37659645080566, 15.056845664978 4.37838315963745, 15.2198839187622 4.36411762237549, 15.3799018859863 4.33382892608643, 15.5345678329468 4.2875452041626, 15.681544303894 4.22529458999634, 15.8184909820557 4.14710569381714, 15.9430751800537 4.05300617218018, 16.0530071258545 3.94307255744934, 16.1471080780029 3.81848883628845, 16.2252960205078 3.68154096603394, 16.2875461578369 3.53456616401672, 16.3338298797607 3.37990093231201, 16.3641166687012 3.219881772995, 16.3783836364746 3.05684399604797, 16.3765964508057 2.89312481880188, 16.3587284088135 2.73106050491333, 16.3247547149658 2.57298684120178, 16.2746448516846 2.42124080657959, 16.2083702087402 2.27815842628479, 16.1259021759033 2.146075963974, 16.0272102355957 2.02732920646667, 15.9124450683594 1.92408156394958, 15.7832660675049 1.83697760105133, 15.6421175003052 1.7658828496933, 15.4914503097534 1.71065592765808, 15.3337097167969 1.67115533351898, 15.1713457107544 1.6472395658493, 15.0068111419678 1.63876724243164, 14.8425559997559 1.64559710025787, 14.681022644043 1.66758728027344, 14.5246696472168 1.70459699630737, 14.375940322876 1.75648427009583, 14.2372856140137 1.82310783863068, 14.1111574172974 1.90432631969452, 14 2)", + "LINESTRING Z (14 2 0,13.9043277090443 2.1111553863727 0,13.8231089120438 2.23728477691191 0,13.7564850364624 2.3759387050853 0,13.7045975097642 2.5246677043605 0,13.6675877594132 2.68102230820516 0,13.6455972128733 2.84255305008692 0,13.6387672976085 3.00681046347343 0,13.6472394410828 3.17134508183234 0,13.6711550707602 3.33370743863128 0,13.7106556141046 3.49144806733791 0,13.7658824985801 3.64211750141987 0,13.8369771516507 3.7832662743448 0,13.9240810007803 3.91244491958036 0,14.0273290209536 4.02721042307341 0,14.1460754371684 4.12590052075793 0,14.2781581418028 4.20836928118745 0,14.4212408102955 4.27464498985476 0,14.5729871180854 4.32475593225266 0,14.7310607406114 4.35873039387394 0,14.8931253533123 4.37659666021141 0,15.0568446316268 4.37838301675786 0,15.2198822509939 4.36411774900609 0,15.3799018868524 4.3338291424489 0,15.5345672146411 4.28754548257907 0,15.6815419097988 4.22529505488942 0,15.8184896477644 4.14710614487273 0,15.9430741039767 4.0530070380218 0,16.0530070380218 3.94307410397669 0,16.1471061448727 3.81848964776439 0,16.2252950548894 3.68154190979879 0,16.2875454825791 3.53456721464106 0,16.3338291424489 3.37990188685238 0,16.3641177490061 3.21988225099391 0,16.3783830167579 3.05684463162681 0,16.3765966602114 2.89312535331225 0,16.3587303938739 2.73106074061141 0,16.3247559322527 2.57298711808543 0,16.2746449898548 2.4212408102955 0,16.2083692811874 2.27815814180278 0,16.1259005207579 2.14607543716844 0,16.0272104230734 2.02732902095363 0,15.9124449195804 1.92408100078027 0,15.7832662743448 1.83697715165069 0,15.6421175014199 1.76588249858013 0,15.4914480673379 1.71065561410461 0,15.3337074386313 1.67115507076015 0,15.1713450818323 1.64723944108276 0,15.0068104634734 1.63876729760846 0,14.8425530500869 1.64559721287326 0,14.6810223082052 1.66758775941317 0,14.5246677043605 1.70459750976422 0,14.3759387050853 1.75648503646241 0,14.2372847769119 1.82310891204376 0,14.1111553863727 1.90432770904428 0,14 2 0)", ) # spline 24c, closed, recalculate knots feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (14 2, 13.9043273925781 2.11115527153015, 13.82310962677 2.23728489875793, 13.7564849853516 2.3759388923645, 13.7045974731445 2.52466750144958, 13.6675891876221 2.68102264404297, 13.6455984115601 2.84255337715149, 13.6387672424316 3.00681042671204, 13.6472396850586 3.17134499549866, 13.6711559295654 3.33370733261108, 13.7106552124023 3.49144792556763, 13.7658815383911 3.64211750030518, 13.8369770050049 3.78326630592346, 13.9240808486938 3.9124448299408, 14.0273275375366 4.0272102355957, 14.1460762023926 4.125901222229, 14.2781581878662 4.20836925506592, 14.4212408065796 4.27464532852173, 14.5729866027832 4.32475566864014, 14.7310619354248 4.35873079299927, 14.8931264877319 4.37659645080566, 15.056845664978 4.37838315963745, 15.2198839187622 4.36411762237549, 15.3799018859863 4.33382892608643, 15.5345678329468 4.2875452041626, 15.681544303894 4.22529458999634, 15.8184909820557 4.14710569381714, 15.9430751800537 4.05300617218018, 16.0530071258545 3.94307255744934, 16.1471080780029 3.81848883628845, 16.2252960205078 3.68154096603394, 16.2875461578369 3.53456616401672, 16.3338298797607 3.37990093231201, 16.3641166687012 3.219881772995, 16.3783836364746 3.05684399604797, 16.3765964508057 2.89312481880188, 16.3587284088135 2.73106050491333, 16.3247547149658 2.57298684120178, 16.2746448516846 2.42124080657959, 16.2083702087402 2.27815842628479, 16.1259021759033 2.146075963974, 16.0272102355957 2.02732920646667, 15.9124450683594 1.92408156394958, 15.7832660675049 1.83697760105133, 15.6421175003052 1.7658828496933, 15.4914503097534 1.71065592765808, 15.3337097167969 1.67115533351898, 15.1713457107544 1.6472395658493, 15.0068111419678 1.63876724243164, 14.8425559997559 1.64559710025787, 14.681022644043 1.66758728027344, 14.5246696472168 1.70459699630737, 14.375940322876 1.75648427009583, 14.2372856140137 1.82310783863068, 14.1111574172974 1.90432631969452, 14 2)", + "LINESTRING Z (14 2 0,13.9043277090443 2.1111553863727 0,13.8231089120438 2.23728477691191 0,13.7564850364624 2.3759387050853 0,13.7045975097642 2.5246677043605 0,13.6675877594132 2.68102230820516 0,13.6455972128733 2.84255305008692 0,13.6387672976085 3.00681046347343 0,13.6472394410828 3.17134508183234 0,13.6711550707602 3.33370743863128 0,13.7106556141046 3.49144806733791 0,13.7658824985801 3.64211750141987 0,13.8369771516507 3.7832662743448 0,13.9240810007803 3.91244491958036 0,14.0273290209536 4.02721042307341 0,14.1460754371684 4.12590052075793 0,14.2781581418028 4.20836928118745 0,14.4212408102955 4.27464498985476 0,14.5729871180854 4.32475593225266 0,14.7310607406114 4.35873039387394 0,14.8931253533123 4.37659666021141 0,15.0568446316268 4.37838301675786 0,15.2198822509939 4.36411774900609 0,15.3799018868524 4.3338291424489 0,15.5345672146411 4.28754548257907 0,15.6815419097988 4.22529505488942 0,15.8184896477644 4.14710614487273 0,15.9430741039767 4.0530070380218 0,16.0530070380218 3.94307410397669 0,16.1471061448727 3.81848964776439 0,16.2252950548894 3.68154190979879 0,16.2875454825791 3.53456721464106 0,16.3338291424489 3.37990188685238 0,16.3641177490061 3.21988225099391 0,16.3783830167579 3.05684463162681 0,16.3765966602114 2.89312535331225 0,16.3587303938739 2.73106074061141 0,16.3247559322527 2.57298711808543 0,16.2746449898548 2.4212408102955 0,16.2083692811874 2.27815814180278 0,16.1259005207579 2.14607543716844 0,16.0272104230734 2.02732902095363 0,15.9124449195804 1.92408100078027 0,15.7832662743448 1.83697715165069 0,15.6421175014199 1.76588249858013 0,15.4914480673379 1.71065561410461 0,15.3337074386313 1.67115507076015 0,15.1713450818323 1.64723944108276 0,15.0068104634734 1.63876729760846 0,14.8425530500869 1.64559721287326 0,14.6810223082052 1.66758775941317 0,14.5246677043605 1.70459750976422 0,14.3759387050853 1.75648503646241 0,14.2372847769119 1.82310891204376 0,14.1111553863727 1.90432770904428 0,14 2 0)", ) ds = None @@ -1478,20 +1478,20 @@ def test_ogr_dxf_31(): # OGRFeature(entities):10 # EntityHandle (String) = 200 - # LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8) + # LINESTRING Z (2 2 0,2.15384615384615 2.15384615384615 0,2.30769230769231 2.30769230769231 0,2.46153846153846 2.46153846153846 0,2.61538461538461 2.61538461538461 0,2.76923076923077 2.76923076923077 0,2.92307692307692 2.92307692307692 0,3.07692307692308 3.07692307692308 0,3.23076923076923 3.23076923076923 0,3.38461538461538 3.38461538461538 0,3.53846153846154 3.53846153846154 0,3.69230769230769 3.69230769230769 0,3.84615384615385 3.84615384615385 0,4 4 0,4.15384615384615 4.15384615384615 0,4.30769230769231 4.30769230769231 0,4.46153846153846 4.46153846153846 0,4.61538461538462 4.61538461538462 0,4.76923076923077 4.76923076923077 0,4.92307692307692 4.92307692307692 0,5.07692307692308 5.07692307692308 0,5.23076923076923 5.23076923076923 0,5.38461538461538 5.38461538461538 0,5.53846153846154 5.53846153846154 0,5.69230769230769 5.69230769230769 0,5.84615384615385 5.84615384615385 0,6.0 6.0 0,6.15384615384615 6.15384615384615 0,6.30769230769231 6.30769230769231 0,6.46153846153846 6.46153846153846 0,6.61538461538462 6.61538461538462 0,6.76923076923077 6.76923076923077 0,6.92307692307692 6.92307692307692 0,7.07692307692308 7.07692307692308 0,7.23076923076923 7.23076923076923 0,7.38461538461539 7.38461538461539 0,7.53846153846154 7.53846153846154 0,7.69230769230769 7.69230769230769 0,7.84615384615385 7.84615384615385 0,8 8 0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8)", + "LINESTRING Z (2 2 0,2.15384615384615 2.15384615384615 0,2.30769230769231 2.30769230769231 0,2.46153846153846 2.46153846153846 0,2.61538461538461 2.61538461538461 0,2.76923076923077 2.76923076923077 0,2.92307692307692 2.92307692307692 0,3.07692307692308 3.07692307692308 0,3.23076923076923 3.23076923076923 0,3.38461538461538 3.38461538461538 0,3.53846153846154 3.53846153846154 0,3.69230769230769 3.69230769230769 0,3.84615384615385 3.84615384615385 0,4 4 0,4.15384615384615 4.15384615384615 0,4.30769230769231 4.30769230769231 0,4.46153846153846 4.46153846153846 0,4.61538461538462 4.61538461538462 0,4.76923076923077 4.76923076923077 0,4.92307692307692 4.92307692307692 0,5.07692307692308 5.07692307692308 0,5.23076923076923 5.23076923076923 0,5.38461538461538 5.38461538461538 0,5.53846153846154 5.53846153846154 0,5.69230769230769 5.69230769230769 0,5.84615384615385 5.84615384615385 0,6.0 6.0 0,6.15384615384615 6.15384615384615 0,6.30769230769231 6.30769230769231 0,6.46153846153846 6.46153846153846 0,6.61538461538462 6.61538461538462 0,6.76923076923077 6.76923076923077 0,6.92307692307692 6.92307692307692 0,7.07692307692308 7.07692307692308 0,7.23076923076923 7.23076923076923 0,7.38461538461539 7.38461538461539 0,7.53846153846154 7.53846153846154 0,7.69230769230769 7.69230769230769 0,7.84615384615385 7.84615384615385 0,8 8 0)", ) # OGRFeature(entities):11 # EntityHandle (String) = 201 - # LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8) + # LINESTRING Z (8 1 0,7.62837370825536 0.987348067229724 0,7.25775889681215 0.975707614760869 0,6.88916704597178 0.966090122894857 0,6.52360963603567 0.959507071933107 0,6.16209814730525 0.956969942177043 0,5.80564406008193 0.959490213928084 0,5.45525885466714 0.968079367487651 0,5.11195401136229 0.983748883157167 0,4.77674101046882 1.00751024123805 0,4.45063133228814 1.04037492203173 0,4.13463645712167 1.08335440583961 0,3.82976786527082 1.13746017296313 0,3.53703703703704 1.2037037037037 0,3.25745545272173 1.28309647836275 0,2.99203459262631 1.37664997724169 0,2.74178593705221 1.48537568064195 0,2.50772096630085 1.61028506886495 0,2.29085116067365 1.75238962221211 0,2.09218800047203 1.91270082098484 0,1.91270082098485 2.09218800047202 0,1.75238962221211 2.29085116067364 0,1.61028506886495 2.50772096630085 0,1.48537568064195 2.74178593705221 0,1.37664997724169 2.99203459262631 0,1.28309647836275 3.25745545272172 0,1.2037037037037 3.53703703703703 0,1.13746017296313 3.82976786527082 0,1.08335440583961 4.13463645712166 0,1.04037492203173 4.45063133228814 0,1.00751024123805 4.77674101046882 0,0.983748883157167 5.11195401136229 0,0.968079367487652 5.45525885466714 0,0.959490213928084 5.80564406008193 0,0.956969942177043 6.16209814730525 0,0.959507071933108 6.52360963603567 0,0.966090122894857 6.88916704597178 0,0.975707614760869 7.25775889681216 0,0.987348067229724 7.62837370825537 0,1 8 0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8)", + "LINESTRING Z (8 1 0,7.62837370825536 0.987348067229724 0,7.25775889681215 0.975707614760869 0,6.88916704597178 0.966090122894857 0,6.52360963603567 0.959507071933107 0,6.16209814730525 0.956969942177043 0,5.80564406008193 0.959490213928084 0,5.45525885466714 0.968079367487651 0,5.11195401136229 0.983748883157167 0,4.77674101046882 1.00751024123805 0,4.45063133228814 1.04037492203173 0,4.13463645712167 1.08335440583961 0,3.82976786527082 1.13746017296313 0,3.53703703703704 1.2037037037037 0,3.25745545272173 1.28309647836275 0,2.99203459262631 1.37664997724169 0,2.74178593705221 1.48537568064195 0,2.50772096630085 1.61028506886495 0,2.29085116067365 1.75238962221211 0,2.09218800047203 1.91270082098484 0,1.91270082098485 2.09218800047202 0,1.75238962221211 2.29085116067364 0,1.61028506886495 2.50772096630085 0,1.48537568064195 2.74178593705221 0,1.37664997724169 2.99203459262631 0,1.28309647836275 3.25745545272172 0,1.2037037037037 3.53703703703703 0,1.13746017296313 3.82976786527082 0,1.08335440583961 4.13463645712166 0,1.04037492203173 4.45063133228814 0,1.00751024123805 4.77674101046882 0,0.983748883157167 5.11195401136229 0,0.968079367487652 5.45525885466714 0,0.959490213928084 5.80564406008193 0,0.956969942177043 6.16209814730525 0,0.959507071933108 6.52360963603567 0,0.966090122894857 6.88916704597178 0,0.975707614760869 7.25775889681216 0,0.987348067229724 7.62837370825537 0,1 8 0)", ) # OGRFeature(entities):12 @@ -1589,20 +1589,20 @@ def test_ogr_dxf_31(): # OGRFeature(entities):23 # EntityHandle (String) = 212 - # LINESTRING (-2 2,-2.15384615384615 2.15384615384615,-2.30769230769231 2.30769230769231,-2.46153846153846 2.46153846153846,-2.61538461538461 2.61538461538461,-2.76923076923077 2.76923076923077,-2.92307692307692 2.92307692307692,-3.07692307692308 3.07692307692308,-3.23076923076923 3.23076923076923,-3.38461538461538 3.38461538461538,-3.53846153846154 3.53846153846154,-3.69230769230769 3.69230769230769,-3.84615384615385 3.84615384615385,-4 4,-4.15384615384615 4.15384615384615,-4.30769230769231 4.30769230769231,-4.46153846153846 4.46153846153846,-4.61538461538462 4.61538461538462,-4.76923076923077 4.76923076923077,-4.92307692307692 4.92307692307692,-5.07692307692308 5.07692307692308,-5.23076923076923 5.23076923076923,-5.38461538461538 5.38461538461538,-5.53846153846154 5.53846153846154,-5.69230769230769 5.69230769230769,-5.84615384615385 5.84615384615385,-6.0 6.0,-6.15384615384615 6.15384615384615,-6.30769230769231 6.30769230769231,-6.46153846153846 6.46153846153846,-6.61538461538462 6.61538461538462,-6.76923076923077 6.76923076923077,-6.92307692307692 6.92307692307692,-7.07692307692308 7.07692307692308,-7.23076923076923 7.23076923076923,-7.38461538461539 7.38461538461539,-7.53846153846154 7.53846153846154,-7.69230769230769 7.69230769230769,-7.84615384615385 7.84615384615385,-8 8) + # LINESTRING Z (-2 2 -0.0,-2.15384615384615 2.15384615384615 -0.0,-2.30769230769231 2.30769230769231 -0.0,-2.46153846153846 2.46153846153846 -0.0,-2.61538461538461 2.61538461538461 -0.0,-2.76923076923077 2.76923076923077 -0.0,-2.92307692307692 2.92307692307692 -0.0,-3.07692307692308 3.07692307692308 -0.0,-3.23076923076923 3.23076923076923 -0.0,-3.38461538461538 3.38461538461538 -0.0,-3.53846153846154 3.53846153846154 -0.0,-3.69230769230769 3.69230769230769 -0.0,-3.84615384615385 3.84615384615385 -0.0,-4 4 -0.0,-4.15384615384615 4.15384615384615 -0.0,-4.30769230769231 4.30769230769231 -0.0,-4.46153846153846 4.46153846153846 -0.0,-4.61538461538462 4.61538461538462 -0.0,-4.76923076923077 4.76923076923077 -0.0,-4.92307692307692 4.92307692307692 -0.0,-5.07692307692308 5.07692307692308 -0.0,-5.23076923076923 5.23076923076923 -0.0,-5.38461538461538 5.38461538461538 -0.0,-5.53846153846154 5.53846153846154 -0.0,-5.69230769230769 5.69230769230769 -0.0,-5.84615384615385 5.84615384615385 -0.0,-6 6.0 -0.0,-6.15384615384615 6.15384615384615 -0.0,-6.30769230769231 6.30769230769231 -0.0,-6.46153846153846 6.46153846153846 -0.0,-6.61538461538462 6.61538461538462 -0.0,-6.76923076923077 6.76923076923077 -0.0,-6.92307692307692 6.92307692307692 -0.0,-7.07692307692308 7.07692307692308 -0.0,-7.23076923076923 7.23076923076923 -0.0,-7.38461538461539 7.38461538461539 -0.0,-7.53846153846154 7.53846153846154 -0.0,-7.69230769230769 7.69230769230769 -0.0,-7.84615384615385 7.84615384615385 -0.0,-8 8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-2 2,-2.15384615384615 2.15384615384615,-2.30769230769231 2.30769230769231,-2.46153846153846 2.46153846153846,-2.61538461538461 2.61538461538461,-2.76923076923077 2.76923076923077,-2.92307692307692 2.92307692307692,-3.07692307692308 3.07692307692308,-3.23076923076923 3.23076923076923,-3.38461538461538 3.38461538461538,-3.53846153846154 3.53846153846154,-3.69230769230769 3.69230769230769,-3.84615384615385 3.84615384615385,-4 4,-4.15384615384615 4.15384615384615,-4.30769230769231 4.30769230769231,-4.46153846153846 4.46153846153846,-4.61538461538462 4.61538461538462,-4.76923076923077 4.76923076923077,-4.92307692307692 4.92307692307692,-5.07692307692308 5.07692307692308,-5.23076923076923 5.23076923076923,-5.38461538461538 5.38461538461538,-5.53846153846154 5.53846153846154,-5.69230769230769 5.69230769230769,-5.84615384615385 5.84615384615385,-6.0 6.0,-6.15384615384615 6.15384615384615,-6.30769230769231 6.30769230769231,-6.46153846153846 6.46153846153846,-6.61538461538462 6.61538461538462,-6.76923076923077 6.76923076923077,-6.92307692307692 6.92307692307692,-7.07692307692308 7.07692307692308,-7.23076923076923 7.23076923076923,-7.38461538461539 7.38461538461539,-7.53846153846154 7.53846153846154,-7.69230769230769 7.69230769230769,-7.84615384615385 7.84615384615385,-8 8)", + "LINESTRING Z (-2 2 -0.0,-2.15384615384615 2.15384615384615 -0.0,-2.30769230769231 2.30769230769231 -0.0,-2.46153846153846 2.46153846153846 -0.0,-2.61538461538461 2.61538461538461 -0.0,-2.76923076923077 2.76923076923077 -0.0,-2.92307692307692 2.92307692307692 -0.0,-3.07692307692308 3.07692307692308 -0.0,-3.23076923076923 3.23076923076923 -0.0,-3.38461538461538 3.38461538461538 -0.0,-3.53846153846154 3.53846153846154 -0.0,-3.69230769230769 3.69230769230769 -0.0,-3.84615384615385 3.84615384615385 -0.0,-4 4 -0.0,-4.15384615384615 4.15384615384615 -0.0,-4.30769230769231 4.30769230769231 -0.0,-4.46153846153846 4.46153846153846 -0.0,-4.61538461538462 4.61538461538462 -0.0,-4.76923076923077 4.76923076923077 -0.0,-4.92307692307692 4.92307692307692 -0.0,-5.07692307692308 5.07692307692308 -0.0,-5.23076923076923 5.23076923076923 -0.0,-5.38461538461538 5.38461538461538 -0.0,-5.53846153846154 5.53846153846154 -0.0,-5.69230769230769 5.69230769230769 -0.0,-5.84615384615385 5.84615384615385 -0.0,-6 6.0 -0.0,-6.15384615384615 6.15384615384615 -0.0,-6.30769230769231 6.30769230769231 -0.0,-6.46153846153846 6.46153846153846 -0.0,-6.61538461538462 6.61538461538462 -0.0,-6.76923076923077 6.76923076923077 -0.0,-6.92307692307692 6.92307692307692 -0.0,-7.07692307692308 7.07692307692308 -0.0,-7.23076923076923 7.23076923076923 -0.0,-7.38461538461539 7.38461538461539 -0.0,-7.53846153846154 7.53846153846154 -0.0,-7.69230769230769 7.69230769230769 -0.0,-7.84615384615385 7.84615384615385 -0.0,-8 8 -0.0)", ) # OGRFeature(entities):24 # EntityHandle (String) = 213 - # LINESTRING (-8 1,-7.62837370825536 0.987348067229724,-7.25775889681215 0.975707614760869,-6.88916704597178 0.966090122894857,-6.52360963603567 0.959507071933107,-6.16209814730525 0.956969942177043,-5.80564406008193 0.959490213928084,-5.45525885466714 0.968079367487651,-5.11195401136229 0.983748883157167,-4.77674101046882 1.00751024123805,-4.45063133228814 1.04037492203173,-4.13463645712167 1.08335440583961,-3.82976786527082 1.13746017296313,-3.53703703703704 1.2037037037037,-3.25745545272173 1.28309647836275,-2.99203459262631 1.37664997724169,-2.74178593705221 1.48537568064195,-2.50772096630085 1.61028506886495,-2.29085116067365 1.75238962221211,-2.09218800047203 1.91270082098484,-1.91270082098485 2.09218800047202,-1.75238962221211 2.29085116067364,-1.61028506886495 2.50772096630085,-1.48537568064195 2.74178593705221,-1.37664997724169 2.99203459262631,-1.28309647836275 3.25745545272172,-1.2037037037037 3.53703703703703,-1.13746017296313 3.82976786527082,-1.08335440583961 4.13463645712166,-1.04037492203173 4.45063133228814,-1.00751024123805 4.77674101046882,-0.983748883157167 5.11195401136229,-0.968079367487652 5.45525885466714,-0.959490213928084 5.80564406008193,-0.956969942177043 6.16209814730525,-0.959507071933108 6.52360963603567,-0.966090122894857 6.88916704597178,-0.975707614760869 7.25775889681216,-0.987348067229724 7.62837370825537,-1 8) + # LINESTRING Z (-8 1 -0.0,-7.62837370825536 0.987348067229724 -0.0,-7.25775889681215 0.975707614760869 -0.0,-6.88916704597178 0.966090122894857 -0.0,-6.52360963603567 0.959507071933107 -0.0,-6.16209814730525 0.956969942177043 -0.0,-5.80564406008193 0.959490213928084 -0.0,-5.45525885466714 0.968079367487651 -0.0,-5.11195401136229 0.983748883157167 -0.0,-4.77674101046882 1.00751024123805 -0.0,-4.45063133228814 1.04037492203173 -0.0,-4.13463645712167 1.08335440583961 -0.0,-3.82976786527082 1.13746017296313 -0.0,-3.53703703703704 1.2037037037037 -0.0,-3.25745545272173 1.28309647836275 -0.0,-2.99203459262631 1.37664997724169 -0.0,-2.74178593705221 1.48537568064195 -0.0,-2.50772096630085 1.61028506886495 -0.0,-2.29085116067365 1.75238962221211 -0.0,-2.09218800047203 1.91270082098484 -0.0,-1.91270082098485 2.09218800047202 -0.0,-1.75238962221211 2.29085116067364 -0.0,-1.61028506886495 2.50772096630085 -0.0,-1.48537568064195 2.74178593705221 -0.0,-1.37664997724169 2.99203459262631 -0.0,-1.28309647836275 3.25745545272172 -0.0,-1.2037037037037 3.53703703703703 -0.0,-1.13746017296313 3.82976786527082 -0.0,-1.08335440583961 4.13463645712166 -0.0,-1.04037492203173 4.45063133228814 -0.0,-1.00751024123805 4.77674101046882 -0.0,-0.983748883157167 5.11195401136229 -0.0,-0.968079367487652 5.45525885466714 -0.0,-0.959490213928084 5.80564406008193 -0.0,-0.956969942177043 6.16209814730525 -0.0,-0.959507071933108 6.52360963603567 -0.0,-0.966090122894857 6.88916704597178 -0.0,-0.975707614760869 7.25775889681216 -0.0,-0.987348067229724 7.62837370825537 -0.0,-1 8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-8 1,-7.62837370825536 0.987348067229724,-7.25775889681215 0.975707614760869,-6.88916704597178 0.966090122894857,-6.52360963603567 0.959507071933107,-6.16209814730525 0.956969942177043,-5.80564406008193 0.959490213928084,-5.45525885466714 0.968079367487651,-5.11195401136229 0.983748883157167,-4.77674101046882 1.00751024123805,-4.45063133228814 1.04037492203173,-4.13463645712167 1.08335440583961,-3.82976786527082 1.13746017296313,-3.53703703703704 1.2037037037037,-3.25745545272173 1.28309647836275,-2.99203459262631 1.37664997724169,-2.74178593705221 1.48537568064195,-2.50772096630085 1.61028506886495,-2.29085116067365 1.75238962221211,-2.09218800047203 1.91270082098484,-1.91270082098485 2.09218800047202,-1.75238962221211 2.29085116067364,-1.61028506886495 2.50772096630085,-1.48537568064195 2.74178593705221,-1.37664997724169 2.99203459262631,-1.28309647836275 3.25745545272172,-1.2037037037037 3.53703703703703,-1.13746017296313 3.82976786527082,-1.08335440583961 4.13463645712166,-1.04037492203173 4.45063133228814,-1.00751024123805 4.77674101046882,-0.983748883157167 5.11195401136229,-0.968079367487652 5.45525885466714,-0.959490213928084 5.80564406008193,-0.956969942177043 6.16209814730525,-0.959507071933108 6.52360963603567,-0.966090122894857 6.88916704597178,-0.975707614760869 7.25775889681216,-0.987348067229724 7.62837370825537,-1 8)", + "LINESTRING Z (-8 1 -0.0,-7.62837370825536 0.987348067229724 -0.0,-7.25775889681215 0.975707614760869 -0.0,-6.88916704597178 0.966090122894857 -0.0,-6.52360963603567 0.959507071933107 -0.0,-6.16209814730525 0.956969942177043 -0.0,-5.80564406008193 0.959490213928084 -0.0,-5.45525885466714 0.968079367487651 -0.0,-5.11195401136229 0.983748883157167 -0.0,-4.77674101046882 1.00751024123805 -0.0,-4.45063133228814 1.04037492203173 -0.0,-4.13463645712167 1.08335440583961 -0.0,-3.82976786527082 1.13746017296313 -0.0,-3.53703703703704 1.2037037037037 -0.0,-3.25745545272173 1.28309647836275 -0.0,-2.99203459262631 1.37664997724169 -0.0,-2.74178593705221 1.48537568064195 -0.0,-2.50772096630085 1.61028506886495 -0.0,-2.29085116067365 1.75238962221211 -0.0,-2.09218800047203 1.91270082098484 -0.0,-1.91270082098485 2.09218800047202 -0.0,-1.75238962221211 2.29085116067364 -0.0,-1.61028506886495 2.50772096630085 -0.0,-1.48537568064195 2.74178593705221 -0.0,-1.37664997724169 2.99203459262631 -0.0,-1.28309647836275 3.25745545272172 -0.0,-1.2037037037037 3.53703703703703 -0.0,-1.13746017296313 3.82976786527082 -0.0,-1.08335440583961 4.13463645712166 -0.0,-1.04037492203173 4.45063133228814 -0.0,-1.00751024123805 4.77674101046882 -0.0,-0.983748883157167 5.11195401136229 -0.0,-0.968079367487652 5.45525885466714 -0.0,-0.959490213928084 5.80564406008193 -0.0,-0.956969942177043 6.16209814730525 -0.0,-0.959507071933108 6.52360963603567 -0.0,-0.966090122894857 6.88916704597178 -0.0,-0.975707614760869 7.25775889681216 -0.0,-0.987348067229724 7.62837370825537 -0.0,-1 8 -0.0)", ) # OGRFeature(entities):25 @@ -1692,20 +1692,20 @@ def test_ogr_dxf_31(): # OGRFeature(entities):36 # EntityHandle (String) = 224 - # LINESTRING (-2 -2,-2.15384615384615 -2.15384615384615,-2.30769230769231 -2.30769230769231,-2.46153846153846 -2.46153846153846,-2.61538461538461 -2.61538461538461,-2.76923076923077 -2.76923076923077,-2.92307692307692 -2.92307692307692,-3.07692307692308 -3.07692307692308,-3.23076923076923 -3.23076923076923,-3.38461538461538 -3.38461538461538,-3.53846153846154 -3.53846153846154,-3.69230769230769 -3.69230769230769,-3.84615384615385 -3.84615384615385,-4 -4,-4.15384615384615 -4.15384615384615,-4.30769230769231 -4.30769230769231,-4.46153846153846 -4.46153846153846,-4.61538461538462 -4.61538461538462,-4.76923076923077 -4.76923076923077,-4.92307692307692 -4.92307692307692,-5.07692307692308 -5.07692307692308,-5.23076923076923 -5.23076923076923,-5.38461538461538 -5.38461538461538,-5.53846153846154 -5.53846153846154,-5.69230769230769 -5.69230769230769,-5.84615384615385 -5.84615384615385,-6.0 -6.0,-6.15384615384615 -6.15384615384615,-6.30769230769231 -6.30769230769231,-6.46153846153846 -6.46153846153846,-6.61538461538462 -6.61538461538462,-6.76923076923077 -6.76923076923077,-6.92307692307692 -6.92307692307692,-7.07692307692308 -7.07692307692308,-7.23076923076923 -7.23076923076923,-7.38461538461539 -7.38461538461539,-7.53846153846154 -7.53846153846154,-7.69230769230769 -7.69230769230769,-7.84615384615385 -7.84615384615385,-8 -8) + # LINESTRING Z (-2 -2 -0.0,-2.15384615384615 -2.15384615384615 -0.0,-2.30769230769231 -2.30769230769231 -0.0,-2.46153846153846 -2.46153846153846 -0.0,-2.61538461538461 -2.61538461538461 -0.0,-2.76923076923077 -2.76923076923077 -0.0,-2.92307692307692 -2.92307692307692 -0.0,-3.07692307692308 -3.07692307692308 -0.0,-3.23076923076923 -3.23076923076923 -0.0,-3.38461538461538 -3.38461538461538 -0.0,-3.53846153846154 -3.53846153846154 -0.0,-3.69230769230769 -3.69230769230769 -0.0,-3.84615384615385 -3.84615384615385 -0.0,-4 -4 -0.0,-4.15384615384615 -4.15384615384615 -0.0,-4.30769230769231 -4.30769230769231 -0.0,-4.46153846153846 -4.46153846153846 -0.0,-4.61538461538462 -4.61538461538462 -0.0,-4.76923076923077 -4.76923076923077 -0.0,-4.92307692307692 -4.92307692307692 -0.0,-5.07692307692308 -5.07692307692308 -0.0,-5.23076923076923 -5.23076923076923 -0.0,-5.38461538461538 -5.38461538461538 -0.0,-5.53846153846154 -5.53846153846154 -0.0,-5.69230769230769 -5.69230769230769 -0.0,-5.84615384615385 -5.84615384615385 -0.0,-6 -6 -0.0,-6.15384615384615 -6.15384615384615 -0.0,-6.30769230769231 -6.30769230769231 -0.0,-6.46153846153846 -6.46153846153846 -0.0,-6.61538461538462 -6.61538461538462 -0.0,-6.76923076923077 -6.76923076923077 -0.0,-6.92307692307692 -6.92307692307692 -0.0,-7.07692307692308 -7.07692307692308 -0.0,-7.23076923076923 -7.23076923076923 -0.0,-7.38461538461539 -7.38461538461539 -0.0,-7.53846153846154 -7.53846153846154 -0.0,-7.69230769230769 -7.69230769230769 -0.0,-7.84615384615385 -7.84615384615385 -0.0,-8 -8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-2 -2,-2.15384615384615 -2.15384615384615,-2.30769230769231 -2.30769230769231,-2.46153846153846 -2.46153846153846,-2.61538461538461 -2.61538461538461,-2.76923076923077 -2.76923076923077,-2.92307692307692 -2.92307692307692,-3.07692307692308 -3.07692307692308,-3.23076923076923 -3.23076923076923,-3.38461538461538 -3.38461538461538,-3.53846153846154 -3.53846153846154,-3.69230769230769 -3.69230769230769,-3.84615384615385 -3.84615384615385,-4 -4,-4.15384615384615 -4.15384615384615,-4.30769230769231 -4.30769230769231,-4.46153846153846 -4.46153846153846,-4.61538461538462 -4.61538461538462,-4.76923076923077 -4.76923076923077,-4.92307692307692 -4.92307692307692,-5.07692307692308 -5.07692307692308,-5.23076923076923 -5.23076923076923,-5.38461538461538 -5.38461538461538,-5.53846153846154 -5.53846153846154,-5.69230769230769 -5.69230769230769,-5.84615384615385 -5.84615384615385,-6.0 -6.0,-6.15384615384615 -6.15384615384615,-6.30769230769231 -6.30769230769231,-6.46153846153846 -6.46153846153846,-6.61538461538462 -6.61538461538462,-6.76923076923077 -6.76923076923077,-6.92307692307692 -6.92307692307692,-7.07692307692308 -7.07692307692308,-7.23076923076923 -7.23076923076923,-7.38461538461539 -7.38461538461539,-7.53846153846154 -7.53846153846154,-7.69230769230769 -7.69230769230769,-7.84615384615385 -7.84615384615385,-8 -8)", + "LINESTRING Z (-2 -2 -0.0,-2.15384615384615 -2.15384615384615 -0.0,-2.30769230769231 -2.30769230769231 -0.0,-2.46153846153846 -2.46153846153846 -0.0,-2.61538461538461 -2.61538461538461 -0.0,-2.76923076923077 -2.76923076923077 -0.0,-2.92307692307692 -2.92307692307692 -0.0,-3.07692307692308 -3.07692307692308 -0.0,-3.23076923076923 -3.23076923076923 -0.0,-3.38461538461538 -3.38461538461538 -0.0,-3.53846153846154 -3.53846153846154 -0.0,-3.69230769230769 -3.69230769230769 -0.0,-3.84615384615385 -3.84615384615385 -0.0,-4 -4 -0.0,-4.15384615384615 -4.15384615384615 -0.0,-4.30769230769231 -4.30769230769231 -0.0,-4.46153846153846 -4.46153846153846 -0.0,-4.61538461538462 -4.61538461538462 -0.0,-4.76923076923077 -4.76923076923077 -0.0,-4.92307692307692 -4.92307692307692 -0.0,-5.07692307692308 -5.07692307692308 -0.0,-5.23076923076923 -5.23076923076923 -0.0,-5.38461538461538 -5.38461538461538 -0.0,-5.53846153846154 -5.53846153846154 -0.0,-5.69230769230769 -5.69230769230769 -0.0,-5.84615384615385 -5.84615384615385 -0.0,-6 -6 -0.0,-6.15384615384615 -6.15384615384615 -0.0,-6.30769230769231 -6.30769230769231 -0.0,-6.46153846153846 -6.46153846153846 -0.0,-6.61538461538462 -6.61538461538462 -0.0,-6.76923076923077 -6.76923076923077 -0.0,-6.92307692307692 -6.92307692307692 -0.0,-7.07692307692308 -7.07692307692308 -0.0,-7.23076923076923 -7.23076923076923 -0.0,-7.38461538461539 -7.38461538461539 -0.0,-7.53846153846154 -7.53846153846154 -0.0,-7.69230769230769 -7.69230769230769 -0.0,-7.84615384615385 -7.84615384615385 -0.0,-8 -8 -0.0)", ) # OGRFeature(entities):37 # EntityHandle (String) = 225 - # LINESTRING (-8 -1,-7.62837370825536 -0.987348067229724,-7.25775889681215 -0.975707614760869,-6.88916704597178 -0.966090122894857,-6.52360963603567 -0.959507071933107,-6.16209814730525 -0.956969942177043,-5.80564406008193 -0.959490213928084,-5.45525885466714 -0.968079367487651,-5.11195401136229 -0.983748883157167,-4.77674101046882 -1.00751024123805,-4.45063133228814 -1.04037492203173,-4.13463645712167 -1.08335440583961,-3.82976786527082 -1.13746017296313,-3.53703703703704 -1.2037037037037,-3.25745545272173 -1.28309647836275,-2.99203459262631 -1.37664997724169,-2.74178593705221 -1.48537568064195,-2.50772096630085 -1.61028506886495,-2.29085116067365 -1.75238962221211,-2.09218800047203 -1.91270082098484,-1.91270082098485 -2.09218800047202,-1.75238962221211 -2.29085116067364,-1.61028506886495 -2.50772096630085,-1.48537568064195 -2.74178593705221,-1.37664997724169 -2.99203459262631,-1.28309647836275 -3.25745545272172,-1.2037037037037 -3.53703703703703,-1.13746017296313 -3.82976786527082,-1.08335440583961 -4.13463645712166,-1.04037492203173 -4.45063133228814,-1.00751024123805 -4.77674101046882,-0.983748883157167 -5.11195401136229,-0.968079367487652 -5.45525885466714,-0.959490213928084 -5.80564406008193,-0.956969942177043 -6.16209814730525,-0.959507071933108 -6.52360963603567,-0.966090122894857 -6.88916704597178,-0.975707614760869 -7.25775889681216,-0.987348067229724 -7.62837370825537,-1 -8) + # LINESTRING Z (-8 -1 -0.0,-7.62837370825536 -0.987348067229724 -0.0,-7.25775889681215 -0.975707614760869 -0.0,-6.88916704597178 -0.966090122894857 -0.0,-6.52360963603567 -0.959507071933107 -0.0,-6.16209814730525 -0.956969942177043 -0.0,-5.80564406008193 -0.959490213928084 -0.0,-5.45525885466714 -0.968079367487651 -0.0,-5.11195401136229 -0.983748883157167 -0.0,-4.77674101046882 -1.00751024123805 -0.0,-4.45063133228814 -1.04037492203173 -0.0,-4.13463645712167 -1.08335440583961 -0.0,-3.82976786527082 -1.13746017296313 -0.0,-3.53703703703704 -1.2037037037037 -0.0,-3.25745545272173 -1.28309647836275 -0.0,-2.99203459262631 -1.37664997724169 -0.0,-2.74178593705221 -1.48537568064195 -0.0,-2.50772096630085 -1.61028506886495 -0.0,-2.29085116067365 -1.75238962221211 -0.0,-2.09218800047203 -1.91270082098484 -0.0,-1.91270082098485 -2.09218800047202 -0.0,-1.75238962221211 -2.29085116067364 -0.0,-1.61028506886495 -2.50772096630085 -0.0,-1.48537568064195 -2.74178593705221 -0.0,-1.37664997724169 -2.99203459262631 -0.0,-1.28309647836275 -3.25745545272172 -0.0,-1.2037037037037 -3.53703703703703 -0.0,-1.13746017296313 -3.82976786527082 -0.0,-1.08335440583961 -4.13463645712166 -0.0,-1.04037492203173 -4.45063133228814 -0.0,-1.00751024123805 -4.77674101046882 -0.0,-0.983748883157167 -5.11195401136229 -0.0,-0.968079367487652 -5.45525885466714 -0.0,-0.959490213928084 -5.80564406008193 -0.0,-0.956969942177043 -6.16209814730525 -0.0,-0.959507071933108 -6.52360963603567 -0.0,-0.966090122894857 -6.88916704597178 -0.0,-0.975707614760869 -7.25775889681216 -0.0,-0.987348067229724 -7.62837370825537 -0.0,-1 -8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-8 -1,-7.62837370825536 -0.987348067229724,-7.25775889681215 -0.975707614760869,-6.88916704597178 -0.966090122894857,-6.52360963603567 -0.959507071933107,-6.16209814730525 -0.956969942177043,-5.80564406008193 -0.959490213928084,-5.45525885466714 -0.968079367487651,-5.11195401136229 -0.983748883157167,-4.77674101046882 -1.00751024123805,-4.45063133228814 -1.04037492203173,-4.13463645712167 -1.08335440583961,-3.82976786527082 -1.13746017296313,-3.53703703703704 -1.2037037037037,-3.25745545272173 -1.28309647836275,-2.99203459262631 -1.37664997724169,-2.74178593705221 -1.48537568064195,-2.50772096630085 -1.61028506886495,-2.29085116067365 -1.75238962221211,-2.09218800047203 -1.91270082098484,-1.91270082098485 -2.09218800047202,-1.75238962221211 -2.29085116067364,-1.61028506886495 -2.50772096630085,-1.48537568064195 -2.74178593705221,-1.37664997724169 -2.99203459262631,-1.28309647836275 -3.25745545272172,-1.2037037037037 -3.53703703703703,-1.13746017296313 -3.82976786527082,-1.08335440583961 -4.13463645712166,-1.04037492203173 -4.45063133228814,-1.00751024123805 -4.77674101046882,-0.983748883157167 -5.11195401136229,-0.968079367487652 -5.45525885466714,-0.959490213928084 -5.80564406008193,-0.956969942177043 -6.16209814730525,-0.959507071933108 -6.52360963603567,-0.966090122894857 -6.88916704597178,-0.975707614760869 -7.25775889681216,-0.987348067229724 -7.62837370825537,-1 -8)", + "LINESTRING Z (-8 -1 -0.0,-7.62837370825536 -0.987348067229724 -0.0,-7.25775889681215 -0.975707614760869 -0.0,-6.88916704597178 -0.966090122894857 -0.0,-6.52360963603567 -0.959507071933107 -0.0,-6.16209814730525 -0.956969942177043 -0.0,-5.80564406008193 -0.959490213928084 -0.0,-5.45525885466714 -0.968079367487651 -0.0,-5.11195401136229 -0.983748883157167 -0.0,-4.77674101046882 -1.00751024123805 -0.0,-4.45063133228814 -1.04037492203173 -0.0,-4.13463645712167 -1.08335440583961 -0.0,-3.82976786527082 -1.13746017296313 -0.0,-3.53703703703704 -1.2037037037037 -0.0,-3.25745545272173 -1.28309647836275 -0.0,-2.99203459262631 -1.37664997724169 -0.0,-2.74178593705221 -1.48537568064195 -0.0,-2.50772096630085 -1.61028506886495 -0.0,-2.29085116067365 -1.75238962221211 -0.0,-2.09218800047203 -1.91270082098484 -0.0,-1.91270082098485 -2.09218800047202 -0.0,-1.75238962221211 -2.29085116067364 -0.0,-1.61028506886495 -2.50772096630085 -0.0,-1.48537568064195 -2.74178593705221 -0.0,-1.37664997724169 -2.99203459262631 -0.0,-1.28309647836275 -3.25745545272172 -0.0,-1.2037037037037 -3.53703703703703 -0.0,-1.13746017296313 -3.82976786527082 -0.0,-1.08335440583961 -4.13463645712166 -0.0,-1.04037492203173 -4.45063133228814 -0.0,-1.00751024123805 -4.77674101046882 -0.0,-0.983748883157167 -5.11195401136229 -0.0,-0.968079367487652 -5.45525885466714 -0.0,-0.959490213928084 -5.80564406008193 -0.0,-0.956969942177043 -6.16209814730525 -0.0,-0.959507071933108 -6.52360963603567 -0.0,-0.966090122894857 -6.88916704597178 -0.0,-0.975707614760869 -7.25775889681216 -0.0,-0.987348067229724 -7.62837370825537 -0.0,-1 -8 -0.0)", ) # OGRFeature(entities):38 @@ -1802,20 +1802,20 @@ def test_ogr_dxf_31(): # OGRFeature(entities):49 # EntityHandle (String) = 236 - # LINESTRING (2 -2,2.15384615384615 -2.15384615384615,2.30769230769231 -2.30769230769231,2.46153846153846 -2.46153846153846,2.61538461538461 -2.61538461538461,2.76923076923077 -2.76923076923077,2.92307692307692 -2.92307692307692,3.07692307692308 -3.07692307692308,3.23076923076923 -3.23076923076923,3.38461538461538 -3.38461538461538,3.53846153846154 -3.53846153846154,3.69230769230769 -3.69230769230769,3.84615384615385 -3.84615384615385,4 -4,4.15384615384615 -4.15384615384615,4.30769230769231 -4.30769230769231,4.46153846153846 -4.46153846153846,4.61538461538462 -4.61538461538462,4.76923076923077 -4.76923076923077,4.92307692307692 -4.92307692307692,5.07692307692308 -5.07692307692308,5.23076923076923 -5.23076923076923,5.38461538461538 -5.38461538461538,5.53846153846154 -5.53846153846154,5.69230769230769 -5.69230769230769,5.84615384615385 -5.84615384615385,6.0 -6.0,6.15384615384615 -6.15384615384615,6.30769230769231 -6.30769230769231,6.46153846153846 -6.46153846153846,6.61538461538462 -6.61538461538462,6.76923076923077 -6.76923076923077,6.92307692307692 -6.92307692307692,7.07692307692308 -7.07692307692308,7.23076923076923 -7.23076923076923,7.38461538461539 -7.38461538461539,7.53846153846154 -7.53846153846154,7.69230769230769 -7.69230769230769,7.84615384615385 -7.84615384615385,8 -8) + # LINESTRING Z (2 -2 -0.0,2.15384615384615 -2.15384615384615 -0.0,2.30769230769231 -2.30769230769231 -0.0,2.46153846153846 -2.46153846153846 -0.0,2.61538461538461 -2.61538461538461 -0.0,2.76923076923077 -2.76923076923077 -0.0,2.92307692307692 -2.92307692307692 -0.0,3.07692307692308 -3.07692307692308 -0.0,3.23076923076923 -3.23076923076923 -0.0,3.38461538461538 -3.38461538461538 -0.0,3.53846153846154 -3.53846153846154 -0.0,3.69230769230769 -3.69230769230769 -0.0,3.84615384615385 -3.84615384615385 -0.0,4 -4 -0.0,4.15384615384615 -4.15384615384615 -0.0,4.30769230769231 -4.30769230769231 -0.0,4.46153846153846 -4.46153846153846 -0.0,4.61538461538462 -4.61538461538462 -0.0,4.76923076923077 -4.76923076923077 -0.0,4.92307692307692 -4.92307692307692 -0.0,5.07692307692308 -5.07692307692308 -0.0,5.23076923076923 -5.23076923076923 -0.0,5.38461538461538 -5.38461538461538 -0.0,5.53846153846154 -5.53846153846154 -0.0,5.69230769230769 -5.69230769230769 -0.0,5.84615384615385 -5.84615384615385 -0.0,6.0 -6 -0.0,6.15384615384615 -6.15384615384615 -0.0,6.30769230769231 -6.30769230769231 -0.0,6.46153846153846 -6.46153846153846 -0.0,6.61538461538462 -6.61538461538462 -0.0,6.76923076923077 -6.76923076923077 -0.0,6.92307692307692 -6.92307692307692 -0.0,7.07692307692308 -7.07692307692308 -0.0,7.23076923076923 -7.23076923076923 -0.0,7.38461538461539 -7.38461538461539 -0.0,7.53846153846154 -7.53846153846154 -0.0,7.69230769230769 -7.69230769230769 -0.0,7.84615384615385 -7.84615384615385 -0.0,8 -8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 -2,2.15384615384615 -2.15384615384615,2.30769230769231 -2.30769230769231,2.46153846153846 -2.46153846153846,2.61538461538461 -2.61538461538461,2.76923076923077 -2.76923076923077,2.92307692307692 -2.92307692307692,3.07692307692308 -3.07692307692308,3.23076923076923 -3.23076923076923,3.38461538461538 -3.38461538461538,3.53846153846154 -3.53846153846154,3.69230769230769 -3.69230769230769,3.84615384615385 -3.84615384615385,4 -4,4.15384615384615 -4.15384615384615,4.30769230769231 -4.30769230769231,4.46153846153846 -4.46153846153846,4.61538461538462 -4.61538461538462,4.76923076923077 -4.76923076923077,4.92307692307692 -4.92307692307692,5.07692307692308 -5.07692307692308,5.23076923076923 -5.23076923076923,5.38461538461538 -5.38461538461538,5.53846153846154 -5.53846153846154,5.69230769230769 -5.69230769230769,5.84615384615385 -5.84615384615385,6.0 -6.0,6.15384615384615 -6.15384615384615,6.30769230769231 -6.30769230769231,6.46153846153846 -6.46153846153846,6.61538461538462 -6.61538461538462,6.76923076923077 -6.76923076923077,6.92307692307692 -6.92307692307692,7.07692307692308 -7.07692307692308,7.23076923076923 -7.23076923076923,7.38461538461539 -7.38461538461539,7.53846153846154 -7.53846153846154,7.69230769230769 -7.69230769230769,7.84615384615385 -7.84615384615385,8 -8)", + "LINESTRING Z (2 -2 -0.0,2.15384615384615 -2.15384615384615 -0.0,2.30769230769231 -2.30769230769231 -0.0,2.46153846153846 -2.46153846153846 -0.0,2.61538461538461 -2.61538461538461 -0.0,2.76923076923077 -2.76923076923077 -0.0,2.92307692307692 -2.92307692307692 -0.0,3.07692307692308 -3.07692307692308 -0.0,3.23076923076923 -3.23076923076923 -0.0,3.38461538461538 -3.38461538461538 -0.0,3.53846153846154 -3.53846153846154 -0.0,3.69230769230769 -3.69230769230769 -0.0,3.84615384615385 -3.84615384615385 -0.0,4 -4 -0.0,4.15384615384615 -4.15384615384615 -0.0,4.30769230769231 -4.30769230769231 -0.0,4.46153846153846 -4.46153846153846 -0.0,4.61538461538462 -4.61538461538462 -0.0,4.76923076923077 -4.76923076923077 -0.0,4.92307692307692 -4.92307692307692 -0.0,5.07692307692308 -5.07692307692308 -0.0,5.23076923076923 -5.23076923076923 -0.0,5.38461538461538 -5.38461538461538 -0.0,5.53846153846154 -5.53846153846154 -0.0,5.69230769230769 -5.69230769230769 -0.0,5.84615384615385 -5.84615384615385 -0.0,6.0 -6 -0.0,6.15384615384615 -6.15384615384615 -0.0,6.30769230769231 -6.30769230769231 -0.0,6.46153846153846 -6.46153846153846 -0.0,6.61538461538462 -6.61538461538462 -0.0,6.76923076923077 -6.76923076923077 -0.0,6.92307692307692 -6.92307692307692 -0.0,7.07692307692308 -7.07692307692308 -0.0,7.23076923076923 -7.23076923076923 -0.0,7.38461538461539 -7.38461538461539 -0.0,7.53846153846154 -7.53846153846154 -0.0,7.69230769230769 -7.69230769230769 -0.0,7.84615384615385 -7.84615384615385 -0.0,8 -8 -0.0)", ) # OGRFeature(entities):50 # EntityHandle (String) = 237 - # LINESTRING (8 -1,7.62837370825536 -0.987348067229724,7.25775889681215 -0.975707614760869,6.88916704597178 -0.966090122894857,6.52360963603567 -0.959507071933107,6.16209814730525 -0.956969942177043,5.80564406008193 -0.959490213928084,5.45525885466714 -0.968079367487651,5.11195401136229 -0.983748883157167,4.77674101046882 -1.00751024123805,4.45063133228814 -1.04037492203173,4.13463645712167 -1.08335440583961,3.82976786527082 -1.13746017296313,3.53703703703704 -1.2037037037037,3.25745545272173 -1.28309647836275,2.99203459262631 -1.37664997724169,2.74178593705221 -1.48537568064195,2.50772096630085 -1.61028506886495,2.29085116067365 -1.75238962221211,2.09218800047203 -1.91270082098484,1.91270082098485 -2.09218800047202,1.75238962221211 -2.29085116067364,1.61028506886495 -2.50772096630085,1.48537568064195 -2.74178593705221,1.37664997724169 -2.99203459262631,1.28309647836275 -3.25745545272172,1.2037037037037 -3.53703703703703,1.13746017296313 -3.82976786527082,1.08335440583961 -4.13463645712166,1.04037492203173 -4.45063133228814,1.00751024123805 -4.77674101046882,0.983748883157167 -5.11195401136229,0.968079367487652 -5.45525885466714,0.959490213928084 -5.80564406008193,0.956969942177043 -6.16209814730525,0.959507071933108 -6.52360963603567,0.966090122894857 -6.88916704597178,0.975707614760869 -7.25775889681216,0.987348067229724 -7.62837370825537,1 -8) + # LINESTRING Z (8 -1 -0.0,7.62837370825536 -0.987348067229724 -0.0,7.25775889681215 -0.975707614760869 -0.0,6.88916704597178 -0.966090122894857 -0.0,6.52360963603567 -0.959507071933107 -0.0,6.16209814730525 -0.956969942177043 -0.0,5.80564406008193 -0.959490213928084 -0.0,5.45525885466714 -0.968079367487651 -0.0,5.11195401136229 -0.983748883157167 -0.0,4.77674101046882 -1.00751024123805 -0.0,4.45063133228814 -1.04037492203173 -0.0,4.13463645712167 -1.08335440583961 -0.0,3.82976786527082 -1.13746017296313 -0.0,3.53703703703704 -1.2037037037037 -0.0,3.25745545272173 -1.28309647836275 -0.0,2.99203459262631 -1.37664997724169 -0.0,2.74178593705221 -1.48537568064195 -0.0,2.50772096630085 -1.61028506886495 -0.0,2.29085116067365 -1.75238962221211 -0.0,2.09218800047203 -1.91270082098484 -0.0,1.91270082098485 -2.09218800047202 -0.0,1.75238962221211 -2.29085116067364 -0.0,1.61028506886495 -2.50772096630085 -0.0,1.48537568064195 -2.74178593705221 -0.0,1.37664997724169 -2.99203459262631 -0.0,1.28309647836275 -3.25745545272172 -0.0,1.2037037037037 -3.53703703703703 -0.0,1.13746017296313 -3.82976786527082 -0.0,1.08335440583961 -4.13463645712166 -0.0,1.04037492203173 -4.45063133228814 -0.0,1.00751024123805 -4.77674101046882 -0.0,0.983748883157167 -5.11195401136229 -0.0,0.968079367487652 -5.45525885466714 -0.0,0.959490213928084 -5.80564406008193 -0.0,0.956969942177043 -6.16209814730525 -0.0,0.959507071933108 -6.52360963603567 -0.0,0.966090122894857 -6.88916704597178 -0.0,0.975707614760869 -7.25775889681216 -0.0,0.987348067229724 -7.62837370825537 -0.0,1 -8 -0.0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (8 -1,7.62837370825536 -0.987348067229724,7.25775889681215 -0.975707614760869,6.88916704597178 -0.966090122894857,6.52360963603567 -0.959507071933107,6.16209814730525 -0.956969942177043,5.80564406008193 -0.959490213928084,5.45525885466714 -0.968079367487651,5.11195401136229 -0.983748883157167,4.77674101046882 -1.00751024123805,4.45063133228814 -1.04037492203173,4.13463645712167 -1.08335440583961,3.82976786527082 -1.13746017296313,3.53703703703704 -1.2037037037037,3.25745545272173 -1.28309647836275,2.99203459262631 -1.37664997724169,2.74178593705221 -1.48537568064195,2.50772096630085 -1.61028506886495,2.29085116067365 -1.75238962221211,2.09218800047203 -1.91270082098484,1.91270082098485 -2.09218800047202,1.75238962221211 -2.29085116067364,1.61028506886495 -2.50772096630085,1.48537568064195 -2.74178593705221,1.37664997724169 -2.99203459262631,1.28309647836275 -3.25745545272172,1.2037037037037 -3.53703703703703,1.13746017296313 -3.82976786527082,1.08335440583961 -4.13463645712166,1.04037492203173 -4.45063133228814,1.00751024123805 -4.77674101046882,0.983748883157167 -5.11195401136229,0.968079367487652 -5.45525885466714,0.959490213928084 -5.80564406008193,0.956969942177043 -6.16209814730525,0.959507071933108 -6.52360963603567,0.966090122894857 -6.88916704597178,0.975707614760869 -7.25775889681216,0.987348067229724 -7.62837370825537,1 -8)", + "LINESTRING Z (8 -1 -0.0,7.62837370825536 -0.987348067229724 -0.0,7.25775889681215 -0.975707614760869 -0.0,6.88916704597178 -0.966090122894857 -0.0,6.52360963603567 -0.959507071933107 -0.0,6.16209814730525 -0.956969942177043 -0.0,5.80564406008193 -0.959490213928084 -0.0,5.45525885466714 -0.968079367487651 -0.0,5.11195401136229 -0.983748883157167 -0.0,4.77674101046882 -1.00751024123805 -0.0,4.45063133228814 -1.04037492203173 -0.0,4.13463645712167 -1.08335440583961 -0.0,3.82976786527082 -1.13746017296313 -0.0,3.53703703703704 -1.2037037037037 -0.0,3.25745545272173 -1.28309647836275 -0.0,2.99203459262631 -1.37664997724169 -0.0,2.74178593705221 -1.48537568064195 -0.0,2.50772096630085 -1.61028506886495 -0.0,2.29085116067365 -1.75238962221211 -0.0,2.09218800047203 -1.91270082098484 -0.0,1.91270082098485 -2.09218800047202 -0.0,1.75238962221211 -2.29085116067364 -0.0,1.61028506886495 -2.50772096630085 -0.0,1.48537568064195 -2.74178593705221 -0.0,1.37664997724169 -2.99203459262631 -0.0,1.28309647836275 -3.25745545272172 -0.0,1.2037037037037 -3.53703703703703 -0.0,1.13746017296313 -3.82976786527082 -0.0,1.08335440583961 -4.13463645712166 -0.0,1.04037492203173 -4.45063133228814 -0.0,1.00751024123805 -4.77674101046882 -0.0,0.983748883157167 -5.11195401136229 -0.0,0.968079367487652 -5.45525885466714 -0.0,0.959490213928084 -5.80564406008193 -0.0,0.956969942177043 -6.16209814730525 -0.0,0.959507071933108 -6.52360963603567 -0.0,0.966090122894857 -6.88916704597178 -0.0,0.975707614760869 -7.25775889681216 -0.0,0.987348067229724 -7.62837370825537 -0.0,1 -8 -0.0)", ) # OGRFeature(entities):51 @@ -1940,20 +1940,20 @@ def test_ogr_dxf_32(): # OGRFeature(entities):14 # EntityHandle (String) = 1C6 - # LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8) + # LINESTRING Z (2 2 0,2.15384615384615 2.15384615384615 0,2.30769230769231 2.30769230769231 0,2.46153846153846 2.46153846153846 0,2.61538461538461 2.61538461538461 0,2.76923076923077 2.76923076923077 0,2.92307692307692 2.92307692307692 0,3.07692307692308 3.07692307692308 0,3.23076923076923 3.23076923076923 0,3.38461538461538 3.38461538461538 0,3.53846153846154 3.53846153846154 0,3.69230769230769 3.69230769230769 0,3.84615384615385 3.84615384615385 0,4 4 0,4.15384615384615 4.15384615384615 0,4.30769230769231 4.30769230769231 0,4.46153846153846 4.46153846153846 0,4.61538461538462 4.61538461538462 0,4.76923076923077 4.76923076923077 0,4.92307692307692 4.92307692307692 0,5.07692307692308 5.07692307692308 0,5.23076923076923 5.23076923076923 0,5.38461538461538 5.38461538461538 0,5.53846153846154 5.53846153846154 0,5.69230769230769 5.69230769230769 0,5.84615384615385 5.84615384615385 0,6.0 6.0 0,6.15384615384615 6.15384615384615 0,6.30769230769231 6.30769230769231 0,6.46153846153846 6.46153846153846 0,6.61538461538462 6.61538461538462 0,6.76923076923077 6.76923076923077 0,6.92307692307692 6.92307692307692 0,7.07692307692308 7.07692307692308 0,7.23076923076923 7.23076923076923 0,7.38461538461539 7.38461538461539 0,7.53846153846154 7.53846153846154 0,7.69230769230769 7.69230769230769 0,7.84615384615385 7.84615384615385 0,8 8 0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2 2,2.15384615384615 2.15384615384615,2.30769230769231 2.30769230769231,2.46153846153846 2.46153846153846,2.61538461538461 2.61538461538461,2.76923076923077 2.76923076923077,2.92307692307692 2.92307692307692,3.07692307692308 3.07692307692308,3.23076923076923 3.23076923076923,3.38461538461538 3.38461538461538,3.53846153846154 3.53846153846154,3.69230769230769 3.69230769230769,3.84615384615385 3.84615384615385,4 4,4.15384615384615 4.15384615384615,4.30769230769231 4.30769230769231,4.46153846153846 4.46153846153846,4.61538461538462 4.61538461538462,4.76923076923077 4.76923076923077,4.92307692307692 4.92307692307692,5.07692307692308 5.07692307692308,5.23076923076923 5.23076923076923,5.38461538461538 5.38461538461538,5.53846153846154 5.53846153846154,5.69230769230769 5.69230769230769,5.84615384615385 5.84615384615385,6.0 6.0,6.15384615384615 6.15384615384615,6.30769230769231 6.30769230769231,6.46153846153846 6.46153846153846,6.61538461538462 6.61538461538462,6.76923076923077 6.76923076923077,6.92307692307692 6.92307692307692,7.07692307692308 7.07692307692308,7.23076923076923 7.23076923076923,7.38461538461539 7.38461538461539,7.53846153846154 7.53846153846154,7.69230769230769 7.69230769230769,7.84615384615385 7.84615384615385,8 8)", + "LINESTRING Z (2 2 0,2.15384615384615 2.15384615384615 0,2.30769230769231 2.30769230769231 0,2.46153846153846 2.46153846153846 0,2.61538461538461 2.61538461538461 0,2.76923076923077 2.76923076923077 0,2.92307692307692 2.92307692307692 0,3.07692307692308 3.07692307692308 0,3.23076923076923 3.23076923076923 0,3.38461538461538 3.38461538461538 0,3.53846153846154 3.53846153846154 0,3.69230769230769 3.69230769230769 0,3.84615384615385 3.84615384615385 0,4 4 0,4.15384615384615 4.15384615384615 0,4.30769230769231 4.30769230769231 0,4.46153846153846 4.46153846153846 0,4.61538461538462 4.61538461538462 0,4.76923076923077 4.76923076923077 0,4.92307692307692 4.92307692307692 0,5.07692307692308 5.07692307692308 0,5.23076923076923 5.23076923076923 0,5.38461538461538 5.38461538461538 0,5.53846153846154 5.53846153846154 0,5.69230769230769 5.69230769230769 0,5.84615384615385 5.84615384615385 0,6.0 6.0 0,6.15384615384615 6.15384615384615 0,6.30769230769231 6.30769230769231 0,6.46153846153846 6.46153846153846 0,6.61538461538462 6.61538461538462 0,6.76923076923077 6.76923076923077 0,6.92307692307692 6.92307692307692 0,7.07692307692308 7.07692307692308 0,7.23076923076923 7.23076923076923 0,7.38461538461539 7.38461538461539 0,7.53846153846154 7.53846153846154 0,7.69230769230769 7.69230769230769 0,7.84615384615385 7.84615384615385 0,8 8 0)", ) # OGRFeature(entities):15 # EntityHandle (String) = 1C7 - # LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8) + # LINESTRING Z (8 1 0,7.62837370825536 0.987348067229724 0,7.25775889681215 0.975707614760869 0,6.88916704597178 0.966090122894857 0,6.52360963603567 0.959507071933107 0,6.16209814730525 0.956969942177043 0,5.80564406008193 0.959490213928084 0,5.45525885466714 0.968079367487651 0,5.11195401136229 0.983748883157167 0,4.77674101046882 1.00751024123805 0,4.45063133228814 1.04037492203173 0,4.13463645712167 1.08335440583961 0,3.82976786527082 1.13746017296313 0,3.53703703703704 1.2037037037037 0,3.25745545272173 1.28309647836275 0,2.99203459262631 1.37664997724169 0,2.74178593705221 1.48537568064195 0,2.50772096630085 1.61028506886495 0,2.29085116067365 1.75238962221211 0,2.09218800047203 1.91270082098484 0,1.91270082098485 2.09218800047202 0,1.75238962221211 2.29085116067364 0,1.61028506886495 2.50772096630085 0,1.48537568064195 2.74178593705221 0,1.37664997724169 2.99203459262631 0,1.28309647836275 3.25745545272172 0,1.2037037037037 3.53703703703703 0,1.13746017296313 3.82976786527082 0,1.08335440583961 4.13463645712166 0,1.04037492203173 4.45063133228814 0,1.00751024123805 4.77674101046882 0,0.983748883157167 5.11195401136229 0,0.968079367487652 5.45525885466714 0,0.959490213928084 5.80564406008193 0,0.956969942177043 6.16209814730525 0,0.959507071933108 6.52360963603567 0,0.966090122894857 6.88916704597178 0,0.975707614760869 7.25775889681216 0,0.987348067229724 7.62837370825537 0,1 8 0) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (8 1,7.62837370825536 0.987348067229724,7.25775889681215 0.975707614760869,6.88916704597178 0.966090122894857,6.52360963603567 0.959507071933107,6.16209814730525 0.956969942177043,5.80564406008193 0.959490213928084,5.45525885466714 0.968079367487651,5.11195401136229 0.983748883157167,4.77674101046882 1.00751024123805,4.45063133228814 1.04037492203173,4.13463645712167 1.08335440583961,3.82976786527082 1.13746017296313,3.53703703703704 1.2037037037037,3.25745545272173 1.28309647836275,2.99203459262631 1.37664997724169,2.74178593705221 1.48537568064195,2.50772096630085 1.61028506886495,2.29085116067365 1.75238962221211,2.09218800047203 1.91270082098484,1.91270082098485 2.09218800047202,1.75238962221211 2.29085116067364,1.61028506886495 2.50772096630085,1.48537568064195 2.74178593705221,1.37664997724169 2.99203459262631,1.28309647836275 3.25745545272172,1.2037037037037 3.53703703703703,1.13746017296313 3.82976786527082,1.08335440583961 4.13463645712166,1.04037492203173 4.45063133228814,1.00751024123805 4.77674101046882,0.983748883157167 5.11195401136229,0.968079367487652 5.45525885466714,0.959490213928084 5.80564406008193,0.956969942177043 6.16209814730525,0.959507071933108 6.52360963603567,0.966090122894857 6.88916704597178,0.975707614760869 7.25775889681216,0.987348067229724 7.62837370825537,1 8)", + "LINESTRING Z (8 1 0,7.62837370825536 0.987348067229724 0,7.25775889681215 0.975707614760869 0,6.88916704597178 0.966090122894857 0,6.52360963603567 0.959507071933107 0,6.16209814730525 0.956969942177043 0,5.80564406008193 0.959490213928084 0,5.45525885466714 0.968079367487651 0,5.11195401136229 0.983748883157167 0,4.77674101046882 1.00751024123805 0,4.45063133228814 1.04037492203173 0,4.13463645712167 1.08335440583961 0,3.82976786527082 1.13746017296313 0,3.53703703703704 1.2037037037037 0,3.25745545272173 1.28309647836275 0,2.99203459262631 1.37664997724169 0,2.74178593705221 1.48537568064195 0,2.50772096630085 1.61028506886495 0,2.29085116067365 1.75238962221211 0,2.09218800047203 1.91270082098484 0,1.91270082098485 2.09218800047202 0,1.75238962221211 2.29085116067364 0,1.61028506886495 2.50772096630085 0,1.48537568064195 2.74178593705221 0,1.37664997724169 2.99203459262631 0,1.28309647836275 3.25745545272172 0,1.2037037037037 3.53703703703703 0,1.13746017296313 3.82976786527082 0,1.08335440583961 4.13463645712166 0,1.04037492203173 4.45063133228814 0,1.00751024123805 4.77674101046882 0,0.983748883157167 5.11195401136229 0,0.968079367487652 5.45525885466714 0,0.959490213928084 5.80564406008193 0,0.956969942177043 6.16209814730525 0,0.959507071933108 6.52360963603567 0,0.966090122894857 6.88916704597178 0,0.975707614760869 7.25775889681216 0,0.987348067229724 7.62837370825537 0,1 8 0)", ) # OGRFeature(entities):16 @@ -2086,20 +2086,20 @@ def test_ogr_dxf_32(): # OGRFeature(entities):31 # EntityHandle (String) = 1DC - # LINESTRING (-1.0 2.0,-1.07692307692308 2.15384615384615,-1.15384615384615 2.30769230769231,-1.23076923076923 2.46153846153846,-1.30769230769231 2.61538461538461,-1.38461538461538 2.76923076923077,-1.46153846153846 2.92307692307692,-1.53846153846154 3.07692307692308,-1.61538461538461 3.23076923076923,-1.69230769230769 3.38461538461538,-1.76923076923077 3.53846153846154,-1.84615384615384 3.69230769230769,-1.92307692307692 3.84615384615385,-2.0 4.0,-2.07692307692307 4.15384615384615,-2.15384615384615 4.30769230769231,-2.23076923076923 4.46153846153846,-2.30769230769231 4.61538461538462,-2.38461538461538 4.76923076923077,-2.46153846153846 4.92307692307692,-2.53846153846154 5.07692307692308,-2.61538461538461 5.23076923076923,-2.69230769230769 5.38461538461538,-2.76923076923077 5.53846153846154,-2.84615384615384 5.69230769230769,-2.92307692307692 5.84615384615385,-3.0 6.0,-3.07692307692308 6.15384615384615,-3.15384615384615 6.30769230769231,-3.23076923076923 6.46153846153846,-3.30769230769231 6.61538461538462,-3.38461538461538 6.76923076923077,-3.46153846153846 6.92307692307692,-3.53846153846154 7.07692307692308,-3.61538461538461 7.23076923076923,-3.69230769230769 7.38461538461539,-3.76923076923077 7.53846153846154,-3.84615384615384 7.69230769230769,-3.92307692307692 7.84615384615385,-4.0 8.0) + # LINESTRING Z (-1.0 2.0 -1.73205080756888,-1.07692307692308 2.15384615384615 -1.86528548507418,-1.15384615384615 2.30769230769231 -1.99852016257947,-1.23076923076923 2.46153846153846 -2.13175484008477,-1.30769230769231 2.61538461538461 -2.26498951759007,-1.38461538461538 2.76923076923077 -2.39822419509537,-1.46153846153846 2.92307692307692 -2.53145887260067,-1.53846153846154 3.07692307692308 -2.66469355010597,-1.61538461538461 3.23076923076923 -2.79792822761126,-1.69230769230769 3.38461538461538 -2.93116290511656,-1.76923076923077 3.53846153846154 -3.06439758262186,-1.84615384615384 3.69230769230769 -3.19763226012716,-1.92307692307692 3.84615384615385 -3.33086693763246,-2 4.0 -3.46410161513776,-2.07692307692307 4.15384615384615 -3.59733629264305,-2.15384615384615 4.30769230769231 -3.73057097014835,-2.23076923076923 4.46153846153846 -3.86380564765365,-2.30769230769231 4.61538461538462 -3.99704032515895,-2.38461538461538 4.76923076923077 -4.13027500266425,-2.46153846153846 4.92307692307692 -4.26350968016954,-2.53846153846154 5.07692307692308 -4.39674435767484,-2.61538461538461 5.23076923076923 -4.52997903518014,-2.69230769230769 5.38461538461538 -4.66321371268544,-2.76923076923077 5.53846153846154 -4.79644839019074,-2.84615384615384 5.69230769230769 -4.92968306769604,-2.92307692307692 5.84615384615385 -5.06291774520133,-3 6.0 -5.19615242270663,-3.07692307692308 6.15384615384615 -5.32938710021193,-3.15384615384615 6.30769230769231 -5.46262177771723,-3.23076923076923 6.46153846153846 -5.59585645522253,-3.30769230769231 6.61538461538462 -5.72909113272783,-3.38461538461538 6.76923076923077 -5.86232581023313,-3.46153846153846 6.92307692307692 -5.99556048773842,-3.53846153846154 7.07692307692308 -6.12879516524372,-3.61538461538461 7.23076923076923 -6.26202984274902,-3.69230769230769 7.38461538461539 -6.39526452025432,-3.76923076923077 7.53846153846154 -6.52849919775962,-3.84615384615384 7.69230769230769 -6.66173387526491,-3.92307692307692 7.84615384615385 -6.79496855277021,-4 8.0 -6.92820323027551) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-1.0 2.0,-1.07692307692308 2.15384615384615,-1.15384615384615 2.30769230769231,-1.23076923076923 2.46153846153846,-1.30769230769231 2.61538461538461,-1.38461538461538 2.76923076923077,-1.46153846153846 2.92307692307692,-1.53846153846154 3.07692307692308,-1.61538461538461 3.23076923076923,-1.69230769230769 3.38461538461538,-1.76923076923077 3.53846153846154,-1.84615384615384 3.69230769230769,-1.92307692307692 3.84615384615385,-2.0 4.0,-2.07692307692307 4.15384615384615,-2.15384615384615 4.30769230769231,-2.23076923076923 4.46153846153846,-2.30769230769231 4.61538461538462,-2.38461538461538 4.76923076923077,-2.46153846153846 4.92307692307692,-2.53846153846154 5.07692307692308,-2.61538461538461 5.23076923076923,-2.69230769230769 5.38461538461538,-2.76923076923077 5.53846153846154,-2.84615384615384 5.69230769230769,-2.92307692307692 5.84615384615385,-3.0 6.0,-3.07692307692308 6.15384615384615,-3.15384615384615 6.30769230769231,-3.23076923076923 6.46153846153846,-3.30769230769231 6.61538461538462,-3.38461538461538 6.76923076923077,-3.46153846153846 6.92307692307692,-3.53846153846154 7.07692307692308,-3.61538461538461 7.23076923076923,-3.69230769230769 7.38461538461539,-3.76923076923077 7.53846153846154,-3.84615384615384 7.69230769230769,-3.92307692307692 7.84615384615385,-4.0 8.0)", + "LINESTRING Z (-1.0 2.0 -1.73205080756888,-1.07692307692308 2.15384615384615 -1.86528548507418,-1.15384615384615 2.30769230769231 -1.99852016257947,-1.23076923076923 2.46153846153846 -2.13175484008477,-1.30769230769231 2.61538461538461 -2.26498951759007,-1.38461538461538 2.76923076923077 -2.39822419509537,-1.46153846153846 2.92307692307692 -2.53145887260067,-1.53846153846154 3.07692307692308 -2.66469355010597,-1.61538461538461 3.23076923076923 -2.79792822761126,-1.69230769230769 3.38461538461538 -2.93116290511656,-1.76923076923077 3.53846153846154 -3.06439758262186,-1.84615384615384 3.69230769230769 -3.19763226012716,-1.92307692307692 3.84615384615385 -3.33086693763246,-2 4.0 -3.46410161513776,-2.07692307692307 4.15384615384615 -3.59733629264305,-2.15384615384615 4.30769230769231 -3.73057097014835,-2.23076923076923 4.46153846153846 -3.86380564765365,-2.30769230769231 4.61538461538462 -3.99704032515895,-2.38461538461538 4.76923076923077 -4.13027500266425,-2.46153846153846 4.92307692307692 -4.26350968016954,-2.53846153846154 5.07692307692308 -4.39674435767484,-2.61538461538461 5.23076923076923 -4.52997903518014,-2.69230769230769 5.38461538461538 -4.66321371268544,-2.76923076923077 5.53846153846154 -4.79644839019074,-2.84615384615384 5.69230769230769 -4.92968306769604,-2.92307692307692 5.84615384615385 -5.06291774520133,-3 6.0 -5.19615242270663,-3.07692307692308 6.15384615384615 -5.32938710021193,-3.15384615384615 6.30769230769231 -5.46262177771723,-3.23076923076923 6.46153846153846 -5.59585645522253,-3.30769230769231 6.61538461538462 -5.72909113272783,-3.38461538461538 6.76923076923077 -5.86232581023313,-3.46153846153846 6.92307692307692 -5.99556048773842,-3.53846153846154 7.07692307692308 -6.12879516524372,-3.61538461538461 7.23076923076923 -6.26202984274902,-3.69230769230769 7.38461538461539 -6.39526452025432,-3.76923076923077 7.53846153846154 -6.52849919775962,-3.84615384615384 7.69230769230769 -6.66173387526491,-3.92307692307692 7.84615384615385 -6.79496855277021,-4 8.0 -6.92820323027551)", ) # OGRFeature(entities):32 # EntityHandle (String) = 1DD - # LINESTRING (-4.0 1.0,-3.81418685412768 0.987348067229724,-3.62887944840607 0.975707614760869,-3.44458352298589 0.966090122894857,-3.26180481801783 0.959507071933107,-3.08104907365262 0.956969942177043,-2.90282203004096 0.959490213928084,-2.72762942733357 0.968079367487651,-2.55597700568115 0.983748883157167,-2.38837050523441 1.00751024123805,-2.22531566614407 1.04037492203173,-2.06731822856083 1.08335440583961,-1.91488393263541 1.13746017296313,-1.76851851851852 1.2037037037037,-1.62872772636086 1.28309647836275,-1.49601729631315 1.37664997724169,-1.3708929685261 1.48537568064195,-1.25386048315042 1.61028506886495,-1.14542558033682 1.75238962221211,-1.04609400023601 1.91270082098484,-0.956350410492422 2.09218800047202,-0.876194811106054 2.29085116067364,-0.805142534432475 2.50772096630085,-0.742687840320977 2.74178593705221,-0.688324988620847 2.99203459262631,-0.641548239181376 3.25745545272172,-0.601851851851852 3.53703703703703,-0.568730086481566 3.82976786527082,-0.541677202919806 4.13463645712166,-0.520187461015863 4.45063133228814,-0.503755120619026 4.77674101046882,-0.491874441578583 5.11195401136229,-0.484039683743826 5.45525885466714,-0.479745106964042 5.80564406008193,-0.478484971088521 6.16209814730525,-0.479753535966554 6.52360963603567,-0.483045061447428 6.88916704597178,-0.487853807380435 7.25775889681216,-0.493674033614862 7.62837370825537,-0.5 8.0) + # LINESTRING Z (-4 1.0 -6.92820323027551,-3.81418685412768 0.987348067229724 -6.60636542091045,-3.62887944840607 0.975707614760869 -6.28540357918185,-3.44458352298589 0.966090122894857 -5.96619367272616,-3.26180481801783 0.959507071933107 -5.64961166917985,-3.08104907365262 0.956969942177043 -5.33653353617937,-2.90282203004096 0.959490213928084 -5.02783524136118,-2.72762942733357 0.968079367487651 -4.72439275236174,-2.55597700568115 0.983748883157167 -4.42708203681751,-2.38837050523441 1.00751024123805 -4.13677906236495,-2.22531566614407 1.04037492203173 -3.85435979664051,-2.06731822856083 1.08335440583961 -3.58070020728065,-1.91488393263541 1.13746017296313 -3.31667626192183,-1.76851851851852 1.2037037037037 -3.06316392820052,-1.62872772636086 1.28309647836275 -2.82103917375315,-1.49601729631315 1.37664997724169 -2.59117796621621,-1.3708929685261 1.48537568064195 -2.37445627322614,-1.25386048315042 1.61028506886495 -2.1717500624194,-1.14542558033682 1.75238962221211 -1.98393530143245,-1.04609400023601 1.91270082098484 -1.81188795790174,-0.956350410492422 2.09218800047202 -1.65644750081223,-0.876194811106054 2.29085116067364 -1.5176139301639,-0.805142534432475 2.50772096630085 -1.39454777697182,-0.742687840320977 2.74178593705221 -1.28637307359953,-0.688324988620847 2.99203459262631 -1.19221385241058,-0.641548239181376 3.25745545272172 -1.11119414576849,-0.601851851851852 3.53703703703703 -1.04243798603683,-0.568730086481566 3.82976786527082 -0.985069405579114,-0.541677202919806 4.13463645712166 -0.938212436758902,-0.520187461015863 4.45063133228814 -0.90099111193973,-0.503755120619026 4.77674101046882 -0.872529463485141,-0.491874441578583 5.11195401136229 -0.851951523758677,-0.484039683743826 5.45525885466714 -0.838381325123878,-0.479745106964042 5.80564406008193 -0.830942899944286,-0.478484971088521 6.16209814730525 -0.828760280583445,-0.479753535966554 6.52360963603567 -0.830957499404894,-0.483045061447428 6.88916704597178 -0.836658588772177,-0.487853807380435 7.25775889681216 -0.844987581048834,-0.493674033614862 7.62837370825537 -0.855068508598407,-0.5 8.0 -0.866025403784439) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-4.0 1.0,-3.81418685412768 0.987348067229724,-3.62887944840607 0.975707614760869,-3.44458352298589 0.966090122894857,-3.26180481801783 0.959507071933107,-3.08104907365262 0.956969942177043,-2.90282203004096 0.959490213928084,-2.72762942733357 0.968079367487651,-2.55597700568115 0.983748883157167,-2.38837050523441 1.00751024123805,-2.22531566614407 1.04037492203173,-2.06731822856083 1.08335440583961,-1.91488393263541 1.13746017296313,-1.76851851851852 1.2037037037037,-1.62872772636086 1.28309647836275,-1.49601729631315 1.37664997724169,-1.3708929685261 1.48537568064195,-1.25386048315042 1.61028506886495,-1.14542558033682 1.75238962221211,-1.04609400023601 1.91270082098484,-0.956350410492422 2.09218800047202,-0.876194811106054 2.29085116067364,-0.805142534432475 2.50772096630085,-0.742687840320977 2.74178593705221,-0.688324988620847 2.99203459262631,-0.641548239181376 3.25745545272172,-0.601851851851852 3.53703703703703,-0.568730086481566 3.82976786527082,-0.541677202919806 4.13463645712166,-0.520187461015863 4.45063133228814,-0.503755120619026 4.77674101046882,-0.491874441578583 5.11195401136229,-0.484039683743826 5.45525885466714,-0.479745106964042 5.80564406008193,-0.478484971088521 6.16209814730525,-0.479753535966554 6.52360963603567,-0.483045061447428 6.88916704597178,-0.487853807380435 7.25775889681216,-0.493674033614862 7.62837370825537,-0.5 8.0)", + "LINESTRING Z (-4 1.0 -6.92820323027551,-3.81418685412768 0.987348067229724 -6.60636542091045,-3.62887944840607 0.975707614760869 -6.28540357918185,-3.44458352298589 0.966090122894857 -5.96619367272616,-3.26180481801783 0.959507071933107 -5.64961166917985,-3.08104907365262 0.956969942177043 -5.33653353617937,-2.90282203004096 0.959490213928084 -5.02783524136118,-2.72762942733357 0.968079367487651 -4.72439275236174,-2.55597700568115 0.983748883157167 -4.42708203681751,-2.38837050523441 1.00751024123805 -4.13677906236495,-2.22531566614407 1.04037492203173 -3.85435979664051,-2.06731822856083 1.08335440583961 -3.58070020728065,-1.91488393263541 1.13746017296313 -3.31667626192183,-1.76851851851852 1.2037037037037 -3.06316392820052,-1.62872772636086 1.28309647836275 -2.82103917375315,-1.49601729631315 1.37664997724169 -2.59117796621621,-1.3708929685261 1.48537568064195 -2.37445627322614,-1.25386048315042 1.61028506886495 -2.1717500624194,-1.14542558033682 1.75238962221211 -1.98393530143245,-1.04609400023601 1.91270082098484 -1.81188795790174,-0.956350410492422 2.09218800047202 -1.65644750081223,-0.876194811106054 2.29085116067364 -1.5176139301639,-0.805142534432475 2.50772096630085 -1.39454777697182,-0.742687840320977 2.74178593705221 -1.28637307359953,-0.688324988620847 2.99203459262631 -1.19221385241058,-0.641548239181376 3.25745545272172 -1.11119414576849,-0.601851851851852 3.53703703703703 -1.04243798603683,-0.568730086481566 3.82976786527082 -0.985069405579114,-0.541677202919806 4.13463645712166 -0.938212436758902,-0.520187461015863 4.45063133228814 -0.90099111193973,-0.503755120619026 4.77674101046882 -0.872529463485141,-0.491874441578583 5.11195401136229 -0.851951523758677,-0.484039683743826 5.45525885466714 -0.838381325123878,-0.479745106964042 5.80564406008193 -0.830942899944286,-0.478484971088521 6.16209814730525 -0.828760280583445,-0.479753535966554 6.52360963603567 -0.830957499404894,-0.483045061447428 6.88916704597178 -0.836658588772177,-0.487853807380435 7.25775889681216 -0.844987581048834,-0.493674033614862 7.62837370825537 -0.855068508598407,-0.5 8.0 -0.866025403784439)", ) # OGRFeature(entities):33 @@ -2232,20 +2232,20 @@ def test_ogr_dxf_32(): # OGRFeature(entities):48 # EntityHandle (String) = 1F2 - # LINESTRING (0.5 -1.0,0.53846153846154 -1.07692307692308,0.576923076923078 -1.15384615384615,0.615384615384617 -1.23076923076923,0.653846153846155 -1.30769230769231,0.692307692307694 -1.38461538461538,0.730769230769232 -1.46153846153846,0.769230769230771 -1.53846153846154,0.807692307692309 -1.61538461538462,0.846153846153848 -1.69230769230769,0.884615384615386 -1.76923076923077,0.923076923076924 -1.84615384615385,0.961538461538463 -1.92307692307692,1.0 -2.0,1.03846153846154 -2.07692307692308,1.07692307692308 -2.15384615384615,1.11538461538462 -2.23076923076923,1.15384615384616 -2.30769230769231,1.19230769230769 -2.38461538461538,1.23076923076923 -2.46153846153846,1.26923076923077 -2.53846153846154,1.30769230769231 -2.61538461538461,1.34615384615385 -2.69230769230769,1.38461538461539 -2.76923076923077,1.42307692307693 -2.84615384615385,1.46153846153846 -2.92307692307692,1.5 -3.0,1.53846153846154 -3.07692307692308,1.57692307692308 -3.15384615384615,1.61538461538462 -3.23076923076923,1.65384615384616 -3.30769230769231,1.6923076923077 -3.38461538461539,1.73076923076923 -3.46153846153846,1.76923076923077 -3.53846153846154,1.80769230769231 -3.61538461538461,1.84615384615385 -3.69230769230769,1.88461538461539 -3.76923076923077,1.92307692307693 -3.84615384615385,1.96153846153847 -3.92307692307692,2.0 -4.0) + # LINESTRING Z (0.5 -1.0 -2.59807621135332,0.53846153846154 -1.07692307692308 -2.79792822761126,0.576923076923078 -1.15384615384615 -2.99778024386921,0.615384615384617 -1.23076923076923 -3.19763226012716,0.653846153846155 -1.30769230769231 -3.3974842763851,0.692307692307694 -1.38461538461538 -3.59733629264305,0.730769230769232 -1.46153846153846 -3.797188308901,0.769230769230771 -1.53846153846154 -3.99704032515895,0.807692307692309 -1.61538461538462 -4.19689234141689,0.846153846153848 -1.69230769230769 -4.39674435767484,0.884615384615386 -1.76923076923077 -4.59659637393279,0.923076923076924 -1.84615384615385 -4.79644839019073,0.961538461538463 -1.92307692307692 -4.99630040644868,1.0 -2 -5.19615242270663,1.03846153846154 -2.07692307692308 -5.39600443896458,1.07692307692308 -2.15384615384615 -5.59585645522253,1.11538461538462 -2.23076923076923 -5.79570847148047,1.15384615384616 -2.30769230769231 -5.99556048773842,1.19230769230769 -2.38461538461538 -6.19541250399637,1.23076923076923 -2.46153846153846 -6.39526452025432,1.26923076923077 -2.53846153846154 -6.59511653651226,1.30769230769231 -2.61538461538461 -6.79496855277021,1.34615384615385 -2.69230769230769 -6.99482056902816,1.38461538461539 -2.76923076923077 -7.19467258528611,1.42307692307693 -2.84615384615385 -7.39452460154405,1.46153846153846 -2.92307692307692 -7.594376617802,1.5 -3 -7.79422863405995,1.53846153846154 -3.07692307692308 -7.99408065031789,1.57692307692308 -3.15384615384615 -8.19393266657584,1.61538461538462 -3.23076923076923 -8.39378468283379,1.65384615384616 -3.30769230769231 -8.59363669909174,1.6923076923077 -3.38461538461539 -8.79348871534969,1.73076923076923 -3.46153846153846 -8.99334073160763,1.76923076923077 -3.53846153846154 -9.19319274786558,1.80769230769231 -3.61538461538461 -9.39304476412353,1.84615384615385 -3.69230769230769 -9.59289678038147,1.88461538461539 -3.76923076923077 -9.79274879663942,1.92307692307693 -3.84615384615385 -9.99260081289737,1.96153846153847 -3.92307692307692 -10.1924528291553,2.0 -4 -10.3923048454133) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (0.5 -1.0,0.53846153846154 -1.07692307692308,0.576923076923078 -1.15384615384615,0.615384615384617 -1.23076923076923,0.653846153846155 -1.30769230769231,0.692307692307694 -1.38461538461538,0.730769230769232 -1.46153846153846,0.769230769230771 -1.53846153846154,0.807692307692309 -1.61538461538462,0.846153846153848 -1.69230769230769,0.884615384615386 -1.76923076923077,0.923076923076924 -1.84615384615385,0.961538461538463 -1.92307692307692,1.0 -2.0,1.03846153846154 -2.07692307692308,1.07692307692308 -2.15384615384615,1.11538461538462 -2.23076923076923,1.15384615384616 -2.30769230769231,1.19230769230769 -2.38461538461538,1.23076923076923 -2.46153846153846,1.26923076923077 -2.53846153846154,1.30769230769231 -2.61538461538461,1.34615384615385 -2.69230769230769,1.38461538461539 -2.76923076923077,1.42307692307693 -2.84615384615385,1.46153846153846 -2.92307692307692,1.5 -3.0,1.53846153846154 -3.07692307692308,1.57692307692308 -3.15384615384615,1.61538461538462 -3.23076923076923,1.65384615384616 -3.30769230769231,1.6923076923077 -3.38461538461539,1.73076923076923 -3.46153846153846,1.76923076923077 -3.53846153846154,1.80769230769231 -3.61538461538461,1.84615384615385 -3.69230769230769,1.88461538461539 -3.76923076923077,1.92307692307693 -3.84615384615385,1.96153846153847 -3.92307692307692,2.0 -4.0)", + "LINESTRING Z (0.5 -1.0 -2.59807621135332,0.53846153846154 -1.07692307692308 -2.79792822761126,0.576923076923078 -1.15384615384615 -2.99778024386921,0.615384615384617 -1.23076923076923 -3.19763226012716,0.653846153846155 -1.30769230769231 -3.3974842763851,0.692307692307694 -1.38461538461538 -3.59733629264305,0.730769230769232 -1.46153846153846 -3.797188308901,0.769230769230771 -1.53846153846154 -3.99704032515895,0.807692307692309 -1.61538461538462 -4.19689234141689,0.846153846153848 -1.69230769230769 -4.39674435767484,0.884615384615386 -1.76923076923077 -4.59659637393279,0.923076923076924 -1.84615384615385 -4.79644839019073,0.961538461538463 -1.92307692307692 -4.99630040644868,1.0 -2 -5.19615242270663,1.03846153846154 -2.07692307692308 -5.39600443896458,1.07692307692308 -2.15384615384615 -5.59585645522253,1.11538461538462 -2.23076923076923 -5.79570847148047,1.15384615384616 -2.30769230769231 -5.99556048773842,1.19230769230769 -2.38461538461538 -6.19541250399637,1.23076923076923 -2.46153846153846 -6.39526452025432,1.26923076923077 -2.53846153846154 -6.59511653651226,1.30769230769231 -2.61538461538461 -6.79496855277021,1.34615384615385 -2.69230769230769 -6.99482056902816,1.38461538461539 -2.76923076923077 -7.19467258528611,1.42307692307693 -2.84615384615385 -7.39452460154405,1.46153846153846 -2.92307692307692 -7.594376617802,1.5 -3 -7.79422863405995,1.53846153846154 -3.07692307692308 -7.99408065031789,1.57692307692308 -3.15384615384615 -8.19393266657584,1.61538461538462 -3.23076923076923 -8.39378468283379,1.65384615384616 -3.30769230769231 -8.59363669909174,1.6923076923077 -3.38461538461539 -8.79348871534969,1.73076923076923 -3.46153846153846 -8.99334073160763,1.76923076923077 -3.53846153846154 -9.19319274786558,1.80769230769231 -3.61538461538461 -9.39304476412353,1.84615384615385 -3.69230769230769 -9.59289678038147,1.88461538461539 -3.76923076923077 -9.79274879663942,1.92307692307693 -3.84615384615385 -9.99260081289737,1.96153846153847 -3.92307692307692 -10.1924528291553,2.0 -4 -10.3923048454133)", ) # OGRFeature(entities):49 # EntityHandle (String) = 1F3 - # LINESTRING (-3.25 -0.5,-3.07367580370539 -0.493674033614862,-2.89709873733542 -0.487853807380434,-2.72001593081474 -0.483045061447428,-2.542174514068 -0.479753535966554,-2.36332161701984 -0.478484971088521,-2.1832043695949 -0.479745106964042,-2.00156990171783 -0.484039683743825,-1.81816534331327 -0.491874441578583,-1.63273782430587 -0.503755120619026,-1.44503447462027 -0.520187461015863,-1.25480242418112 -0.541677202919806,-1.06178880291306 -0.568730086481565,-0.865740740740739 -0.601851851851852,-0.666405367588798 -0.641548239181375,-0.463529813381883 -0.688324988620846,-0.256861208044639 -0.742687840320976,-0.04614668150171 -0.805142534432475,0.168866636322258 -0.876194811106053,0.388431615502622 -0.956350410492422,0.612790589861596 -1.04609400023601,0.841943559399181 -1.14542558033682,1.07564819029316 -1.25386048315042,1.31365161246818 -1.3708929685261,1.55570095584888 -1.49601729631315,1.80154335035992 -1.62872772636086,2.05092592592592 -1.76851851851852,2.30359581247155 -1.91488393263541,2.55930013992144 -2.06731822856083,2.81778603820024 -2.22531566614407,3.07880063723259 -2.38837050523441,3.34209106694314 -2.55597700568115,3.60740445725653 -2.72762942733357,3.87448793809741 -2.90282203004097,4.14308863939042 -3.08104907365262,4.4129536910602 -3.26180481801784,4.68383022303141 -3.44458352298589,4.95546536522868 -3.62887944840608,5.22760624757667 -3.81418685412768,5.5 -4.0) + # LINESTRING Z (-3.25 -0.5 -7.36121593216773,-3.07367580370539 -0.493674033614862 -7.03389967520965,-2.89709873733542 -0.487853807380434 -6.70789736970626,-2.72001593081474 -0.483045061447428 -6.38452296711225,-2.542174514068 -0.479753535966554 -6.06509041888229,-2.36332161701984 -0.478484971088521 -5.75091367647109,-2.1832043695949 -0.479745106964042 -5.44330669133333,-2.00156990171783 -0.484039683743825 -5.14358341492368,-1.81816534331327 -0.491874441578583 -4.85305779869685,-1.63273782430587 -0.503755120619026 -4.57304379410752,-1.44503447462027 -0.520187461015863 -4.30485535261037,-1.25480242418112 -0.541677202919806 -4.0498064256601,-1.06178880291306 -0.568730086481565 -3.80921096471139,-0.865740740740739 -0.601851851851852 -3.58438292121893,-0.666405367588798 -0.641548239181375 -3.3766362466374,-0.463529813381883 -0.688324988620846 -3.1872848924215,-0.256861208044639 -0.742687840320976 -3.0176428100259,-0.04614668150171 -0.805142534432475 -2.86902395090531,0.168866636322258 -0.876194811106053 -2.74274226651439,0.388431615502622 -0.956350410492422 -2.64011170830786,0.612790589861596 -1.04609400023601 -2.5623914797631,0.841943559399181 -1.14542558033682 -2.50958158088012,1.07564819029316 -1.25386048315042 -2.48042280818152,1.31365161246818 -1.3708929685261 -2.4736012102126,1.55570095584888 -1.49601729631315 -2.48780283551868,1.80154335035992 -1.62872772636086 -2.52171373264507,2.05092592592592 -1.76851851851852 -2.57401995013708,2.30359581247155 -1.91488393263541 -2.64340753654003,2.55930013992144 -2.06731822856083 -2.72856254039923,2.81778603820024 -2.22531566614407 -2.82817101025998,3.07880063723259 -2.38837050523441 -2.94091899466761,3.34209106694314 -2.55597700568115 -3.06549254216743,3.60740445725653 -2.72762942733357 -3.20057770130475,3.87448793809741 -2.90282203004097 -3.34486052062488,4.14308863939042 -3.08104907365262 -3.49702704867313,4.4129536910602 -3.26180481801784 -3.65576333399482,4.68383022303141 -3.44458352298589 -3.81975542513526,4.95546536522868 -3.62887944840608 -3.98768937063976,5.22760624757667 -3.81418685412768 -4.15825121905363,5.5 -4 -4.33012701892219) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (-3.25 -0.5,-3.07367580370539 -0.493674033614862,-2.89709873733542 -0.487853807380434,-2.72001593081474 -0.483045061447428,-2.542174514068 -0.479753535966554,-2.36332161701984 -0.478484971088521,-2.1832043695949 -0.479745106964042,-2.00156990171783 -0.484039683743825,-1.81816534331327 -0.491874441578583,-1.63273782430587 -0.503755120619026,-1.44503447462027 -0.520187461015863,-1.25480242418112 -0.541677202919806,-1.06178880291306 -0.568730086481565,-0.865740740740739 -0.601851851851852,-0.666405367588798 -0.641548239181375,-0.463529813381883 -0.688324988620846,-0.256861208044639 -0.742687840320976,-0.04614668150171 -0.805142534432475,0.168866636322258 -0.876194811106053,0.388431615502622 -0.956350410492422,0.612790589861596 -1.04609400023601,0.841943559399181 -1.14542558033682,1.07564819029316 -1.25386048315042,1.31365161246818 -1.3708929685261,1.55570095584888 -1.49601729631315,1.80154335035992 -1.62872772636086,2.05092592592592 -1.76851851851852,2.30359581247155 -1.91488393263541,2.55930013992144 -2.06731822856083,2.81778603820024 -2.22531566614407,3.07880063723259 -2.38837050523441,3.34209106694314 -2.55597700568115,3.60740445725653 -2.72762942733357,3.87448793809741 -2.90282203004097,4.14308863939042 -3.08104907365262,4.4129536910602 -3.26180481801784,4.68383022303141 -3.44458352298589,4.95546536522868 -3.62887944840608,5.22760624757667 -3.81418685412768,5.5 -4.0)", + "LINESTRING Z (-3.25 -0.5 -7.36121593216773,-3.07367580370539 -0.493674033614862 -7.03389967520965,-2.89709873733542 -0.487853807380434 -6.70789736970626,-2.72001593081474 -0.483045061447428 -6.38452296711225,-2.542174514068 -0.479753535966554 -6.06509041888229,-2.36332161701984 -0.478484971088521 -5.75091367647109,-2.1832043695949 -0.479745106964042 -5.44330669133333,-2.00156990171783 -0.484039683743825 -5.14358341492368,-1.81816534331327 -0.491874441578583 -4.85305779869685,-1.63273782430587 -0.503755120619026 -4.57304379410752,-1.44503447462027 -0.520187461015863 -4.30485535261037,-1.25480242418112 -0.541677202919806 -4.0498064256601,-1.06178880291306 -0.568730086481565 -3.80921096471139,-0.865740740740739 -0.601851851851852 -3.58438292121893,-0.666405367588798 -0.641548239181375 -3.3766362466374,-0.463529813381883 -0.688324988620846 -3.1872848924215,-0.256861208044639 -0.742687840320976 -3.0176428100259,-0.04614668150171 -0.805142534432475 -2.86902395090531,0.168866636322258 -0.876194811106053 -2.74274226651439,0.388431615502622 -0.956350410492422 -2.64011170830786,0.612790589861596 -1.04609400023601 -2.5623914797631,0.841943559399181 -1.14542558033682 -2.50958158088012,1.07564819029316 -1.25386048315042 -2.48042280818152,1.31365161246818 -1.3708929685261 -2.4736012102126,1.55570095584888 -1.49601729631315 -2.48780283551868,1.80154335035992 -1.62872772636086 -2.52171373264507,2.05092592592592 -1.76851851851852 -2.57401995013708,2.30359581247155 -1.91488393263541 -2.64340753654003,2.55930013992144 -2.06731822856083 -2.72856254039923,2.81778603820024 -2.22531566614407 -2.82817101025998,3.07880063723259 -2.38837050523441 -2.94091899466761,3.34209106694314 -2.55597700568115 -3.06549254216743,3.60740445725653 -2.72762942733357 -3.20057770130475,3.87448793809741 -2.90282203004097 -3.34486052062488,4.14308863939042 -3.08104907365262 -3.49702704867313,4.4129536910602 -3.26180481801784 -3.65576333399482,4.68383022303141 -3.44458352298589 -3.81975542513526,4.95546536522868 -3.62887944840608 -3.98768937063976,5.22760624757667 -3.81418685412768 -4.15825121905363,5.5 -4 -4.33012701892219)", ) # OGRFeature(entities):50 @@ -2378,20 +2378,20 @@ def test_ogr_dxf_32(): # OGRFeature(entities):65 # EntityHandle (String) = 208 - # LINESTRING (2.75 0.5,2.96153846153846 0.538461538461539,3.17307692307692 0.576923076923077,3.38461538461539 0.615384615384616,3.59615384615385 0.653846153846154,3.80769230769231 0.692307692307693,4.01923076923077 0.730769230769231,4.23076923076923 0.76923076923077,4.44230769230769 0.807692307692308,4.65384615384616 0.846153846153847,4.86538461538462 0.884615384615385,5.07692307692308 0.923076923076924,5.28846153846154 0.961538461538462,5.5 1.0,5.71153846153846 1.03846153846154,5.92307692307693 1.07692307692308,6.13461538461539 1.11538461538462,6.34615384615385 1.15384615384615,6.55769230769231 1.19230769230769,6.76923076923077 1.23076923076923,6.98076923076923 1.26923076923077,7.19230769230769 1.30769230769231,7.40384615384616 1.34615384615385,7.61538461538462 1.38461538461539,7.82692307692308 1.42307692307692,8.03846153846154 1.46153846153846,8.25 1.5,8.46153846153846 1.53846153846154,8.67307692307693 1.57692307692308,8.88461538461539 1.61538461538462,9.09615384615385 1.65384615384615,9.30769230769231 1.69230769230769,9.51923076923077 1.73076923076923,9.73076923076923 1.76923076923077,9.94230769230769 1.80769230769231,10.1538461538462 1.84615384615385,10.3653846153846 1.88461538461539,10.5769230769231 1.92307692307692,10.7884615384615 1.96153846153846,11.0 2.0) + # LINESTRING Z (2.75 0.5 -0.43301270189222,2.96153846153846 0.538461538461539 -0.466321371268544,3.17307692307692 0.576923076923077 -0.499630040644869,3.38461538461539 0.615384615384616 -0.532938710021194,3.59615384615385 0.653846153846154 -0.566247379397518,3.80769230769231 0.692307692307693 -0.599556048773843,4.01923076923077 0.730769230769231 -0.632864718150167,4.23076923076923 0.76923076923077 -0.666173387526492,4.44230769230769 0.807692307692308 -0.699482056902817,4.65384615384616 0.846153846153847 -0.732790726279141,4.86538461538462 0.884615384615385 -0.766099395655466,5.07692307692308 0.923076923076924 -0.79940806503179,5.28846153846154 0.961538461538462 -0.832716734408115,5.5 1.0 -0.866025403784439,5.71153846153846 1.03846153846154 -0.899334073160764,5.92307692307693 1.07692307692308 -0.932642742537089,6.13461538461539 1.11538461538462 -0.965951411913413,6.34615384615385 1.15384615384615 -0.999260081289738,6.55769230769231 1.19230769230769 -1.03256875066606,6.76923076923077 1.23076923076923 -1.06587742004239,6.98076923076923 1.26923076923077 -1.09918608941871,7.19230769230769 1.30769230769231 -1.13249475879504,7.40384615384616 1.34615384615385 -1.16580342817136,7.61538461538462 1.38461538461539 -1.19911209754769,7.82692307692308 1.42307692307692 -1.23242076692401,8.03846153846154 1.46153846153846 -1.26572943630033,8.25 1.5 -1.29903810567666,8.46153846153846 1.53846153846154 -1.33234677505298,8.67307692307693 1.57692307692308 -1.36565544442931,8.88461538461539 1.61538461538462 -1.39896411380563,9.09615384615385 1.65384615384615 -1.43227278318196,9.30769230769231 1.69230769230769 -1.46558145255828,9.51923076923077 1.73076923076923 -1.49889012193461,9.73076923076923 1.76923076923077 -1.53219879131093,9.94230769230769 1.80769230769231 -1.56550746068726,10.1538461538462 1.84615384615385 -1.59881613006358,10.3653846153846 1.88461538461539 -1.6321247994399,10.5769230769231 1.92307692307692 -1.66543346881623,10.7884615384615 1.96153846153846 -1.69874213819255,11.0 2.0 -1.73205080756888) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (2.75 0.5,2.96153846153846 0.538461538461539,3.17307692307692 0.576923076923077,3.38461538461539 0.615384615384616,3.59615384615385 0.653846153846154,3.80769230769231 0.692307692307693,4.01923076923077 0.730769230769231,4.23076923076923 0.76923076923077,4.44230769230769 0.807692307692308,4.65384615384616 0.846153846153847,4.86538461538462 0.884615384615385,5.07692307692308 0.923076923076924,5.28846153846154 0.961538461538462,5.5 1.0,5.71153846153846 1.03846153846154,5.92307692307693 1.07692307692308,6.13461538461539 1.11538461538462,6.34615384615385 1.15384615384615,6.55769230769231 1.19230769230769,6.76923076923077 1.23076923076923,6.98076923076923 1.26923076923077,7.19230769230769 1.30769230769231,7.40384615384616 1.34615384615385,7.61538461538462 1.38461538461539,7.82692307692308 1.42307692307692,8.03846153846154 1.46153846153846,8.25 1.5,8.46153846153846 1.53846153846154,8.67307692307693 1.57692307692308,8.88461538461539 1.61538461538462,9.09615384615385 1.65384615384615,9.30769230769231 1.69230769230769,9.51923076923077 1.73076923076923,9.73076923076923 1.76923076923077,9.94230769230769 1.80769230769231,10.1538461538462 1.84615384615385,10.3653846153846 1.88461538461539,10.5769230769231 1.92307692307692,10.7884615384615 1.96153846153846,11.0 2.0)", + "LINESTRING Z (2.75 0.5 -0.43301270189222,2.96153846153846 0.538461538461539 -0.466321371268544,3.17307692307692 0.576923076923077 -0.499630040644869,3.38461538461539 0.615384615384616 -0.532938710021194,3.59615384615385 0.653846153846154 -0.566247379397518,3.80769230769231 0.692307692307693 -0.599556048773843,4.01923076923077 0.730769230769231 -0.632864718150167,4.23076923076923 0.76923076923077 -0.666173387526492,4.44230769230769 0.807692307692308 -0.699482056902817,4.65384615384616 0.846153846153847 -0.732790726279141,4.86538461538462 0.884615384615385 -0.766099395655466,5.07692307692308 0.923076923076924 -0.79940806503179,5.28846153846154 0.961538461538462 -0.832716734408115,5.5 1.0 -0.866025403784439,5.71153846153846 1.03846153846154 -0.899334073160764,5.92307692307693 1.07692307692308 -0.932642742537089,6.13461538461539 1.11538461538462 -0.965951411913413,6.34615384615385 1.15384615384615 -0.999260081289738,6.55769230769231 1.19230769230769 -1.03256875066606,6.76923076923077 1.23076923076923 -1.06587742004239,6.98076923076923 1.26923076923077 -1.09918608941871,7.19230769230769 1.30769230769231 -1.13249475879504,7.40384615384616 1.34615384615385 -1.16580342817136,7.61538461538462 1.38461538461539 -1.19911209754769,7.82692307692308 1.42307692307692 -1.23242076692401,8.03846153846154 1.46153846153846 -1.26572943630033,8.25 1.5 -1.29903810567666,8.46153846153846 1.53846153846154 -1.33234677505298,8.67307692307693 1.57692307692308 -1.36565544442931,8.88461538461539 1.61538461538462 -1.39896411380563,9.09615384615385 1.65384615384615 -1.43227278318196,9.30769230769231 1.69230769230769 -1.46558145255828,9.51923076923077 1.73076923076923 -1.49889012193461,9.73076923076923 1.76923076923077 -1.53219879131093,9.94230769230769 1.80769230769231 -1.56550746068726,10.1538461538462 1.84615384615385 -1.59881613006358,10.3653846153846 1.88461538461539 -1.6321247994399,10.5769230769231 1.92307692307692 -1.66543346881623,10.7884615384615 1.96153846153846 -1.69874213819255,11.0 2.0 -1.73205080756888)", ) # OGRFeature(entities):66 # EntityHandle (String) = 209 - # LINESTRING (5.75 5.5,5.5082446180819 5.22760624757667,5.26788002157825 4.95546536522868,5.03029699590351 4.68383022303141,4.79688632647213 4.4129536910602,4.56903879869856 4.14308863939042,4.34814519799727 3.87448793809741,4.1355963097827 3.60740445725653,3.93278291946931 3.34209106694314,3.74109581247155 3.07880063723259,3.56192577420388 2.81778603820024,3.39666359008075 2.55930013992144,3.24670004551661 2.30359581247155,3.11342592592593 2.05092592592593,2.99823201672314 1.80154335035992,2.90250910332271 1.55570095584889,2.8276479711391 1.31365161246818,2.77503940558674 1.07564819029316,2.74607419208011 0.84194355939918,2.74214311603365 0.612790589861594,2.76457901346955 0.38843161550262,2.8133818843878 0.168866636322256,2.88721889276623 -0.046146681501713,2.98469925319038 -0.256861208044643,3.10443218024579 -0.463529813381887,3.24502688851802 -0.666405367588803,3.4050925925926 -0.865740740740744,3.58323850705508 -1.06178880291307,3.77807384649101 -1.25480242418113,3.98820782548594 -1.44503447462028,4.21224965862541 -1.63273782430588,4.44880856049496 -1.81816534331328,4.69649374568015 -2.00156990171784,4.95391442876651 -2.18320436959491,5.2196798243396 -2.36332161701985,5.49239914698496 -2.54217451406801,5.77068161128813 -2.72001593081475,6.05313643183467 -2.89709873733543,6.33837282321012 -3.0736758037054,6.625 -3.25) + # LINESTRING Z (5.75 5.50000000000001 1.29903810567666,5.5082446180819 5.22760624757667 1.22405710092841,5.26788002157825 4.95546536522868 1.14885710427104,5.03029699590351 4.68383022303141 1.07321912379545,4.79688632647213 4.4129536910602 0.996924167592515,4.56903879869856 4.14308863939042 0.91975324375312,4.34814519799727 3.87448793809741 0.841487360368152,4.1355963097827 3.60740445725653 0.761907525528497,3.93278291946931 3.34209106694314 0.68079474732504,3.74109581247155 3.07880063723259 0.597930033848667,3.56192577420388 2.81778603820024 0.513094393190262,3.39666359008075 2.55930013992144 0.426068833440712,3.24670004551661 2.30359581247155 0.336634362690902,3.11342592592593 2.05092592592593 0.244571989031716,2.99823201672314 1.80154335035992 0.149662720554042,2.90250910332271 1.55570095584889 0.051687565348764,2.8276479711391 1.31365161246818 -0.049572468493233,2.77503940558674 1.07564819029316 -0.154336372881063,2.74607419208011 0.84194355939918 -0.26282313972384,2.74214311603365 0.612790589861594 -0.375251760930679,2.76457901346955 0.38843161550262 -0.491832103747815,2.8133818843878 0.168866636322256 -0.612564168175248,2.88721889276623 -0.046146681501713 -0.737238086966744,2.98469925319038 -0.256861208044643 -0.865634868213187,3.10443218024579 -0.463529813381887 -0.997535520005462,3.24502688851802 -0.666405367588803 -1.13272105043446,3.4050925925926 -0.865740740740744 -1.27097246759105,3.58323850705508 -1.06178880291307 -1.41207077956614,3.77807384649101 -1.25480242418113 -1.5557969944506,3.98820782548594 -1.44503447462028 -1.70193212033533,4.21224965862541 -1.63273782430588 -1.85025716531119,4.44880856049496 -1.81816534331328 -2.00055313746909,4.69649374568015 -2.00156990171784 -2.15260104489991,4.95391442876651 -2.18320436959491 -2.30618189569452,5.2196798243396 -2.36332161701985 -2.46107669794383,5.49239914698496 -2.54217451406801 -2.61706645973871,5.77068161128813 -2.72001593081475 -2.77393218917004,6.05313643183467 -2.89709873733543 -2.93145489432872,6.33837282321012 -3.0736758037054 -3.08941558330563,6.625 -3.25 -3.24759526419165) feat = lyr.GetNextFeature() ogrtest.check_feature_geometry( feat, - "LINESTRING (5.75 5.5,5.5082446180819 5.22760624757667,5.26788002157825 4.95546536522868,5.03029699590351 4.68383022303141,4.79688632647213 4.4129536910602,4.56903879869856 4.14308863939042,4.34814519799727 3.87448793809741,4.1355963097827 3.60740445725653,3.93278291946931 3.34209106694314,3.74109581247155 3.07880063723259,3.56192577420388 2.81778603820024,3.39666359008075 2.55930013992144,3.24670004551661 2.30359581247155,3.11342592592593 2.05092592592593,2.99823201672314 1.80154335035992,2.90250910332271 1.55570095584889,2.8276479711391 1.31365161246818,2.77503940558674 1.07564819029316,2.74607419208011 0.84194355939918,2.74214311603365 0.612790589861594,2.76457901346955 0.38843161550262,2.8133818843878 0.168866636322256,2.88721889276623 -0.046146681501713,2.98469925319038 -0.256861208044643,3.10443218024579 -0.463529813381887,3.24502688851802 -0.666405367588803,3.4050925925926 -0.865740740740744,3.58323850705508 -1.06178880291307,3.77807384649101 -1.25480242418113,3.98820782548594 -1.44503447462028,4.21224965862541 -1.63273782430588,4.44880856049496 -1.81816534331328,4.69649374568015 -2.00156990171784,4.95391442876651 -2.18320436959491,5.2196798243396 -2.36332161701985,5.49239914698496 -2.54217451406801,5.77068161128813 -2.72001593081475,6.05313643183467 -2.89709873733543,6.33837282321012 -3.0736758037054,6.625 -3.25)", + "LINESTRING Z (5.75 5.50000000000001 1.29903810567666,5.5082446180819 5.22760624757667 1.22405710092841,5.26788002157825 4.95546536522868 1.14885710427104,5.03029699590351 4.68383022303141 1.07321912379545,4.79688632647213 4.4129536910602 0.996924167592515,4.56903879869856 4.14308863939042 0.91975324375312,4.34814519799727 3.87448793809741 0.841487360368152,4.1355963097827 3.60740445725653 0.761907525528497,3.93278291946931 3.34209106694314 0.68079474732504,3.74109581247155 3.07880063723259 0.597930033848667,3.56192577420388 2.81778603820024 0.513094393190262,3.39666359008075 2.55930013992144 0.426068833440712,3.24670004551661 2.30359581247155 0.336634362690902,3.11342592592593 2.05092592592593 0.244571989031716,2.99823201672314 1.80154335035992 0.149662720554042,2.90250910332271 1.55570095584889 0.051687565348764,2.8276479711391 1.31365161246818 -0.049572468493233,2.77503940558674 1.07564819029316 -0.154336372881063,2.74607419208011 0.84194355939918 -0.26282313972384,2.74214311603365 0.612790589861594 -0.375251760930679,2.76457901346955 0.38843161550262 -0.491832103747815,2.8133818843878 0.168866636322256 -0.612564168175248,2.88721889276623 -0.046146681501713 -0.737238086966744,2.98469925319038 -0.256861208044643 -0.865634868213187,3.10443218024579 -0.463529813381887 -0.997535520005462,3.24502688851802 -0.666405367588803 -1.13272105043446,3.4050925925926 -0.865740740740744 -1.27097246759105,3.58323850705508 -1.06178880291307 -1.41207077956614,3.77807384649101 -1.25480242418113 -1.5557969944506,3.98820782548594 -1.44503447462028 -1.70193212033533,4.21224965862541 -1.63273782430588 -1.85025716531119,4.44880856049496 -1.81816534331328 -2.00055313746909,4.69649374568015 -2.00156990171784 -2.15260104489991,4.95391442876651 -2.18320436959491 -2.30618189569452,5.2196798243396 -2.36332161701985 -2.46107669794383,5.49239914698496 -2.54217451406801 -2.61706645973871,5.77068161128813 -2.72001593081475 -2.77393218917004,6.05313643183467 -2.89709873733543 -2.93145489432872,6.33837282321012 -3.0736758037054 -3.08941558330563,6.625 -3.25 -3.24759526419165)", ) # OGRFeature(entities):67 @@ -3716,7 +3716,7 @@ def test_ogr_dxf_52(): ), "Wrong SubClasses on HELIX" ogrtest.check_feature_geometry( f, - "LINESTRING (150 120,149.345876458438 119.778561209114,148.706627788813 119.535836602547,148.082773142501 119.272634882071,147.474831670876 118.989764749454,146.883322525316 118.688034906466,146.308764857195 118.368254054878,145.75167781789 118.03123089646,145.212580558776 117.677774132981,144.691992231228 117.308692466212,144.190431986623 116.924794597921,143.708418976337 116.52688922988,143.246472351745 116.115785063858,142.805226682224 115.692350328976,142.385468357145 115.257680939095,141.987209053809 114.8126724387,141.610382578047 114.358190780749,141.254922735687 113.895101918197,140.920763332559 113.424271804003,140.607838174492 112.946566391121,140.316081067316 112.46285163251,140.04542581686 111.973993481125,139.795806228954 111.480857889924,139.567156109426 110.984310811863,139.359409264107 110.4852181999,139.172499498825 109.98444600699,139.00636061941 109.482860186091,138.860926431692 108.981326690159,138.7361307415 108.480711472151,138.631907354662 107.981880485024,138.54819007701 107.485699681734,138.484912714371 106.993035015239,138.442009072576 106.504752438495,138.419412957453 106.021717904458,138.41678542913 105.544991394258,138.433333223564 105.075482938615,138.468434844937 104.613670677827,138.521471087835 104.160029888371,138.59182274684 103.715035846723,138.678870616536 103.27916382936,138.781995491508 102.852889112758,138.900578166339 102.436686973394,139.033999435614 102.031032687745,139.181640093916 101.636401532287,139.342880935829 101.253268783496,139.517102755937 100.882109717849,139.703686348824 100.523399611823,139.902012509075 100.177613741895,140.111462031272 99.8452273845396,140.33141571 99.5267158162348,140.561254339843 99.2225543134567,140.800358715385 98.933218152682,141.04810963121 98.6591826103871,141.303887881901 98.4009229630486,141.567055122443 98.1589144355755,141.836465751876 97.9334729764931,142.111203876514 97.7245055448538,142.390570491032 97.5318567084626,142.673866590107 97.3553710351246,142.960393168413 97.194893092645,143.249451220625 97.0502674488286,143.54034174142 96.9213386714808,143.832365725473 96.8079513284064,144.124824167458 96.7099499874106,144.417018062052 96.6271792162984,144.708248403929 96.5594835828749,144.997816187765 96.5067076549452,145.285022408236 96.4686960003143,145.569168060017 96.4452931867873,145.849554137782 96.4363437821692,146.125481636209 96.4416923542652,146.396251549971 96.4611834708803,146.661164873745 96.4946616998195,146.919522602205 96.5419716088879,147.170625730027 96.6029577658907,147.413708536343 96.6773765373194,147.64790100184 96.7644518356677,147.872845806317 96.8635266377703,148.088244263586 96.9739879715066,148.293797687463 97.0952228647559,148.48920739176 97.2266183453974,148.674174690292 97.3675614413103,148.848400896871 97.5174391803741,149.011587325312 97.675638590468,149.163435289429 97.8415466994713,149.303646103034 98.0145505352631,149.431921079943 98.194037125723,149.547961533967 98.37939349873,149.651468778922 98.5700066821635,149.742144128621 98.7652637039028,149.819688896877 98.9645515918272,149.883804397505 99.1672573738159,149.934191944317 99.3727680777483,149.970552851128 99.5804707315036,149.992588431751 99.7897523629611,150 100)", + "LINESTRING Z (150 120 0,149.345876458438 119.778561209114 0.210526315789474,148.706627788813 119.535836602547 0.421052631578947,148.082773142501 119.272634882071 0.631578947368421,147.474831670876 118.989764749454 0.842105263157894,146.883322525316 118.688034906466 1.05263157894737,146.308764857195 118.368254054878 1.26315789473684,145.75167781789 118.03123089646 1.47368421052632,145.212580558776 117.677774132981 1.68421052631579,144.691992231228 117.308692466212 1.89473684210526,144.190431986623 116.924794597921 2.10526315789474,143.708418976337 116.52688922988 2.31578947368421,143.246472351745 116.115785063858 2.52631578947368,142.805226682224 115.692350328976 2.73684210526316,142.385468357145 115.257680939095 2.94736842105263,141.987209053809 114.8126724387 3.1578947368421,141.610382578047 114.358190780749 3.36842105263158,141.254922735687 113.895101918197 3.57894736842105,140.920763332559 113.424271804003 3.78947368421053,140.607838174492 112.946566391121 4,140.316081067316 112.46285163251 4.21052631578947,140.04542581686 111.973993481125 4.42105263157895,139.795806228954 111.480857889924 4.63157894736842,139.567156109426 110.984310811863 4.8421052631579,139.359409264107 110.4852181999 5.05263157894737,139.172499498825 109.98444600699 5.26315789473684,139.00636061941 109.482860186091 5.47368421052632,138.860926431692 108.981326690159 5.68421052631579,138.7361307415 108.480711472151 5.89473684210526,138.631907354662 107.981880485024 6.10526315789474,138.54819007701 107.485699681734 6.31578947368421,138.484912714371 106.993035015239 6.52631578947369,138.442009072576 106.504752438495 6.73684210526316,138.419412957453 106.021717904458 6.94736842105264,138.41678542913 105.544991394258 7.15789473684211,138.433333223564 105.075482938615 7.36842105263158,138.468434844937 104.613670677827 7.57894736842106,138.521471087835 104.160029888371 7.78947368421053,138.59182274684 103.715035846723 8.00000000000001,138.678870616536 103.27916382936 8.21052631578948,138.781995491508 102.852889112758 8.42105263157896,138.900578166339 102.436686973394 8.63157894736843,139.033999435614 102.031032687745 8.8421052631579,139.181640093916 101.636401532287 9.05263157894738,139.342880935829 101.253268783496 9.26315789473685,139.517102755937 100.882109717849 9.47368421052633,139.703686348824 100.523399611823 9.6842105263158,139.902012509075 100.177613741895 9.89473684210528,140.111462031272 99.8452273845396 10.1052631578948,140.33141571 99.5267158162348 10.3157894736842,140.561254339843 99.2225543134567 10.5263157894737,140.800358715385 98.933218152682 10.7368421052632,141.04810963121 98.6591826103871 10.9473684210526,141.303887881901 98.4009229630486 11.1578947368421,141.567055122443 98.1589144355755 11.3684210526316,141.836465751876 97.9334729764931 11.5789473684211,142.111203876514 97.7245055448538 11.7894736842105,142.390570491032 97.5318567084626 12,142.673866590107 97.3553710351246 12.2105263157895,142.960393168413 97.194893092645 12.421052631579,143.249451220625 97.0502674488286 12.6315789473684,143.54034174142 96.9213386714808 12.8421052631579,143.832365725473 96.8079513284064 13.0526315789474,144.124824167458 96.7099499874106 13.2631578947369,144.417018062052 96.6271792162984 13.4736842105263,144.708248403929 96.5594835828749 13.6842105263158,144.997816187765 96.5067076549452 13.8947368421053,145.285022408236 96.4686960003143 14.1052631578948,145.569168060017 96.4452931867873 14.3157894736842,145.849554137782 96.4363437821692 14.5263157894737,146.125481636209 96.4416923542652 14.7368421052632,146.396251549971 96.4611834708803 14.9473684210527,146.661164873745 96.4946616998195 15.1578947368421,146.919522602205 96.5419716088879 15.3684210526316,147.170625730027 96.6029577658907 15.5789473684211,147.413708536343 96.6773765373194 15.7894736842105,147.64790100184 96.7644518356677 16,147.872845806317 96.8635266377703 16.2105263157895,148.088244263586 96.9739879715066 16.421052631579,148.293797687463 97.0952228647559 16.6315789473684,148.48920739176 97.2266183453974 16.8421052631579,148.674174690292 97.3675614413103 17.0526315789474,148.848400896871 97.5174391803741 17.2631578947369,149.011587325312 97.675638590468 17.4736842105263,149.163435289429 97.8415466994713 17.6842105263158,149.303646103034 98.0145505352631 17.8947368421053,149.431921079943 98.194037125723 18.1052631578948,149.547961533967 98.37939349873 18.3157894736842,149.651468778922 98.5700066821635 18.5263157894737,149.742144128621 98.7652637039028 18.7368421052632,149.819688896877 98.9645515918272 18.9473684210527,149.883804397505 99.1672573738159 19.1578947368421,149.934191944317 99.3727680777483 19.3684210526316,149.970552851128 99.5804707315036 19.5789473684211,149.992588431751 99.7897523629611 19.7894736842106,150 100 20)", context="HELIX", ) @@ -3827,7 +3827,7 @@ def test_ogr_dxf_52(): f = lyr.GetNextFeature() ogrtest.check_feature_geometry( f, - "LINESTRING (0 20,0.513272464826192 19.8251653183892,1.00815682586353 19.629626397244,1.48499546839613 19.4132825350102,1.94413077770813 19.1760330301337,2.38590513908363 18.9177771810603,2.81066093780676 18.6384142862359,3.21874055916165 18.3378436441062,3.61048638843241 18.0159645531172,3.98624081090316 17.6726763117148,4.34634621185803 17.3078782183446,4.69114497658114 16.9214695714527,5.02097949035661 16.5133496694848,5.33619213846856 16.0834178108867,5.63712530620111 15.6315732941045,5.92412137883838 15.1577154175837,6.1975227416645 14.6617434797705,6.45767177996359 14.1435567791104,6.70491087901976 13.6030546140496,6.93958242411715 13.0401362830336,7.16202880053986 12.4547010845085,7.37259239357203 11.8466483169201,7.57161558849776 11.2158772787141,7.7594407706012 10.5622872683365,7.93641032516645 9.88577758423314,8.10286663747763 9.18624752484979,8.25915209281888 8.46359638863234,8.4056090764743 7.71772347402662,8.54257997372803 6.94852807947849,8.67040716986418 6.1559095034338,8.78943305016688 5.33976704433838,8.9 4.5)", + "LINESTRING Z (0 20 0,0.513272464826192 19.8251653183892 0,1.00815682586353 19.629626397244 0,1.48499546839613 19.4132825350102 0,1.94413077770813 19.1760330301337 0,2.38590513908363 18.9177771810603 0,2.81066093780676 18.6384142862359 0,3.21874055916165 18.3378436441062 0,3.61048638843241 18.0159645531172 0,3.98624081090316 17.6726763117148 0,4.34634621185803 17.3078782183446 0,4.69114497658114 16.9214695714527 0,5.02097949035661 16.5133496694848 0,5.33619213846856 16.0834178108867 0,5.63712530620111 15.6315732941045 0,5.92412137883838 15.1577154175837 0,6.1975227416645 14.6617434797705 0,6.45767177996359 14.1435567791104 0,6.70491087901976 13.6030546140496 0,6.93958242411715 13.0401362830336 0,7.16202880053986 12.4547010845085 0,7.37259239357203 11.8466483169201 0,7.57161558849776 11.2158772787141 0,7.7594407706012 10.5622872683365 0,7.93641032516645 9.88577758423314 0,8.10286663747763 9.18624752484979 0,8.25915209281888 8.46359638863234 0,8.4056090764743 7.71772347402662 0,8.54257997372803 6.94852807947849 0,8.67040716986418 6.1559095034338 0,8.78943305016688 5.33976704433838 0,8.9 4.5 0)", context="SPLINE", ) diff --git a/ogr/ogrsf_frmts/dxf/ogr_dxf.h b/ogr/ogrsf_frmts/dxf/ogr_dxf.h index 0e9e2ef12e2d..ba06616f07ff 100644 --- a/ogr/ogrsf_frmts/dxf/ogr_dxf.h +++ b/ogr/ogrsf_frmts/dxf/ogr_dxf.h @@ -510,10 +510,12 @@ class OGRDXFLayer final : public OGRLayer OGRDXFFeature *TranslateMLEADER(); OGRDXFFeature *TranslateASMEntity(); + static constexpr int FORTRAN_INDEXING = 1; + bool GenerateINSERTFeatures(); std::unique_ptr InsertSplineWithChecks(const int nDegree, - std::vector &adfControlPoints, + std::vector &adfControlPoints, bool bHasZ, int nControlPoints, std::vector &adfKnots, int nKnots, std::vector &adfWeights); static OGRGeometry *SimplifyBlockGeometry(OGRGeometryCollection *); diff --git a/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp b/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp index 55c929feba93..a17c01648a13 100644 --- a/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp +++ b/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp @@ -463,7 +463,7 @@ OGRErr OGRDXFLayer::CollectBoundaryPath(OGRGeometryCollection *poGC, else break; - std::vector adfKnots(1, 0.0); + std::vector adfKnots(FORTRAN_INDEXING, 0.0); nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf)); if (nCode != 40) @@ -475,8 +475,8 @@ OGRErr OGRDXFLayer::CollectBoundaryPath(OGRGeometryCollection *poGC, nCode = poDS->ReadValue(szLineBuf, sizeof(szLineBuf)); } - std::vector adfControlPoints(1, 0.0); - std::vector adfWeights(1, 0.0); + std::vector adfControlPoints(FORTRAN_INDEXING, 0.0); + std::vector adfWeights(FORTRAN_INDEXING, 0.0); if (nCode != 10) break; @@ -516,9 +516,10 @@ OGRErr OGRDXFLayer::CollectBoundaryPath(OGRGeometryCollection *poGC, if (nCode > 0) poDS->UnreadValue(); - auto poLS = InsertSplineWithChecks(nDegree, adfControlPoints, - nControlPoints, adfKnots, nKnots, - adfWeights); + auto poLS = + InsertSplineWithChecks(nDegree, adfControlPoints, + /* bHaZ = */ false, nControlPoints, + adfKnots, nKnots, adfWeights); if (!poLS) { diff --git a/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp index 812b95de981d..719d3bb85324 100644 --- a/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp +++ b/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp @@ -2040,12 +2040,14 @@ OGRDXFFeature *OGRDXFLayer::TranslateSPLINE() int nCode; auto poFeature = std::make_unique(poFeatureDefn); - std::vector adfControlPoints(1, 0.0); - std::vector adfKnots(1, 0.0); - std::vector adfWeights(1, 0.0); + std::vector adfControlPoints(FORTRAN_INDEXING, 0.0); + std::vector adfKnots(FORTRAN_INDEXING, 0.0); + std::vector adfWeights(FORTRAN_INDEXING, 0.0); int nDegree = -1; int nControlPoints = -1; int nKnots = -1; + bool bInsertNullZ = false; + bool bHasZ = false; /* -------------------------------------------------------------------- */ /* Process values. */ @@ -2056,12 +2058,23 @@ OGRDXFFeature *OGRDXFLayer::TranslateSPLINE() switch (nCode) { case 10: + if (bInsertNullZ) + { + adfControlPoints.push_back(0.0); + bInsertNullZ = false; + } adfControlPoints.push_back(CPLAtof(szLineBuf)); break; case 20: adfControlPoints.push_back(CPLAtof(szLineBuf)); - adfControlPoints.push_back(0.0); + bInsertNullZ = true; + break; + + case 30: + adfControlPoints.push_back(CPLAtof(szLineBuf)); + bHasZ = true; + bInsertNullZ = false; break; case 40: @@ -2136,12 +2149,25 @@ OGRDXFFeature *OGRDXFLayer::TranslateSPLINE() if (nCode == 0) poDS->UnreadValue(); + if (bInsertNullZ) + { + adfControlPoints.push_back(0.0); + } + + if (static_cast(adfControlPoints.size() % 3) != FORTRAN_INDEXING) + { + CPLError(CE_Failure, CPLE_AppDefined, + "Invalid number of values for spline control points"); + DXF_LAYER_READER_ERROR(); + return nullptr; + } + /* -------------------------------------------------------------------- */ /* Use the helper function to check the input data and insert */ /* the spline. */ /* -------------------------------------------------------------------- */ auto poLS = - InsertSplineWithChecks(nDegree, adfControlPoints, nControlPoints, + InsertSplineWithChecks(nDegree, adfControlPoints, bHasZ, nControlPoints, adfKnots, nKnots, adfWeights); if (!poLS) @@ -2165,7 +2191,7 @@ OGRDXFFeature *OGRDXFLayer::TranslateSPLINE() /************************************************************************/ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( - const int nDegree, std::vector &adfControlPoints, + const int nDegree, std::vector &adfControlPoints, bool bHasZ, int nControlPoints, std::vector &adfKnots, int nKnots, std::vector &adfWeights) { @@ -2178,11 +2204,13 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( if (bResult == true) { // Check whether nctrlpts value matches number of vertices read - int nCheck = (static_cast(adfControlPoints.size()) - 1) / 3; + int nCheck = + (static_cast(adfControlPoints.size()) - FORTRAN_INDEXING) / 3; if (nControlPoints == -1) nControlPoints = - (static_cast(adfControlPoints.size()) - 1) / 3; + (static_cast(adfControlPoints.size()) - FORTRAN_INDEXING) / + 3; // min( num(ctrlpts) ) = order bResult = (nControlPoints >= nOrder && nControlPoints == nCheck); @@ -2191,7 +2219,7 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( bool bCalculateKnots = false; if (bResult == true) { - int nCheck = static_cast(adfKnots.size()) - 1; + int nCheck = static_cast(adfKnots.size()) - FORTRAN_INDEXING; // Recalculate knots when: // - no knots data present, nknots is -1 and ncheck is 0 @@ -2203,13 +2231,13 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( for (int i = 0; i < (nControlPoints + nOrder); i++) adfKnots.push_back(0.0); - nCheck = static_cast(adfKnots.size()) - 1; + nCheck = static_cast(adfKnots.size()) - FORTRAN_INDEXING; } // Adjust nknots value when: // - nknots value not present, knot vertices present // nknots is -1, ncheck is (nctrlpts + order) if (nKnots == -1) - nKnots = static_cast(adfKnots.size()) - 1; + nKnots = static_cast(adfKnots.size()) - FORTRAN_INDEXING; // num(knots) = num(ctrlpts) + order bResult = (nKnots == (nControlPoints + nOrder) && nKnots == nCheck); @@ -2217,14 +2245,14 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( if (bResult == true) { - int nWeights = static_cast(adfWeights.size()) - 1; + int nWeights = static_cast(adfWeights.size()) - FORTRAN_INDEXING; if (nWeights == 0) { for (int i = 0; i < nControlPoints; i++) adfWeights.push_back(1.0); - nWeights = static_cast(adfWeights.size()) - 1; + nWeights = static_cast(adfWeights.size()) - FORTRAN_INDEXING; } // num(weights) = num(ctrlpts) @@ -2238,11 +2266,7 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( /* Interpolate spline */ /* -------------------------------------------------------------------- */ int p1 = nControlPoints * 8; - std::vector p; - - p.push_back(0.0); - for (int i = 0; i < 3 * p1; i++) - p.push_back(0.0); + std::vector p(3 * p1 + FORTRAN_INDEXING); rbspline2(nControlPoints, nOrder, p1, &(adfControlPoints[0]), &(adfWeights[0]), bCalculateKnots, &(adfKnots[0]), &(p[0])); @@ -2253,8 +2277,19 @@ std::unique_ptr OGRDXFLayer::InsertSplineWithChecks( auto poLS = std::make_unique(); poLS->setNumPoints(p1); - for (int i = 0; i < p1; i++) - poLS->setPoint(i, p[i * 3 + 1], p[i * 3 + 2]); + if (bHasZ) + { + for (int i = 0; i < p1; i++) + poLS->setPoint(i, p[i * 3 + FORTRAN_INDEXING], + p[i * 3 + FORTRAN_INDEXING + 1], + p[i * 3 + FORTRAN_INDEXING + 2]); + } + else + { + for (int i = 0; i < p1; i++) + poLS->setPoint(i, p[i * 3 + FORTRAN_INDEXING], + p[i * 3 + FORTRAN_INDEXING + 1]); + } return poLS; }