Skip to content

Commit 4e2fa7c

Browse files
committed
Remove GTopo Format and get ready for 1.18 release
1 parent 9928d9b commit 4e2fa7c

File tree

9 files changed

+64
-45
lines changed

9 files changed

+64
-45
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
target/
22
.idea/
3-
*.iml
3+
*.iml
4+
.project
5+
.settings
6+
.vscode

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ and then include the GeoScript Groovy dependency::
127127
<dependency>
128128
<groupId>org.geoscript</groupId>
129129
<artifactId>geoscript-groovy</artifactId>
130-
<version>1.17.0</version>
130+
<version>1.18.0</version>
131131
</dependency>
132132

133133
Docker
@@ -151,7 +151,7 @@ Versions
151151
+-----------+----------+-----------+--------+----------+
152152
| GeoScript | GeoTools | GeoServer | JTS | Groovy |
153153
+-----------+----------+-----------+--------+----------+
154-
| 1.18 | 26 | 2.20 | 1.18.1 | 3.0.9 |
154+
| 1.18 | 26 | 2.20 | 1.18.2 | 3.0.9 |
155155
+-----------+----------+-----------+--------+----------+
156156
| 1.17 | 25 | 2.19 | 1.18.1 | 3.0.7 |
157157
+-----------+----------+-----------+--------+----------+
@@ -193,7 +193,7 @@ Versions
193193
API Groovy Docs
194194
---------------
195195

196-
`1.18-SNAPSHOT <http://geoscript.github.io/geoscript-groovy/api/1.18-SNAPSHOT/index.html>`_
196+
`1.18.0 <http://geoscript.github.io/geoscript-groovy/api/1.18.0/index.html>`_
197197

198198
`1.17.0 <http://geoscript.github.io/geoscript-groovy/api/1.17.0/index.html>`_
199199

doc/gradle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Then edit the build.gradle file.
5151
}
5252
5353
dependencies {
54-
compile "org.geoscript:geoscript-groovy:1.17.0"
54+
compile "org.geoscript:geoscript-groovy:1.18.0"
5555
}
5656
5757
task wrapper(type: Wrapper) {

doc/mavenapp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Add geoscript as a dependency in pom.xml.
3131
<dependency>
3232
<groupId>org.geoscript</groupId>
3333
<artifactId>geoscript-groovy</artifactId>
34-
<version>1.17.0</version>
34+
<version>1.18.0</version>
3535
</dependency>
3636
</dependencies>
3737

doc/mavenwebappjndi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Add geoscript as a dependency in the **pom.xml** file:
4242
<dependency>
4343
<groupId>org.geoscript</groupId>
4444
<artifactId>geoscript-groovy</artifactId>
45-
<version>1.17.0</version>
45+
<version>1.18.0</version>
4646
</dependency>
4747
<depenencies>
4848

doc/releases.rst

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,59 @@
33
GeoScript Groovy Releases
44
=========================
55

6+
1.18.0
7+
------
8+
The 1.18 release of GeoScript is build on Groovy 3.0.9, GeoTools 26.0, and the Java Topology Suite 1.18.2 and requires Java 8.
9+
10+
Added a WikiMedia OSM Layer::
11+
12+
OSM osm = OSM.getWellKnownOSM("wikimedia")
13+
14+
Add a Geometry method to fix invalid Geometries::
15+
16+
Geometry invalidLine = new LineString([[0, 0], [0, 0], [0, 0], [0, 0], [0, 0], [1, 1]])
17+
Geometry fixedLine = invalidLine.fix()
18+
println fixedLine.wkt
19+
>>> LINESTRING (0 0, 1 1)
20+
21+
Removed GTopo30 Raster Format.
22+
23+
When drawing maps, resample large raster for better performance.
24+
25+
Added a RasterTileRenderer that creates Tiles from a Single Raster::
26+
27+
File file = new File("world.tif")
28+
GeoTIFF geoTIFF = new GeoTIFF(file)
29+
Raster raster = geoTIFF.read()
30+
31+
RasterTileRenderer tileRenderer = new RasterTileRenderer(raster)
32+
Pyramid pyramid = Pyramid.createGlobalMercatorPyramid()
33+
byte[] bytes = tileRenderer.render(pyramid.bounds(new Tile(0,0,0)), size: [256,256])
34+
35+
Added StyleRepository for files (flat and nested directories) and databases (h2, sqlite, and postgres)::
36+
37+
Sql sql = Sql.newInstance("jdbc:sqlite:styles.db", "org.sqlite.JDBC")
38+
StyleRepository styleRepository = DatabaseStyleRepository.forSqlite(sql)
39+
40+
// Save
41+
File file = new File("states.sld")
42+
styleRepository.save("states", "states", file.text)
43+
44+
// Get
45+
String sld = styleRepository.getDefaultForLayer("states")
46+
47+
// Delete (layer, style)
48+
styleRepository.delete("states", "states")
49+
50+
Add support for exporting SLDs with NamedLayer elements::
51+
52+
Symbolizer sym = new Fill("wheat") + new Stroke("brown")
53+
SLDWriter writer = new SLDWriter();
54+
ByteArrayOutputStream out = new ByteArrayOutputStream()
55+
writer.write(sym, out, type: "NamedLayer")
56+
57+
Upgraded JUnit from 4 to 5 and refactored tests.
58+
659
1.17.0
760
------
861
The 1.17 release of GeoScript is build on Groovy 3.0.7, GeoTools 25.0, and the Java Topology Suite 1.18.1 and requires Java 8.

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@
198198
<artifactId>gt-grassraster</artifactId>
199199
<version>${gt.version}</version>
200200
</dependency>
201-
<dependency>
202-
<groupId>org.geotools</groupId>
203-
<artifactId>gt-gtopo30</artifactId>
204-
<version>${gt.version}</version>
205-
</dependency>
206201
<dependency>
207202
<groupId>org.geotools</groupId>
208203
<artifactId>gt-imagepyramid</artifactId>
@@ -571,7 +566,7 @@
571566
</plugins>
572567
</reporting>
573568
<properties>
574-
<gt.version>26-SNAPSHOT</gt.version>
569+
<gt.version>26.0</gt.version>
575570
<groovy.version>3.0.9</groovy.version>
576571
</properties>
577572
<name>geoscript groovy</name>

src/main/groovy/geoscript/layer/GTopo30.groovy

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/resources/META-INF/services/geoscript.layer.FormatFactory

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
geoscript.layer.ArcGrid$Factory
22
geoscript.layer.GeoTIFF$Factory
33
geoscript.layer.Grass$Factory
4-
geoscript.layer.GTopo30$Factory
54
geoscript.layer.ImagePyramid$Factory
65
geoscript.layer.Mosaic$Factory
76
geoscript.layer.MrSID$Factory

0 commit comments

Comments
 (0)