diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index 13b35414..62669247 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -89,7 +89,7 @@ mindplot.widget.Menu = new Class({
this._registerTooltip('fontSize', "Text size");
}
- var topicShapeBtn = $('topicShapeBtn');
+ var topicShapeBtn = $('topicShape');
if (topicShapeBtn) {
var topicShapeModel = {
getValue: function() {
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 1b42b483..ab55add0 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -212,6 +212,11 @@
+
+ org.apache.xmlgraphics
+ batik-codec
+ 1.7
+
javax.servlet
servlet-api
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
index 07ff7be6..723c8a3e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
@@ -62,7 +62,7 @@ public class TransformView extends AbstractView {
final ExportProperties.ImageProperties.Size size = ExportProperties.ImageProperties.Size.valueOf(sizeStr);
imageProperties.setSize(size);
} else {
- imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
+ imageProperties.setSize(ExportProperties.ImageProperties.Size.MEDIUM);
}
}
diff --git a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
index fdf1f340..4656f2e3 100644
--- a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
+++ b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
@@ -12,10 +12,12 @@
\ No newline at end of file
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
index 71552417..0cefc9a4 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
@@ -56,16 +56,16 @@ public class ExportTest {
public Object[][] parameterIntTestProvider() {
final File dataDir = new File(DATA_DIR_PATH);
- final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
+ final File[] svgFile = dataDir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.endsWith(".svg");
}
});
- final Object[][] result = new Object[freeMindFiles.length][2];
- for (int i = 0; i < freeMindFiles.length; i++) {
- File freeMindFile = freeMindFiles[i];
+ final Object[][] result = new Object[svgFile.length][2];
+ for (int i = 0; i < svgFile.length; i++) {
+ File freeMindFile = svgFile[i];
final String name = freeMindFile.getName();
result[i] = new Object[]{freeMindFile, new File(DATA_DIR_PATH, name.substring(0, name.lastIndexOf(".")) + ".png")};
}
diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0.png b/wise-webapp/src/test/resources/data/svg/map-3.0.png
new file mode 100644
index 00000000..09b61de6
Binary files /dev/null and b/wise-webapp/src/test/resources/data/svg/map-3.0.png differ
diff --git a/wise-webapp/src/test/resources/data/svg/map-3.0.svg b/wise-webapp/src/test/resources/data/svg/map-3.0.svg
new file mode 100644
index 00000000..99e8804a
--- /dev/null
+++ b/wise-webapp/src/test/resources/data/svg/map-3.0.svg
@@ -0,0 +1,216 @@
+
+