Index: trunk/test/data/tracks/tracks-extensions.gpx
===================================================================
--- trunk/test/data/tracks/tracks-extensions.gpx (revision 15496)
+++ trunk/test/data/tracks/tracks-extensions.gpx (revision 15496)
@@ -0,0 +1,1378 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Track extension
+
+ Red
+
+
+
+
+ Segment extension
+
+
+ 471.86000000000001
+
+
+
+ 471.43000000000001
+
+
+
+ 470.69
+
+
+
+ 470.94
+
+
+
+ 471.5
+
+
+
+ 471.67000000000002
+
+
+
+ 471.58999999999997
+
+
+
+ 472.44999999999999
+
+
+
+ 472.54000000000002
+
+
+
+ 472.45999999999998
+
+
+
+ 471.38
+
+
+
+ 471.26999999999998
+
+
+
+ 471.36000000000001
+
+
+
+ 473.19999999999999
+
+
+
+ 475.06
+
+
+
+ 474.75
+
+
+
+ 474.62
+
+
+
+ 474.74000000000001
+
+
+
+ 474.06
+
+
+
+ 474
+
+
+
+ 474.58999999999997
+
+
+
+ 474.81999999999999
+
+
+
+ 476.29000000000002
+
+
+
+ 478.48000000000002
+
+
+
+ 481.02999999999997
+
+
+
+ 480
+
+
+
+ 479.58999999999997
+
+
+
+ 478.99000000000001
+
+
+
+ 479.58999999999997
+
+
+
+ 481.18000000000001
+
+
+
+ 481.88
+
+
+
+ 483.11000000000001
+
+
+
+ 484.49000000000001
+
+
+
+ 486.88
+
+
+
+ 488.05000000000001
+
+
+
+ 487.76999999999998
+
+
+
+ 488.95999999999998
+
+
+
+ 488.36000000000001
+
+
+
+ 488.35000000000002
+
+
+
+ 487.19
+
+
+
+ 487.63999999999999
+
+
+
+ 487.55000000000001
+
+
+
+ 488.39999999999998
+
+
+
+ 489.18000000000001
+
+
+
+ 490.73000000000002
+
+
+
+ 491.24000000000001
+
+
+
+ 490.25
+
+
+
+ 490.00999999999999
+
+
+
+ 489.54000000000002
+
+
+
+ 489.66000000000003
+
+
+
+ 489.06
+
+
+
+ 490.08999999999997
+
+
+
+ 489.41000000000003
+
+
+
+ 489.17000000000002
+
+
+
+ 488.87
+
+
+
+ 489.37
+
+
+
+ 488.94999999999999
+
+
+
+ 488.93000000000001
+
+
+
+ 488.88999999999999
+
+
+
+ 488.86000000000001
+
+
+
+ 489.19999999999999
+
+
+
+ 489.29000000000002
+
+
+
+ 488.95999999999998
+
+
+
+ 489.10000000000002
+
+
+
+ 492.19
+
+
+
+ 492.12
+
+
+
+ 493.06999999999999
+
+
+
+ 492.58999999999997
+
+
+
+ 492.38999999999999
+
+
+
+ 492.94
+
+
+
+ 492.47000000000003
+
+
+
+ 492.50999999999999
+
+
+
+ 492.73000000000002
+
+
+
+ 492.63
+
+
+
+ 493
+
+
+
+ 493.00999999999999
+
+
+
+ 493.19999999999999
+
+
+
+ 493.18000000000001
+
+
+
+ 493
+
+
+
+ 493.20999999999998
+
+
+
+ 493.11000000000001
+
+
+
+ 493.30000000000001
+
+
+
+ 493.50999999999999
+
+
+
+ 493
+
+
+
+ 492.37
+
+
+
+ 492.30000000000001
+
+
+
+ 492.04000000000002
+
+
+
+ 491.37
+
+
+
+ 491.06999999999999
+
+
+
+ 490.39999999999998
+
+
+
+ 489.75
+
+
+
+ 489.87
+
+
+
+ 488.95999999999998
+
+
+
+ 485.85000000000002
+
+
+
+ 482.81
+
+
+
+ 481.99000000000001
+
+
+
+ 478.92
+
+
+ 476
+
+
+ 474.38
+
+
+
+ 474.35000000000002
+
+
+
+ 474.12
+
+
+
+ 472.52999999999997
+
+
+
+ 472.75
+
+
+
+ 472.19
+
+
+
+ 471.92000000000002
+
+
+
+ 471.98000000000002
+
+
+
+ 473.49000000000001
+
+
+
+ 473.44999999999999
+
+
+
+ 473.45999999999998
+
+
+
+ 470.27999999999997
+
+
+
+ 467.20999999999998
+
+
+
+ 466.89999999999998
+
+
+
+ 466.76999999999998
+
+
+
+ 466.25
+
+
+
+ 465.23000000000002
+
+
+
+ 464.12
+
+
+
+ 463.68000000000001
+
+
+
+ 462.5
+
+
+
+ 462.45999999999998
+
+
+
+ 461.56999999999999
+
+
+
+ 461.14999999999998
+
+
+
+ 460.19
+
+
+
+ 459.83999999999997
+
+
+
+ 460.49000000000001
+
+
+
+ 460.23000000000002
+
+
+
+ 460.56999999999999
+
+
+
+ 457.79000000000002
+
+
+
+ 454.66000000000003
+
+
+
+
+
+
+ #0000FF
+
+
+
+ 624.7421875
+
+
+ 626.015625
+
+
+ 627.0625
+
+
+ 627.3671875
+
+
+ 626.90234375
+
+
+ 626.11328125
+
+
+ 625.33203125
+
+
+ 623.90625
+
+
+ 623.66796875
+
+
+ 623.71484375
+
+
+ 623.75
+
+
+ 623.9375
+
+
+ 624.1640625
+
+
+ 625.234375
+
+
+ 626
+
+
+ 626.3515625
+
+
+ 626.14453125
+
+
+ 625.6640625
+
+
+ 624.7890625
+
+
+ 623.23046875
+
+
+ 622.09375
+
+
+ 620.9765625
+
+
+ 620.23828125
+
+
+ 619.42578125
+
+
+ 617.7734375
+
+
+ 616.8671875
+
+
+ 616.09765625
+
+
+ 615.87890625
+
+
+ 615.3984375
+
+
+ 614.76953125
+
+
+ 613.47265625
+
+
+ 612.72265625
+
+
+ 612.4609375
+
+
+ 611.85546875
+
+
+ 611.90625
+
+
+ 612.27734375
+
+
+ 613.66796875
+
+
+ 614.62890625
+
+
+ 615.0703125
+
+
+ 614.72265625
+
+
+ 614.26171875
+
+
+ 612.06640625
+
+
+ 609.6875
+
+
+ 606.83984375
+
+
+ 604.671875
+
+
+ 602.52734375
+
+
+ 600.78515625
+
+
+ 598.078125
+
+
+ 597.1953125
+
+
+ 596.5234375
+
+
+ 595.74609375
+
+
+ 594.82421875
+
+
+ 594.10546875
+
+
+ 593.2109375
+
+
+ 592.6875
+
+
+ 592.5390625
+
+
+ 592.7578125
+
+
+ 592.77734375
+
+
+ 592.63671875
+
+
+ 592.06640625
+
+
+ 591.2578125
+
+
+ 590.46875
+
+
+ 589.7578125
+
+
+ 589.359375
+
+
+ 589.05859375
+
+
+ 589.21875
+
+
+ 589.59375
+
+
+ 589.98046875
+
+
+ 589.51953125
+
+
+ 588.796875
+
+
+ 587.4375
+
+
+ 585.70703125
+
+
+ 584.48046875
+
+
+ 583.328125
+
+
+ 582.69921875
+
+
+ 581.96875
+
+
+ 581.3359375
+
+
+ 580.6796875
+
+
+ 580.33984375
+
+
+ 580.0234375
+
+
+ 579.5078125
+
+
+ 578.890625
+
+
+ 578.34375
+
+
+ 577.984375
+
+
+ 577.90234375
+
+
+ 577.50390625
+
+
+ 577.20703125
+
+
+ 576.6171875
+
+
+ 575.82421875
+
+
+ 575.125
+
+
+ 575.0546875
+
+
+ 574.89453125
+
+
+ 574.75
+
+
+ 574.6484375
+
+
+ 574.26953125
+
+
+ 573.72265625
+
+
+ 572.4296875
+
+
+ 570.828125
+
+
+ 570.1015625
+
+
+ 568.7734375
+
+
+ 567.8125
+
+
+ 567.25390625
+
+
+ 567.09765625
+
+
+ 567.1640625
+
+
+ 567.546875
+
+
+ 567.86328125
+
+
+ 568.2890625
+
+
+ 568.49609375
+
+
+ 568.33203125
+
+
+ 566.84765625
+
+
+ 566.609375
+
+
+ 566.94140625
+
+
+ 566.88671875
+
+
+ 566.27734375
+
+
+ 565.48046875
+
+
+ 563.5
+
+
+ 562.51953125
+
+
+ 561.9453125
+
+
+ 561.85546875
+
+
+ 561.7578125
+
+
+ 561.765625
+
+
+ 561.453125
+
+
+ 560.6015625
+
+
+ 559.65234375
+
+
+ 558.7578125
+
+
+ 557.66015625
+
+
+ 556.35546875
+
+
+ 555.2265625
+
+
+ 553.53125
+
+
+ 551.265625
+
+
+ 549.92578125
+
+
+ 549.140625
+
+
+ 548.48828125
+
+
+ 548.0078125
+
+
+ 547.39453125
+
+
+ 547.15234375
+
+
+ 547.08203125
+
+
+ 547.55078125
+
+
+ 548.69921875
+
+
+ 548.76953125
+
+
+ 548.51953125
+
+
+ 547.88671875
+
+
+ 546.7265625
+
+
+ 545.3984375
+
+
+ 543.87890625
+
+
+ 540.6484375
+
+
+ 536.4296875
+
+
+ 536.046875
+
+
+ 535.765625
+
+
+ 535.71875
+
+
+ 535.55859375
+
+
+ 535.359375
+
+
+ 534.5234375
+
+
+ 534.2578125
+
+
+ 535.1328125
+
+
+ 535.46875
+
+
+ 535.04296875
+
+
+ 534.04296875
+
+
+ 532.234375
+
+
+ 530.2109375
+
+
+ 528.7890625
+
+
+ 527.69140625
+
+
+ 526.76171875
+
+
+ 526.1171875
+
+
+ 525.83984375
+
+
+ 525.51171875
+
+
+ 525.34375
+
+
+ 525.18359375
+
+
+ 524.3515625
+
+
+ 524.41015625
+
+
+ 524.47265625
+
+
+ 524.02734375
+
+
+ 523.09375
+
+
+ 521.92578125
+
+
+ 520.87109375
+
+
+ 520.51953125
+
+
+ 520.2578125
+
+
+ 519.6640625
+
+
+ 518.5703125
+
+
+ 517.04296875
+
+
+ 513.03125
+
+
+ 510.19921875
+
+
+ 508.5
+
+
+ 507.8828125
+
+
+ 506.71875
+
+
+ 506.03125
+
+
+ 505.5390625
+
+
+ 504.96875
+
+
+ 504.28125
+
+
+ 503.6640625
+
+
+ 502.578125
+
+
+ 500.921875
+
+
+ 499.85546875
+
+
+ 499.40234375
+
+
+ 498.96875
+
+
+ 497.8828125
+
+
+ 496.2265625
+
+
+ 494.9609375
+
+
+ 494.13671875
+
+
+ 493.6015625
+
+
+ 492.828125
+
+
+ 492.1015625
+
+
+ 491.76953125
+
+
+ 490.83984375
+
+
+ 490.23828125
+
+
+ 489.96484375
+
+
+ 489.703125
+
+
+ 484.7109375
+
+
+ 482.328125
+
+
+ 481.04296875
+
+
+ 480.3046875
+
+
+ 479.70703125
+
+
+ 478.984375
+
+
+ 478.4609375
+
+
+ 479.1015625
+
+
+ 480.359375
+
+
+ 481.19140625
+
+
+ 482.2890625
+
+
+ 483.28125
+
+
+ 483.69921875
+
+
+ 483.4609375
+
+
+ 483.0390625
+
+
+ 481.9140625
+
+
+ 480.515625
+
+
+ 479.16796875
+
+
+ 476.74609375
+
+
+ 474.3515625
+
+
+ 473.28515625
+
+
+ 472.39453125
+
+
+ 471.3671875
+
+
+ 470.0390625
+
+
+ 468.76171875
+
+
+ 467.3671875
+
+
+ 466.60546875
+
+
+ 464.65625
+
+
+ 463.62109375
+
+
+ 462.84375
+
+
+ 462.84765625
+
+
+
+
+
+ #00FF00
+
+
+
+ 647.81640625
+
+
+ 646.87109375
+
+
+ 646.1953125
+
+
+ 645.5859375
+
+
+ 644.8203125
+
+
+ 642.9765625
+
+
+ 641.796875
+
+
+ 639.4296875
+
+
+ 636.4921875
+
+
+ 634.1328125
+
+
+ 629.55859375
+
+
+ 627.55078125
+
+
+ 624.0234375
+
+
+
+
+
+
+ 663.90234375
+
+
+ 662.74609375
+
+
+ 662.1328125
+
+
+ 661.39453125
+
+
+ 658.98828125
+
+
+ 657.47265625
+
+
+ 654.22265625
+
+
+ 650.0703125
+
+
+ 647.890625
+
+
+
+
+
+
+ 421.52999999999997
+
+
+
+ 423.57999999999998
+
+
+
+ 423
+
+
+
+ 423.07999999999998
+
+
+
+ 423.02999999999997
+
+
+
+ 422.26999999999998
+
+
+
+ 421.35000000000002
+
+
+
+ 421.75
+
+
+
+ 421.48000000000002
+
+
+
+
+
Index: trunk/test/data/tracks/tracks-extensions.osm
===================================================================
--- trunk/test/data/tracks/tracks-extensions.osm (revision 15496)
+++ trunk/test/data/tracks/tracks-extensions.osm (revision 15496)
@@ -0,0 +1,1741 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/data/tracks/tracks-layerprefs.gpx
===================================================================
--- trunk/test/data/tracks/tracks-layerprefs.gpx (revision 15496)
+++ trunk/test/data/tracks/tracks-layerprefs.gpx (revision 15496)
@@ -0,0 +1,1384 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #FF0000
+
+
+
+ Segment extension
+
+
+ 471.86000000000001
+
+
+
+ 471.43000000000001
+
+
+
+ 470.69
+
+
+
+ 470.94
+
+
+
+ 471.5
+
+
+
+ 471.67000000000002
+
+
+
+ 471.58999999999997
+
+
+
+ 472.44999999999999
+
+
+
+ 472.54000000000002
+
+
+
+ 472.45999999999998
+
+
+
+ 471.38
+
+
+
+ 471.26999999999998
+
+
+
+ 471.36000000000001
+
+
+
+ 473.19999999999999
+
+
+
+ 475.06
+
+
+
+ 474.75
+
+
+
+ 474.62
+
+
+
+ 474.74000000000001
+
+
+
+ 474.06
+
+
+
+ 474
+
+
+
+ 474.58999999999997
+
+
+
+ 474.81999999999999
+
+
+
+ 476.29000000000002
+
+
+
+ 478.48000000000002
+
+
+
+ 481.02999999999997
+
+
+
+ 480
+
+
+
+ 479.58999999999997
+
+
+
+ 478.99000000000001
+
+
+
+ 479.58999999999997
+
+
+
+ 481.18000000000001
+
+
+
+ 481.88
+
+
+
+ 483.11000000000001
+
+
+
+ 484.49000000000001
+
+
+
+ 486.88
+
+
+
+ 488.05000000000001
+
+
+
+ 487.76999999999998
+
+
+
+ 488.95999999999998
+
+
+
+ 488.36000000000001
+
+
+
+ 488.35000000000002
+
+
+
+ 487.19
+
+
+
+ 487.63999999999999
+
+
+
+ 487.55000000000001
+
+
+
+ 488.39999999999998
+
+
+
+ 489.18000000000001
+
+
+
+ 490.73000000000002
+
+
+
+ 491.24000000000001
+
+
+
+ 490.25
+
+
+
+ 490.00999999999999
+
+
+
+ 489.54000000000002
+
+
+
+ 489.66000000000003
+
+
+
+ 489.06
+
+
+
+ 490.08999999999997
+
+
+
+ 489.41000000000003
+
+
+
+ 489.17000000000002
+
+
+
+ 488.87
+
+
+
+ 489.37
+
+
+
+ 488.94999999999999
+
+
+
+ 488.93000000000001
+
+
+
+ 488.88999999999999
+
+
+
+ 488.86000000000001
+
+
+
+ 489.19999999999999
+
+
+
+ 489.29000000000002
+
+
+
+ 488.95999999999998
+
+
+
+ 489.10000000000002
+
+
+
+ 492.19
+
+
+
+ 492.12
+
+
+
+ 493.06999999999999
+
+
+
+ 492.58999999999997
+
+
+
+ 492.38999999999999
+
+
+
+ 492.94
+
+
+
+ 492.47000000000003
+
+
+
+ 492.50999999999999
+
+
+
+ 492.73000000000002
+
+
+
+ 492.63
+
+
+
+ 493
+
+
+
+ 493.00999999999999
+
+
+
+ 493.19999999999999
+
+
+
+ 493.18000000000001
+
+
+
+ 493
+
+
+
+ 493.20999999999998
+
+
+
+ 493.11000000000001
+
+
+
+ 493.30000000000001
+
+
+
+ 493.50999999999999
+
+
+
+ 493
+
+
+
+ 492.37
+
+
+
+ 492.30000000000001
+
+
+
+ 492.04000000000002
+
+
+
+ 491.37
+
+
+
+ 491.06999999999999
+
+
+
+ 490.39999999999998
+
+
+
+ 489.75
+
+
+
+ 489.87
+
+
+
+ 488.95999999999998
+
+
+
+ 485.85000000000002
+
+
+
+ 482.81
+
+
+
+ 481.99000000000001
+
+
+
+ 478.92
+
+
+ 476
+
+
+ 474.38
+
+
+
+ 474.35000000000002
+
+
+
+ 474.12
+
+
+
+ 472.52999999999997
+
+
+
+ 472.75
+
+
+
+ 472.19
+
+
+
+ 471.92000000000002
+
+
+
+ 471.98000000000002
+
+
+
+ 473.49000000000001
+
+
+
+ 473.44999999999999
+
+
+
+ 473.45999999999998
+
+
+
+ 470.27999999999997
+
+
+
+ 467.20999999999998
+
+
+
+ 466.89999999999998
+
+
+
+ 466.76999999999998
+
+
+
+ 466.25
+
+
+
+ 465.23000000000002
+
+
+
+ 464.12
+
+
+
+ 463.68000000000001
+
+
+
+ 462.5
+
+
+
+ 462.45999999999998
+
+
+
+ 461.56999999999999
+
+
+
+ 461.14999999999998
+
+
+
+ 460.19
+
+
+
+ 459.83999999999997
+
+
+
+ 460.49000000000001
+
+
+
+ 460.23000000000002
+
+
+
+ 460.56999999999999
+
+
+
+ 457.79000000000002
+
+
+
+ 454.66000000000003
+
+
+
+
+
+
+ #0000FF
+
+
+
+ 624.7421875
+
+
+ 626.015625
+
+
+ 627.0625
+
+
+ 627.3671875
+
+
+ 626.90234375
+
+
+ 626.11328125
+
+
+ 625.33203125
+
+
+ 623.90625
+
+
+ 623.66796875
+
+
+ 623.71484375
+
+
+ 623.75
+
+
+ 623.9375
+
+
+ 624.1640625
+
+
+ 625.234375
+
+
+ 626
+
+
+ 626.3515625
+
+
+ 626.14453125
+
+
+ 625.6640625
+
+
+ 624.7890625
+
+
+ 623.23046875
+
+
+ 622.09375
+
+
+ 620.9765625
+
+
+ 620.23828125
+
+
+ 619.42578125
+
+
+ 617.7734375
+
+
+ 616.8671875
+
+
+ 616.09765625
+
+
+ 615.87890625
+
+
+ 615.3984375
+
+
+ 614.76953125
+
+
+ 613.47265625
+
+
+ 612.72265625
+
+
+ 612.4609375
+
+
+ 611.85546875
+
+
+ 611.90625
+
+
+ 612.27734375
+
+
+ 613.66796875
+
+
+ 614.62890625
+
+
+ 615.0703125
+
+
+ 614.72265625
+
+
+ 614.26171875
+
+
+ 612.06640625
+
+
+ 609.6875
+
+
+ 606.83984375
+
+
+ 604.671875
+
+
+ 602.52734375
+
+
+ 600.78515625
+
+
+ 598.078125
+
+
+ 597.1953125
+
+
+ 596.5234375
+
+
+ 595.74609375
+
+
+ 594.82421875
+
+
+ 594.10546875
+
+
+ 593.2109375
+
+
+ 592.6875
+
+
+ 592.5390625
+
+
+ 592.7578125
+
+
+ 592.77734375
+
+
+ 592.63671875
+
+
+ 592.06640625
+
+
+ 591.2578125
+
+
+ 590.46875
+
+
+ 589.7578125
+
+
+ 589.359375
+
+
+ 589.05859375
+
+
+ 589.21875
+
+
+ 589.59375
+
+
+ 589.98046875
+
+
+ 589.51953125
+
+
+ 588.796875
+
+
+ 587.4375
+
+
+ 585.70703125
+
+
+ 584.48046875
+
+
+ 583.328125
+
+
+ 582.69921875
+
+
+ 581.96875
+
+
+ 581.3359375
+
+
+ 580.6796875
+
+
+ 580.33984375
+
+
+ 580.0234375
+
+
+ 579.5078125
+
+
+ 578.890625
+
+
+ 578.34375
+
+
+ 577.984375
+
+
+ 577.90234375
+
+
+ 577.50390625
+
+
+ 577.20703125
+
+
+ 576.6171875
+
+
+ 575.82421875
+
+
+ 575.125
+
+
+ 575.0546875
+
+
+ 574.89453125
+
+
+ 574.75
+
+
+ 574.6484375
+
+
+ 574.26953125
+
+
+ 573.72265625
+
+
+ 572.4296875
+
+
+ 570.828125
+
+
+ 570.1015625
+
+
+ 568.7734375
+
+
+ 567.8125
+
+
+ 567.25390625
+
+
+ 567.09765625
+
+
+ 567.1640625
+
+
+ 567.546875
+
+
+ 567.86328125
+
+
+ 568.2890625
+
+
+ 568.49609375
+
+
+ 568.33203125
+
+
+ 566.84765625
+
+
+ 566.609375
+
+
+ 566.94140625
+
+
+ 566.88671875
+
+
+ 566.27734375
+
+
+ 565.48046875
+
+
+ 563.5
+
+
+ 562.51953125
+
+
+ 561.9453125
+
+
+ 561.85546875
+
+
+ 561.7578125
+
+
+ 561.765625
+
+
+ 561.453125
+
+
+ 560.6015625
+
+
+ 559.65234375
+
+
+ 558.7578125
+
+
+ 557.66015625
+
+
+ 556.35546875
+
+
+ 555.2265625
+
+
+ 553.53125
+
+
+ 551.265625
+
+
+ 549.92578125
+
+
+ 549.140625
+
+
+ 548.48828125
+
+
+ 548.0078125
+
+
+ 547.39453125
+
+
+ 547.15234375
+
+
+ 547.08203125
+
+
+ 547.55078125
+
+
+ 548.69921875
+
+
+ 548.76953125
+
+
+ 548.51953125
+
+
+ 547.88671875
+
+
+ 546.7265625
+
+
+ 545.3984375
+
+
+ 543.87890625
+
+
+ 540.6484375
+
+
+ 536.4296875
+
+
+ 536.046875
+
+
+ 535.765625
+
+
+ 535.71875
+
+
+ 535.55859375
+
+
+ 535.359375
+
+
+ 534.5234375
+
+
+ 534.2578125
+
+
+ 535.1328125
+
+
+ 535.46875
+
+
+ 535.04296875
+
+
+ 534.04296875
+
+
+ 532.234375
+
+
+ 530.2109375
+
+
+ 528.7890625
+
+
+ 527.69140625
+
+
+ 526.76171875
+
+
+ 526.1171875
+
+
+ 525.83984375
+
+
+ 525.51171875
+
+
+ 525.34375
+
+
+ 525.18359375
+
+
+ 524.3515625
+
+
+ 524.41015625
+
+
+ 524.47265625
+
+
+ 524.02734375
+
+
+ 523.09375
+
+
+ 521.92578125
+
+
+ 520.87109375
+
+
+ 520.51953125
+
+
+ 520.2578125
+
+
+ 519.6640625
+
+
+ 518.5703125
+
+
+ 517.04296875
+
+
+ 513.03125
+
+
+ 510.19921875
+
+
+ 508.5
+
+
+ 507.8828125
+
+
+ 506.71875
+
+
+ 506.03125
+
+
+ 505.5390625
+
+
+ 504.96875
+
+
+ 504.28125
+
+
+ 503.6640625
+
+
+ 502.578125
+
+
+ 500.921875
+
+
+ 499.85546875
+
+
+ 499.40234375
+
+
+ 498.96875
+
+
+ 497.8828125
+
+
+ 496.2265625
+
+
+ 494.9609375
+
+
+ 494.13671875
+
+
+ 493.6015625
+
+
+ 492.828125
+
+
+ 492.1015625
+
+
+ 491.76953125
+
+
+ 490.83984375
+
+
+ 490.23828125
+
+
+ 489.96484375
+
+
+ 489.703125
+
+
+ 484.7109375
+
+
+ 482.328125
+
+
+ 481.04296875
+
+
+ 480.3046875
+
+
+ 479.70703125
+
+
+ 478.984375
+
+
+ 478.4609375
+
+
+ 479.1015625
+
+
+ 480.359375
+
+
+ 481.19140625
+
+
+ 482.2890625
+
+
+ 483.28125
+
+
+ 483.69921875
+
+
+ 483.4609375
+
+
+ 483.0390625
+
+
+ 481.9140625
+
+
+ 480.515625
+
+
+ 479.16796875
+
+
+ 476.74609375
+
+
+ 474.3515625
+
+
+ 473.28515625
+
+
+ 472.39453125
+
+
+ 471.3671875
+
+
+ 470.0390625
+
+
+ 468.76171875
+
+
+ 467.3671875
+
+
+ 466.60546875
+
+
+ 464.65625
+
+
+ 463.62109375
+
+
+ 462.84375
+
+
+ 462.84765625
+
+
+
+
+
+ #00FF00
+
+
+
+ 647.81640625
+
+
+ 646.87109375
+
+
+ 646.1953125
+
+
+ 645.5859375
+
+
+ 644.8203125
+
+
+ 642.9765625
+
+
+ 641.796875
+
+
+ 639.4296875
+
+
+ 636.4921875
+
+
+ 634.1328125
+
+
+ 629.55859375
+
+
+ 627.55078125
+
+
+ 624.0234375
+
+
+
+
+
+ #FFCC00
+
+
+
+ 663.90234375
+
+
+ 662.74609375
+
+
+ 662.1328125
+
+
+ 661.39453125
+
+
+ 658.98828125
+
+
+ 657.47265625
+
+
+ 654.22265625
+
+
+ 650.0703125
+
+
+ 647.890625
+
+
+
+
+
+
+ 421.52999999999997
+
+
+
+ 423.57999999999998
+
+
+
+ 423
+
+
+
+ 423.07999999999998
+
+
+
+ 423.02999999999997
+
+
+
+ 422.26999999999998
+
+
+
+ 421.35000000000002
+
+
+
+ 421.75
+
+
+
+ 421.48000000000002
+
+
+
+
+
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java (revision 15496)
@@ -36,4 +36,5 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
/**
@@ -64,5 +65,5 @@
@Test
public void testMergeFrom() {
- ImmutableGpxTrack track = singleWaypointGpxTrack();
+ GpxTrack track = singleWaypointGpxTrack();
GpxRoute route = singleWaypointRoute();
WayPoint newWP = new WayPoint(LatLon.NORTH_POLE);
@@ -103,5 +104,7 @@
final GpxData expected = getGpx(exp);
own.mergeFrom(other, cut, connect);
- assertEquals(expected, own);
+ own.put(GpxConstants.META_BOUNDS, null);
+ expected.put(GpxConstants.META_BOUNDS, null); //they are only updated by GpxWriter
+ assertEquals(exp + " didn't match!", expected, own);
}
@@ -117,6 +120,6 @@
assertEquals(0, data.getTracks().size());
- ImmutableGpxTrack track1 = emptyGpxTrack();
- ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+ GpxTrack track1 = emptyGpxTrack();
+ GpxTrack track2 = singleWaypointGpxTrack();
data.addTrack(track1);
assertEquals(1, data.getTracks().size());
@@ -137,5 +140,5 @@
@Test(expected = IllegalArgumentException.class)
public void testAddTrackFails() {
- ImmutableGpxTrack track1 = emptyGpxTrack();
+ GpxTrack track1 = emptyGpxTrack();
data.addTrack(track1);
data.addTrack(track1);
@@ -147,5 +150,5 @@
@Test(expected = IllegalArgumentException.class)
public void testRemoveTrackFails() {
- ImmutableGpxTrack track1 = emptyGpxTrack();
+ GpxTrack track1 = emptyGpxTrack();
data.addTrack(track1);
data.removeTrack(track1);
@@ -246,8 +249,8 @@
public void testHasTrackPoints() {
assertFalse(data.hasTrackPoints());
- ImmutableGpxTrack track1 = emptyGpxTrack();
+ GpxTrack track1 = emptyGpxTrack();
data.addTrack(track1);
assertFalse(data.hasTrackPoints());
- ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+ GpxTrack track2 = singleWaypointGpxTrack();
data.addTrack(track2);
assertTrue(data.hasTrackPoints());
@@ -260,8 +263,8 @@
public void testGetTrackPoints() {
assertEquals(0, data.getTrackPoints().count());
- ImmutableGpxTrack track1 = singleWaypointGpxTrack();
+ GpxTrack track1 = singleWaypointGpxTrack();
data.addTrack(track1);
assertEquals(1, data.getTrackPoints().count());
- ImmutableGpxTrack track2 = singleWaypointGpxTrack();
+ GpxTrack track2 = singleWaypointGpxTrack();
data.addTrack(track2);
assertEquals(2, data.getTrackPoints().count());
@@ -281,5 +284,5 @@
@Test
public void testIsEmpty() {
- ImmutableGpxTrack track1 = singleWaypointGpxTrack();
+ GpxTrack track1 = singleWaypointGpxTrack();
WayPoint waypoint = new WayPoint(LatLon.ZERO);
GpxRoute route = singleWaypointRoute();
@@ -308,9 +311,9 @@
@Test
public void testLength() {
- ImmutableGpxTrack track1 = waypointGpxTrack(
+ GpxTrack track1 = waypointGpxTrack(
new WayPoint(new LatLon(0, 0)),
new WayPoint(new LatLon(1, 1)),
new WayPoint(new LatLon(0, 2)));
- ImmutableGpxTrack track2 = waypointGpxTrack(
+ GpxTrack track2 = waypointGpxTrack(
new WayPoint(new LatLon(0, 0)),
new WayPoint(new LatLon(-1, 1)));
@@ -336,6 +339,6 @@
p2.setTime(new Date(100020));
p4.setTime(new Date(500020));
- data.addTrack(new ImmutableGpxTrack(Arrays.asList(Arrays.asList(p1, p2)), Collections.emptyMap()));
- data.addTrack(new ImmutableGpxTrack(Arrays.asList(Arrays.asList(p3, p4, p5)), Collections.emptyMap()));
+ data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p1, p2)), Collections.emptyMap()));
+ data.addTrack(new GpxTrack(Arrays.asList(Arrays.asList(p3, p4, p5)), Collections.emptyMap()));
Date[] times = data.getMinMaxTimeForAllTracks();
@@ -355,5 +358,5 @@
.map(WayPoint::new)
.collect(Collectors.toList());
- data.addTrack(new ImmutableGpxTrack(Arrays.asList(points), Collections.emptyMap()));
+ data.addTrack(new GpxTrack(Arrays.asList(points), Collections.emptyMap()));
WayPoint closeToMiddle = data.nearestPointOnTrack(new EastNorth(10, 0), 10);
@@ -449,14 +452,14 @@
}
- private static ImmutableGpxTrack emptyGpxTrack() {
- return new ImmutableGpxTrack(Collections.>emptyList(), Collections.emptyMap());
- }
-
- private static ImmutableGpxTrack singleWaypointGpxTrack() {
- return new ImmutableGpxTrack(Collections.singleton(Collections.singleton(new WayPoint(LatLon.ZERO))), Collections.emptyMap());
- }
-
- private static ImmutableGpxTrack waypointGpxTrack(WayPoint... wps) {
- return new ImmutableGpxTrack(Collections.singleton(Arrays.asList(wps)), Collections.emptyMap());
+ private static GpxTrack emptyGpxTrack() {
+ return new GpxTrack(Collections.>emptyList(), Collections.emptyMap());
+ }
+
+ private static GpxTrack singleWaypointGpxTrack() {
+ return new GpxTrack(Collections.singleton(Collections.singleton(new WayPoint(LatLon.ZERO))), Collections.emptyMap());
+ }
+
+ private static GpxTrack waypointGpxTrack(WayPoint... wps) {
+ return new GpxTrack(Collections.singleton(Arrays.asList(wps)), Collections.emptyMap());
}
@@ -473,8 +476,12 @@
public void testEqualsContract() {
TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
EqualsVerifier.forClass(GpxData.class).usingGetClass()
- .withIgnoredFields("attr", "creator", "fromServer", "storageFile", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans")
+ .suppress(Warning.NONFINAL_FIELDS)
+ .withIgnoredFields("creator", "fromServer", "storageFile", "initializing", "updating", "suppressedInvalidate", "listeners", "tracks", "routes", "waypoints", "proxy", "segSpans", "modified")
.withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))
.withPrefabValues(ListenerList.class, ListenerList.create(), ListenerList.create())
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
.verify();
}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java (revision 15496)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java (revision 15496)
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.gpx;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.layer.gpx.ConvertToDataLayerActionTest;
+import org.openstreetmap.josm.io.GpxReaderTest;
+import org.openstreetmap.josm.io.GpxWriterTest;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+/**
+ * Unit tests for class {@link GpxExtension}
+ */
+public class GpxExtensionTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of methods {@link GpxExtension#equals} and {@link GpxExtension#hashCode}.
+ * @see GpxWriterTest#testExtensions()
+ * @see GpxReaderTest#testLayerPrefs()
+ * @see ConvertToDataLayerActionTest#testFromTrack()
+ */
+ @Test
+ public void testEqualsContract() {
+ TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
+ EqualsVerifier.forClass(GpxExtension.class).usingGetClass()
+ .suppress(Warning.NONFINAL_FIELDS)
+ .withIgnoredFields("qualifiedName")
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
+ .verify();
+ }
+
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxRouteTest.java (revision 15496)
@@ -30,7 +30,10 @@
public void testEqualsContract() {
TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
EqualsVerifier.forClass(GpxRoute.class).usingGetClass()
.suppress(Warning.NONFINAL_FIELDS)
.withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
.verify();
}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java (revision 15496)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackSegmentTest.java (revision 15496)
@@ -0,0 +1,41 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.gpx;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+/**
+ * Unit tests for class {@link GpxTrackSegment}.
+ */
+public class GpxTrackSegmentTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of methods {@link GpxTrackSegment#equals} and {@link GpxTrackSegment#hashCode}.
+ */
+ @Test
+ public void testEqualsContract() {
+ TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
+ EqualsVerifier.forClass(GpxTrackSegment.class).usingGetClass()
+ .suppress(Warning.NONFINAL_FIELDS)
+ .withIgnoredFields("bounds", "length")
+ .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
+ .verify();
+ }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java (revision 15496)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTrackTest.java (revision 15496)
@@ -0,0 +1,74 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.gpx;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.ListenerList;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+/**
+ * Unit tests for class {@link GpxTrack}.
+ */
+public class GpxTrackTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests weather the track can read and write colors.
+ */
+ @Test
+ public void testColors() {
+ GpxTrack trk = new GpxTrack(new ArrayList(), new HashMap<>());
+ GpxExtensionCollection ext = trk.getExtensions();
+ ext.add("gpxd", "color", "#FF0000");
+ trk.invalidate();
+ assertEquals(trk.getColor(), Color.RED);
+ trk.setColor(Color.GREEN);
+ assertEquals(trk.getColor(), Color.GREEN);
+ trk.invalidate();
+ assertEquals(trk.getColor(), Color.GREEN);
+ ext.remove("gpxd", "color");
+ trk.invalidate();
+ assertNull(trk.getColor());
+ ext.add("gpxx", "TrackExtensions").getExtensions().add("gpxx", "DisplayColor", "Blue");
+ trk.invalidate();
+ assertEquals(trk.getColor(), Color.BLUE);
+ trk.setColor(null);
+ assertNull(trk.getColor());
+ trk.invalidate();
+ assertNull(trk.getColor());
+ }
+
+ /**
+ * Unit test of methods {@link GpxTrack#equals} and {@link GpxTrack#hashCode}.
+ */
+ @Test
+ public void testEqualsContract() {
+ TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
+ EqualsVerifier.forClass(GpxTrack.class).usingGetClass()
+ .suppress(Warning.NONFINAL_FIELDS)
+ .withPrefabValues(ListenerList.class, ListenerList.create(), ListenerList.create())
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
+ .withIgnoredFields("bounds", "length", "colorCache", "colorFormat", "listeners")
+ .verify();
+ }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegmentTest.java (revision 15487)
+++ (revision )
@@ -1,36 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.gpx;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Unit tests for class {@link ImmutableGpxTrackSegment}.
- */
-public class ImmutableGpxTrackSegmentTest {
-
- /**
- * Setup test.
- */
- @Rule
- @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
-
- /**
- * Unit test of methods {@link ImmutableGpxTrackSegment#equals} and {@link ImmutableGpxTrackSegment#hashCode}.
- */
- @Test
- public void testEqualsContract() {
- TestUtils.assumeWorkingEqualsVerifier();
- EqualsVerifier.forClass(ImmutableGpxTrackSegment.class).usingGetClass()
- .withIgnoredFields("bounds", "length")
- .withPrefabValues(WayPoint.class, new WayPoint(LatLon.NORTH_POLE), new WayPoint(LatLon.SOUTH_POLE))
- .verify();
- }
-}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackTest.java (revision 15487)
+++ (revision )
@@ -1,36 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data.gpx;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-
-/**
- * Unit tests for class {@link ImmutableGpxTrack}.
- */
-public class ImmutableGpxTrackTest {
-
- /**
- * Setup test.
- */
- @Rule
- @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
-
- /**
- * Unit test of methods {@link ImmutableGpxTrack#equals} and {@link ImmutableGpxTrack#hashCode}.
- */
- @Test
- public void testEqualsContract() {
- TestUtils.assumeWorkingEqualsVerifier();
- EqualsVerifier.forClass(ImmutableGpxTrack.class).usingGetClass()
- .suppress(Warning.NONFINAL_FIELDS)
- .withIgnoredFields("bounds", "length")
- .verify();
- }
-}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java (revision 15496)
@@ -29,7 +29,10 @@
public void testEqualsContract() {
TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
EqualsVerifier.forClass(WayPoint.class).usingGetClass()
.suppress(Warning.NONFINAL_FIELDS)
.withIgnoredFields("customColoring", "dir", "drawLine", "east", "north", "eastNorthCacheKey")
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
.verify();
}
Index: trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/data/gpx/WithAttributesTest.java (revision 15496)
@@ -29,6 +29,9 @@
public void testEqualsContract() {
TestUtils.assumeWorkingEqualsVerifier();
+ GpxExtensionCollection col = new GpxExtensionCollection();
+ col.add("josm", "from-server", "true");
EqualsVerifier.forClass(WithAttributes.class).usingGetClass()
.suppress(Warning.NONFINAL_FIELDS)
+ .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
.verify();
}
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java (revision 15496)
@@ -4,4 +4,5 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -19,5 +20,6 @@
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -74,13 +76,17 @@
public void testGpxLayer() throws Exception {
GpxLayer layer = new GpxLayer(new GpxData(), "foo", false);
+ GpxTrack trk = new GpxTrack(new ArrayList(), new HashMap<>());
+ trk.getExtensions().add("gpxd", "color", "#FF0000");
+ layer.data.addTrack(trk);
+
assertEquals("foo", layer.getName());
assertFalse(layer.isLocalFile());
- assertEquals(Color.MAGENTA, layer.getColorProperty().get());
- assertEquals("0 tracks (0 segments), 0 routes, 0 waypoints
Length: < 0.01 m
", layer.getToolTipText());
+ assertEquals(layer.getColor(), Color.RED);
+ assertEquals("1 track (0 segments), 0 routes, 0 waypoints
Length: < 0.01 m
", layer.getToolTipText());
GpxLayer layer2 = new GpxLayer(new GpxData(), "bar", true);
assertEquals("bar", layer2.getName());
assertTrue(layer2.isLocalFile());
- assertEquals(Color.MAGENTA, layer2.getColorProperty().get());
+ assertNull(layer2.getColor());
assertEquals("0 tracks (0 segments), 0 routes, 0 waypoints
Length: < 0.01 m
", layer2.getToolTipText());
@@ -188,5 +194,5 @@
public void testGetTimespanForTrack() throws Exception {
assertEquals("", GpxLayer.getTimespanForTrack(
- new ImmutableGpxTrack(new ArrayList>(), new HashMap())));
+ new GpxTrack(new ArrayList>(), new HashMap())));
assertEquals("1/3/16 11:59 AM - 12:00 PM (0:00)", GpxLayer.getTimespanForTrack(getMinimalGpxData().tracks.iterator().next()));
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java (revision 15496)
@@ -8,5 +8,4 @@
import static org.junit.Assert.assertTrue;
-import java.awt.Color;
import java.io.File;
@@ -14,6 +13,4 @@
import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.data.preferences.AbstractProperty;
-import org.openstreetmap.josm.data.preferences.NamedColorProperty;
import org.openstreetmap.josm.data.projection.ProjectionRegistry;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -41,23 +38,4 @@
public void setUp() {
testLayer = new LayerManagerTest.TestLayer();
- }
-
- /**
- * Test {@link Layer#getColorProperty()}
- */
- @Test
- public void testGetColorProperty() {
- assertEquals(null, testLayer.getColorProperty());
-
- AbstractProperty color = new LayerManagerTest.TestLayer() {
- @Override
- protected NamedColorProperty getBaseColorProperty() {
- return new NamedColorProperty("x", Color.BLACK);
- }
- }.getColorProperty();
-
- assertEquals(Color.BLACK, color.get());
- assertEquals(Color.BLACK, color.getDefaultValue());
- assertEquals("clr.layer.Test Layer.x", color.getKey());
}
@@ -98,10 +76,5 @@
assertEquals("Test Layer2", testLayer.getName());
- testLayer = new LayerManagerTest.TestLayer() {
- @Override
- public AbstractProperty getColorProperty() {
- return new NamedColorProperty("test", Color.RED);
- }
- };
+ testLayer = new LayerManagerTest.TestLayer();
testLayer.setName("Test Layer2");
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java (revision 15487)
+++ (revision )
@@ -1,49 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * Unit tests of {@link MarkerLayer} class.
- */
-public class MarkerLayerTest {
-
- /**
- * For creating layers
- */
- @Rule
- @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().main().projection();
-
- /**
- * Unit test of {@code Main.map.mapView.playHeadMarker}.
- */
- @Test
- public void testPlayHeadMarker() {
- try {
- MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
- MapFrame map = MainApplication.getMap();
- MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null);
- assertNull(map.mapView.playHeadMarker);
- MainApplication.getLayerManager().addLayer(layer);
- assertNotNull(map.mapView.playHeadMarker);
- MainApplication.getLayerManager().removeLayer(layer);
- } finally {
- if (MainApplication.isDisplayingMapView()) {
- MainApplication.getMap().mapView.playHeadMarker = null;
- }
- }
- }
-}
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java (revision 15496)
@@ -24,5 +24,5 @@
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.data.osm.DataSet;
@@ -241,5 +241,5 @@
assertEquals(1, gpx.getTrackCount());
GpxTrack track = gpx.getTracks().iterator().next();
- Collection segments = track.getSegments();
+ Collection segments = track.getSegments();
assertEquals(1, segments.size());
Collection trackpoints = segments.iterator().next().getWayPoints();
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java (revision 15496)
@@ -39,13 +39,13 @@
@Override
protected String getString(final ExtendedDialog instance) {
- return ((JLabel) ((JPanel) this.getContent(instance)).getComponent(2)).getText();
+ return ((JLabel) ((JPanel) instance.getContentPane().getComponent(0)).getComponent(2)).getText();
}
};
edMocker.getMockResultMap().put(
- "Select all tracks that you want to be displayed. You can drag select a range of " +
- "tracks or use CTRL+Click to select specific ones. The map is updated live in the " +
- "background. Open the URLs by double clicking them.",
- "Show all"
- );
+ "Select all tracks that you want to be displayed. " +
+ "You can drag select a range of tracks or use CTRL+Click to select specific ones. " +
+ "The map is updated live in the background. Open the URLs by double clicking them, edit name and description by double clicking the cell.",
+ "Show all"
+ );
new ChooseTrackVisibilityAction(GpxLayerTest.getMinimalGpxLayer()).actionPerformed(null);
@@ -53,5 +53,5 @@
assertEquals(1, edMocker.getInvocationLog().size());
Object[] invocationLogEntry = edMocker.getInvocationLog().get(0);
- assertEquals(1, (int) invocationLogEntry[0]);
+ assertEquals(2, (int) invocationLogEntry[0]);
assertEquals("Set track visibility for Bananas", invocationLogEntry[2]);
}
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (revision 15496)
@@ -67,18 +67,31 @@
public void testFromTrack() throws Exception {
Config.getPref().put("gpx.convert-tags", "no");
- testFromTrack("tracks");
+ testFromTrack("tracks.gpx", "tracks.osm");
Config.getPref().put("gpx.convert-tags", "yes");
- testFromTrack("tracks-ele-time");
+ testFromTrack("tracks.gpx", "tracks-ele-time.osm");
Config.getPref().put("gpx.convert-tags", "list");
Config.getPref().putList("gpx.convert-tags.list.yes", Arrays.asList("ele"));
Config.getPref().putList("gpx.convert-tags.list.no", Arrays.asList("time"));
- testFromTrack("tracks-ele");
-
+ testFromTrack("tracks.gpx", "tracks-ele.osm");
Config.getPref().putList("gpx.convert-tags.list.yes", Arrays.asList("time"));
Config.getPref().putList("gpx.convert-tags.list.no", Arrays.asList("ele"));
- testFromTrack("tracks-time");
+ testFromTrack("tracks.gpx", "tracks-time.osm");
+
+ //Extension tests:
+ Config.getPref().put("gpx.convert-tags", "yes");
+ testFromTrack("tracks-extensions.gpx", "tracks-extensions.osm");
+
+ Config.getPref().put("gpx.convert-tags", "list");
+ Config.getPref().putList("gpx.convert-tags.list.yes", Arrays.asList("time", "ele"));
+ Config.getPref().putList("gpx.convert-tags.list.no", Arrays.asList(
+ "gpxx:DisplayColor",
+ "gpxd:color",
+ "gpx:extension:test:tag",
+ "gpx:extension:test:segment:tag"));
+ testFromTrack("tracks-extensions.gpx", "tracks-ele-time.osm");
+
}
@@ -107,11 +120,11 @@
}
- private void testFromTrack(String expected) throws IOException, SAXException, IllegalDataException {
- final GpxData data = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "tracks/tracks.gpx");
+ private void testFromTrack(String originalGpx, String expectedOsm) throws IOException, SAXException, IllegalDataException {
+ final GpxData data = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "tracks/" + originalGpx);
final DataSet osmExpected = OsmReader.parseDataSet(Files.newInputStream(
- Paths.get(TestUtils.getTestDataRoot(), "tracks/" + expected + ".osm")), null);
+ Paths.get(TestUtils.getTestDataRoot(), "tracks/" + expectedOsm)), null);
final GpxLayer layer = new GpxLayer(data);
final DataSet osm = new ConvertFromGpxLayerAction(layer).convert();
- //compare sorted coordinates/tags and total amount of primitives, because IDs and order will vary after reload
+ //compare sorted nodes/ways, tags and total amount of primitives, because IDs and order will vary after reload
List nodes = osm.getNodes().stream()
@@ -125,6 +138,19 @@
.collect(Collectors.toList());
- assertEquals(nodesExpected, nodes);
- assertEquals(osmExpected.allPrimitives().size(), osm.allPrimitives().size());
+ assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", nodesExpected, nodes);
+
+ List ways = osm.getWays().stream()
+ .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString())
+ .sorted()
+ .collect(Collectors.toList());
+
+ List waysExpected = osmExpected.getWays().stream()
+ .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream().sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString())
+ .sorted()
+ .collect(Collectors.toList());
+
+ assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", waysExpected, ways);
+
+ assertEquals("Conversion " + originalGpx + " -> " + expectedOsm + " didn't match!", osmExpected.allPrimitives().size(), osm.allPrimitives().size());
}
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 15496)
@@ -7,4 +7,5 @@
import java.io.IOException;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -14,9 +15,11 @@
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper.ColorMode;
import org.openstreetmap.josm.io.GpxReaderTest;
-import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.ColorHelper;
import org.xml.sax.SAXException;
+
+import com.google.common.collect.ImmutableMap;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -42,8 +45,9 @@
@Test
public void testTicket12312() throws FileNotFoundException, IOException, SAXException {
- Config.getPref().putBoolean("draw.rawgps.colors.dynamic.layer 12312", true);
- Config.getPref().putInt("draw.rawgps.colors.layer 12312", GpxDrawHelper.ColorMode.VELOCITY.toIndex());
- final List colors = calculateColors(TestUtils.getRegressionDataFile(12312, "single_trackpoint.gpx"), "12312", 1);
- assertEquals("[#FF00FF]", colors.toString());
+ final List colors = calculateColors(TestUtils.getRegressionDataFile(12312, "single_trackpoint.gpx"),
+ ImmutableMap.of("colormode.dynamic-range", "true",
+ "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())),
+ 1);
+ assertEquals("[null]", colors.toString());
}
@@ -56,6 +60,6 @@
@Test
public void testNone() throws IOException, SAXException {
- final List colors = calculateColors("data_nodist/2094047.gpx", "000", 10);
- assertEquals("[#FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF, #FF00FF]", colors.toString());
+ final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of(), 10);
+ assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString());
}
@@ -68,7 +72,6 @@
@Test
public void testVelocity() throws IOException, SAXException {
- Config.getPref().putInt("draw.rawgps.colors.layer 001", GpxDrawHelper.ColorMode.VELOCITY.toIndex());
- final List colors = calculateColors("data_nodist/2094047.gpx", "001", 10);
- assertEquals("[#FF00FF, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString());
+ final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10);
+ assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString());
}
@@ -81,8 +84,9 @@
@Test
public void testVelocityDynamic() throws IOException, SAXException {
- Config.getPref().putInt("draw.rawgps.colors.layer 002", GpxDrawHelper.ColorMode.VELOCITY.toIndex());
- Config.getPref().putBoolean("draw.rawgps.colors.dynamic.layer 002", true);
- final List colors = calculateColors("data_nodist/2094047.gpx", "002", 10);
- assertEquals("[#FF00FF, #00FFE0, #00FFC2, #00FFC2, #00FF75, #00FF3D, #99FF00, #94FF00, #38FF00, #00FF38]", colors.toString());
+ final List colors = calculateColors("data_nodist/2094047.gpx",
+ ImmutableMap.of("colormode.dynamic-range", "true",
+ "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())),
+ 10);
+ assertEquals("[#000000, #00FFE0, #00FFC2, #00FFC2, #00FF75, #00FF3D, #99FF00, #94FF00, #38FF00, #00FF38]", colors.toString());
}
@@ -95,7 +99,6 @@
@Test
public void testDirection() throws IOException, SAXException {
- Config.getPref().putInt("draw.rawgps.colors.layer 003", GpxDrawHelper.ColorMode.DIRECTION.toIndex());
- final List colors = calculateColors("data_nodist/2094047.gpx", "003", 10);
- assertEquals("[#FF00FF, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString());
+ final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10);
+ assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString());
}
@@ -108,7 +111,6 @@
@Test
public void testTime() throws IOException, SAXException {
- Config.getPref().putInt("draw.rawgps.colors.layer 003", GpxDrawHelper.ColorMode.TIME.toIndex());
- final List colors = calculateColors("data_nodist/2094047.gpx", "003", 10);
- assertEquals("[#FF00FF, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString());
+ final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10);
+ assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString());
}
@@ -116,5 +118,5 @@
*
* @param fileName the GPX filename to parse
- * @param layerName the layer name used to fetch the color settings, see {@link GpxDrawHelper#readPreferences(java.lang.String)}
+ * @param layerPrefs a HashMap representing the layer specific preferences
* @param n the number of waypoints of the first track/segment to analyze
* @return the HTML color codes for the first {@code n} points
@@ -123,9 +125,10 @@
* @throws SAXException if any SAX error occurs
*/
- static List calculateColors(String fileName, String layerName, int n) throws IOException, SAXException {
+ static List calculateColors(String fileName, Map layerPrefs, int n) throws IOException, SAXException {
final GpxData data = GpxReaderTest.parseGpxData(fileName);
+ data.getLayerPrefs().putAll(layerPrefs);
final GpxLayer layer = new GpxLayer(data);
final GpxDrawHelper gdh = new GpxDrawHelper(layer);
- gdh.readPreferences(layerName);
+ gdh.readPreferences();
gdh.calculateColors();
return data.getTrackPoints().limit(n).map(p -> ColorHelper.color2html(p.customColoring)).collect(Collectors.toList());
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarkerTest.java (revision 15496)
@@ -11,6 +11,4 @@
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.gpx.Extensions;
-import org.openstreetmap.josm.data.gpx.GpxConstants;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -46,6 +44,5 @@
WayPoint wpt = marker.convertToWayPoint();
assertEquals(LatLon.ZERO, wpt.getCoor());
- Extensions ext = (Extensions) wpt.get(GpxConstants.META_EXTENSIONS);
- assertEquals("2.0", ext.get("offset"));
+ assertEquals("2.0", wpt.getExtensions().get("josm", "offset").getValue());
}
}
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java (revision 15496)
@@ -4,7 +4,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import java.awt.Color;
import java.util.Arrays;
@@ -17,5 +17,8 @@
import org.openstreetmap.josm.data.gpx.GpxLink;
import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -29,5 +32,5 @@
/**
- * Setup tests
+ * For creating layers
*/
@Rule
@@ -48,10 +51,9 @@
@Test
public void testMarkerLayer() {
- assertEquals(Color.magenta, MarkerLayer.getGenericColor());
MarkerLayer layer = new MarkerLayer(new GpxData(), "foo", null, null);
MainApplication.getLayerManager().addLayer(layer);
assertEquals("foo", layer.getName());
- assertEquals(Color.magenta, layer.getColorProperty().get());
+ assertNull(layer.getColor());
assertNotNull(layer.getIcon());
assertEquals("0 markers", layer.getToolTipText());
@@ -62,13 +64,13 @@
WayPoint wpt = new WayPoint(LatLon.ZERO);
wpt.attr.put(GpxConstants.META_LINKS, Arrays.asList(new GpxLink("https://josm.openstreetmap.de")));
- wpt.addExtension("offset", "1.0");
+ wpt.getExtensions().add("josm", "offset", "1.0");
gpx.waypoints.add(wpt);
wpt = new WayPoint(LatLon.ZERO);
- wpt.addExtension("offset", "NaN");
+ wpt.getExtensions().add("josm", "offset", "NaN");
gpx.waypoints.add(wpt);
layer = new MarkerLayer(gpx, "bar", null, null);
assertEquals("bar", layer.getName());
- assertEquals(Color.magenta, layer.getColorProperty().get());
+ assertNull(layer.getColor());
assertNotNull(layer.getIcon());
assertEquals("3 markers", layer.getToolTipText());
@@ -76,3 +78,23 @@
assertTrue(layer.getMenuEntries().length > 10);
}
+
+ /**
+ * Unit test of {@code Main.map.mapView.playHeadMarker}.
+ */
+ @Test
+ public void testPlayHeadMarker() {
+ try {
+ MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
+ MapFrame map = MainApplication.getMap();
+ MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null);
+ assertNull(map.mapView.playHeadMarker);
+ MainApplication.getLayerManager().addLayer(layer);
+ assertNotNull(map.mapView.playHeadMarker);
+ MainApplication.getLayerManager().removeLayer(layer);
+ } finally {
+ if (MainApplication.isDisplayingMapView()) {
+ MainApplication.getMap().mapView.playHeadMarker = null;
+ }
+ }
+ }
}
Index: trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 15496)
@@ -11,4 +11,6 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.Rule;
@@ -70,4 +72,22 @@
/**
+ * Tests if layer preferences can be read
+ * @throws Exception if track can't be parsed
+ */
+ @Test
+ public void testLayerPrefs() throws Exception {
+ final GpxData data = parseGpxData(TestUtils.getTestDataRoot() + "tracks/tracks-layerprefs.gpx");
+ Map e = new HashMap<>();
+ e.put("colormode.velocity.tune", "10");
+ e.put("lines.arrows.min-distance", "20");
+ e.put("colormode", "1");
+ e.put("lines", "1");
+ e.put("lines.arrows", "true");
+ e.put("colormode.dynamic-range", "true");
+ e.put("colors", "0");
+ assertEquals(data.getLayerPrefs(), e);
+ }
+
+ /**
* Tests invalid data.
* @throws Exception always SAXException
Index: trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/io/GpxWriterTest.java (revision 15496)
@@ -4,4 +4,5 @@
import static org.junit.Assert.assertEquals;
+import java.awt.Color;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -10,5 +11,7 @@
import java.time.Month;
import java.time.ZoneOffset;
+import java.util.Arrays;
import java.util.Date;
+import java.util.HashMap;
import java.util.function.Consumer;
@@ -18,4 +21,8 @@
import org.openstreetmap.josm.data.gpx.GpxConstants;
import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxData.XMLNamespace;
+import org.openstreetmap.josm.data.gpx.GpxExtensionCollection;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -88,3 +95,185 @@
" 1.2%n");
}
+
+ /**
+ * Tests if extensions are written correctly.
+ * @throws IOException
+ */
+ @Test
+ public void testExtensions() throws IOException {
+ GpxData data = new GpxData();
+ data.getNamespaces().add(new XMLNamespace("test", "http://example.com/testURI")); //only namespace, no location printed
+ data.getNamespaces().add(new XMLNamespace("knownprefix", "http://example.com/URI", "http://example.com/location.xsd")); //printed
+ data.getNamespaces().add(new XMLNamespace("notpresent", "http://example.com/notpresent", "http://example.com/notpresent.xsd")); //NOT printed
+
+ GpxExtensionCollection exts = data.getExtensions();
+ data.fromServer = true; //printed
+ data.getLayerPrefs().put("foo", "bar"); //printed depending on writer config
+ exts.add("knownprefix", "foo", "bar"); //printed
+ exts.add("unknownprefix", "foo", "bar"); //NOT printed
+
+ WayPoint wpt = new WayPoint(LatLon.ZERO);
+ wpt.getExtensions().add("test", "foo", "extension of a waypoint"); //printed
+
+ GpxTrackSegment seg = new GpxTrackSegment(Arrays.asList(wpt));
+ seg.getExtensions().add("test", "foo", "extension of a segment"); //printed
+
+ GpxTrack trk = new GpxTrack(Arrays.asList(seg), new HashMap<>());
+
+ trk.setColor(Color.RED); //printed depending on writer configuration
+
+ data.addTrack(trk);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ GpxWriter writer = new GpxWriter(baos);
+
+ writer.write(data);
+ assertEquals("\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " bar\n" +
+ " true\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " #FF0000\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a segment\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a waypoint\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "", baos.toString());
+
+ baos.reset();
+ writer.write(data, GpxConstants.ColorFormat.GPXX, true);
+ assertEquals("\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " bar\n" +
+ " true\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " Red\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a segment\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a waypoint\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "", baos.toString());
+
+ baos.reset();
+ writer.write(data, null, false);
+ assertEquals("\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " bar\n" +
+ " true\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a segment\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a waypoint\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "", baos.toString());
+
+ baos.reset();
+ writer.write(data, GpxConstants.ColorFormat.GPXX, true);
+ // checked again to make sure that extensions are shown again after
+ // being hidden, even if they don't actually have to be converted
+ // (GPXD -> convertColor() -> GPXX -> hide() -> null -> show() -> GPXX)
+ assertEquals("\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " bar\n" +
+ " true\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " Red\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a segment\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " extension of a waypoint\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "", baos.toString());
+
+ writer.close();
+ }
}
Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 15487)
+++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 15496)
@@ -25,5 +25,5 @@
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.io.GpxReaderTest;
@@ -101,6 +101,6 @@
assertEquals(nTracks, nmeaTrack.getSegments().size());
if (nTracks > 0) {
- GpxTrackSegment gpxSeg = gpxTrack.getSegments().iterator().next();
- GpxTrackSegment nmeaSeg = nmeaTrack.getSegments().iterator().next();
+ IGpxTrackSegment gpxSeg = gpxTrack.getSegments().iterator().next();
+ IGpxTrackSegment nmeaSeg = nmeaTrack.getSegments().iterator().next();
assertEquals(gpxSeg.getBounds(), nmeaSeg.getBounds());
assertEquals(numCoor, gpxSeg.getWayPoints().size());