Merge branch 'master' into wise-org-pela

Home.textile

@@ -2,6 +2,7 @@ h1. What is WiseMapping Open Source?
 
 WiseMapping is a free web based mindmapping application. The goal of this project is to provide a high quality product that can be deployed by educational  and academic institutions, private and public companies and anyone who needs to have a mindmapping application. WiseMapping is based on the same code source supporting WiseMapping.com. 
 
+
 h1. Why Open Source ?
 
 In the last years, we have received hundred of mails from different persons asking for:
@@ -18,4 +19,4 @@ h1. [[Documentation]]
 
 h1. [[Compiling and Running]]
 
-h1. [[FAQ]]
+h1. [[FAQ]]

installer/copy-dist.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e	
+set -u
+
+WISE_VERSION=$1
+SERVER_DOWNLOAD_DIR=/var
+
+WISE_BIN_FILE_NAME=wisemapping-${WISE_VERSION}.zip
+WISE_BIN_FILE_PATH=./installer/target/${WISE_BIN_FILE_NAME}
+
+WISE_SRC_FILE_NAME=wisemapping-${WISE_VERSION}-src.tar.gz 
+WISE_SRC_FILE_PATH=./installer/target/${WISE_SRC_FILE_NAME}
+
+scp ${WISE_SRC_FILE_PATH} thecrow@wisemapping.com:${SERVER_DOWNLOAD_DIR}/
+scp ${WISE_BIN_FILE_PATH} thecrow@wisemapping.com:${SERVER_DOWNLOAD_DIR}
+
+# It's there ?
+wget  -S http://downloads.wisemapping.org/stable/${WISE_BIN_FILE_NAME}
+wget  -S http://downloads.wisemapping.org/stable/${WISE_SRC_FILE_NAME}

installer/package-bin.sh

@@ -18,7 +18,7 @@ rm -fr ${JETTY_DIR}
 rm -fr ${TARGET_DIR}/jetty-distribution-7.3.0.v20110203
 
 # Prepare resources ..
-mvn -f $BASE_DIR/../pom.xml install -Dmaven.test.skip=true
+mvn -f $BASE_DIR/../pom.xml install
 
 if [ ! -f ./target/${JETTY_ZIP}  ]
 then	

installer/package-src.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e	
+set -u
+
+WISE_VERSION=$1
+TMP_DIR=/tmp/wise-src/wisemapping-src
+TAR_FILE_NAME=wisemapping-${WISE_VERSION}-src.tar.gz
+OUTPUT_DIR=`pwd`"/target"
+OUTPUT_FILE=${OUTPUT_DIR}/${TAR_FILE_NAME}
+
+
+# Clean all.
+cd ..
+rm -rf ${TMP_DIR}/../
+mvn clean 
+
+# Prepare copy 
+mkdir -p ${TMP_DIR}
+rsync -aCv --exclude ".git"  --exclude "wisemapping.i*" --exclude "*/*.iml" --exclude "*/wisemapping.log*" --exclude "**/.DS_Store" --exclude "*.textile" --exclude "**/.gitignore" --exclude "installer" --exclude "*/target" . ${TMP_DIR}
+
+# Zip file
+[ ! -e ${OUTPUT_DIR} ] && mkdir ${OUTPUT_DIR}
+rm -f ${OUTPUT_FILE}
+
+cd ${TMP_DIR}/..
+tar -cvzf ${OUTPUT_FILE} .
+
+echo 
+echo "#################################################################"
+echo "Zip file generated on:"${OUTPUT_FILE}
+echo "#################################################################"

libraries/com.jhlabs/poms/imaging-01012005.pom

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.jhlabs</groupId>
-  <artifactId>imaging</artifactId>
-  <version>01012005</version>
-</project>

libraries/javax.transaction/pom/jta-1.0.1B.pom

@@ -1,14 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>javax.transaction</groupId>
-  <artifactId>jta</artifactId>
-  <version>1.0.1B</version>
-  <name>Java Transaction API</name>
-  <description>
-    The javax.transaction package. It is appropriate for inclusion in a classpath, and may be added to a Java 2 installation.
-  </description>
-  <url>http://java.sun.com/products/jta</url>
-  <distributionManagement>
-    <downloadUrl>http://java.sun.com/products/jta</downloadUrl>
-  </distributionManagement>
-</project>

mindplot/src/main/javascript/ConnectionLine.js

@@ -124,7 +124,7 @@ mindplot.ConnectionLine.prototype.redraw = function()
         line2d.setSrcControlPoint(ctrlPoints[0]);
         line2d.setDestControlPoint(ctrlPoints[1]);
     }
-    line2d.moveToBack();
+//    line2d.moveToBack();
 
     // Add connector ...
     this._positionateConnector(targetTopic);
@@ -169,6 +169,7 @@ mindplot.ConnectionLine.prototype.setStroke = function(color, style, opacity)
 mindplot.ConnectionLine.prototype.addToWorkspace = function(workspace)
 {
     workspace.appendChild(this._line2d);
+    this._line2d.moveToBack();
 };
 
 mindplot.ConnectionLine.prototype.removeFromWorkspace = function(workspace)

mindplot/src/main/javascript/DragPivot.js

@@ -36,7 +36,8 @@ mindplot.DragPivot.prototype.getTargetTopic = function()
 
 mindplot.DragPivot.prototype._buildStraightLine = function()
 {
-    var line = new web2d.Line();
+    var line = new web2d.CurvedLine();
+    line.setStyle(web2d.CurvedLine.SIMPLE_LINE);
     line.setStroke(1, 'solid', '#CC0033');
     line.setOpacity(0.4);
     line.setVisibility(false);
@@ -45,7 +46,8 @@ mindplot.DragPivot.prototype._buildStraightLine = function()
 
 mindplot.DragPivot.prototype._buildCurvedLine = function()
 {
-    var line = new web2d.PolyLine();
+    var line = new web2d.CurvedLine();
+    line.setStyle(web2d.CurvedLine.SIMPLE_LINE);
     line.setStroke(1, 'solid', '#CC0033');
     line.setOpacity(0.4);
     line.setVisibility(false);

mindplot/src/main/javascript/DragTopicPositioner.js

@@ -42,7 +42,7 @@ mindplot.DragTopicPositioner.prototype.positionateDragTopic = function(dragTopic
     }
 };
 
-mindplot.DragTopicPositioner.CENTRAL_TO_MAINTOPIC_MAX_HORIZONTAL_DISTANCE = 300;
+mindplot.DragTopicPositioner.CENTRAL_TO_MAINTOPIC_MAX_HORIZONTAL_DISTANCE = 400;
 
 mindplot.DragTopicPositioner.prototype._checkDragTopicConnection = function(dragTopic)
 {
@@ -99,6 +99,7 @@ mindplot.DragTopicPositioner.prototype._lookUpForMainTopicToMainTopicConnection
     var result = null;
     var clouserDistance = -1;
     var draggedNode = dragTopic.getDraggedTopic();
+    var distance = null;
 
     // Check MainTopic->MainTopic connection...
     for (var i = 0; i < topics.length; i++)
@@ -110,8 +111,19 @@ mindplot.DragTopicPositioner.prototype._lookUpForMainTopicToMainTopicConnection
             var canBeConnected = dragTopic.canBeConnectedTo(targetTopic);
             if (canBeConnected)
             {
-                result = targetTopic;
-                break;
+                var targetPosition = targetTopic.getPosition();
+                var fix = position.y>targetPosition.y;
+                var gap = 0;
+                if(targetTopic._getChildren().length>0){
+                    gap = Math.abs(targetPosition.y - targetTopic._getChildren()[0].getPosition().y)
+                }
+                var yDistance = Math.abs(position.y -fix*gap - targetPosition.y);
+                if(distance==null || yDistance<distance)
+                {
+                     result = targetTopic;
+                    distance = yDistance;
+                }
+
             }
         }
     }

mindplot/src/main/javascript/FixedDistanceBoard.js

@@ -307,8 +307,8 @@ mindplot.FixedDistanceBoard.prototype.lookupEntryByPosition = function(pos)
             if (pos.y < firstEntry.getLowerLimit())
             {
                 var upperLimit = firstEntry.getLowerLimit();
-                var lowerLimit = upperLimit + defaultHeight;
-                result = this.createBoardEntry(lowerLimit, upperLimit, -1);
+                var lowerLimit = upperLimit - defaultHeight;
+                result = this.createBoardEntry(lowerLimit, upperLimit, 0);
             } else
             {
                 var entriesLenght = entries.length;

mindplot/src/main/javascript/NodeModel.js

@@ -305,8 +305,12 @@ mindplot.NodeModel.prototype.canBeConnected = function(sourceModel, sourcePositi
         // Finally, check current node ubication.
         var targetTopicSize = targetModel.getSize();
         var yDistance = Math.abs(sourcePosition.y - targetPosition.y);
+        var gap = 35 + targetTopicHeight / 2;
+        if(targetModel.getChildren().length>0){
+            gap += Math.abs(targetPosition.y - targetModel.getChildren()[0].getPosition().y);
+        }
 
-        if (yDistance <= 5 + targetTopicHeight / 2)
+        if (yDistance <= gap)
         {
             // Circular connection ?
             if (!sourceModel._isChildNode(this))
@@ -339,7 +343,7 @@ mindplot.NodeModel.prototype.canBeConnected = function(sourceModel, sourcePositi
     return result;
 };
 
-mindplot.NodeModel.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 60;
+mindplot.NodeModel.MAIN_TOPIC_TO_MAIN_TOPIC_DISTANCE = 220;
 
 mindplot.NodeModel.prototype._isChildNode = function(node)
 {

mindplot/src/main/javascript/XMLMindmapSerializer_Beta.js

@@ -64,7 +64,10 @@ mindplot.XMLMindmapSerializer_Beta.prototype._topicToXML = function(document, to
         } else
         {
             var order = topic.getOrder();
-            parentTopic.setAttribute("order", order);
+             if(core.Utils.isDefined(order) && !isNaN(order-0))
+             {
+                 parentTopic.setAttribute("order", order);
+             }
         }
     }
 
@@ -213,7 +216,7 @@ mindplot.XMLMindmapSerializer_Beta.prototype._deserializeNode = function(domElem
     }
 
     var order = domElem.getAttribute('order');
-    if (core.Utils.isDefined(order)) {
+    if (core.Utils.isDefined(order) && !isNaN(order-0)) {
         topic.setOrder(order);
     }
 

mindplot/src/main/javascript/XMLMindmapSerializer_Pela.js

@@ -83,7 +83,10 @@ mindplot.XMLMindmapSerializer_Pela.prototype._topicToXML = function(document, to
 //        } else
 //        {
             var order = topic.getOrder();
-            parentTopic.setAttribute("order", order);
+            if(core.Utils.isDefined(order) && !isNaN(order-0))
+            {
+                parentTopic.setAttribute("order", order);
+            }
 //        }
     }
 
@@ -248,7 +251,8 @@ mindplot.XMLMindmapSerializer_Pela.prototype.loadFromDom = function(dom)
                     break;
                 case "relationship":
                     var relationship = this._deserializeRelationship(child,mindmap);
-                    mindmap.addRelationship(relationship);
+                    if(relationship!=null)
+                        mindmap.addRelationship(relationship);
                     break;
             }
         }
@@ -280,7 +284,7 @@ mindplot.XMLMindmapSerializer_Pela.prototype._deserializeNode = function(domElem
     }
 
     var order = domElem.getAttribute('order');
-    if (core.Utils.isDefined(order)) {
+    if (core.Utils.isDefined(order) && !isNaN(order-0)) {
         topic.setOrder(parseInt(order));
     }
 
@@ -393,6 +397,10 @@ mindplot.XMLMindmapSerializer_Pela.prototype._deserializeRelationship = function
     var destCtrlPoint = domElement.getAttribute("destCtrlPoint");
     var endArrow = domElement.getAttribute("endArrow");
     var startArrow = domElement.getAttribute("startArrow");
+    //If for some reason a relationship lines has source and dest nodes the same, don't import it.
+    if(srcId==destId){
+        return null;
+    }
     var model = mindmap.createRelationship(srcId,  destId);
     model.setLineType(lineType);
     if(core.Utils.isDefined(srcCtrlPoint) && srcCtrlPoint!=""){

mindplot/src/main/javascript/commands/DragTopicCommand.js

@@ -52,15 +52,15 @@ mindplot.commands.DragTopicCommand = mindplot.Command.extend(
         }
 
 
-        // Set topic position ...
-        if (this._position != null)
+        // Set topic order ...
+        if (this._order != null)
+        {
+            topic.setOrder(this._order);
+        } else if (this._position != null)
         {
             // Set position ...
             topic.setPosition(this._position);
 
-        } else if (this._order != null)
-        {
-            topic.setOrder(this._order);
         } else
         {
             core.assert("Illegal commnad state exception.");

mindplot/src/main/javascript/layoutManagers/OriginalLayoutManager.js

@@ -41,6 +41,13 @@ mindplot.layoutManagers.OriginalLayoutManager = mindplot.layoutManagers.BaseLayo
                         maxOrder=order;
                 }
                 result[order] = child;
+
+                //remove position for all childs in depth >1
+                var parent = node.getParent();
+                if(core.Utils.isDefined(parent)){
+                    child._position = null;
+                    child._finalPosition = null;
+                }
             }
         }
         nodesByOrder=null;

web2d/src/main/javascript/peer/svg/CurvedLinePeer.js

@@ -33,22 +33,26 @@ objects.extend(web2d.peer.svg.CurvedLinePeer, web2d.peer.svg.ElementPeer);
 
 web2d.peer.svg.CurvedLinePeer.prototype.setSrcControlPoint = function(control){
     this._customControlPoint_1 = true;
+    var change = this._control1.x!=control.x || this._control1.y!=control.y;
     if(core.Utils.isDefined(control.x)){
         this._control1 = control;
         this._control1.x = parseInt(this._control1.x);
         this._control1.y = parseInt(this._control1.y)
     }
-    this._updatePath();
+    if(change)
+        this._updatePath();
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype.setDestControlPoint = function(control){
     this._customControlPoint_2 = true;
+    var change = this._control2.x!=control.x || this._control2.y!=control.y;
     if(core.Utils.isDefined(control.x)){
         this._control2 = control;
         this._control2.x = parseInt(this._control2.x);
         this._control2.y = parseInt(this._control2.y)
     }
-    this._updatePath();
+    if(change)
+        this._updatePath();
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype.isSrcControlPointCustom = function() {
@@ -75,16 +79,20 @@ web2d.peer.svg.CurvedLinePeer.prototype.getControlPoints = function(){
 
 web2d.peer.svg.CurvedLinePeer.prototype.setFrom = function(x1, y1)
 {
+    var change = this._x1!=parseInt(x1) || this._y1!=parseInt(y1);
     this._x1 = parseInt(x1);
     this._y1 = parseInt(y1);
-    this._updatePath();
+    if(change)
+        this._updatePath();
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype.setTo = function(x2, y2)
 {
+    var change = this._x2!=parseInt(x2) || this._y2!=parseInt(y2);
     this._x2 = parseInt(x2);
     this._y2 = parseInt(y2);
-    this._updatePath();
+    if(change)
+        this._updatePath();
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype.getFrom = function()
@@ -152,18 +160,21 @@ web2d.peer.svg.CurvedLinePeer.prototype.isShowStartArrow = function(){
 
 web2d.peer.svg.CurvedLinePeer.prototype._updatePath = function(avoidControlPointFix)
 {
-    this._calculateAutoControlPoints(avoidControlPointFix);
-    var path = "M"+this._x1+","+this._y1
-                +" C"+(this._control1.x+this._x1)+","+(this._control1.y+this._y1)+" "
-                  +(this._control2.x+this._x2)+","+(this._control2.y+this._y2)+" "
-                  +this._x2+","+this._y2+
-                  (this._lineStyle?" "
-                    +(this._control2.x+this._x2)+","+(this._control2.y+this._y2+3)+" "
-                    +(this._control1.x+this._x1)+","+(this._control1.y+this._y1+5)+" "
-                    +this._x1+","+(this._y1+7)+" Z"
-                    :""
-                  );
-    this._native.setAttribute("d",path);
+    if(core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._y1) && core.Utils.isDefined(this._x2) && core.Utils.isDefined(this._y2))
+    {
+        this._calculateAutoControlPoints(avoidControlPointFix);
+        var path = "M"+this._x1+","+this._y1
+                    +" C"+(this._control1.x + this._x1)+","+(this._control1.y+this._y1)+" "
+                      +(this._control2.x+this._x2)+","+(this._control2.y+this._y2)+" "
+                      +this._x2+","+this._y2+
+                      (this._lineStyle?" "
+                        +(this._control2.x+this._x2)+","+(this._control2.y+this._y2+3)+" "
+                        +(this._control1.x+this._x1)+","+(this._control1.y+this._y1+5)+" "
+                        +this._x1+","+(this._y1+7)+" Z"
+                        :""
+                      );
+        this._native.setAttribute("d",path);
+    }
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype._updateStyle = function()
@@ -176,7 +187,6 @@ web2d.peer.svg.CurvedLinePeer.prototype._updateStyle = function()
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype._calculateAutoControlPoints = function(avoidControlPointFix){
-    if(core.Utils.isDefined(this._x1) && core.Utils.isDefined(this._x2)){
         //Both points available, calculate real points
         var defaultpoints = core.Utils.calculateDefaultControlPoints(new core.Point(this._x1, this._y1),new core.Point(this._x2,this._y2));
         if(!this._customControlPoint_1 && !(core.Utils.isDefined(avoidControlPointFix) && avoidControlPointFix==0)){
@@ -187,7 +197,6 @@ web2d.peer.svg.CurvedLinePeer.prototype._calculateAutoControlPoints = function(a
             this._control2.x = defaultpoints[1].x;
             this._control2.y = defaultpoints[1].y;
         }
-    }
 };
 
 web2d.peer.svg.CurvedLinePeer.prototype.setDashed = function(length,spacing){

web2d/src/main/javascript/peer/svg/ElementPeer.js

@@ -152,13 +152,13 @@ web2d.peer.svg.ElementPeer.prototype.removeEventListener = function(type, listen
 
 web2d.peer.svg.ElementPeer.prototype.setSize = function(width, height)
 {
-    if (core.Utils.isDefined(width))
+    if (core.Utils.isDefined(width) && this._size.width != parseInt(width))
     {
         this._size.width = parseInt(width);
         this._native.setAttribute('width', parseInt(width));
     }
 
-    if (core.Utils.isDefined(height))
+    if (core.Utils.isDefined(height) && this._size.height != parseInt(height))
     {
         this._size.height = parseInt(height);
         this._native.setAttribute('height', parseInt(height));

web2d/src/main/javascript/peer/svg/GroupPeer.js

@@ -36,9 +36,11 @@ objects.extend(web2d.peer.svg.GroupPeer, web2d.peer.svg.ElementPeer);
 
 web2d.peer.svg.GroupPeer.prototype.setCoordSize = function(width, height)
 {
+    var change = this._coordSize.width!=width || this._coordSize.height!=height;
     this._coordSize.width = width;
     this._coordSize.height = height;
-    this.updateTransform();
+    if(change)
+        this.updateTransform();
     web2d.peer.utils.EventUtils.broadcastChangeEvent(this, "strokeStyle");
 };
 
@@ -81,6 +83,7 @@ web2d.peer.svg.GroupPeer.prototype.updateTransform = function()
 
 web2d.peer.svg.GroupPeer.prototype.setCoordOrigin = function(x, y)
 {
+    var change = x!=this._coordOrigin.x || y!=this._coordOrigin.y;
     if (core.Utils.isDefined(x))
     {
         this._coordOrigin.x = x;
@@ -90,17 +93,21 @@ web2d.peer.svg.GroupPeer.prototype.setCoordOrigin = function(x, y)
     {
         this._coordOrigin.y = y;
     }
-    this.updateTransform();
+    if(change)
+        this.updateTransform();
 };
 
 web2d.peer.svg.GroupPeer.prototype.setSize = function(width, height)
 {
+    var change = width != this._size.width || height!=this._size.height;
     web2d.peer.svg.GroupPeer.superClass.setSize.call(this, width, height);
-    this.updateTransform();
+    if(change)
+        this.updateTransform();
 };
 
 web2d.peer.svg.GroupPeer.prototype.setPosition = function(x, y)
 {
+    var change = x!=this._position.x || y!=this._position.y;
     if (core.Utils.isDefined(x))
     {
         this._position.x = parseInt(x);
@@ -110,7 +117,8 @@ web2d.peer.svg.GroupPeer.prototype.setPosition = function(x, y)
     {
         this._position.y = parseInt(y);
     }
-    this.updateTransform();
+    if(change)
+        this.updateTransform();
 };
 
 web2d.peer.svg.GroupPeer.prototype.getPosition = function()

wise-webapp/pom.xml

@@ -13,12 +13,20 @@
     </parent>
 
     <repositories>
-        <repository>
-            <layout>legacy</layout>
-            <id>local-dependecies</id>
-            <name>local-dependecies</name>
-            <url>file://${basedir}/../libraries</url>
+         <repository>
+          <id>maven2-repository.dev.java.net</id>
+          <name>Java.net Repository for Maven</name>
+          <url>http://download.java.net/maven/2/</url>
+          <layout>default</layout>
         </repository>
+         <repository>
+          <id>maven2-repository.jahia.org</id>
+          <name>Jahia Repository for Maven</name>
+          <url>http://maven.jahia.org/maven2/</url>
+          <layout>default</layout>
+        </repository>
+
+
     </repositories>
 
     <dependencies>
@@ -89,12 +97,12 @@
             <version>1.0.1B</version>
             <scope>compile</scope>
         </dependency>
-      <dependency>
+      <!-- <dependency>
             <groupId>com.jhlabs</groupId>
             <artifactId>imaging</artifactId>
             <version>01012005</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency> -->
         <dependency>
              <groupId>com.octo.captcha</groupId>
              <artifactId>jcaptcha</artifactId>

wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java

@@ -19,7 +19,7 @@
 package com.wisemapping.exporter;
 
 public enum ExportFormat {
-    SVG("image/svg+xml", "xml"),
+    SVG("image/svg+xml", "svg"),
     JPEG("image/jpeg", "jpg"),
     PNG("image/png", "png"),
     MINDJET("text/xml", "xml"),

wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java

@@ -215,9 +215,9 @@ public class ExporterFactory {
                     // Hack for backward compatibility . This can be removed in 2012. :)
                     String imgPath;
                     if (imgUrl.contains("images")) {
-                        imgPath = imgBaseUrl + "../images/" + iconName;
+                        imgPath = imgBaseUrl + "/../images/" + iconName;
                     } else {
-                        imgPath = imgBaseUrl + imgUrl;
+                        imgPath = imgBaseUrl + "/" + imgUrl;
                     }
                     elem.setAttribute("xlink:href", imgPath);
                     elem.appendChild(document.createTextNode(" "));

wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java

@@ -51,7 +51,7 @@ public class FreemindExporter
 
     public void export(MindMap map, OutputStream outputStream) throws ExportException {
         try {
-            export(map.getUnzippedXml().getBytes(), outputStream);
+            export(map.getUnzippedXml().getBytes("UTF-8"), outputStream);
         } catch (IOException e) {
             throw new ExportException(e);
         }
@@ -73,7 +73,7 @@ public class FreemindExporter
 
             final List<TopicType> topics = mindmapMap.getTopic();
 
-            // Insolated Topic doesn´t exists in Freemind only take the center topic
+            // Isolated Topic does not exist in Freemind only take the center topic
             TopicType centerTopic = null;
             if (topics.size() > 1) {
                 for (TopicType topic : topics) {

wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java

@@ -24,16 +24,13 @@ import com.wisemapping.model.IconFamily;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 final public class FreemindIconConverter {
 
 
-    private final static Map<String, MindmapIcon> freeIdToIcon = new HashMap<String, MindmapIcon>();
-    private final static Map<MindmapIcon, String> iconToFreeId = new HashMap<MindmapIcon, String>();
+    private final static Map<String, MindmapIcon> freeIdToIcon = new TreeMap<String, MindmapIcon>();
+    private final static Map<MindmapIcon, String> iconToFreeId = new TreeMap<MindmapIcon, String>();
 
     private FreemindIconConverter() {
     }

wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java

@@ -94,7 +94,7 @@ public class FreemindImporter
 
     }
 
-    public MindMap importMap(String mapName, String description, InputStream input) throws ImporterException {
+    public MindMap importMap(@NotNull String mapName, @NotNull  String description, @NotNull InputStream input) throws ImporterException {
 
         final MindMap result = new MindMap();
         nodesMap = new HashMap<String, TopicType>();
@@ -135,9 +135,7 @@ public class FreemindImporter
             nodesMap.put(freeNode.getID(), wiseTopic);
 
             convertChildNodes(freeNode, wiseTopic, 1);
-
-            // @Todo: Pablo, tenemos que ver como arreglamos esto. No estoy seteando a los hijos la posicion.
-            //addRelationships(mindmapMap);
+            addRelationships(mindmapMap);
 
             JAXBUtils.saveMap(mindmapMap, baos, "com.wisemapping.xml.mindmap");
 
@@ -233,14 +231,10 @@ public class FreemindImporter
                 }
                 wiseChild.setOrder(norder);
 
-
-                // @Todo: This is required in the old layout. Pablo, we need to discuss this.
-                if (depth == 1) {
-                    // Convert node position
-                    int childrenCount = freeChilden.size();
-                    final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
-                    wiseChild.setPosition(position);
-                }
+                // Convert node position
+                int childrenCount = freeChilden.size();
+                final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
+                wiseChild.setPosition(position);
 
                 // Convert the rest of the node properties ...
                 convertNodeProperties(freeChild, wiseChild);

wise-webapp/src/main/java/com/wisemapping/model/MindMap.java

@@ -29,6 +29,7 @@ package com.wisemapping.model;
 
 import com.wisemapping.util.ZipUtils;
 import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.Calendar;
@@ -183,13 +184,13 @@ public class MindMap {
         String xml = getNativeXml();
         if (xml != null) {
             xml = xml.replace("'", "\\'");
-            xml = xml.replace("\n", "");
+            xml = xml.replaceAll("\\r|\\n", "");
             xml = xml.trim();
         }
         return xml;
     }
 
-    public void setNativeXml(String nativeXml)
+    public void setNativeXml(@NotNull String nativeXml)
             throws IOException {
         this.xml = ZipUtils.stringToZip(nativeXml);
     }

wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java

@@ -18,7 +18,7 @@
 
 package com.wisemapping.model;
 
-public class MindmapIcon {
+public class MindmapIcon implements Comparable{
     private String name;
     private IconFamily family;
 
@@ -38,4 +38,8 @@ public class MindmapIcon {
     public String getId() {
         return family.name().toLowerCase() + "_" + name;
     }
+
+    public int compareTo(Object o) {
+        return ((MindmapIcon)o).getId().compareTo(this.getId());
+    }
 }

wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java

@@ -203,7 +203,7 @@ public class MindmapIcons {
     private static void load() {
         try {
             if (iconsByFamily == null) {
-                iconsByFamily = new HashMap<IconFamily, List<MindmapIcon>>();
+                iconsByFamily = new TreeMap<IconFamily, List<MindmapIcon>>();
 
                 Field[] fields = MindmapIcons.class.getDeclaredFields();
                 for (Field field : fields) {

wise-webapp/src/main/java/com/wisemapping/security/CustomTokenBasedRememberMeServices.java

@@ -18,14 +18,19 @@
 
 package com.wisemapping.security;
 
+import com.wisemapping.dao.UserManager;
+import com.wisemapping.model.UserLogin;
 import org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices;
 import org.acegisecurity.Authentication;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Calendar;
 
 public class CustomTokenBasedRememberMeServices extends
         TokenBasedRememberMeServices {
+    private UserManager userManager;
+
     public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
     {
      if(authentication!=null)
@@ -37,4 +42,24 @@ public class CustomTokenBasedRememberMeServices extends
      }
     }
 
+    @Override
+    public void loginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
+        final User user = (User)successfulAuthentication.getPrincipal();
+
+        final UserLogin userLogin = new UserLogin();
+        final Calendar now = Calendar.getInstance();
+        userLogin.setLoginDate(now);
+        userLogin.setEmail(user.getUsername());
+        userManager.auditLogin(userLogin);
+
+        super.loginSuccess(request, response, successfulAuthentication);    //To change body of overridden methods use File | Settings | File Templates.
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+    public UserManager getUserManager() {
+        return userManager;
+    }
 }

wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java

@@ -54,9 +54,9 @@ public class JAXBUtils {
 
     }
 
-    public static void saveMap(@NotNull Object obj, @NotNull OutputStream out, String pachage) throws JAXBException {
+    public static void saveMap(@NotNull Object obj, @NotNull OutputStream out, String packag) throws JAXBException {
 
-        final JAXBContext context = getInstance(pachage);
+        final JAXBContext context = getInstance(packag);
         final Marshaller marshaller = context.createMarshaller();
 
         marshaller.marshal(obj, out);

wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java

@@ -40,7 +40,7 @@ public class ZipUtils {
             byte[] buffer = new byte[512];
 
             int len;
-            StringBuffer sb_result = new StringBuffer();
+            StringBuilder sb_result = new StringBuilder();
 
             while ((len = zipIn.read(buffer)) > 0) {
 

wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml

@@ -123,6 +123,7 @@
     <bean id="rememberMeServices" class="com.wisemapping.security.CustomTokenBasedRememberMeServices">
         <property name="userDetailsService" ref="userDetailsService"/>
         <property name="key" value="changeThis"/>
+        <property name="userManager" ref="userManager"/>
     </bean>
 
     <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager">

wise-webapp/src/test/data/freemind/basic.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node wORDER="0" wCOORDS="-200,0" TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node wORDER="0" TEXT="Child Level 2 Left 11" ID="ID_3"/><node wORDER="1" TEXT="Child Level 2 Left 12" ID="ID_4"/></node><node wORDER="4" wCOORDS="200,100" TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node wORDER="4" wCOORDS="-200,100" TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node wORDER="0" TEXT="Child Level 2 Left 21 " ID="ID_7"/><node wORDER="1" TEXT="Child Level 2 Left 22" ID="ID_8"/></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="This is the root node" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/><node wORDER="0" wCOORDS="-200,0" TEXT="Child Level 1 Left 1" POSITION="left" ID="ID_2"><node wORDER="0" wCOORDS="-290,-25" TEXT="Child Level 2 Left 11" POSITION="left" ID="ID_3"/><node wORDER="1" wCOORDS="-290,0" TEXT="Child Level 2 Left 12" POSITION="left" ID="ID_4"/></node><node wORDER="4" wCOORDS="200,100" TEXT="Child Level 1 Right 2" POSITION="right" ID="ID_5"/><node wORDER="4" wCOORDS="-200,100" TEXT="Child Level 1 Left  2" POSITION="left" ID="ID_6"><node wORDER="0" wCOORDS="-290,75" TEXT="Child Level 2 Left 21 " POSITION="left" ID="ID_7"/><node wORDER="1" wCOORDS="-290,100" TEXT="Child Level 2 Left 22" POSITION="left" ID="ID_8"/></node></node></map>

wise-webapp/src/test/data/freemind/basic.wxml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,0" order="0" shape="line" text="Child Level 1 Right 1"/><topic id="2" position="-200,0" order="0" shape="line" text="Child Level 1 Left 1"><topic id="3" order="0" shape="line" text="Child Level 2 Left 11"/><topic id="4" order="1" shape="line" text="Child Level 2 Left 12"/></topic><topic id="5" position="200,100" order="4" shape="line" text="Child Level 1 Right 2"/><topic id="6" position="-200,100" order="4" shape="line" text="Child Level 1 Left  2"><topic id="7" order="0" shape="line" text="Child Level 2 Left 21 "/><topic id="8" order="1" shape="line" text="Child Level 2 Left 22"/></topic></topic></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="This is the root node"><topic id="1" position="200,0" order="0" shape="line" text="Child Level 1 Right 1"/><topic id="2" position="-200,0" order="0" shape="line" text="Child Level 1 Left 1"><topic id="3" position="-290,-25" order="0" shape="line" text="Child Level 2 Left 11"/><topic id="4" position="-290,0" order="1" shape="line" text="Child Level 2 Left 12"/></topic><topic id="5" position="200,100" order="4" shape="line" text="Child Level 1 Right 2"/><topic id="6" position="-200,100" order="4" shape="line" text="Child Level 1 Left  2"><topic id="7" position="-290,75" order="0" shape="line" text="Child Level 2 Left 21 "/><topic id="8" position="-290,100" order="1" shape="line" text="Child Level 2 Left 22"/></topic></topic></map>

wise-webapp/src/test/data/freemind/fonts.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Fonts" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Styles" POSITION="right" ID="ID_1"><node wORDER="0" TEXT="Bold" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node wORDER="1" TEXT="Italic" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Sizes" POSITION="left" ID="ID_4"><node wORDER="0" TEXT="Normal----" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node wORDER="1" TEXT="Normal---" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node wORDER="2" TEXT="Normal--" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node wORDER="3" TEXT="Normal-" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node wORDER="4" TEXT="Normal" ID="ID_9"/><node wORDER="5" TEXT="Nomal+" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node wORDER="6" TEXT="Normal++" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node wORDER="7" TEXT="Normal+++" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node wORDER="8" TEXT="Normal++++" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Fonts" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Styles" POSITION="right" ID="ID_1"><node wORDER="0" wCOORDS="290,-25" TEXT="Bold" POSITION="right" ID="ID_2"><font SIZE="12" NAME="Arial" BOLD="true"/></node><node wORDER="1" wCOORDS="290,0" TEXT="Italic" POSITION="right" ID="ID_3"><font SIZE="12" NAME="Arial" ITALIC="true"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Sizes" POSITION="left" ID="ID_4"><node wORDER="0" wCOORDS="-290,-100" TEXT="Normal----" POSITION="left" ID="ID_5"><font SIZE="8" NAME="Arial"/></node><node wORDER="1" wCOORDS="-290,-75" TEXT="Normal---" POSITION="left" ID="ID_6"><font SIZE="9" NAME="Arial"/></node><node wORDER="2" wCOORDS="-290,-50" TEXT="Normal--" POSITION="left" ID="ID_7"><font SIZE="10" NAME="Arial"/></node><node wORDER="3" wCOORDS="-290,-25" TEXT="Normal-" POSITION="left" ID="ID_8"><font SIZE="11" NAME="Arial"/></node><node wORDER="4" wCOORDS="-290,0" TEXT="Normal" POSITION="left" ID="ID_9"/><node wORDER="5" wCOORDS="-290,25" TEXT="Nomal+" POSITION="left" ID="ID_10"><font SIZE="13" NAME="Arial"/></node><node wORDER="6" wCOORDS="-290,50" TEXT="Normal++" POSITION="left" ID="ID_11"><font SIZE="14" NAME="Arial"/></node><node wORDER="7" wCOORDS="-290,75" TEXT="Normal+++" POSITION="left" ID="ID_12"><font SIZE="15" NAME="Arial"/></node><node wORDER="8" wCOORDS="-290,100" TEXT="Normal++++" POSITION="left" ID="ID_13"><font SIZE="16" NAME="Arial"/></node></node></node></map>

wise-webapp/src/test/data/freemind/fonts.wxml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Fonts"><topic id="1" position="200,0" order="0" shape="line" text="Styles"><topic id="2" order="0" fontStyle="Arial;12;;bold;;" shape="line" text="Bold"/><topic id="3" order="1" fontStyle="Arial;12;;;italic;" shape="line" text="Italic"/></topic><topic id="4" position="-200,0" order="0" shape="line" text="Sizes"><topic id="5" order="0" fontStyle="Arial;8;;;;" shape="line" text="Normal----"/><topic id="6" order="1" fontStyle="Arial;9;;;;" shape="line" text="Normal---"/><topic id="7" order="2" fontStyle="Arial;10;;;;" shape="line" text="Normal--"/><topic id="8" order="3" fontStyle="Arial;11;;;;" shape="line" text="Normal-"/><topic id="9" order="4" shape="line" text="Normal"/><topic id="10" order="5" fontStyle="Arial;13;;;;" shape="line" text="Nomal+"/><topic id="11" order="6" fontStyle="Arial;14;;;;" shape="line" text="Normal++"/><topic id="12" order="7" fontStyle="Arial;15;;;;" shape="line" text="Normal+++"/><topic id="13" order="8" fontStyle="Arial;16;;;;" shape="line" text="Normal++++"/></topic></topic></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Fonts"><topic id="1" position="200,0" order="0" shape="line" text="Styles"><topic id="2" position="290,-25" order="0" fontStyle="Arial;12;;bold;;" shape="line" text="Bold"/><topic id="3" position="290,0" order="1" fontStyle="Arial;12;;;italic;" shape="line" text="Italic"/></topic><topic id="4" position="-200,0" order="0" shape="line" text="Sizes"><topic id="5" position="-290,-100" order="0" fontStyle="Arial;8;;;;" shape="line" text="Normal----"/><topic id="6" position="-290,-75" order="1" fontStyle="Arial;9;;;;" shape="line" text="Normal---"/><topic id="7" position="-290,-50" order="2" fontStyle="Arial;10;;;;" shape="line" text="Normal--"/><topic id="8" position="-290,-25" order="3" fontStyle="Arial;11;;;;" shape="line" text="Normal-"/><topic id="9" position="-290,0" order="4" shape="line" text="Normal"/><topic id="10" position="-290,25" order="5" fontStyle="Arial;13;;;;" shape="line" text="Nomal+"/><topic id="11" position="-290,50" order="6" fontStyle="Arial;14;;;;" shape="line" text="Normal++"/><topic id="12" position="-290,75" order="7" fontStyle="Arial;15;;;;" shape="line" text="Normal+++"/><topic id="13" position="-290,100" order="8" fontStyle="Arial;16;;;;" shape="line" text="Normal++++"/></topic></topic></map>

wise-webapp/src/test/data/freemind/links.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node wORDER="0" wCOORDS="200,0" TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node wORDER="0" TEXT="Link Topic Topic" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Node Links" LINK="http://www.google.com" ID="ID_0"><icon BUILTIN="closed"/><node wORDER="0" wCOORDS="200,0" TEXT="Link Topic" POSITION="right" LINK="http://www.bing.com" ID="ID_1" FOLDED="true"><icon BUILTIN="info"/><node wORDER="0" wCOORDS="290,-25" TEXT="Link Topic Topic" POSITION="right" LINK="http://bing.com" ID="ID_2"><icon BUILTIN="messagebox_warning"/></node></node></node></map>

wise-webapp/src/test/data/freemind/links.wxml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Node Links"><icon id="onoff_delete"/><link url="http://www.google.com"/><topic shrink="true" id="1" position="200,0" order="0" shape="line" text="Link Topic"><icon id="sign_info"/><link url="http://www.bing.com"/><topic id="2" order="0" shape="line" text="Link Topic Topic"><icon id="sign_warning"/><link url="http://bing.com"/></topic></topic></topic></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Node Links"><icon id="onoff_delete"/><link url="http://www.google.com"/><topic shrink="true" id="1" position="200,0" order="0" shape="line" text="Link Topic"><icon id="sign_info"/><link url="http://www.bing.com"/><topic id="2" position="290,-25" order="0" shape="line" text="Link Topic Topic"><icon id="sign_warning"/><link url="http://bing.com"/></topic></topic></topic></map>

wise-webapp/src/test/data/freemind/node-styles.mmr

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Shapes" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Node Styles" POSITION="right" ID="ID_1"><node wORDER="0" TEXT="Fork" ID="ID_2"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_3"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_4"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_5"><edge COLOR="#808080"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node wORDER="0" TEXT="Fork" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node wORDER="0" TEXT="Fork" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" TEXT="Bubble" STYLE="bubble" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" TEXT="As parent" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" TEXT="Combined" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="Shapes" ID="ID_0"><node wORDER="0" wCOORDS="200,0" TEXT="Node Styles" POSITION="right" ID="ID_1"><node wORDER="0" wCOORDS="290,-50" TEXT="Fork" POSITION="right" ID="ID_2"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="290,-25" TEXT="Bubble" STYLE="bubble" POSITION="right" ID="ID_3"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="290,0" TEXT="As parent" POSITION="right" ID="ID_4"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="290,25" TEXT="Combined" POSITION="right" ID="ID_5"><edge COLOR="#808080"/></node></node><node wORDER="0" wCOORDS="-200,0" TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707"><node wORDER="0" wCOORDS="-290,-50" TEXT="Fork" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="-290,-25" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_8" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="-290,0" TEXT="As parent" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="-290,25" TEXT="Combined" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node><node wORDER="4" wCOORDS="-200,100" TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707"><node wORDER="0" wCOORDS="-290,50" TEXT="Fork" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc"><edge COLOR="#808080"/></node><node wORDER="1" wCOORDS="-290,75" TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc"><edge COLOR="#808080"/></node><node wORDER="2" wCOORDS="-290,100" TEXT="As parent" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff"><edge COLOR="#808080"/></node><node wORDER="3" wCOORDS="-290,125" TEXT="Combined" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099"><edge COLOR="#808080"/></node></node></node></map>

wise-webapp/src/test/data/freemind/node-styles.wxml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Shapes"><topic id="1" position="200,0" order="0" shape="line" text="Node Styles"><topic id="2" order="0" brColor="#808080" shape="line" text="Fork"/><topic id="3" order="1" brColor="#808080" shape="rounded rectagle" text="Bubble"/><topic id="4" order="2" brColor="#808080" shape="line" text="As parent"/><topic id="5" order="3" brColor="#808080" shape="line" text="Combined"/></topic><topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="line" text="Node Background Color"><topic id="7" order="0" brColor="#808080" bgColor="#0000cc" shape="line" text="Fork"/><topic id="8" order="1" brColor="#808080" bgColor="#ccffcc" shape="rounded rectagle" text="Bubble"/><topic id="9" order="2" brColor="#808080" bgColor="#00ffff" shape="line" text="As parent"/><topic id="10" order="3" brColor="#808080" bgColor="#990099" shape="line" text="Combined"/></topic><topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="line" text="Node Text Color"><topic id="12" order="0" brColor="#808080" bgColor="#0000cc" fontStyle=";;#ffff00;;;" shape="line" text="Fork"/><topic id="13" order="1" brColor="#808080" bgColor="#ccffcc" fontStyle=";;#ff6666;;;" shape="rounded rectagle" text="Bubble"/><topic id="14" order="2" brColor="#808080" bgColor="#00ffff" fontStyle=";;#009999;;;" shape="line" text="As parent"/><topic id="15" order="3" brColor="#808080" bgColor="#990099" fontStyle=";;#009999;;;" shape="line" text="Combined"/></topic></topic></map>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" shape="rounded rectagle" text="Shapes"><topic id="1" position="200,0" order="0" shape="line" text="Node Styles"><topic id="2" position="290,-50" order="0" brColor="#808080" shape="line" text="Fork"/><topic id="3" position="290,-25" order="1" brColor="#808080" shape="rounded rectagle" text="Bubble"/><topic id="4" position="290,0" order="2" brColor="#808080" shape="line" text="As parent"/><topic id="5" position="290,25" order="3" brColor="#808080" shape="line" text="Combined"/></topic><topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="line" text="Node Background Color"><topic id="7" position="-290,-50" order="0" brColor="#808080" bgColor="#0000cc" shape="line" text="Fork"/><topic id="8" position="-290,-25" order="1" brColor="#808080" bgColor="#ccffcc" shape="rounded rectagle" text="Bubble"/><topic id="9" position="-290,0" order="2" brColor="#808080" bgColor="#00ffff" shape="line" text="As parent"/><topic id="10" position="-290,25" order="3" brColor="#808080" bgColor="#990099" shape="line" text="Combined"/></topic><topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="line" text="Node Text Color"><topic id="12" position="-290,50" order="0" brColor="#808080" bgColor="#0000cc" fontStyle=";;#ffff00;;;" shape="line" text="Fork"/><topic id="13" position="-290,75" order="1" brColor="#808080" bgColor="#ccffcc" fontStyle=";;#ff6666;;;" shape="rounded rectagle" text="Bubble"/><topic id="14" position="-290,100" order="2" brColor="#808080" bgColor="#00ffff" fontStyle=";;#009999;;;" shape="line" text="As parent"/><topic id="15" position="-290,125" order="3" brColor="#808080" bgColor="#990099" fontStyle=";;#009999;;;" shape="line" text="Combined"/></topic></topic></map>

wise-webapp/src/test/data/freemind/relationships.mmr

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="0.9.0"><node wCOORDS="0,0" TEXT="eeeeeeeeeee" ID="ID_0" COLOR="#000000"><font SIZE="10" NAME="Arial"/><hook NAME="accessories/plugins/NodeNote.properties"><text>
-                </text></hook><node wORDER="7" wCOORDS="200,-200" TEXT="interne" POSITION="right" ID="ID_1" COLOR="#cc0000"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" TEXT="faiblesses" ID="ID_2" COLOR="#330033"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node><node wORDER="3" wCOORDS="200,-100" TEXT="www.luxuo.com" POSITION="right" LINK="www.luxuo.com" ID="ID_3"/><node wORDER="0" wCOORDS="200,0" TEXT="" POSITION="right" ID="ID_4"/><node wORDER="4" wCOORDS="200,100" TEXT="forces" POSITION="right" ID="ID_5" COLOR="#003333"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="8" wCOORDS="200,200" TEXT="" POSITION="right" ID="ID_6"><hook NAME="accessories/plugins/NodeNote.properties"><text>%5El%3A%5El%3A%5El
-                    </text></hook></node><node wORDER="12" wCOORDS="200,300" TEXT="" POSITION="right" ID="ID_7"><node wORDER="0" TEXT="externe" ID="ID_8" COLOR="#000066"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/><node wORDER="0" TEXT="opportunit?s" ID="ID_9" COLOR="#ff3300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node><node wORDER="1" TEXT="menaces" ID="ID_10" COLOR="#333300"><font SIZE="12" NAME="Arial" ITALIC="true" BOLD="true"/></node></node></node></node></map>

wise-webapp/src/test/data/freemind/relationships.wxml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><map version="pela" name="basic"><topic id="0" central="true" position="0,0" fontStyle="Arial;10;#000000;;;" shape="rounded rectagle" text="eeeeeeeeeee"><note text="%0A                "/><topic id="1" position="200,-200" order="7" fontStyle="Arial;12;#cc0000;bold;italic;" shape="line" text="interne"><topic id="2" order="0" fontStyle="Arial;12;#330033;bold;italic;" shape="line" text="faiblesses"/></topic><topic id="3" position="200,-100" order="3" shape="line" text="www.luxuo.com"><link url="www.luxuo.com"/></topic><topic id="4" position="200,0" order="0" shape="line" text=""/><topic id="5" position="200,100" order="4" fontStyle="Arial;12;#003333;bold;italic;" shape="line" text="forces"/><topic id="6" position="200,200" order="8" shape="line" text=""><note text="%5El%3A%5El%3A%5El%0A                    "/></topic><topic id="7" position="200,300" order="12" shape="line" text=""><topic id="8" order="0" fontStyle="Arial;12;#000066;bold;italic;" shape="line" text="externe"><topic id="9" order="0" fontStyle="Arial;12;#ff3300;bold;italic;" shape="line" text="opportunit?s"/><topic id="10" order="1" fontStyle="Arial;12;#333300;bold;italic;" shape="line" text="menaces"/></topic></topic></topic></map>

wise-webapp/src/test/data/wisemaps/simple-maps.wxml

@@ -0,0 +1,616 @@
+<map name="34083" version="pela">
+    <topic central="true" text="Así que quieres recorrer Medellín..." shape="rounded rectagle" id="1"
+           fontStyle=";15;#ffffff;;;" bgColor="#000000" brColor="#ffffff">
+        <topic position="344,0" order="0" text="Y ERES UN TURISTA" shape="rounded rectagle" id="134"
+               fontStyle=";;#ffffff;bold;;" bgColor="#000000" brColor="#000000"/>
+        <topic position="-318,0" order="0" text="Y ERES UN RESIDENTE" shape="rounded rectagle" id="4"
+               fontStyle=";;#ffffff;bold;;" bgColor="#000000" brColor="#000000">
+            <topic position="-484,-1029" order="0" text="Divertirte" shape="rounded rectagle" id="6"
+                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                <topic position="-619,-1038" order="0" text="Te gusta la rumba" id="136">
+                    <topic position="-738,-1746" order="0" text="Sí" shape="rounded rectagle" id="137"
+                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                        <topic position="-842,-1809" order="0" text="Para bailar" id="216">
+                            <topic position="-959,-1857" order="0" text="Mango's" shape="rounded rectagle" id="224"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-973,-1833" order="1" text="Kukaramakara" shape="rounded rectagle" id="226"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-954,-1809" order="2" text="El Pub" shape="rounded rectagle" id="235"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-961,-1785" order="3" text="B Lounge" shape="rounded rectagle" id="233"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-972,-1761" order="4" text="Mamma Juana" shape="rounded rectagle" id="234"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                        </topic>
+                        <topic position="-852,-1707" order="1" text="Para oír música" id="217">
+                            <topic position="-981,-1731" order="0" text="Palmahía" shape="rounded rectagle" id="225"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-977,-1707" order="1" text="El Deck" shape="rounded rectagle" id="236"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                            <topic position="-994,-1683" order="2" text="Hard Rock Café" shape="rounded rectagle"
+                                   id="232" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                        </topic>
+                        <topic position="-867,-1653" order="2" text="¿Y para tocar música?" id="222">
+                            <topic position="-1048,-1653" order="0" text="Red de Escuelas de Música"
+                                   shape="rounded rectagle" id="223" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                   brColor="#000000"/>
+                        </topic>
+                    </topic>
+                    <topic position="-740,-918" order="1" text="No" shape="rounded rectagle" id="173"
+                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                        <topic position="-858,-1551" order="0" text="Hacer deporte sí" shape="rounded rectagle" id="174"
+                               fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                            <topic position="-994,-1611" order="0" text="Al aire libre" id="208">
+                                <topic position="-1174,-1623" order="0" text="Los domingos y festivos en la ciclovía"
+                                       shape="rounded rectagle" id="213" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1157,-1599" order="1" text="En caminatas por los parques"
+                                       shape="rounded rectagle" id="214" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                            </topic>
+                            <topic position="-996,-1533" order="1" text="En un centro" id="209">
+                                <topic position="-1153,-1569" order="0" text="Estadio Atanasio Girardot"
+                                       shape="rounded rectagle" id="212" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1173,-1545" order="1" text="Unidad Deportiva Atanasio Girardot"
+                                       shape="rounded rectagle" id="215" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1158,-1521" order="2" text="Unidades Deportivas INDER"
+                                       shape="rounded rectagle" id="211" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1137,-1497" order="3" text="Polideportivo UPB"
+                                       shape="rounded rectagle" id="210" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                            </topic>
+                        </topic>
+                        <topic position="-863,-846" order="1" text="Algo más calmado" shape="rounded rectagle" id="138"
+                               fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                            <topic position="-1020,-1077" order="0" text="¿Salir de compras?" id="139">
+                                <topic position="-1142,-1173" order="0" text="Sí" shape="rounded rectagle" id="141"
+                                       fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                    <topic position="-1282,-1182" order="0" text="¿Traes dinero en el bolsillo?"
+                                           id="143">
+                                        <topic position="-1424,-1347" order="0" text="No" shape="rounded rectagle"
+                                               id="145" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                            <topic position="-1553,-1356" order="0" text="¿Dónde sacar dinero?"
+                                                   id="146">
+                                                <topic position="-1726,-1467" order="0" text="En Cajeros Automáticos"
+                                                       shape="rounded rectagle" id="147" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1701,-1344" order="1" text="En un Banco"
+                                                       shape="rounded rectagle" id="148" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000">
+                                                    <topic position="-1831,-1449" order="0" text="Bancolombia"
+                                                           shape="rounded rectagle" id="149" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1839,-1425" order="1" text="Banco Santander"
+                                                           shape="rounded rectagle" id="150" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1830,-1401" order="2" text="Banco BBVA"
+                                                           shape="rounded rectagle" id="151" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1841,-1377" order="3" text="Banco Caja Social"
+                                                           shape="rounded rectagle" id="152" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1837,-1353" order="4" text="Banco AV Villas"
+                                                           shape="rounded rectagle" id="153" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1839,-1329" order="5" text="Banco de Bogotá"
+                                                           shape="rounded rectagle" id="154" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1833,-1305" order="6" text="Banco Popular"
+                                                           shape="rounded rectagle" id="155" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1827,-1281" order="7" text="Davivienda"
+                                                           shape="rounded rectagle" id="156" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                    <topic position="-1816,-1257" order="8" text="Otros"
+                                                           shape="rounded rectagle" id="157" fontStyle=";;#ffffff;;;"
+                                                           bgColor="#000000" brColor="#000000"/>
+                                                </topic>
+                                            </topic>
+                                        </topic>
+                                        <topic position="-1422,-1053" order="1" text="Sí" shape="rounded rectagle"
+                                               id="144" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                            <topic position="-1547,-1161" order="0" text="En mediana cantidad" id="158">
+                                                <topic position="-1722,-1209" order="0"
+                                                       text="Centro de la Moda (Itaguí)" shape="rounded rectagle"
+                                                       id="160" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1743,-1185" order="1"
+                                                       text="Centro Comercial Boulevar El Hueco"
+                                                       shape="rounded rectagle" id="161" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1718,-1161" order="2" text="Centro Comercial Japón"
+                                                       shape="rounded rectagle" id="162" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1727,-1137" order="3"
+                                                       text="Centro Comercial Hollywood" shape="rounded rectagle"
+                                                       id="163" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1740,-1113" order="4"
+                                                       text="Centro Comercial Palacio Nacional" shape="rounded rectagle"
+                                                       id="167" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                            </topic>
+                                            <topic position="-1538,-999" order="1" text="En gran cantidad" id="159">
+                                                <topic position="-1712,-1083" order="0"
+                                                       text="Centro Comercial Punto Clave" shape="rounded rectagle"
+                                                       id="164" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1707,-1059" order="1"
+                                                       text="Centro Comercial El Tesoro" shape="rounded rectagle"
+                                                       id="165" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1704,-1035" order="2" text="Centro Comercial Santafé"
+                                                       shape="rounded rectagle" id="166" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1709,-1011" order="3"
+                                                       text="Centro Comercial Monterrey" shape="rounded rectagle"
+                                                       id="168" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1709,-987" order="4" text="Centro Comercial San Diego"
+                                                       shape="rounded rectagle" id="169" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1703,-963" order="5" text="Centro Comercial Oviedo"
+                                                       shape="rounded rectagle" id="170" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1708,-939" order="6" text="Centro Comercial Unicentro"
+                                                       shape="rounded rectagle" id="171" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1706,-915" order="7" text="Centro Comercial Mayorca"
+                                                       shape="rounded rectagle" id="172" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                            </topic>
+                                        </topic>
+                                    </topic>
+                                </topic>
+                                <topic position="-1144,-777" order="1" text="No" shape="rounded rectagle" id="142"
+                                       fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                    <topic position="-1265,-786" order="0" text="¿Ir a comer algo?" id="175">
+                                        <topic position="-1416,-849" order="0" text="Un café o algo así"
+                                               shape="rounded rectagle" id="176" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000">
+                                            <topic position="-1550,-870" order="0" text="Versalles"
+                                                   shape="rounded rectagle" id="178" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1547,-846" order="1" text="El Astor"
+                                                   shape="rounded rectagle" id="179" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                        <topic position="-1417,-759" order="1" text="Un buen almuerzo"
+                                               shape="rounded rectagle" id="177" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000">
+                                            <topic position="-1556,-816" order="0" text="San Carbón"
+                                                   shape="rounded rectagle" id="180" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1552,-792" order="1" text="Hatoviejo"
+                                                   shape="rounded rectagle" id="181" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1545,-768" order="2" text="Triada"
+                                                   shape="rounded rectagle" id="182" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1548,-744" order="3" text="Il Forno"
+                                                   shape="rounded rectagle" id="183" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1556,-720" order="4" text="Mondongo's"
+                                                   shape="rounded rectagle" id="227" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                    </topic>
+                                </topic>
+                            </topic>
+                            <topic position="-1039,-456" order="1" text="¿Algo educativo y divertido?" id="140">
+                                <topic position="-1197,-507" order="0" text="¿Parques?" id="184">
+                                    <topic position="-1319,-546" order="0" text="Educativos" shape="rounded rectagle"
+                                           id="186" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1451,-666" order="0" text="Parque Explora"
+                                               shape="rounded rectagle" id="188" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1468,-642" order="1" text="Museo Interactivo EPM"
+                                               shape="rounded rectagle" id="194" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1489,-531" order="2" text="Conocer más centros educativos"
+                                               id="189">
+                                            <topic position="-1687,-615" order="0" text="Universidad de Antioquia"
+                                                   shape="rounded rectagle" id="198" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1679,-591" order="1" text="Universidad Nacional"
+                                                   shape="rounded rectagle" id="199" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1685,-567" order="2" text="Universidad de Medellín"
+                                                   shape="rounded rectagle" id="200" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1674,-543" order="3" text="Universidad EAFIT"
+                                                   shape="rounded rectagle" id="201" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1705,-519" order="4"
+                                                   text="Universidad Pontificia Bolivariana" shape="rounded rectagle"
+                                                   id="202" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                   brColor="#000000"/>
+                                            <topic position="-1709,-495" order="5"
+                                                   text="Fundación Universitaria Luis Amigó" shape="rounded rectagle"
+                                                   id="203" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                   brColor="#000000"/>
+                                            <topic position="-1689,-471" order="6" text="Universidad Santo Tomás"
+                                                   shape="rounded rectagle" id="204" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1670,-447" order="7" text="Universidad CES"
+                                                   shape="rounded rectagle" id="205" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                    </topic>
+                                    <topic position="-1317,-381" order="1" text="Divertidos" shape="rounded rectagle"
+                                           id="187" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1459,-414" order="0" text="Parque de Las Aguas"
+                                               shape="rounded rectagle" id="195" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1443,-390" order="1" text="Parque Norte"
+                                               shape="rounded rectagle" id="196" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1467,-366" order="2" text="Aeroparque Juan Pablo II"
+                                               shape="rounded rectagle" id="197" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                    </topic>
+                                </topic>
+                                <topic position="-1210,-288" order="1" text="¿Otros centros?" id="185">
+                                    <topic position="-1372,-324" order="0" text="El Planetario de Medellín"
+                                           shape="rounded rectagle" id="190" fontStyle=";;#f2f2f2;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1386,-300" order="1" text="La Plaza de Toros La Macarena"
+                                           shape="rounded rectagle" id="191" fontStyle=";;#f2f2f2;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1400,-276" order="2" text="Jardín Botánico Joaquín Antonio Uribe"
+                                           shape="rounded rectagle" id="192" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1368,-252" order="3" text="Zoológico de Santa Fe"
+                                           shape="rounded rectagle" id="193" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                </topic>
+                            </topic>
+                        </topic>
+                    </topic>
+                </topic>
+            </topic>
+            <topic position="-518,543" order="1" text="Conocer más de tu ciudad" shape="rounded rectagle" id="5"
+                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                <topic position="-678,234" order="0" text="De la historia" shape="rounded rectagle" id="7"
+                       fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                    <topic position="-835,63" order="0" text="De una manera divertida" shape="rounded rectagle" id="10"
+                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                        <topic position="-1013,54" order="0" text="¿Te gustan los teatros?" id="12">
+                            <topic position="-1144,-60" order="0" text="Sí" shape="rounded rectagle" id="14"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1257,-69" order="0" text="¿Los Clásicos?" id="15">
+                                    <topic position="-1370,-159" order="0" text="Sí" shape="rounded rectagle" id="16"
+                                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1502,-168" order="0" text="Entonces puedes visitar" id="21">
+                                            <topic position="-1681,-204" order="0" text="Teatro Pablo Tobón Uribe"
+                                                   shape="rounded rectagle" id="19" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1653,-180" order="1" text="Teatro Lido"
+                                                   shape="rounded rectagle" id="18" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1673,-156" order="2" text="Teatro Metropolitano"
+                                                   shape="rounded rectagle" id="20" fontStyle=";;#ffffff;;normal;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1686,-132" order="3" text="Teatro Porfirio Barba Jacob"
+                                                   shape="rounded rectagle" id="22" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                    </topic>
+                                    <topic position="-1372,-15" order="1" text="No" shape="rounded rectagle" id="17"
+                                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1509,-24" order="0" text="Seguro te gustarán estos" id="23">
+                                            <topic position="-1683,-96" order="0" text="El Peque<75><65>o Teatro"
+                                                   shape="rounded rectagle" id="24" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1705,-72" order="1" text="Teatro de Muñecos La Fanfarria"
+                                                   shape="rounded rectagle" id="25" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1693,-48" order="2" text="Teatro El Águila Descalza"
+                                                   shape="rounded rectagle" id="26" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1710,-24" order="3" text="Teatro Manicomio De Mu<4D><75>ecos"
+                                                   shape="rounded rectagle" id="27" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1683,0" order="4" text="Teatro Matacandelas"
+                                                   shape="rounded rectagle" id="28" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1704,24" order="5" text="Teatro Universidad de Medellín"
+                                                   shape="rounded rectagle" id="29" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                            <topic position="-1677,48" order="6" text="Teatro Caja Negra"
+                                                   shape="rounded rectagle" id="30" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                    </topic>
+                                </topic>
+                            </topic>
+                            <topic position="-1146,204" order="1" text="No" shape="rounded rectagle" id="13"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1275,195" order="0" text="¿Qué tal los museos?" id="31">
+                                    <topic position="-1419,183" order="0" text="Están bien" shape="rounded rectagle"
+                                           id="33" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1555,174" order="0" text="¿De los antiguos?" id="34">
+                                            <topic position="-1674,123" order="0" text="Sí" shape="rounded rectagle"
+                                                   id="35" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                                <topic position="-1796,90" order="0" text="Museo de Antioquia"
+                                                       shape="rounded rectagle" id="37" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1817,114" order="1" text="Museo Cementerio San Pedro"
+                                                       shape="rounded rectagle" id="38" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1791,138" order="2" text="Museo El Castillo"
+                                                       shape="rounded rectagle" id="41" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                            </topic>
+                                            <topic position="-1718,213" order="1" text="Algo más nuevo, mejor"
+                                                   shape="rounded rectagle" id="36" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000">
+                                                <topic position="-1912,168" order="0"
+                                                       text="Museo de Arte Moderno (MAMM)" shape="rounded rectagle"
+                                                       id="39" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                       brColor="#000000"/>
+                                                <topic position="-1956,192" order="1"
+                                                       text="Museo Universitario Universidad de Antioquia (MUUA)"
+                                                       shape="rounded rectagle" id="40" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1924,216" order="2"
+                                                       text="Casa Museo Maestro Pedro Nel Gómez"
+                                                       shape="rounded rectagle" id="42" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                                <topic position="-1892,240" order="3" text="Casa Museo Gardeliana "
+                                                       shape="rounded rectagle" id="43" fontStyle=";;#ffffff;;;"
+                                                       bgColor="#000000" brColor="#000000"/>
+                                            </topic>
+                                        </topic>
+                                    </topic>
+                                    <topic position="-1424,291" order="1" text="No te gustan" shape="rounded rectagle"
+                                           id="32" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                </topic>
+                            </topic>
+                        </topic>
+                    </topic>
+                    <topic position="-857,495" order="1" text="De la historia que está en los libros"
+                           shape="rounded rectagle" id="11" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                           brColor="#000000">
+                        <topic position="-1067,486" order="0" text="¿Quieres ir a una biblioteca?" id="44">
+                            <topic position="-1208,423" order="0" text="Sí" shape="rounded rectagle" id="45"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1331,351" order="0" text="De las tradicionales"
+                                       shape="rounded rectagle" id="47" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000">
+                                    <topic position="-1500,330" order="0" text="Biblioteca Pública Piloto"
+                                           shape="rounded rectagle" id="49" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1481,354" order="1" text="Biblioteca EPM" shape="rounded rectagle"
+                                           id="50" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                </topic>
+                                <topic position="-1328,441" order="1" text="Parques biblioteca" shape="rounded rectagle"
+                                       id="48" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                    <topic position="-1459,384" order="0" text="España" shape="rounded rectagle" id="52"
+                                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1465,408" order="1" text="San Javier" shape="rounded rectagle"
+                                           id="51" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1469,432" order="2" text="La Quintana" shape="rounded rectagle"
+                                           id="55" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1464,456" order="3" text="La Ladera" shape="rounded rectagle"
+                                           id="53" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1456,480" order="4" text="Belén" shape="rounded rectagle" id="54"
+                                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                </topic>
+                            </topic>
+                            <topic position="-1210,579" order="1" text="No" shape="rounded rectagle" id="46"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1340,570" order="0" text="¿Algo más de mapas?" id="65">
+                                    <topic position="-1515,540" order="0" text="Sí, de historia de verdad"
+                                           shape="rounded rectagle" id="66" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000">
+                                        <topic position="-1705,519" order="0" text="Archivo Histórico de Medellín"
+                                               shape="rounded rectagle" id="68" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1716,543" order="1" text="Academia de Historia de Antioquia"
+                                               shape="rounded rectagle" id="69" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                    </topic>
+                                    <topic position="-1470,597" order="1" text="No" shape="rounded rectagle" id="67"
+                                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1596,588" order="0" text="¿Mejor a un parque?" id="61">
+                                            <topic position="-1720,576" order="0" text="Sí" shape="rounded rectagle"
+                                                   id="62" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                                   brColor="#000000"/>
+                                            <topic position="-1735,600" order="1" text="Tampoco"
+                                                   shape="rounded rectagle" id="63" fontStyle=";;#ffffff;;;"
+                                                   bgColor="#000000" brColor="#000000"/>
+                                        </topic>
+                                    </topic>
+                                </topic>
+                            </topic>
+                        </topic>
+                    </topic>
+                </topic>
+                <topic position="-681,969" order="1" text="De la geografía" shape="rounded rectagle" id="9"
+                       fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                    <topic position="-827,714" order="0" text="Parques naturales" shape="rounded rectagle" id="70"
+                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                        <topic position="-1011,669" order="0" text="Parque ecológico Piedras Blancas"
+                               shape="rounded rectagle" id="72" fontStyle=";;#f5f5f5;;;" bgColor="#000000"
+                               brColor="#000000"/>
+                        <topic position="-998,693" order="1" text="Ecoparque Cerro El Volador" shape="rounded rectagle"
+                               id="73" fontStyle=";;#f5f5f5;;;" bgColor="#000000" brColor="#000000"/>
+                        <topic position="-1009,717" order="2" text="Parque Ecológico Cerro Nutibara"
+                               shape="rounded rectagle" id="74" fontStyle=";;#f5f5f5;;;" bgColor="#000000"
+                               brColor="#000000"/>
+                        <topic position="-992,741" order="3" text="Parque Ecoturístico Arví" shape="rounded rectagle"
+                               id="75" fontStyle=";;#f5f5f5;;;" bgColor="#000000" brColor="#000000"/>
+                    </topic>
+                    <topic position="-824,1011" order="1" text="Parques urbanos" shape="rounded rectagle" id="71"
+                           fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                        <topic position="-982,1002" order="0" text="¿De los tradicionales?" id="76">
+                            <topic position="-1110,927" order="0" text="Sí" shape="rounded rectagle" id="79"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1205,843" order="0" text="Plazas" shape="rounded rectagle" id="77"
+                                       fontStyle=";;#f7f7f7;;;" bgColor="#000000" brColor="#000000">
+                                    <topic position="-1339,762" order="0" text="Plaza de San Antonio"
+                                           shape="rounded rectagle" id="81" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1322,786" order="1" text="Plaza Botero" shape="rounded rectagle"
+                                           id="82" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1327,810" order="2" text="Plaza Cisneros" shape="rounded rectagle"
+                                           id="83" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1339,834" order="3" text="Plazuela San Ignacio"
+                                           shape="rounded rectagle" id="85" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1336,858" order="4" text="Plaza de la Libertad"
+                                           shape="rounded rectagle" id="84" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1332,882" order="5" text="Plazuela Nutibara"
+                                           shape="rounded rectagle" id="86" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1344,906" order="6" text="Plazuela de la Veracruz"
+                                           shape="rounded rectagle" id="87" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                </topic>
+                                <topic position="-1209,1005" order="1" text="Parques" shape="rounded rectagle" id="78"
+                                       fontStyle=";;#f7f7f7;;;" bgColor="#000000" brColor="#000000">
+                                    <topic position="-1340,936" order="0" text="Parque de Bolívar"
+                                           shape="rounded rectagle" id="88" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1338,960" order="1" text="Parque de Berrío"
+                                           shape="rounded rectagle" id="89" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1340,984" order="2" text="Parque de Boston"
+                                           shape="rounded rectagle" id="90" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1343,1008" order="3" text="Parque del Poblado"
+                                           shape="rounded rectagle" id="91" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1337,1032" order="4" text="Parque de Belén"
+                                           shape="rounded rectagle" id="92" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                    <topic position="-1347,1056" order="5" text="Parque del Periodista"
+                                           shape="rounded rectagle" id="93" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                           brColor="#000000"/>
+                                </topic>
+                            </topic>
+                            <topic position="-1140,1167" order="1" text="No, algo distinto" shape="rounded rectagle"
+                                   id="80" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1280,1098" order="0" text="Parque Lleras" shape="rounded rectagle"
+                                       id="94" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                <topic position="-1312,1122" order="1" text="Parque de los Pies Descalzos"
+                                       shape="rounded rectagle" id="95" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1309,1146" order="2" text="Parque Lineal La Presidenta"
+                                       shape="rounded rectagle" id="96" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1297,1170" order="3" text="Parque de Los Deseos"
+                                       shape="rounded rectagle" id="97" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1298,1194" order="4" text="Parque de La Bailarina"
+                                       shape="rounded rectagle" id="98" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1302,1218" order="5" text="Parque Juanes de La Paz"
+                                       shape="rounded rectagle" id="99" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                            </topic>
+                        </topic>
+                    </topic>
+                </topic>
+            </topic>
+            <topic position="-499,1563" order="2" text="Otra información" shape="rounded rectagle" id="8"
+                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                <topic position="-651,1554" order="0" text="¿Una emergencia?" id="102">
+                    <topic position="-772,1491" order="0" text="Sí" id="105">
+                        <topic position="-890,1491" order="0" text="¿Tienes teléfono?" id="107">
+                            <topic position="-1008,1335" order="0" text="Sí" shape="rounded rectagle" id="108"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1133,1290" order="0" text="Policía: Llama al 112"
+                                       shape="rounded rectagle" id="117" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1140,1314" order="1" text="Seguridad: Llama al 123"
+                                       shape="rounded rectagle" id="119" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1131,1338" order="2" text="Salud: Llama al 125"
+                                       shape="rounded rectagle" id="118" fontStyle=";;#ffffff;;;" bgColor="#000000"
+                                       brColor="#000000"/>
+                                <topic position="-1117,1362" order="3" text="Información: " shape="rounded rectagle"
+                                       id="120" fontStyle=";;#fcfcfc;;;" bgColor="#ff0000" brColor="#000000"/>
+                            </topic>
+                            <topic position="-1035,1542" order="1" text="No, es mejor ir" shape="rounded rectagle"
+                                   id="109" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1192,1533" order="0" text="¿Algún punto de Salud?" id="100">
+                                    <topic position="-1340,1422" order="0" text="Hospitales" shape="rounded rectagle"
+                                           id="101" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1528,1389" order="0"
+                                               text="Hospital Universitario San Vicente de Paúl"
+                                               shape="rounded rectagle" id="121" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1495,1413" order="1" text="Hospital Pablo Tobón Uribe"
+                                               shape="rounded rectagle" id="122" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1499,1437" order="2" text="Hospital General de Medellín"
+                                               shape="rounded rectagle" id="123" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                    </topic>
+                                    <topic position="-1335,1572" order="1" text="Clínicas" shape="rounded rectagle"
+                                           id="104" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1458,1467" order="0" text="Clínica Soma"
+                                               shape="rounded rectagle" id="124" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1462,1491" order="1" text="Clínica Medellín"
+                                               shape="rounded rectagle" id="125" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1454,1515" order="2" text="Clínica CES"
+                                               shape="rounded rectagle" id="126" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1474,1539" order="3" text="Clínica Las Américas"
+                                               shape="rounded rectagle" id="127" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1477,1563" order="4" text="Clínica Cardiovascular"
+                                               shape="rounded rectagle" id="131" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1467,1587" order="5" text="Clínica Las Vegas"
+                                               shape="rounded rectagle" id="128" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1466,1611" order="6" text="Clínica El Rosario"
+                                               shape="rounded rectagle" id="129" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1462,1635" order="7" text="Clínica El Prado"
+                                               shape="rounded rectagle" id="130" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                        <topic position="-1486,1659" order="8" text="Clínica El Sagrado Corazón"
+                                               shape="rounded rectagle" id="132" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                    </topic>
+                                </topic>
+                            </topic>
+                        </topic>
+                    </topic>
+                    <topic position="-774,1767" order="1" text="No" id="106">
+                        <topic position="-891,1767" order="0" text="¿Estás perdido?" id="103">
+                            <topic position="-1019,1755" order="0" text="Un poco" shape="rounded rectagle" id="110"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                <topic position="-1145,1746" order="0" text="Puedes utilizar" id="112">
+                                    <topic position="-1268,1719" order="0" text="Un bus" shape="rounded rectagle"
+                                           id="113" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                    <topic position="-1271,1746" order="1" text="El Metro" shape="rounded rectagle"
+                                           id="114" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000">
+                                        <topic position="-1391,1737" order="0" text="Metro Cable"
+                                               shape="rounded rectagle" id="116" fontStyle=";;#ffffff;;;"
+                                               bgColor="#000000" brColor="#000000"/>
+                                    </topic>
+                                    <topic position="-1280,1773" order="2" text="El Metroplús" shape="rounded rectagle"
+                                           id="115" fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                                </topic>
+                            </topic>
+                            <topic position="-1008,1812" order="1" text="No" shape="rounded rectagle" id="111"
+                                   fontStyle=";;#ffffff;;;" bgColor="#000000" brColor="#000000"/>
+                        </topic>
+                    </topic>
+                </topic>
+            </topic>
+        </topic>
+    </topic>
+    <relationship srcTopicId="62" destTopicId="76" lineType="3" endArrow="true" startArrow="false"/>
+</map>

wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java

@@ -42,7 +42,7 @@ public class ExportTest {
         final ExportProperties properties = ExportProperties.create(format);
         final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
         imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
-        String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons/";
+        String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons";
         properties.setBaseImagePath(baseUrl);
 
         // Write content ...

wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java

@@ -13,7 +13,7 @@ import org.testng.annotations.Test;
 import java.io.*;
 
 @Test
-public class ExportTest {
+public class FreemindExportTest {
     private static final String DATA_DIR_PATH = "src/test/data/wisemaps/";
 
     @Test(dataProvider = "Data-Provider-Function")
@@ -28,7 +28,7 @@ public class ExportTest {
 
             // Load rec file co
             final FileInputStream fis = new FileInputStream(recFile);
-            final InputStreamReader isr = new InputStreamReader(fis);
+            final InputStreamReader isr = new InputStreamReader(fis,"UTF-8");
             final BufferedReader br = new BufferedReader(isr);
 
             final StringBuilder recContent = new StringBuilder();
@@ -44,7 +44,7 @@ public class ExportTest {
             // Export mile content ...
             final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             freemindExporter.export(mindmap, bos);
-            final String exportContent = new String(bos.toByteArray());
+            final String exportContent = new String(bos.toByteArray(),"UTF-8");
 
             Assert.assertEquals(recContent.toString(), exportContent);
 
@@ -59,7 +59,7 @@ public class ExportTest {
 
     private MindMap load(@NotNull File wisemap) throws IOException {
         final FileInputStream fis = new FileInputStream(wisemap);
-        final InputStreamReader isr = new InputStreamReader(fis);
+        final InputStreamReader isr = new InputStreamReader(fis,"UTF-8");
         final BufferedReader br = new BufferedReader(isr);
 
         final StringBuilder content = new StringBuilder();
@@ -72,7 +72,7 @@ public class ExportTest {
         fis.close();
 
         final MindMap result = new MindMap();
-        result.setXml(content.toString().getBytes());
+        result.setXml(content.toString().getBytes("UTF-8"));
         result.setNativeXml(content.toString());
         return result;
     }
@@ -85,7 +85,7 @@ public class ExportTest {
         final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
 
             public boolean accept(File dir, String name) {
-                return name.endsWith(".xml");
+                return name.endsWith(".wxml");
             }
         });
 

wise-webapp/src/test/java/com/wisemapping/test/freemind/ImportExportTest.java

@@ -29,7 +29,7 @@ public class ImportExportTest {
 
 
     @Test(dataProvider = "Data-Provider-Function")
-    public void exportImportExportTest(@NotNull final File freeMindFile, @NotNull final File wiseFile, @NotNull final File freeRecFile) throws ImporterException, IOException, ExportException {
+    public void exportImportTest(@NotNull final File freeMindFile, @NotNull final File wiseFile, @NotNull final File freeRecFile) throws ImporterException, IOException, ExportException {
 
 
         final FileInputStream fileInputStream = new FileInputStream(freeMindFile.getAbsolutePath());
@@ -46,7 +46,7 @@ public class ImportExportTest {
 
         } else {
             final FileOutputStream fos = new FileOutputStream(wiseFile);
-            fos.write(mindMap.getUnzippedXml().getBytes());
+            fos.write(mindMap.getUnzippedXml().getBytes("UTF-8"));
             fos.close();
         }
 
@@ -55,12 +55,11 @@ public class ImportExportTest {
             // Compare rec and file ...
             final String recContent = readFile(freeRecFile);
 
-            // Export mile content ...
+            // Export content ...
             final ByteArrayOutputStream bos = new ByteArrayOutputStream();
             exporter.export(mindMap, bos);
-            final String exportContent = new String(bos.toByteArray());
 
-            Assert.assertEquals(exportContent, recContent);
+            Assert.assertEquals(bos.toByteArray(), recContent.getBytes("UTF-8"));
 
         } else {
             final FileOutputStream fos = new FileOutputStream(freeRecFile);
@@ -73,7 +72,7 @@ public class ImportExportTest {
     private String readFile(@NotNull File file) throws IOException {
         // Load rec file co
         final FileInputStream fis = new FileInputStream(file);
-        final InputStreamReader isr = new InputStreamReader(fis);
+        final InputStreamReader isr = new InputStreamReader(fis,"UTF-8");
         final BufferedReader br = new BufferedReader(isr);
 
         final StringBuilder result = new StringBuilder();
@@ -92,11 +91,13 @@ public class ImportExportTest {
     @DataProvider(name = "Data-Provider-Function")
     public Object[][] parameterIntTestProvider() {
 
+        final String testNameToRun = System.getProperty("wise.test.name");
+
         final File dataDir = new File(DATA_DIR_PATH);
         final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
 
             public boolean accept(File dir, String name) {
-                return name.endsWith(".mm");
+                return name.endsWith(".mm") && (testNameToRun==null || name.startsWith(testNameToRun));
             }
         });
 

wise-webapp/src/test/sql/mysql/create-schemas.sql

@@ -14,7 +14,7 @@ password varchar(255) CHARACTER SET utf8 NOT NULL,
 activationCode BIGINT(20) NOT NULL,
 activation_date date,
 allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0,
-FOREIGN KEY(colaborator_id) REFERENCES colaborator(id)
+FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE MINDMAP (
@@ -31,7 +31,7 @@ tags varchar(1014) CHARACTER SET utf8 ,
 last_editor varchar(255) CHARACTER SET utf8 ,
 creator_user varchar(255) CHARACTER SET utf8 ,
 editor_properties varchar(512) CHARACTER SET utf8 ,
-FOREIGN KEY(owner_id) REFERENCES user(colaborator_id)
+FOREIGN KEY(owner_id) REFERENCES USER(colaborator_id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE MINDMAP_NATIVE
@@ -55,15 +55,15 @@ id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
 colaborator_id INTEGER NOT NULL,
 mindmap_id INTEGER NOT NULL,
 role_id INTEGER NOT NULL,
-FOREIGN KEY(colaborator_id) REFERENCES colaborator(id),
-FOREIGN KEY(mindmap_id) REFERENCES mindmap(id)
+FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id),
+FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE TAG(
 id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
 name varchar(255) CHARACTER SET utf8 NOT NULL,
 user_id INTEGER NOT NULL,
-FOREIGN KEY(user_id) REFERENCES user(colaborator_id)
+FOREIGN KEY(user_id) REFERENCES USER(colaborator_id)
 ) CHARACTER SET utf8 ;
 
 CREATE TABLE USER_LOGIN (