Skip to content

Commit 80ed594

Browse files
committed
Merge branch 'scala-2.12' of github.com:echeipesh/rasterframes into ec-scala-2.12
* 'scala-2.12' of github.com:echeipesh/rasterframes: Uncomment the forgotten test Add scalafmt
2 parents 8ad7db3 + 29e8aac commit 80ed594

File tree

3 files changed

+29
-37
lines changed

3 files changed

+29
-37
lines changed

.scalafmt.conf

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
maxColumn = 138
1+
version = 3.0.3
2+
runner.dialect = scala212
3+
indent.main = 2
4+
indent.significant = 2
5+
maxColumn = 150
26
continuationIndent.defnSite = 2
3-
binPack.parentConstructors = true
4-
binPack.literalArgumentLists = false
5-
newlines.penalizeSingleSelectMultiArgList = false
6-
newlines.sometimesBeforeColonInMethodReturnType = false
7-
align.openParenCallSite = false
8-
align.openParenDefnSite = false
9-
docstrings = JavaDoc
10-
rewriteTokens {
11-
"=>" = "=>"
12-
"←" = "<-"
13-
}
14-
optIn.selfAnnotationNewline = false
15-
optIn.breakChainOnFirstMethodDot = true
16-
importSelectors = BinPack
7+
assumeStandardLibraryStripMargin = true
8+
danglingParentheses.preset = true
9+
rewrite.rules = [SortImports, RedundantBraces, RedundantParens, SortModifiers]
10+
docstrings.style = Asterisk
11+
# align.preset = more

core/src/test/scala/org/locationtech/rasterframes/RasterJoinSpec.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,18 @@ class RasterJoinSpec extends TestEnvironment with TestData with RasterMatchers {
4343
.withColumnRenamed("tile", "tile2")
4444

4545
it("should join the same scene correctly") {
46-
47-
// spark.conf.set("spark.sql.adaptive.enabled", true)
48-
// spark.conf.set("spark.sql.optimizer.nestedSchemaPruning.enabled", false)
49-
5046
val b4nativeRfPrime = b4nativeTif.toDF(Dimensions(10, 10))
5147
.withColumnRenamed("tile", "tile2")
5248
val joined = b4nativeRf.rasterJoin(b4nativeRfPrime.hint("broadcast"))
5349

5450
joined.count() should be (b4nativeRf.count())
5551

56-
/*val measure = joined.select(
52+
val measure = joined.select(
5753
rf_tile_mean(rf_local_subtract($"tile", $"tile2")) as "diff_mean",
5854
rf_tile_stats(rf_local_subtract($"tile", $"tile2")).getField("variance") as "diff_var")
5955
.as[(Double, Double)]
6056
.collect()
61-
all (measure) should be ((0.0, 0.0))*/
57+
all (measure) should be ((0.0, 0.0))
6258
}
6359

6460
it("should join same scene in different tile sizes"){

project/plugins.sbt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
logLevel := sbt.Level.Error
22

33
addDependencyTreePlugin
4-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
5-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
6-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
7-
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
8-
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
9-
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.5.5")
10-
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
11-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.6")
12-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
13-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
14-
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
15-
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.10")
16-
addSbtPlugin("com.github.gseitz" %% "sbt-release" % "1.0.9")
17-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.19")
18-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
19-
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
4+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.0.0")
5+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
6+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
7+
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
8+
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
9+
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.5.5")
10+
addSbtPlugin("io.github.jonas" % "sbt-paradox-material-theme" % "0.6.0")
11+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.6")
12+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
13+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
14+
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")
15+
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.10")
16+
addSbtPlugin("com.github.gseitz" %% "sbt-release" % "1.0.9")
17+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.19")
18+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
19+
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
20+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

0 commit comments

Comments
 (0)