Skip to content

Commit 63e767d

Browse files
pomadchinpomadchin
authored
PDAL 2.10.x support (#117)
1 parent 5837836 commit 63e767d

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
arch: arm64
2222
java: [11]
2323
distribution: [temurin]
24-
pdal: [2.9.3]
24+
pdal: [2.10.2]
2525
runs-on: ${{ matrix.os }}
2626
defaults:
2727
run:
@@ -88,7 +88,7 @@ jobs:
8888
os: [ubuntu-latest]
8989
java: [11]
9090
distribution: [temurin]
91-
pdal: [2.9.3]
91+
pdal: [2.10.2]
9292
runs-on: ${{ matrix.os }}
9393
if: github.event_name != 'pull_request'
9494
needs: [build]

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Dependency contains bindings for `arm64-darwin`, and `x86_64-linux`, other versi
2424

2525
Given a `{major}.{minor}.{patch}` version:
2626
* `{major}.{minor}` - matches the **PDAL** version it is published for
27-
* 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`
27+
* e.g. **pdal-java** of version `2.10.0` is suitable for all **PDAL** versions `2.10.x` (`2.10.0`, ..., `2.10.2`, etc) major = `2`, minor = `10`
2828
* `{patch}` - this portion of the version corresponds to updates within **pdal-java** and should remain compatible with **PDAL library** `{major}.{minor}` versions
2929
* 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.
3030

@@ -43,7 +43,7 @@ If you would like to use your own bindings, it is necessary to set `java.library
4343

4444
```scala
4545
// macOS X example with manual JNI installation
46-
// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.9.dylib /usr/local/lib/libpdaljni.2.9.dylib
46+
// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.10.dylib /usr/local/lib/libpdaljni.2.10.dylib
4747
// place built binary into /usr/local/lib, and pass java.library.path to your JVM
4848
javaOptions += "-Djava.library.path=/usr/local/lib"
4949
```

‎core/src/main/scala/io/pdal/Pipeline.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Pipeline private (val json: String, val logLevel: Int) extends Native {
4747
def getLogLevel(): LogLevel.Value = LogLevel.apply(getLogLevelInt())
4848
}
4949

50-
object Pipeline extends NativeLoader("pdaljni.2.9") {
50+
object Pipeline extends NativeLoader("pdaljni.2.10") {
5151
def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline =
5252
new Pipeline(json, logLevel)
5353
}

‎core/src/test/resources/metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575
},
7676
"conversion": {
77-
"name": "unnamed",
77+
"name": "unknown",
7878
"method": {
7979
"name": "Lambert Conic Conformal (2SP)",
8080
"id": {
@@ -144,13 +144,13 @@
144144
"axis": [
145145
{
146146
"name": "Easting",
147-
"abbreviation": "",
147+
"abbreviation": "E",
148148
"direction": "east",
149149
"unit": "metre"
150150
},
151151
{
152152
"name": "Northing",
153-
"abbreviation": "",
153+
"abbreviation": "N",
154154
"direction": "north",
155155
"unit": "metre"
156156
}

‎core/src/test/resources/quick-info-with-metadata-mac.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454
},
5555
"conversion": {
56-
"name": "unnamed",
56+
"name": "unknown",
5757
"method": {
5858
"name": "Lambert Conic Conformal (2SP)",
5959
"id": {
@@ -123,13 +123,13 @@
123123
"axis": [
124124
{
125125
"name": "Easting",
126-
"abbreviation": "",
126+
"abbreviation": "E",
127127
"direction": "east",
128128
"unit": "metre"
129129
},
130130
{
131131
"name": "Northing",
132-
"abbreviation": "",
132+
"abbreviation": "N",
133133
"direction": "north",
134134
"unit": "metre"
135135
}

‎examples/pdal-jni/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resolvers += Resolver.sonatypeCentralSnapshots
2323

2424
fork := true
2525

26-
val pdalVersion = "2.9.0"
26+
val pdalVersion = "2.10.0"
2727

2828
libraryDependencies ++= Seq(
2929
"io.pdal" %% "pdal" % pdalVersion,

‎native/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(MAKE_COLOR_MAKEFILE ON)
99

1010
project (pdaljni)
1111
set(PROJECT_VERSION_MAJOR 2)
12-
set(PROJECT_VERSION_MINOR 9)
12+
set(PROJECT_VERSION_MINOR 10)
1313
set(PROJECT_VERSION_PATCH 0)
1414

1515
set(PDAL_LIB_NAME pdalcpp)

0 commit comments

Comments
 (0)