Skip to content

Commit 4269874

Browse files
committed
Clean up metatile code
1 parent 78b5e82 commit 4269874

1 file changed

Lines changed: 4 additions & 26 deletions

File tree

src/main/groovy/geoscript/layer/TileGenerator.groovy

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package geoscript.layer
22

33
import geoscript.geom.Bounds
4-
import geoscript.style.Fill
5-
import geoscript.style.Stroke
6-
import geoscript.workspace.Directory
7-
import geoscript.workspace.Workspace
8-
94
import javax.imageio.ImageIO
105
import java.awt.image.BufferedImage
116

@@ -85,9 +80,10 @@ class TileGenerator {
8580
if (verbose) println " Metatile ${c} ${r} = ${startX},${startY} - ${endX},${endY} @ ${bounds}"
8681

8782
byte[] imageData = imageTileRenderer.render(size: [
88-
width: tileLayer.pyramid.tileWidth * metaTileCursor.width,
89-
height: tileLayer.pyramid.tileHeight * metaTileCursor.height],
90-
bounds)
83+
width: tileLayer.pyramid.tileWidth * metaTileCursor.width,
84+
height: tileLayer.pyramid.tileHeight * metaTileCursor.height],
85+
bounds
86+
)
9187
BufferedImage image = ImageIO.read(new ByteArrayInputStream(imageData))
9288
int imageWidth = image.width
9389
int imageHeight = image.height
@@ -133,22 +129,4 @@ class TileGenerator {
133129
}
134130
}
135131

136-
static void main(String[] args) {
137-
138-
Workspace workspace = new Directory("examples/naturalearth")
139-
Layer countries = workspace.get("ne_110m_admin_0_countries")
140-
countries.style = new Fill("white") + new Stroke("black")
141-
Layer ocean = workspace.get("ne_110m_ocean")
142-
ocean.style = new Fill("blue")
143-
144-
File dir = new File("target/tiles")
145-
Pyramid pyramid = Pyramid.createGlobalMercatorPyramid(origin: Pyramid.Origin.BOTTOM_LEFT)
146-
147-
TMS tms = new TMS("world", "png", dir, pyramid)
148-
TileRenderer renderer = new ImageTileRenderer(tms, [ocean, countries])
149-
TileGenerator generator = new TileGenerator(verbose: true)
150-
generator.generate(tms, renderer, 0, 4, metatile: [width:4, height: 4])
151-
152-
}
153-
154132
}

0 commit comments

Comments
 (0)