Skip to content

Commit b85a86c

Browse files
committed
Release 0.6.0.
Signed-off-by: Simeon H.K. Fitch <[email protected]>
1 parent b7a7dd7 commit b85a86c

File tree

176 files changed

+6251
-1278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+6251
-1278
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ metastore_db
2424
.ensime*
2525
tour/jars
2626
tour/*.tiff
27+
scoverage-report*

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
maxColumn = 120
1+
maxColumn = 100
22
continuationIndent.defnSite = 2
33
binPack.parentConstructors = true
44
newlines.penalizeSingleSelectMultiArgList = false

README.md

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,22 @@
1-
<img src="src/main/paradox/_template/images/RasterFramesLogo.png" width="300px"/><sup style="vertical-align: top;">&trade;</sup>
1+
<img src="docs/src/main/paradox/_template/images/RasterFramesLogo.png" width="300px"/><sup style="vertical-align: top;">&trade;</sup>
22

3-
[ ![Download](https://api.bintray.com/packages/s22s/maven/raster-frames/images/download.svg) ](https://bintray.com/s22s/maven/raster-frames/_latestVersion) [![Build Status](https://travis-ci.org/s22s/raster-frames.svg?branch=develop)](https://travis-ci.org/s22s/raster-frames) [![codecov](https://codecov.io/gh/s22s/raster-frames/branch/develop/graph/badge.svg)](https://codecov.io/gh/s22s/raster-frames)
3+
[![Maven metadata URI](https://img.shields.io/maven-metadata/v/http/central.maven.org/maven2/io/astraea/raster-frames_2.11/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cga%7C1%7Craster-frames) [![Build Status](https://travis-ci.org/s22s/raster-frames.svg?branch=develop)](https://travis-ci.org/s22s/raster-frames) [![codecov](https://codecov.io/gh/s22s/raster-frames/branch/develop/graph/badge.svg)](https://codecov.io/gh/s22s/raster-frames)
44
[![Join the chat at https://gitter.im/s22s/raster-frames](https://badges.gitter.im/s22s/raster-frames.svg)](https://gitter.im/s22s/raster-frames?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

66
_RasterFrames™_ brings the power of Spark DataFrames to geospatial raster data, empowered by the map algebra and tile layer operations of [GeoTrellis](https://geotrellis.io/).
77

8-
<img src="src/main/tut/RasterFramePipelineOverview.png" width="600px"/>
8+
<img src="docs/src/main/tut/RasterFramePipeline.svg" width="600px"/>
99

10-
> **RasterFrames™ is a new project under active development**. Feedback and contributions are welcomed
11-
as we continue to improve it.
12-
13-
## Getting Started
14-
15-
## Quick Start
16-
17-
### macOS
18-
19-
1. If not already, install [Homebrew](https://brew.sh/)
20-
2. Run `brew install sbt`
21-
3. Run `sbt new s22s/raster-frames.g8`
22-
23-
### Linux
24-
25-
1. Install [sbt](http://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html)
26-
2. Run `sbt new s22s/raster-frames.g8`
27-
28-
### Windows
29-
30-
1. Install [sbt](http://www.scala-sbt.org/release/docs/Installing-sbt-on-Windows.html)
31-
2. Run `sbt new s22s/raster-frames.g8`
32-
33-
## General Setup
34-
35-
*RasterFrames* is published via Bintray's JCenter server. In sbt you introduce it with this build setting:
36-
37-
```
38-
resolvers += Resolver.jcenterRepo
39-
```
40-
41-
(See [this](https://bintray.com/bintray/jcenter) for use of JCenter with other build tools.)
42-
43-
To use RasterFrames, add the following library dependency:
44-
45-
sbt:
46-
47-
```scala
48-
libraryDependencies += "io.astraea" %% "raster-frames" % "x.y.z"
49-
```
50-
51-
Maven:
52-
53-
```xml
54-
<dependency>
55-
<groupId>io.astraea</groupId>
56-
<artifactId>raster-frames</artifactId>
57-
<version>x.y.z</version>
58-
</dependency>
59-
```
60-
61-
Note: It assumes that SparkSQL 2.1.1 is available in the runtime classpath.
10+
Please see the [Getting Started](http://rasterframes.io/getting-started.html) section of the Users' Manual to start using RasterFrames.
6211

6312
## Documentation
6413

6514
* [Users' Manual](http://rasterframes.io/)
6615
* [API Documentation](http://rasterframes.io/latest/api/index.html)
6716
* [List of available UDFs](http://rasterframes.io/latest/api/index.html#astraea.spark.rasterframes.ColumnFunctions)
6817

69-
7018
## Copyright and License
7119

72-
All code is available to you under the Apache 2.0 License, copyright Astraea, Inc. 2017.
20+
RasterFrames is released under the Apache 2.0 License, copyright Astraea, Inc. 2017.
7321

7422

bench/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
enablePlugins(BenchmarkPlugin)
22

33
libraryDependencies ++= Seq(
4-
spark("core"),
5-
spark("sql"),
6-
geotrellis("spark"),
7-
geotrellis("raster")
4+
spark("core").value,
5+
spark("sql").value,
6+
geotrellis("spark").value,
7+
geotrellis("raster").value
88
)
99

1010
jmhIterations := Some(5)

bench/src/main/scala/astraea/spark/rasterframes/bench/TileCellScanBench.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
2424
import geotrellis.raster.Tile
2525
import org.apache.spark.sql.catalyst.InternalRow
2626
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
27-
import org.apache.spark.sql.gt.InternalRowTile
27+
import org.apache.spark.sql.rf.InternalRowTile
2828
import org.apache.spark.sql.gt.types.TileUDT
2929
import org.openjdk.jmh.annotations._
3030

build.sbt

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
lazy val `raster-frames` = project
1+
addCommandAlias("makeSite", "docs/makeSite")
2+
3+
lazy val root = project
24
.in(file("."))
3-
.enablePlugins(
4-
SiteScaladocPlugin,
5-
ParadoxSitePlugin,
6-
TutPlugin,
7-
GhpagesPlugin,
8-
BuildInfoPlugin
9-
)
10-
.settings(name := "RasterFrames")
11-
.settings(moduleName := "raster-frames")
5+
.withId("RF")
6+
.aggregate(core, datasource)
7+
.settings(publishArtifact := false)
128
.settings(releaseSettings)
13-
.settings(docSettings)
14-
.settings(buildInfoSettings)
9+
10+
lazy val core = project
11+
12+
lazy val datasource = project
13+
.dependsOn(core % "test->test;compile->compile")
14+
15+
lazy val docs = project
16+
.dependsOn(core, datasource)
1517

1618
lazy val bench = project
17-
.dependsOn(`raster-frames`)
19+
.dependsOn(core)
1820

1921
initialCommands in console := """
2022
|import astraea.spark.rasterframes._

core/build.sbt

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
enablePlugins(BuildInfoPlugin)
2+
3+
moduleName := "raster-frames"
4+
5+
libraryDependencies ++= Seq(
6+
"com.chuusai" %% "shapeless" % "2.3.2",
7+
"org.locationtech.geomesa" %% "geomesa-z3" % "1.3.5",
8+
"org.locationtech.geomesa" %% "geomesa-spark-jts" % "2.0.0-astraea.1" exclude("jgridshift", "jgridshift"),
9+
spark("core").value % Provided,
10+
spark("mllib").value % Provided,
11+
spark("sql").value % Provided,
12+
geotrellis("spark").value,
13+
geotrellis("raster").value,
14+
geotrellis("spark-testkit").value % Test excludeAll (
15+
ExclusionRule(organization = "org.scalastic"),
16+
ExclusionRule(organization = "org.scalatest")
17+
),
18+
scalaTest
19+
)
20+
21+
buildInfoKeys ++= Seq[BuildInfoKey](
22+
name, version, scalaVersion, sbtVersion, rfGeotrellisVersion, rfSparkVersion
23+
)
24+
25+
buildInfoPackage := "astraea.spark.rasterframes"
26+
27+
buildInfoObject := "RFBuildInfo"
28+
29+
buildInfoOptions := Seq(
30+
BuildInfoOption.ToMap,
31+
BuildInfoOption.BuildTime
32+
)
33+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package astraea.spark.rasterframes
2+
3+
/**
4+
*
5+
* @since 2/19/18
6+
*/
7+
trait MetadataKeys {
8+
/** Key under which ContextRDD metadata is stored. */
9+
private[rasterframes] val CONTEXT_METADATA_KEY = "_context"
10+
11+
/** Key under which RasterFrame role a column plays. */
12+
private[rasterframes] val SPATIAL_ROLE_KEY = "_stRole"
13+
}

0 commit comments

Comments
 (0)