Skip to content

Commit e5a0818

Browse files
jaakkor2jaakkor2
authored
Use LibGEOS.equals instead "==" to compare geometries (#81)
Use LibGEOS.equals instead "==" to compare geometries
1 parent 2152760 commit e5a0818

File tree

2 files changed

+49
-41
lines changed

2 files changed

+49
-41
lines changed

‎test/test_geos_functions.jl‎

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
expected_ = LibGEOS._readgeom("LINESTRING (130 240, 650 240)")
7575
output_ = LibGEOS.convexhull(input_)
7676
@test !LibGEOS.isEmpty(output_)
77-
@test LibGEOS._writegeom(output_) == LibGEOS._writegeom(expected_)
77+
@test LibGEOS.equals(output_, expected_)
7878
LibGEOS.destroyGeom(input_)
7979
LibGEOS.destroyGeom(expected_)
8080
LibGEOS.destroyGeom(output_)
@@ -161,15 +161,15 @@
161161
LibGEOS.destroyGeom(geom2_)
162162
geom2_ = LibGEOS.delaunayTriangulation(geom1_, 0.0, true)
163163
geom3_ = LibGEOS._readgeom("MULTILINESTRING ((5 0, 10 0), (0 0, 5 0))")
164-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
164+
@test LibGEOS.equals(geom2_, geom3_)
165165
LibGEOS.destroyGeom(geom1_)
166166
LibGEOS.destroyGeom(geom2_)
167167
LibGEOS.destroyGeom(geom3_)
168168

169169
geom1_ = LibGEOS._readgeom("MULTIPOINT(0 0, 10 0, 10 10, 11 10)")
170170
geom2_ = LibGEOS.delaunayTriangulation(geom1_, 2.0, true)
171171
geom3_ = LibGEOS._readgeom("MULTILINESTRING ((0 0, 10 10), (0 0, 10 0), (10 0, 10 10))")
172-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
172+
@test LibGEOS.equals(geom2_, geom3_)
173173
LibGEOS.destroyGeom(geom1_)
174174
LibGEOS.destroyGeom(geom2_)
175175
LibGEOS.destroyGeom(geom3_)
@@ -208,31 +208,31 @@
208208
geom1_ = LibGEOS._readgeom("POINT(10 0)")
209209
geom2_ = LibGEOS.centroid(geom1_)
210210
geom3_ = LibGEOS._readgeom("POINT (10 0)")
211-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
211+
@test LibGEOS.equals(geom2_, geom3_)
212212
LibGEOS.destroyGeom(geom1_)
213213
LibGEOS.destroyGeom(geom2_)
214214
LibGEOS.destroyGeom(geom3_)
215215

216216
geom1_ = LibGEOS._readgeom("LINESTRING(0 0, 10 0)")
217217
geom2_ = LibGEOS.centroid(geom1_)
218218
geom3_ = LibGEOS._readgeom("POINT (5 0)")
219-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
219+
@test LibGEOS.equals(geom2_, geom3_)
220220
LibGEOS.destroyGeom(geom1_)
221221
LibGEOS.destroyGeom(geom2_)
222222
LibGEOS.destroyGeom(geom3_)
223223

224224
geom1_ = LibGEOS._readgeom("POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))")
225225
geom2_ = LibGEOS.centroid(geom1_)
226226
geom3_ = LibGEOS._readgeom("POINT (5 5)")
227-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
227+
@test LibGEOS.equals(geom2_, geom3_)
228228
LibGEOS.destroyGeom(geom1_)
229229
LibGEOS.destroyGeom(geom2_)
230230
LibGEOS.destroyGeom(geom3_)
231231

232232
geom1_ = LibGEOS._readgeom("LINESTRING EMPTY")
233233
geom2_ = LibGEOS.centroid(geom1_)
234234
geom3_ = LibGEOS._readgeom("POINT EMPTY")
235-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
235+
@test LibGEOS.equals(geom2_, geom3_)
236236
LibGEOS.destroyGeom(geom1_)
237237
LibGEOS.destroyGeom(geom2_)
238238
LibGEOS.destroyGeom(geom3_)
@@ -241,15 +241,17 @@
241241
geom1_ = LibGEOS._readgeom("POLYGON EMPTY")
242242
geom2_ = LibGEOS._readgeom("POLYGON EMPTY")
243243
geom3_ = LibGEOS.intersection(geom1_, geom2_)
244-
@test LibGEOS._writegeom(geom3_) == "GEOMETRYCOLLECTION EMPTY"
244+
geom4_ = LibGEOS._readgeom("GEOMETRYCOLLECTION EMPTY")
245+
@test LibGEOS.equals(geom3_, geom4_)
245246
LibGEOS.destroyGeom(geom1_)
246247
LibGEOS.destroyGeom(geom2_)
247248
LibGEOS.destroyGeom(geom3_)
249+
LibGEOS.destroyGeom(geom4_)
248250

249251
geom1_ = LibGEOS._readgeom("POLYGON((1 1,1 5,5 5,5 1,1 1))")
250252
geom2_ = LibGEOS._readgeom("POINT(2 2)")
251253
geom3_ = LibGEOS.intersection(geom1_, geom2_)
252-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom2_)
254+
@test LibGEOS.equals(geom3_, geom2_)
253255
LibGEOS.destroyGeom(geom1_)
254256
LibGEOS.destroyGeom(geom2_)
255257
LibGEOS.destroyGeom(geom3_)
@@ -258,7 +260,7 @@
258260
geom2_ = LibGEOS._readgeom("POLYGON((-1 1,-1 2,2 2,2 1,-1 1))")
259261
geom3_ = LibGEOS.intersection(geom1_, geom2_)
260262
geom4_ = LibGEOS._readgeom("POLYGON ((0 1, 0 2, 2 2, 2 1, 0 1))")
261-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
263+
@test LibGEOS.equals(geom3_, geom4_)
262264
LibGEOS.destroyGeom(geom1_)
263265
LibGEOS.destroyGeom(geom2_)
264266
LibGEOS.destroyGeom(geom3_)
@@ -268,7 +270,7 @@
268270
geom2_ = LibGEOS._readgeom("POLYGON((0 1,0 2,10 2,10 1,0 1))")
269271
geom3_ = LibGEOS.intersection(geom1_, geom2_)
270272
geom4_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (LINESTRING (1 2, 2 2), LINESTRING (2 1, 1 1), POLYGON ((0.5 1, 1 2, 1 1, 0.5 1)), POLYGON ((9 2, 9.5 1, 2 1, 2 2, 9 2)))")
271-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
273+
@test LibGEOS.equals(geom3_, geom4_)
272274
LibGEOS.destroyGeom(geom1_)
273275
LibGEOS.destroyGeom(geom2_)
274276
LibGEOS.destroyGeom(geom3_)
@@ -342,7 +344,7 @@
342344
geom2_ = LibGEOS.node(geom1_)
343345
LibGEOS.normalize!(geom2_)
344346
geom3_ = LibGEOS._readgeom("MULTILINESTRING ((5 5, 10 0, 10 10, 5 5), (0 10, 5 5), (0 0, 5 5))")
345-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
347+
@test equals(geom2_, geom3_)
346348
LibGEOS.destroyGeom(geom1_)
347349
LibGEOS.destroyGeom(geom2_)
348350
LibGEOS.destroyGeom(geom3_)
@@ -351,7 +353,7 @@
351353
geom2_ = LibGEOS.node(geom1_)
352354
LibGEOS.normalize!(geom2_)
353355
geom3_ = LibGEOS._readgeom("MULTILINESTRING ((4 0, 5 0), (3 0, 4 0), (2 0, 3 0), (1 0, 2 0), (0 0, 1 0))")
354-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
356+
@test LibGEOS.equals(geom2_, geom3_)
355357
LibGEOS.destroyGeom(geom1_)
356358
LibGEOS.destroyGeom(geom2_)
357359
LibGEOS.destroyGeom(geom3_)
@@ -360,7 +362,7 @@
360362
geom2_ = LibGEOS.node(geom1_)
361363
LibGEOS.normalize!(geom2_)
362364
geom3_ = LibGEOS._readgeom("MULTILINESTRING ((2 0, 4 0), (0 0, 2 0))")
363-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
365+
@test LibGEOS.equals(geom2_, geom3_)
364366
LibGEOS.destroyGeom(geom1_)
365367
LibGEOS.destroyGeom(geom2_)
366368
LibGEOS.destroyGeom(geom3_)
@@ -369,23 +371,23 @@
369371
geom1_ = LibGEOS._readgeom("POINT(10 0)")
370372
geom2_ = LibGEOS.pointOnSurface(geom1_)
371373
geom3_ = LibGEOS._readgeom("POINT (10 0)")
372-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
374+
@test LibGEOS.equals(geom2_, geom3_)
373375
LibGEOS.destroyGeom(geom1_)
374376
LibGEOS.destroyGeom(geom2_)
375377
LibGEOS.destroyGeom(geom3_)
376378

377379
geom1_ = LibGEOS._readgeom("LINESTRING(0 0, 5 0, 10 0)")
378380
geom2_ = LibGEOS.pointOnSurface(geom1_)
379381
geom3_ = LibGEOS._readgeom("POINT (5 0)")
380-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
382+
@test LibGEOS.equals(geom2_, geom3_)
381383
LibGEOS.destroyGeom(geom1_)
382384
LibGEOS.destroyGeom(geom2_)
383385
LibGEOS.destroyGeom(geom3_)
384386

385387
geom1_ = LibGEOS._readgeom("POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))")
386388
geom2_ = LibGEOS.pointOnSurface(geom1_)
387389
geom3_ = LibGEOS._readgeom("POINT (5 5)")
388-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
390+
@test LibGEOS.equals(geom2_, geom3_)
389391
LibGEOS.destroyGeom(geom1_)
390392
LibGEOS.destroyGeom(geom2_)
391393
LibGEOS.destroyGeom(geom3_)
@@ -403,12 +405,16 @@
403405

404406
geom1_ = LibGEOS._readgeom("LINESTRING EMPTY")
405407
geom2_ = LibGEOS.pointOnSurface(geom1_)
406-
@test LibGEOS._writegeom(geom2_) == "POINT EMPTY"
408+
geom3_ = LibGEOS._readgeom("POINT EMPTY")
409+
@test LibGEOS.equals(geom2_, geom3_)
410+
LibGEOS.destroyGeom(geom1_)
411+
LibGEOS.destroyGeom(geom2_)
412+
LibGEOS.destroyGeom(geom3_)
407413

408414
geom1_ = LibGEOS._readgeom("LINESTRING(0 0, 0 0)")
409415
geom2_ = LibGEOS.pointOnSurface(geom1_)
410416
geom3_ = LibGEOS._readgeom("POINT (0 0)")
411-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
417+
@test LibGEOS.equals(geom2_, geom3_)
412418
LibGEOS.destroyGeom(geom1_)
413419
LibGEOS.destroyGeom(geom2_)
414420
LibGEOS.destroyGeom(geom3_)
@@ -465,7 +471,7 @@
465471
geom2_ = LibGEOS._readgeom("LINESTRING (-29 -20, 50 60, 50 70, 51 0)")
466472
geom3_ = LibGEOS.sharedPaths(geom1_, geom2_)
467473
geom4_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (MULTILINESTRING ((50 60, 50 70)), MULTILINESTRING EMPTY)")
468-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
474+
@test LibGEOS.equals(geom3_, geom4_)
469475
LibGEOS.destroyGeom(geom1_)
470476
LibGEOS.destroyGeom(geom2_)
471477
LibGEOS.destroyGeom(geom3_)
@@ -501,7 +507,7 @@
501507
geom2_ = LibGEOS._readgeom("POINT(0.5 0)")
502508
geom3_ = LibGEOS.snap(geom1_, geom2_, 1.0)
503509
geom4_ = LibGEOS._readgeom("POLYGON ((0.5 0, 10 0, 10 10, 0 10, 0.5 0))")
504-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
510+
@test LibGEOS.equals(geom3_, geom4_)
505511
LibGEOS.destroyGeom(geom1_)
506512
LibGEOS.destroyGeom(geom2_)
507513
LibGEOS.destroyGeom(geom3_)
@@ -511,7 +517,7 @@
511517
geom2_ = LibGEOS._readgeom("LINESTRING (-29 -20, 40 60, 51 0)")
512518
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
513519
geom4_ = LibGEOS._readgeom("LINESTRING (-29 -20, 50 60, 51 0)")
514-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
520+
@test LibGEOS.equals(geom3_, geom4_)
515521
LibGEOS.destroyGeom(geom1_)
516522
LibGEOS.destroyGeom(geom2_)
517523
LibGEOS.destroyGeom(geom3_)
@@ -521,7 +527,7 @@
521527
geom2_ = LibGEOS._readgeom("LINESTRING (-10 -9, 40 20, 80 79)")
522528
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
523529
geom4_ = LibGEOS._readgeom("LINESTRING (-20 -20, -10 -9, 50 50, 80 79, 100 100)")
524-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
530+
@test LibGEOS.equals(geom3_, geom4_)
525531
LibGEOS.destroyGeom(geom1_)
526532
LibGEOS.destroyGeom(geom2_)
527533
LibGEOS.destroyGeom(geom3_)
@@ -530,15 +536,15 @@
530536
geom1_ = LibGEOS._readgeom("LINESTRING(0 0, 10 0)")
531537
geom2_ = LibGEOS._readgeom("LINESTRING(0 0, 9 0)")
532538
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
533-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom2_)
539+
@test LibGEOS.equals(geom3_, geom2_)
534540
LibGEOS.destroyGeom(geom1_)
535541
LibGEOS.destroyGeom(geom2_)
536542
LibGEOS.destroyGeom(geom3_)
537543

538544
geom1_ = LibGEOS._readgeom("LINESTRING(0 0, 10 0)")
539545
geom2_ = LibGEOS._readgeom("LINESTRING(0 0, 9 0, 10 0, 11 0)")
540546
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
541-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom2_)
547+
@test LibGEOS.equals(geom3_, geom2_)
542548
LibGEOS.destroyGeom(geom1_)
543549
LibGEOS.destroyGeom(geom2_)
544550
LibGEOS.destroyGeom(geom3_)
@@ -547,7 +553,7 @@
547553
geom2_ = LibGEOS._readgeom("MULTIPOINT(5 0,4 1)")
548554
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
549555
geom4_ = LibGEOS._readgeom("LINESTRING (0 3, 4 1, 5 0, 0 1)")
550-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
556+
@test LibGEOS.equals(geom3_, geom4_)
551557
LibGEOS.destroyGeom(geom1_)
552558
LibGEOS.destroyGeom(geom2_)
553559
LibGEOS.destroyGeom(geom3_)
@@ -557,7 +563,7 @@
557563
geom2_ = LibGEOS._readgeom("MULTIPOINT(4 1,5 0)")
558564
geom3_ = LibGEOS.snap(geom1_, geom2_, 2.0)
559565
geom4_ = LibGEOS._readgeom("LINESTRING (0 3, 4 1, 5 0, 0 1)")
560-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
566+
@test LibGEOS.equals(geom3_, geom4_)
561567
LibGEOS.destroyGeom(geom1_)
562568
LibGEOS.destroyGeom(geom2_)
563569
LibGEOS.destroyGeom(geom3_)
@@ -567,7 +573,7 @@
567573
geom2_ = LibGEOS._readgeom("MULTIPOINT(0 0,-1 0)")
568574
geom3_ = LibGEOS.snap(geom1_, geom2_, 3.0)
569575
geom4_ = LibGEOS._readgeom("LINESTRING (-1 0, 0 0, 10 0, 10 10, 0 10, -1 0)")
570-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
576+
@test LibGEOS.equals(geom3_, geom4_)
571577
LibGEOS.destroyGeom(geom1_)
572578
LibGEOS.destroyGeom(geom2_)
573579
LibGEOS.destroyGeom(geom3_)
@@ -577,7 +583,7 @@
577583
geom2_ = LibGEOS._readgeom("POINT(5 0)")
578584
geom3_ = LibGEOS.snap(geom1_, geom2_, 3.0)
579585
geom4_ = LibGEOS._readgeom("LINESTRING (0 2, 5 2, 9 2, 5 0)")
580-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
586+
@test LibGEOS.equals(geom3_, geom4_)
581587
LibGEOS.destroyGeom(geom1_)
582588
LibGEOS.destroyGeom(geom2_)
583589
LibGEOS.destroyGeom(geom3_)
@@ -587,7 +593,7 @@
587593
geom2_ = LibGEOS._readgeom("MULTIPOINT(-71.1261 42.2703,-71.1257 42.2703,-71.1261 42.2702)")
588594
geom3_ = LibGEOS.snap(geom1_, geom2_, 0.5)
589595
geom4_ = LibGEOS._readgeom("LINESTRING (-71.1257 42.2703, -71.1261 42.2703, -71.1261 42.2702, -71.1317 42.2509)")
590-
@test LibGEOS._writegeom(geom3_) == LibGEOS._writegeom(geom4_)
596+
@test LibGEOS.equals(geom3_, geom4_)
591597
LibGEOS.destroyGeom(geom1_)
592598
LibGEOS.destroyGeom(geom2_)
593599
LibGEOS.destroyGeom(geom3_)
@@ -596,62 +602,64 @@
596602
# GEOSUnaryUnionTest
597603
geom1_ = LibGEOS._readgeom("POINT EMPTY")
598604
geom2_ = LibGEOS.unaryUnion(geom1_)
599-
@test LibGEOS._writegeom(geom2_) == "POINT EMPTY"
605+
geom3_ = LibGEOS._readgeom("POINT EMPTY")
606+
@test LibGEOS.equals(geom2_, geom3_)
600607
LibGEOS.destroyGeom(geom1_)
601608
LibGEOS.destroyGeom(geom2_)
609+
LibGEOS.destroyGeom(geom3_)
602610

603611
geom1_ = LibGEOS._readgeom("POINT (6 3)")
604612
geom2_ = LibGEOS.unaryUnion(geom1_)
605613
geom3_ = LibGEOS._readgeom("POINT (6 3)")
606-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
614+
@test LibGEOS.equals(geom2_, geom3_)
607615
LibGEOS.destroyGeom(geom1_)
608616
LibGEOS.destroyGeom(geom2_)
609617
LibGEOS.destroyGeom(geom3_)
610618

611619
geom1_ = LibGEOS._readgeom("POINT (4 5 6)")
612620
geom2_ = LibGEOS.unaryUnion(geom1_)
613621
geom3_ = LibGEOS._readgeom("POINT Z (4 5 6)")
614-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
622+
@test LibGEOS.equals(geom2_, geom3_)
615623
LibGEOS.destroyGeom(geom1_)
616624
LibGEOS.destroyGeom(geom2_)
617625
LibGEOS.destroyGeom(geom3_)
618626

619627
geom1_ = LibGEOS._readgeom("MULTIPOINT (4 5, 6 7, 4 5, 6 5, 6 7)")
620628
geom2_ = LibGEOS.unaryUnion(geom1_)
621629
geom3_ = LibGEOS._readgeom("MULTIPOINT (4 5, 6 5, 6 7)")
622-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
630+
@test LibGEOS.equals(geom2_, geom3_)
623631
LibGEOS.destroyGeom(geom1_)
624632
LibGEOS.destroyGeom(geom2_)
625633
LibGEOS.destroyGeom(geom3_)
626634

627635
geom1_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT(4 5), MULTIPOINT(6 7, 6 5, 6 7), LINESTRING(0 5, 10 5), LINESTRING(4 -10, 4 10))")
628636
geom2_ = LibGEOS.unaryUnion(geom1_)
629637
geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT (6 7), LINESTRING (0 5, 4 5), LINESTRING (4 5, 10 5), LINESTRING (4 -10, 4 5), LINESTRING (4 5, 4 10))")
630-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
638+
@test LibGEOS.equals(geom2_, geom3_)
631639
LibGEOS.destroyGeom(geom1_)
632640
LibGEOS.destroyGeom(geom2_)
633641
LibGEOS.destroyGeom(geom3_)
634642

635643
geom1_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT(4 5), MULTIPOINT(6 7, 6 5, 6 7), POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 6, 7 6, 7 8, 5 8, 5 6)))")
636644
geom2_ = LibGEOS.unaryUnion(geom1_)
637645
geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT (6 7), POLYGON ((0 0, 10 0, 10 10, 0 10, 0 0), (5 6, 7 6, 7 8, 5 8, 5 6)))")
638-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
646+
@test LibGEOS.equals(geom2_, geom3_)
639647
LibGEOS.destroyGeom(geom1_)
640648
LibGEOS.destroyGeom(geom2_)
641649
LibGEOS.destroyGeom(geom3_)
642650

643651
geom1_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (MULTILINESTRING((5 7, 12 7), (4 5, 6 5), (5.5 7.5, 6.5 7.5)), POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 6, 7 6, 7 8, 5 8, 5 6)))")
644652
geom2_ = LibGEOS.unaryUnion(geom1_)
645653
geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (LINESTRING (5 7, 7 7), LINESTRING (10 7, 12 7), LINESTRING (5.5 7.5, 6.5 7.5), POLYGON ((10 7, 10 0, 0 0, 0 10, 10 10, 10 7), (5 6, 7 6, 7 7, 7 8, 5 8, 5 7, 5 6)))")
646-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
654+
@test LibGEOS.equals(geom2_, geom3_)
647655
LibGEOS.destroyGeom(geom1_)
648656
LibGEOS.destroyGeom(geom2_)
649657
LibGEOS.destroyGeom(geom3_)
650658

651659
geom1_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (MULTILINESTRING((5 7, 12 7), (4 5, 6 5), (5.5 7.5, 6.5 7.5)), POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 6, 7 6, 7 8, 5 8, 5 6)), MULTIPOINT(6 6.5, 6 1, 12 2, 6 1))")
652660
geom2_ = LibGEOS.unaryUnion(geom1_)
653661
geom3_ = LibGEOS._readgeom("GEOMETRYCOLLECTION (POINT (6 6.5), POINT (12 2), LINESTRING (5 7, 7 7), LINESTRING (10 7, 12 7), LINESTRING (5.5 7.5, 6.5 7.5), POLYGON ((10 7, 10 0, 0 0, 0 10, 10 10, 10 7), (5 6, 7 6, 7 7, 7 8, 5 8, 5 7, 5 6)))")
654-
@test LibGEOS._writegeom(geom2_) == LibGEOS._writegeom(geom3_)
662+
@test LibGEOS.equals(geom2_, geom3_)
655663
LibGEOS.destroyGeom(geom1_)
656664
LibGEOS.destroyGeom(geom2_)
657665
LibGEOS.destroyGeom(geom3_)
@@ -725,7 +733,7 @@
725733
geom3_ = setPrecision(geom1_, 5.0, flags = LibGEOS.GEOS_PREC_KEEP_COLLAPSED)
726734
# @test equals(geom3_, readgeom("LINESTRING (0 0, 0 0)")) # false ??
727735
@test writegeom(geom3_) == "LINESTRING (0 0, 0 0)"
728-
736+
729737
LibGEOS.destroyGeom(geom1_)
730738
LibGEOS.destroyGeom(geom2_)
731739
LibGEOS.destroyGeom(geom3_)
@@ -735,7 +743,7 @@
735743
input_ = readgeom("POLYGON ((1 6, 6 11, 11 6, 6 1, 1 6))")
736744
output_ = minimumRotatedRectangle(input_)
737745
expected_ = readgeom("POLYGON ((6 1, 11 6, 6 11, 1 6, 6 1))")
738-
@test writegeom(output_) == writegeom(expected_)
746+
@test LibGEOS.equals(output_, expected_)
739747
LibGEOS.destroyGeom(input_)
740748
LibGEOS.destroyGeom(output_)
741749
LibGEOS.destroyGeom(expected_)

‎test/test_geos_operations.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
function equivalent_to_wkt(geom::GeoInterface.AbstractGeometry, wkt::String)
22
test_geom = readgeom(wkt)
3-
@test writegeom(geom) == writegeom(test_geom)
3+
@test LibGEOS.equals(geom, test_geom)
44
end
55

66
function factcheck(f::Function, geom::String, expected::String)

0 commit comments

Comments
 (0)