diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fff84bc..63b435d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,18 +21,18 @@ jobs: arch: arm64 java: [11] distribution: [temurin] - pdal: [2.8.1] + pdal: [2.9.3] runs-on: ${{ matrix.os }} defaults: run: shell: bash -el {0} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 0 - - uses: coursier/cache-action@v6 - - uses: actions/setup-java@v4 + - uses: coursier/cache-action@v8 + - uses: actions/setup-java@v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -40,7 +40,7 @@ jobs: - name: Install sbt uses: sbt/setup-sbt@v1 - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v4 with: activate-environment: pdal-java channels: conda-forge @@ -54,7 +54,7 @@ jobs: - name: Cache Conda env id: conda-cache - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ${{ steps.cache-config.outputs.path }} key: @@ -76,7 +76,7 @@ jobs: - name: Build project run: sbt +test - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: ${{ startsWith(matrix.os, 'macos') }} with: name: ${{ matrix.os }} @@ -88,7 +88,7 @@ jobs: os: [ubuntu-latest] java: [11] distribution: [temurin] - pdal: [2.8.4] + pdal: [2.9.3] runs-on: ${{ matrix.os }} if: github.event_name != 'pull_request' needs: [build] @@ -100,11 +100,11 @@ jobs: CI_CLEAN: "" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 0 - - uses: coursier/cache-action@v6 - - uses: actions/setup-java@v4 + - uses: coursier/cache-action@v8 + - uses: actions/setup-java@v6 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} @@ -112,7 +112,7 @@ jobs: - name: Install sbt uses: sbt/setup-sbt@v1 - - uses: conda-incubator/setup-miniconda@v3 + - uses: conda-incubator/setup-miniconda@v4 with: activate-environment: pdal-java channels: conda-forge @@ -126,7 +126,7 @@ jobs: - name: Cache Conda env id: conda-cache - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ${{ steps.cache-config.outputs.path }} key: @@ -142,7 +142,7 @@ jobs: if: ${{ matrix.os == 'ubuntu-latest' }} run: echo "LD_LIBRARY_PATH=$CONDA/envs/pdal-java/lib:/usr/local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: macos-latest path: native/target/native/arm64-darwin/bin diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 2a02f66..297fb35 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -11,6 +11,6 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v6.0.0 + - uses: release-drafter/release-drafter@v7.7.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 3af5882..4f2924f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## Added +- PDAL 2.9.x [#116](https://github.com/pdal/java/pull/116) (@pomadchin) + +## Changed +- Bump PDAL JNI lib version up to 2.9 [#116](https://github.com/pdal/java/pull/116) (@pomadchin) +- Build the native bindings with C++17, required by `pdal/FileSpec.hpp` [#116](https://github.com/pdal/java/pull/116) (@pomadchin) +- Update GitHub Actions used by CI [#116](https://github.com/pdal/java/pull/116) (@pomadchin) ## [2.8.0] - 2024-09-10 ## Added diff --git a/README.md b/README.md index 63f0205..a16d908 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Dependency contains bindings for `arm64-darwin`, and `x86_64-linux`, other versi Given a `{major}.{minor}.{patch}` version: * `{major}.{minor}` - matches the **PDAL** version it is published for - * e.g. **pdal-java** of version `2.6.1` is suitable for all **PDAL** versions `2.6.x` (`2.6.0`, ..., `2.6.3`, etc) major = `2`, minor = `6` + * e.g. **pdal-java** of version `2.9.0` is suitable for all **PDAL** versions `2.9.x` (`2.9.0`, ..., `2.9.3`, etc) major = `2`, minor = `9` * `{patch}` - this portion of the version corresponds to updates within **pdal-java** and should remain compatible with **PDAL library** `{major}.{minor}` versions * This implies that there may be multiple **pdal-java** releases for the same **PDAL library** version. All releases are compatible with the matching **PDAL library** `{major}.{minor}` version. Thus, higher patch versions are to be preferred. @@ -43,7 +43,7 @@ If you would like to use your own bindings, it is necessary to set `java.library ```scala // macOS X example with manual JNI installation -// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.8.dylib /usr/local/lib/libpdaljni.2.8.dylib +// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.9.dylib /usr/local/lib/libpdaljni.2.9.dylib // place built binary into /usr/local/lib, and pass java.library.path to your JVM javaOptions += "-Djava.library.path=/usr/local/lib" ``` @@ -239,7 +239,7 @@ PDAL_DEPEND_ON_NATIVE=false sbt -Djava.library.path= #### - In case of not installed as global PDAL change [this](./java/native/src/CMakeLists.txt#L25) line to: ```cmake -set(CMAKE_CXX_FLAGS "$ENV{PDAL_LD_FLAGS} $ENV{PDAL_CXX_FLAGS} -std=c++11") +set(CMAKE_CXX_FLAGS "$ENV{PDAL_LD_FLAGS} $ENV{PDAL_CXX_FLAGS} -std=c++17") ``` In this case sbt launch would be the following: ```bash @@ -251,7 +251,7 @@ PDAL_LD_FLAGS=`pdal-config --libs` PDAL_CXX_FLAGS=`pdal-config --includes` sbt the quick workaround would be to replace [this](./java/native/src/CMakeLists.txt#L25) line to: ```cmake -set(CMAKE_CXX_FLAGS "-L -std=c++11") +set(CMAKE_CXX_FLAGS "-L -std=c++17") ``` #### - On macOS could be difficult to install PDAL sometimes (near new releases). You have three options diff --git a/core/src/main/scala/io/pdal/Pipeline.scala b/core/src/main/scala/io/pdal/Pipeline.scala index 016ab1a..f0964d0 100644 --- a/core/src/main/scala/io/pdal/Pipeline.scala +++ b/core/src/main/scala/io/pdal/Pipeline.scala @@ -47,7 +47,7 @@ class Pipeline private (val json: String, val logLevel: Int) extends Native { def getLogLevel(): LogLevel.Value = LogLevel.apply(getLogLevelInt()) } -object Pipeline extends NativeLoader("pdaljni.2.8") { +object Pipeline extends NativeLoader("pdaljni.2.9") { def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline = new Pipeline(json, logLevel) } diff --git a/core/src/test/resources/delaunay.ply b/core/src/test/resources/delaunay.ply index 555cea1..d77b36d 100644 --- a/core/src/test/resources/delaunay.ply +++ b/core/src/test/resources/delaunay.ply @@ -1142,9 +1142,9 @@ end_header 3 794 743 800 3 547 417 546 3 413 417 547 +3 803 801 665 3 660 801 798 3 657 740 660 -3 803 801 665 3 660 740 665 3 765 418 411 3 419 403 410 @@ -1181,9 +1181,9 @@ end_header 3 800 802 804 3 740 661 736 3 657 663 661 +3 780 744 785 3 744 742 785 3 738 737 741 -3 780 744 785 3 409 406 423 3 410 406 409 3 410 402 404 @@ -1253,10 +1253,10 @@ end_header 3 757 755 902 3 408 428 429 3 425 428 408 +3 426 427 533 3 539 427 426 3 421 534 539 3 415 543 416 -3 426 427 533 3 766 649 650 3 348 649 766 3 760 758 754 @@ -1276,9 +1276,9 @@ end_header 3 404 400 428 3 398 396 433 3 399 396 398 +3 299 294 642 3 758 655 639 3 650 646 645 -3 299 294 642 3 424 415 416 3 414 543 415 3 755 773 902 @@ -1293,10 +1293,10 @@ end_header 3 737 733 729 3 804 811 733 3 731 737 729 +3 662 637 748 +3 638 637 662 3 659 637 638 3 658 639 659 -3 638 637 662 -3 662 637 748 3 804 814 811 3 670 730 675 3 733 811 809 @@ -1335,8 +1335,8 @@ end_header 3 663 739 734 3 427 539 534 3 543 558 416 -3 641 643 642 3 642 643 299 +3 641 643 642 3 84 350 351 3 348 350 349 3 427 534 431 @@ -1356,9 +1356,9 @@ end_header 3 735 793 731 3 755 774 773 3 735 881 796 +3 351 407 432 3 429 407 350 3 400 397 395 -3 351 407 432 3 429 428 432 3 398 436 397 3 882 796 880 @@ -1373,10 +1373,10 @@ end_header 3 533 427 435 3 427 431 526 3 416 559 424 +3 728 730 734 3 730 669 734 3 664 636 746 3 639 666 664 -3 728 730 734 3 674 730 728 3 534 421 424 3 545 557 558 @@ -1411,9 +1411,9 @@ end_header 3 791 880 883 3 674 728 724 3 739 634 734 +3 435 526 437 3 427 526 435 3 534 527 431 -3 435 526 437 3 734 732 728 3 746 635 739 3 729 810 727 @@ -1433,24 +1433,24 @@ end_header 3 726 819 812 3 428 400 441 3 397 394 395 -3 739 672 634 3 634 672 673 +3 739 672 634 3 545 773 769 3 773 771 769 -3 732 634 633 3 634 673 633 +3 732 634 633 3 395 394 439 3 328 666 284 3 636 666 635 3 294 299 297 3 436 391 394 3 529 438 392 -3 297 299 302 3 302 652 305 3 652 317 305 +3 297 299 302 +3 424 559 566 3 559 535 566 3 558 557 559 -3 424 559 566 3 424 566 530 3 349 350 84 3 428 441 432 @@ -1482,9 +1482,9 @@ end_header 3 812 819 817 3 678 821 819 3 810 812 817 -3 732 633 676 3 672 633 673 3 635 272 672 +3 732 633 676 3 728 732 677 3 432 441 353 3 394 444 439 @@ -1536,8 +1536,8 @@ end_header 3 297 319 321 3 310 308 319 3 85 155 156 -3 810 721 874 3 805 877 873 +3 810 721 874 3 805 878 877 3 388 385 382 3 387 383 385 @@ -1607,8 +1607,8 @@ end_header 3 530 570 572 3 873 719 869 3 817 717 871 -3 447 381 450 3 381 438 450 +3 447 381 450 3 352 353 401 3 352 401 149 3 323 291 293 @@ -1647,9 +1647,9 @@ end_header 3 324 291 326 3 297 293 324 3 308 81 320 +3 386 451 379 3 388 451 386 3 447 451 382 -3 386 451 379 3 893 778 884 3 778 788 884 3 570 569 573 @@ -1657,9 +1657,9 @@ end_header 3 572 570 573 3 717 817 708 3 678 687 826 +3 722 680 720 3 723 680 679 3 632 631 723 -3 722 680 720 3 447 450 451 3 516 448 443 3 518 434 514 @@ -1667,8 +1667,8 @@ end_header 3 869 866 713 3 724 718 714 3 297 321 293 -3 434 572 514 3 516 518 440 +3 434 572 514 3 722 720 718 3 723 631 681 3 565 528 523 @@ -1686,9 +1686,9 @@ end_header 3 553 550 542 3 550 549 542 3 893 884 776 +3 324 326 289 3 321 323 293 3 81 82 318 -3 324 326 289 3 820 869 713 3 717 866 869 3 390 386 452 @@ -1705,9 +1705,9 @@ end_header 3 710 685 686 3 718 685 714 3 788 784 884 -3 283 280 286 3 326 286 289 3 82 159 160 +3 283 280 286 3 151 91 149 3 354 355 401 3 83 85 156 @@ -1725,9 +1725,9 @@ end_header 3 826 709 712 3 826 687 709 3 718 686 685 -3 623 542 903 3 553 542 537 3 899 767 549 +3 623 542 903 3 714 685 710 3 682 711 687 3 354 453 355 @@ -1736,9 +1736,9 @@ end_header 3 518 514 440 3 573 575 578 3 81 318 320 -3 684 718 716 3 718 683 716 3 631 630 681 +3 684 718 716 3 866 708 704 3 687 688 709 3 276 280 283 @@ -1762,9 +1762,9 @@ end_header 3 291 295 325 3 450 512 456 3 443 509 512 +3 528 553 531 3 767 903 542 3 899 898 767 -3 528 553 531 3 325 295 198 3 521 523 519 3 569 523 521 @@ -1846,15 +1846,15 @@ end_header 3 711 690 689 3 714 710 690 3 355 356 107 -3 276 330 332 3 329 330 276 3 327 205 206 +3 276 330 332 3 276 332 333 3 312 186 313 3 318 186 312 +3 904 896 624 3 905 896 904 3 909 910 911 -3 904 896 624 3 160 76 186 3 788 799 795 3 807 873 820 @@ -1894,11 +1894,11 @@ end_header 3 452 458 380 3 457 375 377 3 156 68 75 -3 905 888 889 3 792 910 908 3 795 910 792 3 875 872 912 3 868 865 813 +3 905 888 889 3 213 329 327 3 198 303 197 3 377 375 458 @@ -1936,13 +1936,13 @@ end_header 3 905 889 896 3 90 152 65 3 708 701 704 -3 704 830 824 3 822 823 827 +3 704 830 824 3 691 629 628 3 336 335 263 -3 147 355 107 3 453 357 389 3 375 462 372 +3 147 355 107 3 795 875 912 3 820 865 868 3 888 885 889 @@ -1968,9 +1968,9 @@ end_header 3 820 861 865 3 451 456 369 3 592 587 591 +3 193 189 194 3 313 311 189 3 75 73 74 -3 193 189 194 3 454 508 459 3 581 513 510 3 59 57 96 @@ -1996,8 +1996,8 @@ end_header 3 147 144 101 3 510 503 581 3 523 524 517 -3 531 554 620 3 562 531 561 +3 531 554 620 3 519 515 574 3 623 904 624 3 896 889 894 @@ -2018,9 +2018,9 @@ end_header 3 523 517 515 3 562 618 520 3 330 329 213 +3 340 261 262 3 336 262 261 3 273 334 271 -3 340 261 262 3 273 333 277 3 333 332 277 3 336 263 262 @@ -2067,9 +2067,9 @@ end_header 3 844 698 843 3 699 698 697 3 369 367 366 -3 150 101 148 3 101 144 145 3 357 358 378 +3 150 101 148 3 552 623 551 3 623 624 551 3 907 906 887 @@ -2081,9 +2081,9 @@ end_header 3 508 455 459 3 591 593 592 3 594 455 592 +3 833 855 832 3 827 824 832 3 701 697 696 -3 833 855 832 3 133 357 378 3 463 372 466 3 107 389 135 @@ -2092,10 +2092,10 @@ end_header 3 273 277 334 3 562 561 618 3 52 54 150 +3 343 629 337 +3 343 337 340 3 335 264 263 3 334 277 221 -3 343 337 340 -3 343 629 337 3 858 701 696 3 844 697 698 3 301 193 194 @@ -2124,9 +2124,9 @@ end_header 3 867 915 806 3 74 73 72 3 101 51 148 +3 373 463 466 3 375 372 463 3 369 366 464 -3 373 463 466 3 818 861 815 3 865 861 818 3 498 459 495 @@ -2143,9 +2143,9 @@ end_header 3 715 626 702 3 344 629 343 3 820 823 822 -3 459 455 460 3 455 594 597 3 590 587 507 +3 459 455 460 3 203 301 199 3 311 188 194 3 376 463 359 @@ -2209,9 +2209,9 @@ end_header 3 499 501 497 3 511 501 499 3 506 582 503 -3 844 695 696 3 626 695 702 3 692 694 625 +3 844 695 696 3 194 314 195 3 315 79 188 3 138 135 136 @@ -2223,10 +2223,10 @@ end_header 3 366 365 364 3 367 365 366 3 364 365 492 +3 495 460 470 3 459 460 495 3 593 494 594 3 499 497 590 -3 495 460 470 3 57 150 54 3 100 57 54 3 215 285 212 @@ -2236,9 +2236,9 @@ end_header 3 316 79 86 3 188 79 314 3 66 97 95 -3 890 886 1017 3 887 886 890 3 907 1012 906 +3 890 886 1017 3 373 468 371 3 466 468 373 3 105 106 49 @@ -2249,10 +2249,10 @@ end_header 3 103 104 52 3 259 339 341 3 339 338 341 +3 867 917 915 3 861 917 815 3 831 853 852 3 854 853 828 -3 867 917 915 3 915 917 916 3 863 870 916 3 911 870 1008 @@ -2290,10 +2290,10 @@ end_header 3 460 597 600 3 626 692 625 3 343 256 254 -3 96 100 99 3 72 66 93 -3 626 625 695 +3 96 100 99 3 695 625 850 +3 626 625 695 3 490 497 588 3 590 497 490 3 60 96 99 @@ -2306,18 +2306,18 @@ end_header 3 493 489 492 3 316 86 88 3 78 86 79 +3 617 618 567 3 621 556 620 3 551 926 621 -3 617 618 567 3 492 491 364 3 344 343 254 3 338 238 341 3 852 850 840 3 855 850 852 3 695 850 696 +3 264 271 269 3 271 334 269 3 214 285 215 -3 264 271 269 3 138 136 139 3 378 360 133 3 471 475 371 @@ -2333,9 +2333,9 @@ end_header 3 465 467 469 3 495 467 465 3 571 567 568 +3 342 239 258 3 341 239 342 3 264 269 266 -3 342 239 258 3 582 504 583 3 617 567 571 3 491 489 487 @@ -2350,21 +2350,21 @@ end_header 3 465 488 489 3 501 503 588 3 216 215 218 -3 44 106 143 3 44 143 41 3 136 137 139 3 135 119 136 +3 44 106 143 3 100 54 53 3 488 469 472 3 465 469 488 3 460 600 482 -3 256 258 257 3 259 258 256 +3 256 258 257 3 95 97 98 3 100 56 99 +3 86 92 88 3 72 92 86 3 95 98 93 -3 86 92 88 3 204 307 304 3 621 926 555 3 1017 1015 1016 @@ -2377,11 +2377,11 @@ end_header 3 471 370 475 3 49 106 44 3 49 44 108 -3 344 254 346 3 694 344 346 -3 260 238 264 +3 344 254 346 3 260 264 266 3 216 218 221 +3 260 238 264 3 314 79 316 3 221 218 222 3 212 292 210 @@ -2394,12 +2394,12 @@ end_header 3 620 619 567 3 926 929 555 3 504 505 580 -3 53 58 56 -3 93 98 94 3 92 93 94 -3 44 41 110 +3 93 98 94 +3 53 58 56 3 41 142 110 3 140 114 141 +3 44 41 110 3 494 590 490 3 501 588 497 3 504 500 583 @@ -2413,8 +2413,8 @@ end_header 3 917 860 916 3 886 906 1015 3 831 840 834 -3 49 108 53 3 53 108 111 +3 49 108 53 3 504 580 500 3 239 238 260 3 221 227 269 @@ -2456,8 +2456,8 @@ end_header 3 467 470 469 3 487 472 474 3 221 222 227 -3 870 863 914 3 914 863 1006 +3 870 863 914 3 195 309 306 3 88 94 187 3 473 364 362 @@ -2481,11 +2481,11 @@ end_header 3 467 495 470 3 472 470 482 3 469 470 472 -3 568 615 571 3 571 614 576 +3 568 615 571 3 500 580 610 -3 116 112 117 3 110 112 109 +3 116 112 117 3 116 109 112 3 619 929 930 3 360 361 368 @@ -2493,8 +2493,8 @@ end_header 3 362 476 363 3 568 616 615 3 929 966 930 -3 133 130 119 3 119 130 129 +3 133 130 119 3 134 136 118 3 472 482 602 3 460 482 470 @@ -2515,9 +2515,9 @@ end_header 3 829 836 825 3 918 860 919 3 115 134 117 -3 694 347 625 3 345 347 346 3 257 253 345 +3 694 347 625 3 625 347 845 3 316 88 187 3 92 94 88 @@ -2539,14 +2539,14 @@ end_header 3 834 839 836 3 850 839 840 3 625 845 850 +3 127 122 368 3 360 122 130 3 476 368 361 -3 127 122 368 3 920 921 851 3 839 837 836 -3 963 616 933 3 616 966 933 3 926 976 927 +3 963 616 933 3 1015 1012 1014 3 1008 1010 1011 3 1024 1014 1025 @@ -2565,8 +2565,8 @@ end_header 3 266 229 240 3 130 122 129 3 360 368 122 -3 500 585 496 3 490 588 484 +3 500 585 496 3 300 202 298 3 825 836 846 3 1024 1025 1061 @@ -2594,21 +2594,21 @@ end_header 3 839 838 837 3 1008 1006 1007 3 922 848 923 -3 859 860 918 3 921 848 851 +3 859 860 918 3 576 612 611 3 345 252 347 3 257 247 249 -3 222 275 229 3 229 270 267 +3 222 275 229 3 260 266 240 -3 288 290 287 3 220 288 281 +3 288 290 287 3 859 918 856 3 229 275 270 +3 978 929 927 3 929 926 927 3 1016 1014 1024 -3 978 929 927 3 848 846 923 3 921 846 848 3 1063 1016 1024 @@ -2642,9 +2642,9 @@ end_header 3 918 919 849 3 1019 1063 1064 3 1013 1027 1026 +3 612 613 579 3 613 615 961 3 979 929 978 -3 612 613 579 3 974 1064 973 3 1019 1064 974 3 1024 1061 1026 @@ -2660,9 +2660,9 @@ end_header 3 1008 1009 1010 3 483 596 480 3 1063 1024 1022 -3 474 602 362 3 601 602 479 3 481 480 478 +3 474 602 362 3 275 279 274 3 220 279 275 3 288 287 281 @@ -2697,9 +2697,9 @@ end_header 3 927 976 977 3 1063 1022 1021 3 974 973 975 +3 240 229 267 3 270 233 267 3 281 178 279 -3 240 229 267 3 611 579 609 3 932 931 962 3 1064 1063 1021 @@ -2730,9 +2730,9 @@ end_header 3 274 174 172 3 1022 1023 1062 3 1024 1023 1022 -3 579 608 609 -3 586 607 485 3 485 607 598 +3 586 607 485 +3 579 608 609 3 1028 1029 1057 3 1008 1007 1009 3 1002 856 999 @@ -2748,8 +2748,8 @@ end_header 3 362 127 476 3 1034 1007 1005 3 1009 1007 1031 -3 120 26 123 3 132 26 120 +3 120 26 123 3 111 45 50 3 287 290 219 3 296 202 207 @@ -2764,8 +2764,8 @@ end_header 3 979 980 967 3 1026 1027 1060 3 1031 1007 1032 -3 1026 1060 1023 3 1023 1060 1062 +3 1026 1060 1023 3 1006 1004 1036 3 1002 999 1001 3 1051 1004 1003 @@ -2826,9 +2826,9 @@ end_header 3 1004 1052 1036 3 977 975 971 3 1060 1058 1062 -3 935 934 960 3 962 934 935 3 967 968 964 +3 935 934 960 3 1028 1057 1030 3 1052 1051 1050 3 478 477 602 @@ -2837,9 +2837,9 @@ end_header 3 168 267 235 3 224 179 176 3 242 240 267 -3 123 22 124 3 26 22 123 3 125 19 21 +3 123 22 124 3 938 579 937 3 936 937 959 3 983 931 982 @@ -2858,8 +2858,8 @@ end_header 3 21 19 22 3 58 50 5 3 120 121 35 -3 1005 1052 1050 3 1004 1051 1052 +3 1005 1052 1050 3 50 113 48 3 187 94 1 3 1028 1030 1058 @@ -2871,8 +2871,8 @@ end_header 3 934 983 984 3 967 964 982 3 1032 1054 1055 -3 235 172 232 3 226 176 175 +3 235 172 232 3 1003 1000 1038 3 999 997 1042 3 1040 999 1042 @@ -2889,9 +2889,9 @@ end_header 3 1003 1038 1051 3 1040 1041 1000 3 1051 1038 1050 +3 937 936 987 3 935 960 987 3 964 984 983 -3 937 936 987 3 1047 1041 996 3 997 1044 1042 3 181 217 183 @@ -2934,8 +2934,8 @@ end_header 3 964 968 981 3 607 605 595 3 941 579 938 -3 607 595 598 3 598 595 603 +3 607 595 598 3 48 6 5 3 35 32 36 3 232 230 173 @@ -2943,8 +2943,8 @@ end_header 3 960 984 985 3 113 35 36 3 123 25 121 -3 247 250 249 3 249 250 252 +3 247 250 249 3 251 250 255 3 958 957 938 3 960 985 987 @@ -2958,8 +2958,8 @@ end_header 3 6 43 7 3 48 43 6 3 984 981 986 -3 121 25 27 3 32 121 31 +3 121 25 27 3 1056 1055 1058 3 1030 1055 1056 3 1005 1035 1034 @@ -2975,15 +2975,15 @@ end_header 3 192 1 77 3 242 241 165 3 1054 1053 1033 +3 1048 1000 1041 3 1042 1044 996 3 922 1044 997 -3 1048 1000 1041 3 168 170 241 3 173 228 231 -3 604 603 477 -3 598 603 604 3 605 951 950 3 606 589 951 +3 598 603 604 +3 604 603 477 3 64 2 1 3 234 173 231 3 184 185 183 @@ -3029,9 +3029,9 @@ end_header 3 1038 1049 1050 3 170 171 237 3 180 182 236 -3 36 31 33 3 31 27 28 3 124 20 25 +3 36 31 33 3 241 169 243 3 0 77 71 3 2 69 70 @@ -3053,20 +3053,20 @@ end_header 3 941 953 942 3 951 944 946 3 952 942 944 -3 944 945 946 3 950 947 599 +3 944 945 946 3 234 231 236 3 231 180 236 3 191 236 185 3 169 237 167 3 170 237 169 +3 996 995 1043 3 1044 995 996 3 922 995 1044 -3 996 995 1043 3 69 62 3 3 2 62 69 -3 241 243 244 3 244 243 166 +3 241 243 244 3 1050 1048 1035 3 1000 1048 1039 3 1046 1048 1047 @@ -3077,9 +3077,9 @@ end_header 3 946 945 947 3 942 992 949 3 953 940 990 +3 80 0 71 3 77 1 71 3 5 55 62 -3 80 0 71 3 10 33 34 3 36 33 10 3 62 61 4 @@ -3169,14 +3169,14 @@ end_header 3 38 13 39 3 15 24 14 3 39 13 37 -3 14 24 17 3 126 24 15 3 23 24 126 3 20 24 23 +3 14 24 17 +3 248 246 162 3 167 246 248 3 236 246 245 3 71 246 236 -3 248 246 162 3 992 993 949 3 955 994 991 3 39 37 11 diff --git a/core/src/test/resources/metadata.json b/core/src/test/resources/metadata.json index 0673dc8..315830e 100644 --- a/core/src/test/resources/metadata.json +++ b/core/src/test/resources/metadata.json @@ -40,6 +40,7 @@ "type": "ProjectedCRS", "name": "NAD83(HARN) / Oregon LCC (m)", "base_crs": { + "type": "GeographicCRS", "name": "NAD83(HARN)", "datum": { "type": "GeodeticReferenceFrame", diff --git a/core/src/test/resources/quick-info-with-metadata-mac.json b/core/src/test/resources/quick-info-with-metadata-mac.json index ef3913e..d52ccb7 100644 --- a/core/src/test/resources/quick-info-with-metadata-mac.json +++ b/core/src/test/resources/quick-info-with-metadata-mac.json @@ -19,6 +19,7 @@ "type": "ProjectedCRS", "name": "NAD83(HARN) / Oregon LCC (m)", "base_crs": { + "type": "GeographicCRS", "name": "NAD83(HARN)", "datum": { "type": "GeodeticReferenceFrame", diff --git a/examples/pdal-jni/build.sbt b/examples/pdal-jni/build.sbt index 590083c..6115d4c 100644 --- a/examples/pdal-jni/build.sbt +++ b/examples/pdal-jni/build.sbt @@ -23,7 +23,7 @@ resolvers += Resolver.sonatypeCentralSnapshots fork := true -val pdalVersion = "2.8.0" +val pdalVersion = "2.9.0" libraryDependencies ++= Seq( "io.pdal" %% "pdal" % pdalVersion, diff --git a/native/src/CMakeLists.txt b/native/src/CMakeLists.txt index 6e10800..777e855 100644 --- a/native/src/CMakeLists.txt +++ b/native/src/CMakeLists.txt @@ -9,7 +9,7 @@ set(MAKE_COLOR_MAKEFILE ON) project (pdaljni) set(PROJECT_VERSION_MAJOR 2) -set(PROJECT_VERSION_MINOR 8) +set(PROJECT_VERSION_MINOR 9) set(PROJECT_VERSION_PATCH 0) set(PDAL_LIB_NAME pdalcpp) @@ -28,10 +28,16 @@ if(MSVC) add_compile_options(/EHsc /utf-8) add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR=1) add_compile_options(/wd4996 /wd4530) + +if (NOT PDAL_BUILD) + # pdal/FileSpec.hpp uses std::filesystem, MSVC still defaults to C++14 + add_compile_options(/std:c++17) +endif() + else() if (NOT PDAL_BUILD) - set(CMAKE_CXX_FLAGS "-std=c++14") + set(CMAKE_CXX_FLAGS "-std=c++17") endif() endif()