X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo%2Fsrc%2Forg%2Fargeo%2Fapp%2Fgeo%2FGeoUtils.java;h=8f971291aeb49c877e145bee691ff92ea87dac51;hb=8a490e540ac623b3545b1bd3da65ecbf2e4b6436;hp=3cec484c2f14d358f86b2cb66bbcab8bb8ee51c4;hpb=d76ddbc151846278fabe03f5e5dcbbca94704ba5;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.geo/src/org/argeo/app/geo/GeoUtils.java b/org.argeo.app.geo/src/org/argeo/app/geo/GeoUtils.java
index 3cec484..8f97129 100644
--- a/org.argeo.app.geo/src/org/argeo/app/geo/GeoUtils.java
+++ b/org.argeo.app.geo/src/org/argeo/app/geo/GeoUtils.java
@@ -32,6 +32,7 @@ import org.geotools.styling.FeatureTypeConstraint;
 import org.geotools.styling.FeatureTypeStyle;
 import org.geotools.styling.Fill;
 import org.geotools.styling.Graphic;
+import org.geotools.styling.NamedLayer;
 import org.geotools.styling.PointSymbolizer;
 import org.geotools.styling.Rule;
 import org.geotools.styling.Stroke;
@@ -176,7 +177,11 @@ public class GeoUtils {
 		}
 	}
 
-	public static org.opengis.style.Style createStyleFromCss(String css) {
+	/*
+	 * STYLING
+	 */
+
+	public static Style createStyleFromCss(String css) {
 		Stylesheet ss = CssParser.parse(css);
 		CssTranslator translator = new CssTranslator();
 		org.opengis.style.Style style = translator.translate(ss);
@@ -190,31 +195,32 @@ public class GeoUtils {
 //			e.printStackTrace();
 //		}
 
-		return style;
+		return (Style) style;
 	}
 
 	public static String createSldFromCss(String name, String title, String css) {
-
-		StyleFactory sf = CommonFactoryFinder.getStyleFactory();
-
-		StyledLayerDescriptor sld = sf.createStyledLayerDescriptor();
+		StyledLayerDescriptor sld = GeoTools.STYLE_FACTORY.createStyledLayerDescriptor();
 		sld.setName(name);
 		sld.setTitle(title);
 
-		UserLayer layer = sf.createUserLayer();
-		layer.setName("default");
+		NamedLayer layer = GeoTools.STYLE_FACTORY.createNamedLayer();
+		layer.setName(name);
 
-		org.opengis.style.Style style = createStyleFromCss(css);
-		layer.userStyles().add((Style) style);
+		Style style = createStyleFromCss(css);
+		layer.styles().add(style);
 
 		sld.layers().add(layer);
+		return sldToXml(sld);
+	}
+
+	public static String sldToXml(StyledLayerDescriptor sld) {
 		try {
 			SLDTransformer styleTransform = new SLDTransformer();
 			String xml = styleTransform.transform(sld);
 //			System.out.println(xml);
 			return xml;
 		} catch (TransformerException e) {
-			throw new IllegalStateException(e);
+			throw new IllegalStateException("Cannot write SLD as XML", e);
 		}
 	}
 
@@ -335,6 +341,14 @@ public class GeoUtils {
 
 	}
 
+	public static long getScaleFromResolution(long resolution) {
+		// see https://gis.stackexchange.com/questions/242424/how-to-get-map-units-to-find-current-scale-in-openlayers
+		final double INCHES_PER_UNIT = 39.37;// m
+		// final double INCHES_PER_UNIT = 4374754;// dd
+		final long DOTS_PER_INCH = 72;
+		return Math.round(INCHES_PER_UNIT * DOTS_PER_INCH * resolution);
+	}
+
 	/** Singleton. */
 	private GeoUtils() {
 	}