Skip to content

Commit 07631c2

Browse files
committed
Update Scala classes to match PDAL 1.7.1
1 parent 3dfca56 commit 07631c2

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

.travis/test-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
if [ `echo $TRAVIS_SCALA_VERSION | cut -f1-2 -d "."` = "2.11" ]; then
44
.travis/test.sh;
55
else
6-
.travis/test-212.sh
6+
.travis/test-212.sh;
77
fi

core-scala/src/main/scala/io/pdal/pipeline/PipelineExpressions.scala

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ case class LasRead(
124124
compression: Option[String] = None,
125125
spatialreference: Option[String] = None,
126126
tag: Option[String] = None,
127+
useEbVlr: Option[String] = None,
127128
`type`: ReaderType = ReaderTypes.las
128129
) extends PipelineExpr
129130

@@ -137,6 +138,17 @@ object NitfRead {
137138
Read(filename, spatialreference, tag, Some(ReaderTypes.nitf))
138139
}
139140

141+
@ConfiguredJsonCodec
142+
case class NumpyRead(
143+
filename: String,
144+
dimension: Option[String] = None,
145+
x: Option[Int] = None,
146+
y: Option[Int] = None,
147+
z: Option[Int] = None,
148+
assignZ: Option[String] = None,
149+
`type`: ReaderType = ReaderTypes.numpy
150+
)
151+
140152
@ConfiguredJsonCodec
141153
case class OciRead(
142154
connection: String,
@@ -222,10 +234,15 @@ case class SqliteRead(
222234
`type`: ReaderType = ReaderTypes.sqlite
223235
) extends PipelineExpr
224236

225-
object TextRead {
226-
def apply(filename: String, spatialreference: Option[String] = None, tag: Option[String] = None): Read =
227-
Read(filename, spatialreference, tag, Some(ReaderTypes.text))
228-
}
237+
@ConfiguredJsonCodec
238+
case class TextRead(
239+
filename: String,
240+
separator: Option[String] = None,
241+
header: Option[String] = None,
242+
skip: Option[Int] = None,
243+
count: Option[Long] = None,
244+
`type`: ReaderType = ReaderTypes.text
245+
) extends PipelineExpr
229246

230247
@ConfiguredJsonCodec
231248
case class TindexRead(
@@ -454,7 +471,8 @@ case class MongusFilter(
454471
) extends PipelineExpr
455472

456473
@ConfiguredJsonCodec
457-
case class MortnOrderFilter(
474+
case class MortonOrderFilter(
475+
reverse: Option[String] = None,
458476
`type`: FilterType = FilterTypes.mortonorder
459477
) extends PipelineExpr
460478

@@ -635,7 +653,7 @@ case class BpfWrite(
635653
format: Option[String] = None,
636654
bundledfile: Option[String] = None,
637655
headerData: Option[String] = None,
638-
coordId: Option[Int] = None,
656+
coordId: Option[String] = None,
639657
scaleX: Option[Double] = None,
640658
scaleY: Option[Double] = None,
641659
scaleZ: Option[Double] = None,
@@ -835,6 +853,7 @@ case class TextWrite(
835853
filename: String,
836854
format: Option[String] = None,
837855
order: Option[String] = None,
856+
precision: Option[Int] = None,
838857
keepUnspecified: Option[Boolean] = None,
839858
jscallback: Option[String] = None,
840859
quoteHeader: Option[String] = None,

core-scala/src/main/scala/io/pdal/pipeline/ReaderTypes.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ object ReaderTypes {
3131
case object mbio extends ReaderType
3232
case object mrsid extends ReaderType
3333
case object nitf extends ReaderType
34+
case object numpy extends ReaderType
3435
case object oci extends ReaderType
3536
case object optech extends ReaderType
3637
case object osg extends ReaderType
@@ -49,7 +50,7 @@ object ReaderTypes {
4950

5051
lazy val all = List(
5152
bpf, buffer, faux, gdal, geowave, greyhound, ilvis2, las, matlab, mbio, mrsid, nitf,
52-
oci, optech, osg, pcd, pgpointcloud, ply, pts, qfit, rxp, sbet, sqlite, text,
53+
numpy, oci, optech, osg, pcd, pgpointcloud, ply, pts, qfit, rxp, sbet, sqlite, text,
5354
tindex, terrasolid, icebridge
5455
)
5556

0 commit comments

Comments
 (0)