Skip to content

Commit f3bcc66

Browse files
committed
Change the Layer.fromGeometry optional parameter from Symbolizer to Style.
1 parent 12e53d9 commit f3bcc66

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/groovy/geoscript/layer/Layer.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@ class Layer implements Renderable {
19701970
* @param options Optional named parameters:
19711971
* <ul>
19721972
* <li>proj = The Projection (defaults to EPSg:4326)</li>
1973-
* <li>style = A Symbolizer</li>
1973+
* <li>style = A Style</li>
19741974
* </ul>
19751975
* @param name The name of the new Layer
19761976
* @param geometry The Geometry
@@ -1979,10 +1979,10 @@ class Layer implements Renderable {
19791979
static Layer fromGeometry(Map options = [:], String name, Geometry geometry) {
19801980
String geometryType = geometry.geometryType
19811981
String epsg = options.get("proj", new Projection("EPSG:4326")).epsg
1982-
Symbolizer symbolizer = options.get("style", Symbolizer.getDefault(geometryType))
1982+
Style style = options.get("style", Symbolizer.getDefault(geometryType))
19831983
Layer layer = new Layer(name, new Schema(name, "geom:${geometryType}:srid=${epsg}"))
19841984
layer.add([geom: geometry])
1985-
layer.style = symbolizer
1985+
layer.style = style
19861986
layer
19871987
}
19881988

@@ -1991,7 +1991,7 @@ class Layer implements Renderable {
19911991
* @param options Optional named parameters:
19921992
* <ul>
19931993
* <li>proj = The Projection (defaults to EPSg:4326)</li>
1994-
* <li>style = A Symbolizer</li>
1994+
* <li>style = A Style</li>
19951995
* </ul>
19961996
* @param name The name of the new Layer
19971997
* @param geometries The List of Geometries
@@ -2001,12 +2001,12 @@ class Layer implements Renderable {
20012001
List<String> geometryTypes = geometries.collect{ Geometry geometry -> geometry.geometryType}.unique()
20022002
String geometryType = geometryTypes.size() > 1 ? "GeometryCollection" : geometryTypes[0]
20032003
String epsg = options.get("proj", new Projection("EPSG:4326")).epsg
2004-
Symbolizer symbolizer = options.get("style", Symbolizer.getDefault(geometryType))
2004+
Style style = options.get("style", Symbolizer.getDefault(geometryType))
20052005
Layer layer = new Layer(name, new Schema(name, "geom:${geometryType}:srid=${epsg}"))
20062006
geometries.each { Geometry geometry ->
20072007
layer.add([geom: geometry])
20082008
}
2009-
layer.style = symbolizer
2009+
layer.style = style
20102010
layer
20112011
}
20122012

0 commit comments

Comments
 (0)