Fix #1873 Wrong Font Family and Size on Print plugin (#1874)

* Fixed font family and size on print * Fixed font name in legend options
geosolutions-it · May 24, 2017 · f116947 · f116947
1 parent 7343a59
commit f116947
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/web/client/components/print/Font.jsx b/web/client/components/print/Font.jsx
@@ -38,8 +38,8 @@ const Font = React.createClass({
     onChangeFamily(family) {
         this.props.onChangeFamily(family);
     },
-    onChangeSize(size) {
-        this.props.onChangeSize(size);
+    onChangeSize(e) {
+        this.props.onChangeSize(parseFloat(e.target.value));
     },
     render() {
         return (

diff --git a/web/client/utils/PrintUtils.js b/web/client/utils/PrintUtils.js
@@ -205,8 +205,7 @@ const PrintUtils = {
                                  height: spec.iconSize,
                                  width: spec.iconSize,
                                  minSymbolSize: spec.iconSize,
-                                 fontFamily: spec.fontFamily,
-                                 LEGEND_OPTIONS: "forceLabels:" + (spec.forceLabels ? "on" : "") + ";fontAntialiasing:" + spec.antiAliasing + ";dpi:" + spec.legendDpi + ";fontStyle:" + (spec.bold && "bold" || (spec.italic && "italic") || ''),
+                                 LEGEND_OPTIONS: "forceLabels:" + (spec.forceLabels ? "on" : "") + ";fontAntialiasing:" + spec.antiAliasing + ";dpi:" + spec.legendDpi + ";fontStyle:" + (spec.bold && "bold" || (spec.italic && "italic") || '') + ";fontName:" + spec.fontFamily + ";fontSize:" + spec.fontSize,
                                  format: "image/png",
                                  ...assign({}, layer.params)
                              }