Merge pull request #14 from PDAL/fix/dim-names

Fix dimName calls to be better, otherwise CSV reads wont work

Author: pomadchin

README.md

@@ -16,8 +16,8 @@ resolvers ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "io.pdal" %% "pdal" % "1.8.1", // core library
-  "io.pdal" %  "pdal-native" % "1.8.1" // jni bindings
+  "io.pdal" %% "pdal" % "1.8.2", // core library
+  "io.pdal" %  "pdal-native" % "1.8.2" // jni bindings
 )
 ```
 
@@ -39,8 +39,8 @@ Scala API to build pipeline expressions instead of writing a raw JSON.
 
 ```scala
 libraryDependencies ++= Seq(
-  "io.pdal" %% "pdal-scala" % "1.8.1", // scala core library
-  "io.pdal" %  "pdal-native" % "1.8.1" // jni bindings
+  "io.pdal" %% "pdal-scala" % "1.8.2", // scala core library
+  "io.pdal" %  "pdal-native" % "1.8.2" // jni bindings
 )
 ```
 

build.sbt

@@ -1,7 +1,7 @@
 name := "pdal-jni"
 
 lazy val commonSettings = Seq(
-  version := "1.8.1" + Environment.versionSuffix,
+  version := "1.8.2" + Environment.versionSuffix,
   scalaVersion := "2.11.12",
   crossScalaVersions := Seq("2.12.8", "2.11.12"),
   organization := "io.pdal",

examples/pdal-jni/build.sbt

@@ -21,7 +21,7 @@ resolvers ++= Seq(
 
 fork := true
 
-val pdalVersion = "1.8.1"
+val pdalVersion = "1.8.2"
 
 libraryDependencies ++= Seq(
   "io.pdal" %% "pdal"        % pdalVersion,

native/src/io_pdal_PointLayout.cpp

@@ -55,7 +55,7 @@ JNIEXPORT jobjectArray JNICALL Java_io_pdal_PointLayout_dimTypes
     for (long i = 0; i < static_cast<long>(dimTypes.size()); i++)
     {
         auto dt = dimTypes.at(i);
-        jstring id = env->NewStringUTF(pdal::Dimension::name(dt.m_id).c_str());
+        jstring id = env->NewStringUTF(pl->dimName(dt.m_id).c_str());
         jstring type = env->NewStringUTF(pdal::Dimension::interpretationName(dt.m_type).c_str());
         jobject element = env->NewObject(dtClass, dtCtor, id, type, dt.m_xform.m_scale.m_val, dt.m_xform.m_offset.m_val);
 
@@ -75,7 +75,7 @@ JNIEXPORT jobject JNICALL Java_io_pdal_PointLayout_findDimType
     std::string fid = std::string(env->GetStringUTFChars(jstr, 0));
     PointLayout *pl = getHandle<PointLayout>(env, obj);
     DimType dt = pl->findDimType(fid);
-    jstring id = env->NewStringUTF(pdal::Dimension::name(dt.m_id).c_str());
+    jstring id = env->NewStringUTF(pl->dimName(dt.m_id).c_str());
     jstring type = env->NewStringUTF(pdal::Dimension::interpretationName(dt.m_type).c_str());
 
     jclass dtClass = env->FindClass("io/pdal/DimType");
@@ -102,8 +102,8 @@ JNIEXPORT jlong JNICALL Java_io_pdal_PointLayout_dimPackedOffset
     DimType dimType = pl->findDimType(fid);
     DimTypeList dims = pl->dimTypes();
 
-    auto it = std::find_if(dims.begin(), dims.end(), [&dimType](const DimType& dt) {
-        return pdal::Dimension::name(dt.m_id) == pdal::Dimension::name(dimType.m_id);
+    auto it = std::find_if(dims.begin(), dims.end(), [&dimType, pl](const DimType& dt) {
+        return pl->dimName(dt.m_id) == pl->dimName(dimType.m_id);
     });
     auto index = std::distance(dims.begin(), it);
     long offset = 0;

scripts/merge-native.sh

@@ -17,11 +17,11 @@ done
 export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
 
 cd ./native/target
-rm -f ./pdal-native-1.8.0${PDAL_VERSION_SUFFIX}.jar
+rm -f ./pdal-native-1.8.2${PDAL_VERSION_SUFFIX}.jar
 rm -rf ./tmp; mkdir -p ./tmp
 
-cd tmp; jar -xf ../pdal-native-x86_64-darwin-1.8.0${PDAL_VERSION_SUFFIX}.jar; cd ~-
-cd tmp; jar -xf ../pdal-native-x86_64-linux-1.8.0${PDAL_VERSION_SUFFIX}.jar; cd ~-
+cd tmp; jar -xf ../pdal-native-x86_64-darwin-1.8.2${PDAL_VERSION_SUFFIX}.jar; cd ~-
+cd tmp; jar -xf ../pdal-native-x86_64-linux-1.8.2${PDAL_VERSION_SUFFIX}.jar; cd ~-
 
 jar -cvf pdal-native-1.8.0${PDAL_VERSION_SUFFIX}.jar -C tmp .